Merge pull request #58 from drunomics/feature/DEV-2035

improve: DEV-2025: Fix broken tests and upgrade php.

Author: petarbasic

.github/workflows/test-drupal-setup.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup PHP
         run: |
-          sudo update-alternatives --set php /usr/bin/php7.4
+          sudo update-alternatives --set php /usr/bin/php8.1
       - name: "Determine composer cache directory"
         id: "determine-composer-cache-directory"
         run: "echo \"::set-output name=directory::$(composer config cache-dir)\""

composer.json

@@ -117,7 +117,7 @@
         },
         "tools": {
             "phapp": {
-                "url": "https://github.com/drunomics/phapp-cli/releases/download/0.6.7/phapp.phar",
+                "url": "https://github.com/drunomics/phapp-cli/releases/download/0.7.0/phapp.phar",
                 "version": "0.6.7"
             },
             "local-php-security-checker": {
@@ -143,7 +143,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.1"
         },
         "sort-packages": true,
         "preferred-install": {

phapp.yml

@@ -39,8 +39,7 @@ commands:
     chmod +w web/sites/default &&
     drush sql-create -y &&
     SITE=${SITE:-default} &&
-    drush site-install -y --sites-subdir=$SITE --config-dir=../config/sync ${INSTALL_PROFILE:-minimal} &&
-    drush en services_env_parameter -y
+    drush site-install -y --sites-subdir=$SITE --config-dir=../config/sync ${INSTALL_PROFILE:-minimal}
   update: |
     ./scripts/init-media-icons.sh &&
     drush updatedb -y &&

scripts/init-devsetup-docker.sh

@@ -28,7 +28,7 @@ if [[ $PROJECT_ADD_DEVSETUP_DOCKER = 1 ]]; then
   php process-replacements.php
   rm -rf devsetup-tmp process-replacements.php
   echo \
-'COMPOSE_AMAZEEIO_VERSION=v1.9.1
-COMPOSE_AMAZEEIO_PHP_VERSION=7.4
+'COMPOSE_AMAZEEIO_VERSION=22.2.0
+COMPOSE_AMAZEEIO_PHP_VERSION=8.1
 ' >> .env-defaults
 fi