Fix tests

Author: aarondfrancis

phpunit.xml.dist

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false"
+>
   <testsuites>
     <testsuite name="unit">
       <directory>tests/Unit</directory>
@@ -16,4 +12,9 @@
   <php>
 
     </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

src/Providers/FlakyServiceProvider.php

@@ -7,6 +7,7 @@
 namespace AaronFrancis\Flaky\Providers;
 
 use Illuminate\Console\Events\CommandStarting;
+use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
@@ -29,6 +30,12 @@ public function register()
 
     public function boot()
     {
-        //
+        // A workaround for testing due to a change in Laravel 10.4.1
+        // https://github.com/laravel/framework/pull/46508
+        if ($this->app->runningUnitTests()) {
+            $this->app->booted(function () {
+                app(Kernel::class)->rerouteSymfonyCommandEvents();
+            });
+        }
     }
 }

tests/Unit/ArbiterTest.php

@@ -10,6 +10,7 @@
 use Exception;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
+use PHPUnit\Framework\Attributes\Test;
 use Throwable;
 
 class ArbiterTest extends Base
@@ -31,7 +32,7 @@ protected function setCache($total, $consecutive, $deadline)
         ], 60);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_throw_because_of_total()
     {
         $this->setCache(5, 0, now()->addMinute()->timestamp);
@@ -52,7 +53,7 @@ public function it_should_throw_because_of_total()
         $this->assertNotNull($e);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_throw_because_of_consecutive()
     {
         $this->setCache(0, 5, now()->addMinute()->timestamp);
@@ -73,7 +74,7 @@ public function it_should_throw_because_of_consecutive()
         $this->assertNotNull($e);
     }
 
-    /** @test */
+    #[Test]
     public function it_should_throw_because_of_deadline()
     {
         Carbon::setTestNow();
@@ -111,7 +112,7 @@ public function it_should_throw_because_of_deadline()
         $a->handle(new Exception);
     }
 
-    /** @test */
+    #[Test]
     public function an_allowed_failure_should_increment_both_and_carry_deadline()
     {
         $deadline = now()->addMinute()->timestamp;
@@ -128,7 +129,7 @@ public function an_allowed_failure_should_increment_both_and_carry_deadline()
         $this->assertEquals($deadline, $stats['deadline']);
     }
 
-    /** @test */
+    #[Test]
     public function a_success_should_update_cache()
     {
         $this->setCache(2, 2, now()->timestamp);

tests/Unit/BasicTest.php

@@ -11,11 +11,12 @@
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use PHPUnit\Framework\Attributes\Test;
 use Throwable;
 
 class BasicTest extends Base
 {
-    /** @test */
+    #[Test]
     public function it_works_with_no_exceptions()
     {
         $result = Flaky::make(__FUNCTION__)->run(function () {
@@ -29,7 +30,7 @@ public function it_works_with_no_exceptions()
         $this->assertNull($result->exception);
     }
 
-    /** @test */
+    #[Test]
     public function failures_past_the_deadline_throw()
     {
         Carbon::setTestNow();
@@ -51,7 +52,7 @@ public function failures_past_the_deadline_throw()
         });
     }
 
-    /** @test */
+    #[Test]
     public function too_many_consecutive_throw()
     {
         $flaky = Flaky::make(__FUNCTION__)->allowConsecutiveFailures(5);
@@ -71,7 +72,7 @@ public function too_many_consecutive_throw()
         });
     }
 
-    /** @test */
+    #[Test]
     public function too_many_total_throw()
     {
         $flaky = Flaky::make(__FUNCTION__)->allowTotalFailures(5);
@@ -91,7 +92,7 @@ public function too_many_total_throw()
         });
     }
 
-    /** @test */
+    #[Test]
     public function reported_instead_of_thrown()
     {
         $handler = new class
@@ -119,7 +120,7 @@ public function report(Throwable $e)
         $this->assertInstanceOf(Exception::class, $handler->reported);
     }
 
-    /** @test */
+    #[Test]
     public function throws_for_unset_specific_exceptions()
     {
         $this->expectException(Exception::class);
@@ -134,7 +135,7 @@ public function throws_for_unset_specific_exceptions()
         });
     }
 
-    /** @test */
+    #[Test]
     public function does_not_throws_for_specific_exceptions()
     {
         Carbon::setTestNow();
@@ -157,7 +158,7 @@ public function does_not_throws_for_specific_exceptions()
         });
     }
 
-    /** @test */
+    #[Test]
     public function can_disable()
     {
         $this->expectException(Exception::class);
@@ -173,7 +174,7 @@ public function can_disable()
         config(['app.env' => 'production']);
     }
 
-    /** @test */
+    #[Test]
     public function can_disable_locally()
     {
         Flaky::make(__FUNCTION__)
@@ -197,7 +198,7 @@ public function can_disable_locally()
             });
     }
 
-    /** @test */
+    #[Test]
     public function can_handle_failures_ourselves()
     {
         $caught = null;
@@ -217,15 +218,15 @@ public function can_handle_failures_ourselves()
         $this->assertInstanceOf(Exception::class, $caught);
     }
 
-    /** @test */
+    #[Test]
     public function can_pass_in_our_own_exception()
     {
         $result = Flaky::make(__FUNCTION__)->handle(new Exception('Oops'));
 
         $this->assertInstanceOf(Result::class, $result);
     }
 
-    /** @test */
+    #[Test]
     public function it_does_not_throw_for_non_exceptions_when_protections_are_bypassed()
     {
         $result = Flaky::make(__FUNCTION__)
@@ -238,7 +239,7 @@ public function it_does_not_throw_for_non_exceptions_when_protections_are_bypass
         $this->assertEquals(1, $result->value);
     }
 
-    /** @test */
+    #[Test]
     public function handles_errors_as_well_as_exceptions()
     {
         $result = Flaky::make(__FUNCTION__)

tests/Unit/CommandTest.php

@@ -9,10 +9,11 @@
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Event;
+use PHPUnit\Framework\Attributes\Test;
 
 class CommandTest extends Base
 {
-    /** @test */
+    #[Test]
     public function varies_on_command()
     {
         Artisan::call('flaky:vary --arg=1 --flag');
@@ -34,7 +35,7 @@ public function varies_on_command()
         $this->assertNotEquals($one, $three);
     }
 
-    /** @test */
+    #[Test]
     public function scheduled_only()
     {
         Artisan::call('flaky:scheduled');
@@ -53,7 +54,7 @@ public function scheduled_only()
         Env::getRepository()->set('IS_SCHEDULED', 0);
     }
 
-    /** @test */
+    #[Test]
     public function env_var_gets_set()
     {
         $repo = Env::getRepository();

tests/Unit/RetryTest.php

@@ -9,10 +9,11 @@
 use AaronFrancis\Flaky\Flaky;
 use AaronFrancis\Flaky\Tests\Support\TimeoutException;
 use Exception;
+use PHPUnit\Framework\Attributes\Test;
 
 class RetryTest extends Base
 {
-    /** @test */
+    #[Test]
     public function it_will_retry()
     {
         $timesRun = 0;
@@ -34,7 +35,7 @@ public function it_will_retry()
         $this->assertEquals(1, $result->value);
     }
 
-    /** @test */
+    #[Test]
     public function it_retries_a_particular_exception_as_single()
     {
         $timesRun = 0;
@@ -62,7 +63,7 @@ public function it_retries_a_particular_exception_as_single()
         $this->assertEquals(6, $timesRun);
     }
 
-    /** @test */
+    #[Test]
     public function it_retries_a_particular_exception_as_array()
     {
         $timesRun = 0;

tests/Unit/SecondsTest.php

@@ -7,10 +7,11 @@
 namespace AaronFrancis\Flaky\Tests\Unit;
 
 use AaronFrancis\Flaky\Flaky;
+use PHPUnit\Framework\Attributes\Test;
 
 class SecondsTest extends Base
 {
-    /** @test */
+    #[Test]
     public function the_math_is_right()
     {
         $data = [