Merge pull request #130 from ByteInternet/add-support-for-php84-update-dependancies

Add support for php84 update dependancies

Author: poespas

.github/workflows/publish.yaml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       matrix:
         php_version:
-          - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         node_version:
           - 16
           - 18

.github/workflows/test.yaml

@@ -6,7 +6,7 @@ jobs:
   integration_test:
     strategy:
       matrix:
-        php_version: [8.1, 8.2, 8.3]
+        php_version: [8.2, 8.3, 8.4]
         testsuite: [general, brancher]
     runs-on: ubuntu-latest
     steps:
@@ -19,12 +19,12 @@ jobs:
         env:
           PHP_VERSION: ${{ matrix.php_version }}
       - name: Start SSH agent for brancher testsuite
-        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.3' }}
+        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.4' }}
         uses: webfactory/ssh-agent@v0.5.4
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
       - name: Run brancher testsuite
-        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.3' }}
+        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.4' }}
         run: ./runtests.sh brancher
         shell: bash
         env:
@@ -34,7 +34,7 @@ jobs:
   code_quality:
     strategy:
       matrix:
-        php_version: [7.4, 8.1, 8.2, 8.3]
+        php_version: [8.1, 8.2, 8.3, 8.4]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout hypernode-deploy

ci/test/run-general.sh

@@ -4,6 +4,11 @@ set -e
 set -x
 
 export PHP_VERSION_SHORT=$(echo "${PHP_VERSION:-8.2}" | sed 's/\.//')
+if [[ "${PHP_VERSION:-8.2}" == "8.4" ]]; then
+    export IMAGE_OS="bookworm"
+else
+    export IMAGE_OS="buster"
+fi
 
 # Handy aliases
 HN="docker-compose exec -T hypernode"
@@ -59,7 +64,7 @@ end_task
 
 begin_task "Setting Magento 2"
 # Create working initial Magento install on the Hypernode container
-$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:2.4.7-p3 /data/web/magento2
+$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:2.4.8 /data/web/magento2
 echo "Waiting for MySQL to be available on the Hypernode container"
 $HN bash -c "until mysql -e 'select 1' ; do sleep 1; done"
 install_magento

composer.json

@@ -17,7 +17,7 @@
         "guzzlehttp/guzzle": "^7.5",
         "hypernode/api-client": "^0.4",
         "hypernode/deploy-configuration": "^3.4",
-        "php-di/php-di": "^6.0",
+        "php-di/php-di": "^7.0",
         "psr/log": "^1.0",
         "symfony/console": "^5.4",
         "symfony/finder": "^5.4",
@@ -36,9 +36,9 @@
     },
     "require-dev": {
         "phpro/grumphp-shim": "^1.13",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.7",
-        "vimeo/psalm": "^4.26"
+        "vimeo/psalm": "^6.0"
     },
     "config": {
         "preferred-install": {