Merge pull request #174 from Brain-WP/feature/improve-mockery-version-constraints-and-run-lowest-ci

Composer: improve version constraints for Mockery and improve CI

Author: gmazzap

.github/workflows/php-qa.yml

@@ -83,17 +83,9 @@ jobs:
 
         strategy:
             matrix:
-                php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+                php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
                 dependency-versions: ['lowest', 'highest']
 
-                include:
-                - php-versions: '8.4'
-                  dependency-versions: 'highest'
-                - php-versions: '8.5'
-                  dependency-versions: 'highest'
-                - php-versions: '8.6'
-                  dependency-versions: 'highest'
-
         continue-on-error: ${{ matrix.php-versions == '8.6' }}
 
         steps:
@@ -118,6 +110,11 @@ jobs:
                 # Bust the cache at least once a month - output format: YYYY-MM.
                 custom-cache-suffix: $(date -u "+%Y-%m")
 
+            # Mockery is only compatible with PHP 8.4 as of Mockery 1.6.10, so we need to update what "lowest" means.
+            - name: Update Mockery lowest (PHP >= 8.4)
+              if: ${{ matrix.php-versions >= '8.4' && matrix.dependency-versions == 'lowest' }}
+              run: composer require mockery/mockery:"1.6.10"
+
             - name: Migrate test configuration (>= 7.3)
               if: ${{ matrix.php-versions >= 7.3 && matrix.dependency-versions == 'highest' }}
               run: ./vendor/bin/phpunit --migrate-configuration

composer.json

@@ -28,7 +28,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.6.0",
-        "mockery/mockery": "^1.3.5 || ^1.4.4",
+        "mockery/mockery": "~1.3.6 || ~1.4.4 || ~1.5.1 || ^1.6.10",
         "antecedent/patchwork": "^2.1.17"
     },
     "require-dev": {