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.

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

Compatibility with PHP8 / Minimum PHP7.4 #128

Open
wants to merge 16 commits into
base: gsc-master-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ reports/
.idea/
.idea/workspace.xml
.docker
.phpunit.result.cache
8 changes: 4 additions & 4 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests');

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config)
->setRules([
'@Symfony' => true,
'@PHP71Migration:risky' => true,
Expand All @@ -15,12 +15,12 @@
'concat_space' => ['spacing' => 'one'],
'declare_strict_types' => true,
'increment_style' => ['style' => 'post'],
'is_null' => ['use_yoda_style' => false],
'list_syntax' => ['syntax' => 'short'],
'method_argument_space' => ['ensure_fully_multiline' => true],
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'yoda_style' => false,
'method_chaining_indentation' => true,
'modernize_types_casting' => true,
'no_multiline_whitespace_before_semicolons' => true,
'multiline_whitespace_before_semicolons' => false,
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => true,
'no_useless_else' => true,
Expand Down
20 changes: 12 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"prefer-stable": true,
"require": {
"php": "^7.1",
"php": "^7.1|^8.0",
"ext-json": "*",
"ext-simplexml": "*",
"linio/util": "^2.2|^3.0",
Expand All @@ -33,13 +33,14 @@
"psr/log": "^1.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"friendsofphp/php-cs-fixer": "^2.19",
"fzaninotto/faker": "^1.8",
"infection/infection": "^0.13.6",
"infection/infection": "^0.26.",
"php-http/guzzle6-adapter": "^2.0",
"phpspec/prophecy": "^1.8",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^0.12.",
"phpunit/phpunit": "^9.5",
"symfony/var-dumper": "^4.4"
},
"suggest" : {
Expand All @@ -50,7 +51,10 @@
"preferred-install": {
"*": "dist"
},
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"infection/extension-installer": true
}
},
"autoload": {
"psr-4": {
Expand All @@ -69,9 +73,9 @@
}
},
"scripts": {
"lint": "php-cs-fixer fix --verbose --show-progress=estimating",
"lint": "php-cs-fixer fix --verbose --show-progress=dots",
"lint:check": [
"php-cs-fixer fix --dry-run --verbose --show-progress=estimating"
"php-cs-fixer fix --dry-run --verbose --show-progress=dots"
],
"phpunit": "phpunit",
"phpstan": "phpstan analyze",
Expand Down
Loading