[8.x] Fix tests (#38398)

* Fix tests * Apply fixes from StyleCI Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com>
laravel · Aug 16, 2021 · f95f3af · f95f3af
1 parent 59b674a
commit f95f3af
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/tests/Database/DatabaseProcessorTest.php b/tests/Database/DatabaseProcessorTest.php
@@ -39,7 +39,7 @@ public function __construct()
     }
 
     #[\ReturnTypeWillChange]
-    public function lastInsertId(string $sequence = null)
+    public function lastInsertId($sequence = null)
     {
         //
     }

diff --git a/tests/Integration/Foundation/DiscoverEventsTest.php b/tests/Integration/Foundation/DiscoverEventsTest.php
@@ -32,12 +32,11 @@ class_alias(ListenerInterface::class, 'Tests\Integration\Foundation\Fixtures\Eve
         ], $events);
     }
 
+    /**
+     * @requires PHP 8
+     */
     public function testUnionEventsCanBeDiscovered()
     {
-        if (version_compare(phpversion(), '8.0.0', '<')) {
-            $this->markTestSkipped('Test uses union types.');
-        }
-
         class_alias(UnionListener::class, 'Tests\Integration\Foundation\Fixtures\EventDiscovery\UnionListeners\UnionListener');
 
         $events = DiscoverEvents::within(__DIR__.'/Fixtures/EventDiscovery/UnionListeners', getcwd());

diff --git a/tests/Support/Fixtures/UnionTypesClosure.php b/tests/Support/Fixtures/UnionTypesClosure.php
@@ -0,0 +1,8 @@
+<?php
+
+use Illuminate\Tests\Support\AnotherExampleParameter;
+use Illuminate\Tests\Support\ExampleParameter;
+
+return function (ExampleParameter | AnotherExampleParameter $a, $b) {
+    //
+};
diff --git a/tests/Support/SupportReflectsClosuresTest.php b/tests/Support/SupportReflectsClosuresTest.php
@@ -64,6 +64,9 @@ public function testItThrowsWhenNoFirstParameterType()
         });
     }
 
+    /**
+     * @requires PHP 8
+     */
     public function testItWorksWithUnionTypes()
     {
         $types = ReflectsClosuresClass::reflectFirstAll(function (ExampleParameter $a, $b) {
@@ -74,9 +77,9 @@ public function testItWorksWithUnionTypes()
             ExampleParameter::class,
         ], $types);
 
-        $types = ReflectsClosuresClass::reflectFirstAll(function (ExampleParameter | AnotherExampleParameter $a, $b) {
-            //
-        });
+        $closure = require __DIR__.'/Fixtures/UnionTypesClosure.php';
+
+        $types = ReflectsClosuresClass::reflectFirstAll($closure);
 
         $this->assertEquals([
             ExampleParameter::class,