Merge pull request #332 from pantheon-systems/cmsp-75

[CMSP-75] PHP 8.2 support

.circleci/config.yml

@@ -1,11 +1,32 @@
-version: 2
+version: 2.1
 workflows:
   version: 2
   main:
     jobs:
       - lint
-      - test-behat
-      - test-phpunit
+      - test-behat:
+          requires:
+            - lint
+      - test-phpunit:
+          name: "Test with PHP 7.4"
+          requires:
+            - lint
+          php_version: "7.4"
+      - test-phpunit:
+          name: "Test with PHP 8.0"
+          requires:
+            - lint
+          php_version: "8.0"
+      - test-phpunit:
+          name: "Test with PHP 8.1"
+          requires:
+            - lint
+          php_version: "8.1"
+      - test-phpunit:
+          name: "Test with PHP 8.2"
+          requires:
+            - lint
+          php_version: "8.2"
   nightly:
     triggers:
       - schedule:
@@ -20,7 +41,7 @@ jobs:
   lint:
     working_directory: ~/pantheon-systems/wp-saml-auth
     docker:
-      - image: quay.io/pantheon-public/build-tools-ci:7.x-php7.4
+      - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
     steps:
       - checkout
       - restore_cache:
@@ -39,7 +60,7 @@ jobs:
     working_directory: ~/pantheon-systems/wp-saml-auth
     parallelism: 1
     docker:
-    - image: quay.io/pantheon-public/build-tools-ci:7.x-php7.4
+    - image: quay.io/pantheon-public/build-tools-ci:8.x-php8.2
     steps:
     - checkout
     - restore_cache:
@@ -81,10 +102,18 @@ jobs:
         command: ./bin/behat-cleanup.sh
         when: always
   test-phpunit:
+    parameters:
+      php_version:
+        type: enum
+        enum:
+          - "7.4"
+          - "8.2"
+          - "8.1"
+          - "8.0"
     working_directory: ~/pantheon-systems/wp-saml-auth
     docker:
-      - image: circleci/php:7.4-node-browsers
-      - image: circleci/mariadb:10.3
+      - image: cimg/php:<< parameters.php_version >>
+      - image: circleci/mariadb:10.4
     environment:
       - WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
       - WP_CORE_DIR: "/tmp/wordpress/"
@@ -108,7 +137,7 @@ jobs:
             yes '' | sudo pecl install imagick || true
             sudo docker-php-ext-enable imagick
             sudo docker-php-ext-install mysqli
-            sudo apt-get install mariadb-client-10.5
+            sudo apt-get install mariadb-client
       - run:
           name: "Run Tests"
           command: |

composer.json

@@ -21,9 +21,9 @@
     },
     "require-dev": {
         "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
-        "wp-coding-standards/wpcs": "^2.1",
+        "wp-coding-standards/wpcs": "dev-develop as 2.3.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
-        "phpunit/phpunit": "^7",
+        "phpunit/phpunit": "^9",
         "phpcompatibility/php-compatibility": "^9.3",
         "symfony/filesystem": "^5",
         "symfony/service-contracts": "^2",