chore: uses PHPUnit attributes

nunomaduro · Jan 8, 2024 · f2f4972 · f2f4972
1 parent 751a38e
commit f2f4972
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 151 deletions.
diff --git a/composer.json b/composer.json
@@ -29,9 +29,9 @@
         "laravel/tinker": "dev-develop",
         "laravel/sail": "^1.26.2",
         "laravel/sanctum": "^4.0.0",
-        "nunomaduro/larastan": "^3.0.0",
+        "larastan/larastan": "^2.8.0",
         "orchestra/testbench-core": "^9.0.0",
-        "pestphp/pest": "^3.0.0",
+        "pestphp/pest": "^2.30.0 || ^3.0.0",
         "sebastian/environment": "^7.0.0"
     },
     "autoload-dev": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
 parameters:
     level: max
     paths:

diff --git a/tests/LaravelApp/bootstrap/app.php b/tests/LaravelApp/bootstrap/app.php
@@ -15,7 +15,7 @@
 |
 */
 
-return Application::configure()
+return Application::configure(dirname(__DIR__))
     ->withProviders()
     ->withRouting(
         web: __DIR__.'/../routes/web.php',

diff --git a/tests/LaravelApp/tests/CreatesApplication.php b/tests/LaravelApp/tests/CreatesApplication.php
diff --git a/tests/LaravelApp/tests/Feature/CoverageTest.php b/tests/LaravelApp/tests/Feature/CoverageTest.php
@@ -4,11 +4,10 @@
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
-/**
- * @group coverage
- */
+#[Group('coverage')]
 class CoverageTest extends TestCase
 {
     public function testExample()

diff --git a/tests/LaravelApp/tests/Feature/EnvironmentCustomVariablesTest.php b/tests/LaravelApp/tests/Feature/EnvironmentCustomVariablesTest.php
@@ -4,16 +4,13 @@
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
-/**
- * @group environmentCustomVariables
- */
+#[Group('environmentCustomVariables')]
 class EnvironmentCustomVariablesTest extends TestCase
 {
-    /**
-     * @group environmentNoCVPhpunit
-     */
+    #[Group('environmentNoCVPhpunit')]
     public function testEnvironmentNoCustomVariablesPhpunit()
     {
         $this->assertEquals(null, env('LARAVEL_PARALLEL_TESTING'));
@@ -23,9 +20,7 @@ public function testEnvironmentNoCustomVariablesPhpunit()
         $this->assertEquals(null, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentNoCVParallel
-     */
+    #[Group('environmentNoCVParallel')]
     public function testEnvironmentNoCustomVariablesParallel()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));
@@ -35,9 +30,7 @@ public function testEnvironmentNoCustomVariablesParallel()
         $this->assertEquals(null, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentNoCVParallelRecreate
-     */
+    #[Group('environmentNoCVParallelRecreate')]
     public function testEnvironmentNoCustomVariablesParallelWithRecreate()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));
@@ -48,9 +41,7 @@ public function testEnvironmentNoCustomVariablesParallelWithRecreate()
         $this->assertEquals(null, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentNoCVParallelDrop
-     */
+    #[Group('environmentNoCVParallelDrop')]
     public function testEnvironmentNoCustomVariablesParallelWithDrop()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));
@@ -61,9 +52,7 @@ public function testEnvironmentNoCustomVariablesParallelWithDrop()
         $this->assertEquals(null, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentCVPhpunit
-     */
+    #[Group('environmentCVPhpunit')]
     public function testEnvironmentCustomVariablesPhpunit()
     {
         $this->assertEquals(null, env('LARAVEL_PARALLEL_TESTING'));
@@ -73,9 +62,7 @@ public function testEnvironmentCustomVariablesPhpunit()
         $this->assertEquals(null, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentCVParallel
-     */
+    #[Group('environmentCVParallel')]
     public function testEnvironmentCustomVariablesParallel()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));
@@ -85,9 +72,7 @@ public function testEnvironmentCustomVariablesParallel()
         $this->assertEquals(1, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentCVParallelRecreate
-     */
+    #[Group('environmentCVParallelRecreate')]
     public function testEnvironmentCustomVariablesParallelWithRecreate()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));
@@ -98,9 +83,7 @@ public function testEnvironmentCustomVariablesParallelWithRecreate()
         $this->assertEquals(1, env('CUSTOM_ENV_VARIABLE_FOR_PARALLEL'));
     }
 
-    /**
-     * @group environmentCVParallelDrop
-     */
+    #[Group('environmentCVParallelDrop')]
     public function testEnvironmentCustomVariablesParallelWithDrop()
     {
         $this->assertEquals(1, env('LARAVEL_PARALLEL_TESTING'));

diff --git a/tests/LaravelApp/tests/Feature/EnvironmentTest.php b/tests/LaravelApp/tests/Feature/EnvironmentTest.php
@@ -4,27 +4,27 @@
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
-/**
- * @group environment
- */
+#[Group('environment')]
 class EnvironmentTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function variableOnlyInDotEnv()
     {
         $this->assertEquals('VAL_IN_DOT_ENV', env('VAR_IN_DOT_ENV'));
         $this->assertEquals(null, env('VAR_IN_DOT_ENV_TESTING'));
     }
 
-    /** @test */
+    #[Test]
     public function variableOnlyInPhpunit()
     {
         $this->assertEquals('VAL_IN_PHPUNIT', env('VAR_IN_PHPUNIT'));
     }
 
-    /** @test */
+    #[Test]
     public function variableInDotEnvButOverriddenInPhpunit()
     {
         $this->assertEquals('VAL_OVERRIDDEN_IN_PHPUNIT', env('VAR_OVERRIDDEN_IN_PHPUNIT'));

diff --git a/tests/LaravelApp/tests/Feature/EnvironmentTestingTest.php b/tests/LaravelApp/tests/Feature/EnvironmentTestingTest.php
@@ -4,27 +4,27 @@
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
-/**
- * @group environmentTesting
- */
+#[Group('environmentTesting')]
 class EnvironmentTestingTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function variableOnlyInDotEnv()
     {
         $this->assertEquals(null, env('VAR_IN_DOT_ENV'));
         $this->assertEquals('VAL_IN_DOT_ENV_TESTING', env('VAR_IN_DOT_ENV_TESTING'));
     }
 
-    /** @test */
+    #[Test]
     public function variableOnlyInPhpunit()
     {
         $this->assertEquals('VAL_IN_PHPUNIT', env('VAR_IN_PHPUNIT'));
     }
 
-    /** @test */
+    #[Test]
     public function variableInDotEnvButOverriddenInPhpunit()
     {
         $this->assertEquals('VAL_OVERRIDDEN_IN_PHPUNIT', env('VAR_OVERRIDDEN_IN_PHPUNIT'));

diff --git a/tests/LaravelApp/tests/Feature/ExampleWithCustomNameTest.php b/tests/LaravelApp/tests/Feature/ExampleWithCustomNameTest.php
@@ -5,6 +5,7 @@
 namespace Tests\Feature;
 
 use NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName;
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
 class ExampleWithCustomNameTest extends TestCase implements HasPrintableTestCaseName
@@ -24,9 +25,7 @@ public static function getLatestPrintableTestCaseMethodName(): string
         return 'my-custom-test-case-name';
     }
 
-    /**
-     * @group custom-name
-     */
+    #[Group('custom-name')]
     public function testPassExample()
     {
         $this->assertTrue(true);

diff --git a/tests/LaravelApp/tests/Feature/ExampleWithUnexpectedOutputTest.php b/tests/LaravelApp/tests/Feature/ExampleWithUnexpectedOutputTest.php
@@ -4,13 +4,12 @@
 
 namespace LaravelApp\tests\Feature;
 
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
 class ExampleWithUnexpectedOutputTest extends TestCase
 {
-    /**
-     * @group unexpected-output
-     */
+    #[Group('unexpected-output')]
     public function testPassExample()
     {
         echo 'This is an unexpected output';

diff --git a/tests/LaravelApp/tests/TestCase.php b/tests/LaravelApp/tests/TestCase.php
@@ -2,9 +2,21 @@
 
 namespace Tests;
 
+use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
-    use CreatesApplication;
+    /**
+     * Create a new application instance.
+     */
+    public function createApplication(): Application
+    {
+        $app = require __DIR__.'/../bootstrap/app.php';
+
+        $app->make(Kernel::class)->bootstrap();
+
+        return $app;
+    }
 }
diff --git a/tests/LaravelApp/tests/Unit/ExampleTest.php b/tests/LaravelApp/tests/Unit/ExampleTest.php
@@ -2,23 +2,20 @@
 
 namespace Tests\Unit;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 error_reporting(E_ALL);
 
 class ExampleTest extends TestCase
 {
-    /**
-     * @group fail
-     */
+    #[Group('fail')]
     public function testFailExample()
     {
         $this->assertFalse(true);
     }
 
-    /**
-     * @group todo
-     */
+    #[Group('todo')]
     public function testTodoExample()
     {
         $this->markTestSkipped('__TODO__');
@@ -29,59 +26,47 @@ public function testBasicTest()
         $this->assertTrue(true);
     }
 
-    /**
-     * @group notices
-     */
+    #[Group('notices')]
     public function testUserNotice()
     {
         trigger_error('This is a user notice');
 
         $this->assertTrue(true);
     }
 
-    /**
-     * @group notices
-     */
+    #[Group('notices')]
     public function testUserNoticeTwo()
     {
         trigger_error('This is another user notice');
 
         $this->assertTrue(true);
     }
 
-    /**
-     * @group warnings
-     */
+    #[Group('warnings')]
     public function testWarning()
     {
         $this->blabla;
 
         $this->assertTrue(true);
     }
 
-    /**
-     * @group warnings
-     */
+    #[Group('warnings')]
     public function testUserWarning()
     {
         trigger_error('This is a user warning', E_USER_WARNING);
 
         $this->assertTrue(true);
     }
 
-    /**
-     * @group deprecations
-     */
+    #[Group('deprecations')]
     public function testDeprecation()
     {
         str_contains(null, null);
 
         $this->assertTrue(true);
     }
 
-    /**
-     * @group deprecations
-     */
+    #[Group('deprecations')]
     public function testUserDeprecation()
     {
         trigger_deprecation('foo', '1.0', 'This is a deprecation description');

diff --git a/tests/LaravelApp/vendor/autoload.php b/tests/LaravelApp/vendor/autoload.php
@@ -1,3 +1,3 @@
 <?php
 
-require __DIR__ . '/../../../vendor/autoload.php';
+// require __DIR__ . '/../../../vendor/autoload.php';
diff --git a/tests/Printer/DatasetsTest.php b/tests/Printer/DatasetsTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Printer;
 
-use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 
 class DatasetsTest extends TestCase
 {