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

Upgrade to PHP 8.0 #112

Merged
merged 13 commits into from
Dec 21, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
20 changes: 11 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/.semaphore export-ignore
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php-cs-fixer.dist.php export-ignore
/composer.lock export-ignore
/LICENSE export-ignore
/phpunit.xml.dist export-ignore
/README.md export-ignore
/.github export-ignore
/docker export-ignore
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php-cs-fixer.dist.php export-ignore
/composer.lock export-ignore
/LICENSE export-ignore
/phpunit.xml.dist export-ignore
/php-demandware-xml export-ignore
/README.md export-ignore
1 change: 0 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
strategy:
matrix:
php-version:
- '7.4'
- '8.0'
steps:
- uses: actions/checkout@v2
Expand Down
7 changes: 6 additions & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?php
return FusionsPim\PhpCsFixer\Factory::fromDefaults([
$config = FusionsPim\PhpCsFixer\Factory::fromDefaults([
'date_time_immutable' => false, // Needed for tests
'group_import' => false, // Currently broken for root classes
]);

return $config->setFinder(
$config->getFinder()
->notName('rector.php')
);
15 changes: 9 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@
"xml"
],
"require": {
"php": "^7.4 || ^8.0",
"ext-SimpleXML": "^7.4 || ^8.0",
"ext-json": "^7.4 || ^8.0",
"ext-xmlreader": "^7.4 || ^8.0",
"ext-xmlwriter": "^7.4 || ^8.0"
"php": "^8.0",
"ext-SimpleXML": "^8.0",
"ext-json": "^8.0",
"ext-libxml": "^8.0",
"ext-xmlreader": "^8.0",
"ext-xmlwriter": "^8.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.6",
"fusionspim/php-cs-fixer-config": "^9.0",
"phpunit/phpunit": "9.5.*"
"phpunit/phpunit": "9.5.*",
"rector/rector": "^0.12.8"
},
"autoload": {
"psr-4": {
Expand All @@ -36,6 +38,7 @@
"php-cs-fixer fix --config=.php-cs-fixer.dist.php",
"composer normalize"
],
"fix-rector": "vendor/bin/rector process src tests",
"test": [
"phpunit --stop-on-failure --stop-on-error"
]
Expand Down
Loading