Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #4

Merged
merged 5 commits into from
Jun 11, 2022
Merged

Update dependencies #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f48273
Require at least PHP v7.4
PabloKowalczyk Jun 11, 2022
a7ac335
Require at least "phpunit/phpunit" v9.5
PabloKowalczyk Jun 11, 2022
cbd173f
Remove "scrutinizer/ocular" dev dependency
PabloKowalczyk Jun 11, 2022
8f2f0b3
Remove ".scruntizer.yml" file
PabloKowalczyk Jun 11, 2022
3ee6581
Update "friendsofphp/php-cs-fixer" to v3
PabloKowalczyk Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs.dist export-ignore
/.scrutinizer.yml export-ignore
/.php-cs-fixer.dist.php export-ignore
/.travis.yml export-ignore
5 changes: 3 additions & 2 deletions .php_cs.dist → .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

declare(strict_types=1);

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setUsingCache(false)
->setRules([
'native_function_invocation' => [
'exclude' => [
'_'
]
],
'include' => ['@all'],
],
])
->setRiskyAllowed(true)
Expand Down
258 changes: 0 additions & 258 deletions .scrutinizer.yml
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@
"issues": "https://github.com/jsonapiphp/jsonapi/issues"
},
"require": {
"php": ">=7.1.0"
"php": ">=7.4.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
"friendsofphp/php-cs-fixer": "^3.8",
"mockery/mockery": "^1.0",
"phpmd/phpmd": "^2.6",
"phpunit/phpunit": "^7.0",
"scrutinizer/ocular": "^1.4",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^2.9"
},
"minimum-stability": "stable",
Expand Down