Merge pull request #189 from shopwareLabs/update-php-version

Allow usage of PHP 8
shopwareLabs · Feb 2, 2023 · 364c29d · 364c29d
2 parents 41f98fc + 6f13246
commit 364c29d
Show file tree

Hide file tree

Showing 29 changed files with 1,479 additions and 1,578 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.3'
+          php-version: '7.4'
           ini-values: phar.readonly=Off
 
       - name: Install dependencies

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,8 +7,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        php: [ 7.3, 7.4 ]
+        php: [ 7.4, 8.0, 8.1, 8.2 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,6 +24,7 @@ jobs:
 
       - name: Check code style
         run: composer cs-check
+        if: ${{ matrix.php == '8.1'}}
 
       - name: Execute tests
         run: composer test
diff --git a/bin/build.sh b/bin/build.sh
@@ -9,4 +9,4 @@ set -o pipefail
 ./bin/download_box.sh
 
 # Build PHAR
-./box.phar build -vv
+./box.phar compile -vv
diff --git a/bin/cleanup_vendor.sh b/bin/cleanup_vendor.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 echo "Cleanup Vendors"
-find vendor/fzaninotto/faker/src/Faker/Provider/ -maxdepth 1 -mindepth 1 -type d -not -name en_US  -exec rm -r {} \;
+find vendor/fakerphp/faker/src/Faker/Provider/ -maxdepth 1 -mindepth 1 -type d -not -name en_US  -exec rm -r {} \;
diff --git a/bin/download_box.sh b/bin/download_box.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "Download Box"
-wget -O box.phar https://github.com/box-project/box/releases/download/3.13.0/box.phar
+wget -O box.phar https://github.com/box-project/box/releases/download/3.16.0/box.phar
 chmod 755 box.phar
diff --git a/box.json.dist b/box.json.dist
@@ -1,5 +1,4 @@
 {
-    "chmod": "0755",
     "alias": "sw.phar",
     "compactors": [
         "KevinGH\\Box\\Compactor\\Json",

diff --git a/composer.json b/composer.json
@@ -4,32 +4,30 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4 || ^8.0",
         "ext-curl": "*",
-        "symfony/console": "~4.4",
-        "symfony/config": "~4.4",
-        "symfony/yaml": "~4.4",
-        "symfony/process": "~4.4",
-        "symfony/dependency-injection": "~4.4",
         "dnoegel/php-xdg-base-dir": "~0.1",
-        "shopwarelabs/plugin-info": "0.1.0",
-        "fzaninotto/faker": "^1.9.1",
+        "fakerphp/faker": "^1.21.0",
         "guzzlehttp/guzzle": "^6.5.2",
-        "padraic/phar-updater": "^1.0.6"
+        "laravel-zero/phar-updater": "^1.1",
+        "shopwarelabs/plugin-info": "0.1.0",
+        "symfony/config": "~5.4",
+        "symfony/console": "~5.4",
+        "symfony/dependency-injection": "~5.4",
+        "symfony/process": "~5.4",
+        "symfony/yaml": "~5.4"
     },
     "require-dev": {
         "ext-phar": "*",
-        "friendsofphp/php-cs-fixer": "^2.19.0",
-        "kubawerlos/php-cs-fixer-custom-fixers": "^2.5.0",
-        "phpunit/phpunit": "^8.5.15",
-        "symfony/var-dumper": "~4.4"
+        "friendsofphp/php-cs-fixer": "^3.14.3",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^v3.11.3",
+        "phpunit/phpunit": "^9.5",
+        "symfony/var-dumper": "~5.4"
     },
     "scripts": {
-        "post-install-cmd": "ln -sf ../../hooks/pre-commit .git/hooks/pre-commit",
-        "post-update-cmd": "ln -sf ../../hooks/pre-commit .git/hooks/pre-commit",
         "cs-check": "php-cs-fixer fix --dry-run -v",
         "cs-fix": "php-cs-fixer fix -v",
-        "test": "phpunit --colors=always"
+        "test": "phpunit"
     },
     "autoload": {
         "psr-4": {