Merge pull request #34 from 10up/feature/upgrade-php-and-phpunit

Feature/upgrade php and phpunit
10up · Nov 23, 2023 · 61393ac · 61393ac
2 parents 9e7c4b2 + 698acff
commit 61393ac
Show file tree

Hide file tree

Showing 19 changed files with 907 additions and 758 deletions.
diff --git a/.github/workflows/php-compat.yml b/.github/workflows/php-compat.yml
@@ -6,40 +6,40 @@ on:
       - develop
       - trunk
     paths:
-      - '**.php'
+      - "**.php"
   pull_request:
     branches:
       - develop
     paths:
-      - '**.php'
+      - "**.php"
 
 jobs:
   php-compatibility:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Setup proper PHP version
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: ${{ runner.os }}-composer-
-
-    - name: Install dependencies
-      run: composer install --prefer-dist
-
-    - name: Run PHP Compatibility
-      run: ./vendor/bin/phpcs --standard=./phpcs-compat.xml -p .
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup proper PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run PHP Compatibility
+        run: ./vendor/bin/phpcs --standard=./phpcs-compat.xml -p .
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -6,49 +6,49 @@ on:
       - develop
       - trunk
     paths:
-      - '**.php'
+      - "**.php"
   pull_request:
     branches:
       - develop
     paths:
-      - '**.php'
+      - "**.php"
 
 jobs:
   phpcs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup proper PHP version
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: ${{ runner.os }}-composer-
-
-    - name: Get changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v39
-      with:
-        files: |
-          **/*.php
-
-    - name: Install dependencies
-      run: composer install --prefer-dist
-
-    - name: Run PHP_CodeSniffer
-      run: |
-        HEAD_REF=$(git rev-parse HEAD)
-        git checkout $HEAD_REF
-        ./vendor/bin/phpcs-changed -s --git --git-base origin/${{ github.base_ref }} ${{ steps.changed-files.outputs.all_changed_files }}
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup proper PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v39
+        with:
+          files: |
+            **/*.php
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run PHP_CodeSniffer
+        run: |
+          HEAD_REF=$(git rev-parse HEAD)
+          git checkout $HEAD_REF
+          ./vendor/bin/phpcs-changed -s --git --git-base origin/${{ github.base_ref }} ${{ steps.changed-files.outputs.all_changed_files }}
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -6,44 +6,44 @@ on:
       - develop
       - trunk
     paths:
-      - '**.php'
+      - "**.php"
   pull_request:
     branches:
       - develop
     paths:
-      - '**.php'
+      - "**.php"
 
 jobs:
   phpunit:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - uses: getong/mariadb-action@v1.1
+      - uses: getong/mariadb-action@v1.1
 
-    - name: Setup proper PHP version
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
+      - name: Setup proper PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
 
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: ${{ runner.os }}-composer-
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
-    - name: Install dependencies
-      run: composer install
+      - name: Install dependencies
+        run: composer install
 
-    - name: Setup WP Tests
-      run: bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1
+      - name: Setup WP Tests
+        run: bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1
 
-    - name: PHPUnit
-      run: './vendor/bin/phpunit'
+      - name: PHPUnit
+        run: "./vendor/bin/phpunit"
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ phpunit.xml
 uploads
 upgrade
 cache
+.phpunit.result.cache
 
 # Project Files
 dist

diff --git a/composer.json b/composer.json
@@ -19,10 +19,10 @@
     "php": ">=7.4"
   },
   "require-dev": {
-    "10up/phpcs-composer": "dev-master",
+    "10up/phpcs-composer": "~3@RC",
     "squizlabs/php_codesniffer": "~3.7.1",
     "yoast/phpunit-polyfills": "^1.0",
-    "phpunit/phpunit": "~7.5.0",
+    "phpunit/phpunit": "~9.0",
     "sirbrillig/phpcs-changed": "^2.11"
   },
   "autoload": {