Merge pull request #1513 from drbyte/phpunit12

Add PHPUnit 12 support, and upgrade phpunit-polyfills

Author: mattstauffer

.github/workflows/tests.yml

@@ -37,6 +37,6 @@ jobs:
         run: composer install --no-interaction --prefer-dist
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
         env:
           APP_ENV: testing

composer.json

@@ -49,7 +49,7 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.2.3",
-        "yoast/phpunit-polyfills": "^0.2.0",
+        "yoast/phpunit-polyfills": "^0.2.0|^4.0",
         "laravel/pint": "^1.4"
     },
     "bin": [

tests/BrewTest.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Container\Container;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Valet\Brew;
 use Valet\CommandLine;
 use Valet\Filesystem;
@@ -388,6 +389,7 @@ public function test_get_all_running_services_will_return_unique_services()
     /**
      * @dataProvider supportedPhpLinkPathProvider
      */
+    #[DataProvider('supportedPhpLinkPathProvider')]
     public function test_get_parsed_linked_php_will_return_matches_for_linked_php($path, $matches)
     {
         $getBrewMock = function ($filesystem) {
@@ -405,6 +407,7 @@ public function test_get_parsed_linked_php_will_return_matches_for_linked_php($p
     /**
      * @dataProvider supportedPhpLinkPathProvider
      */
+    #[DataProvider('supportedPhpLinkPathProvider')]
     public function test_get_linked_php_formula_will_return_linked_php_directory($path, $matches, $expectedLinkFormula)
     {
         $brewMock = Mockery::mock(Brew::class)->makePartial();
@@ -489,7 +492,7 @@ public function test_it_can_compare_two_php_versions()
     /**
      * Provider of php links and their expected split matches.
      */
-    public function supportedPhpLinkPathProvider(): array
+    public static function supportedPhpLinkPathProvider(): array
     {
         return [
             [