Test php8.1

greenpeace · Dec 7, 2022 · 3f305a0 · 3f305a0
1 parent ace32f6
commit 3f305a0
Show file tree

Hide file tree

Showing 14 changed files with 1,080 additions and 858 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,6 +25,8 @@ workflows:
     jobs:
       - php74-tests:
           <<: *on_pr
+      - php81-tests:
+          <<: *on_pr
       - frontend-tests:
           <<: *on_pr
       - acceptance-tests:
@@ -90,7 +92,7 @@ job-references:
           command: |
             mkdir -p /tmp/test-results/phpcs
             vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs
-            vendor/bin/phpcs --report=junit --report-file=/tmp/test-results/phpcs/$CIRCLE_STAGE.xml
+            vendor/bin/phpcs -d error_reporting="E_ALL&~E_DEPRECATED" --report=junit --report-file=/tmp/test-results/phpcs/$CIRCLE_STAGE.xml
       - run:
           name: phpunit
           when: always
@@ -100,7 +102,7 @@ job-references:
             base=$(curl -s https://raw.githubusercontent.com/greenpeace/planet4-base/main/composer.json)
             WP_VERSION=$(jq -r '.extra["wp-version"] // empty' \<<< "${base}")
             bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 $WP_VERSION
-            XDEBUG_MODE=coverage vendor/bin/phpunit --log-junit /tmp/test-results/phpunit/$CIRCLE_STAGE.xml --coverage-html /tmp/coverage-report --coverage-text
+            vendor/bin/phpunit --log-junit /tmp/test-results/phpunit/$CIRCLE_STAGE.xml
       - store_test_results:
           path: /tmp/test-results
       - store_artifacts:
@@ -128,7 +130,7 @@ commands:
   install-instance:
     steps:
       - setup_remote_docker:
-          docker_layer_caching: true
+          docker_layer_caching: false
       - checkout:
           path: /home/circleci/checkout/planet4-master-theme
       - run:
@@ -210,6 +212,16 @@ jobs:
         auth:
           <<: *docker_auth
 
+  php81-tests:
+    <<: *php_job
+    docker:
+      - image: greenpeaceinternational/p4-unit-tests:php8.1
+        auth:
+          <<: *docker_auth
+      - image: cimg/mysql:5.7
+        auth:
+          <<: *docker_auth
+
   frontend-tests:
     docker:
       - image: greenpeaceinternational/p4-unit-tests:node14.19.3

diff --git a/composer.json b/composer.json
@@ -43,9 +43,9 @@
     "squizlabs/php_codesniffer": "^3.5.8",
     "wp-coding-standards/wpcs": "^2.2.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-    "stevegrunwell/phpunit-markup-assertions": "^1.3",
-    "phpunit/phpunit": "^7.5",
-    "wpackagist-plugin/timber-library": "1.18.*",
+    "laminas/laminas-dom": "^2.12",
+    "phpunit/phpunit": "^7.5||^9.5",
+    "wpackagist-plugin/timber-library": "1.22.*",
     "yoast/phpunit-polyfills": "^1.0"
   },
   "scripts": {