Upgrade PHPUnit

Author: kylekatarnls

.github/workflows/tests.yaml

@@ -48,16 +48,20 @@ jobs:
 
       - name: Set PHPUnit version
         if: matrix.php >= 8.1
-        run: composer require "phpunit/phpunit:^8.5.41" --no-update
+        run: composer require "phpunit/phpunit:^9.6.22" --no-update
 
       - name: Install Dependencies
         run: composer update --prefer-dist --prefer-${{ matrix.setup }} --no-interaction --no-suggest
 
+      - name: Run Tests with coverage
+        if: matrix.php == 8.4 && matrix.setup == 'stable'
+        run: vendor/bin/phpunit --coverage-clover=clover.xml --coverage-text --log-junit=test-results.xml
+
       - name: Run Tests
-        run: vendor/bin/phpunit ${{ matrix.php == 8.4 && matrix.setup == 'stable' && '--coverage-clover=clover.xml --coverage-text --log-junit test-results.xml' || '' }}
+        if: matrix.php != 8.4 || matrix.setup != 'stable'
+        run: vendor/bin/phpunit --log-junit=test-results.xml
 
       - name: Upload Test Results
-        if: matrix.php == 8.4 && matrix.setup == 'stable'
         uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.php-version }}-phpunit-results"

composer.json

@@ -17,7 +17,7 @@
         "nesbot/carbon": "^2.72.6 || ^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5.20 || ^8.5.41"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.41 || ^9.6.22"
     },
     "autoload": {
         "psr-4": {

tests/Carbon/Types/GeneratorTest.php

@@ -58,8 +58,9 @@ public function testGetMethodSourceCode()
         $foo = new ReflectionMethod(get_class($object), 'foo');
 
         $sourceCode = $method->invoke($generator, $foo);
+        $match = (preg_match('/public function foo\(\)\s*\{\s*return \'hello\';/', $sourceCode) > 0);
 
-        $this->assertRegExp('/public function foo\(\)\s*\{\s*return \'hello\';/', $sourceCode);
+        $this->assertTrue($match, 'Source code must contain foo method returning "hello".');
     }
 
     /**