Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
omalizadeh committed Jul 4, 2021
2 parents 4517513 + c00444d commit 0ea2ac1
Show file tree
Hide file tree
Showing 14 changed files with 7,509 additions and 31 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/tests export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/composer.lock export-ignore
/phpunit.xml export-ignore
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/.idea
/.vscode
/.vscode
/vendor
.phpunit.result.cache
28 changes: 21 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"type": "library",
"license": "MIT",
"keywords": [
"laravel",
"query",
"filter",
"resource",
Expand All @@ -19,22 +20,35 @@
"email": "[email protected]"
}
],
"require": {
"php": "^7.3|^8.0",
"ext-json": "*",
"illuminate/contracts": "^6.0|^7.0|^8.0",
"illuminate/console": "^6.0|^7.0|^8.0",
"illuminate/database": "^6.0|^7.0|^8.0",
"illuminate/http": "^6.0|^7.0|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0"
},
"autoload": {
"psr-4": {
"Omalizadeh\\QueryFilter\\": "src/"
}
},
"require-dev": {
"orchestra/testbench": "^6.19"
},
"autoload-dev": {
"psr-4": {
"Omalizadeh\\QueryFilter\\Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"providers": [
"Omalizadeh\\QueryFilter\\QueryFilterServiceProvider"
]
}
},
"require": {
"php": "^7.3|^8.0",
"laravel/framework": "^6.0|^7.0|^8.0",
"ext-json": "*"
},
"minimum-stability": "stable"
}
"minimum-stability": "dev",
"prefer-stable": true
}
Loading

0 comments on commit 0ea2ac1

Please sign in to comment.