Merge pull request #844 from kukulich/tests

Ocramius · web-flow · commit ffc03105da4a · 2021-11-11T01:18:11.000+01:00
Fixed `AutoloadSourceLocatorTest::testCanAutoloadPsr4ClassesInPotentiallyMultipleDirectories()` autoloading of PHPUnit assertion classes
diff --git a/test/unit/SourceLocator/Type/AutoloadSourceLocatorTest.php b/test/unit/SourceLocator/Type/AutoloadSourceLocatorTest.php
@@ -385,7 +385,25 @@ public function testReturnsNullWithInternalFunctions(): void
 
     public function testCanAutoloadPsr4ClassesInPotentiallyMultipleDirectories(): void
     {
-        spl_autoload_register([$this, 'autoload']);
+        // Force autoload for these asserts because it's not possible to autoload them in the autoload callback
+        self::assertFalse(false);
+        self::assertTrue(true);
+
+        // A test autoloader that simulates Composer PSR-4 autoloader with 2 possible directories for the same namespace
+        $autoload = static function (string $className): bool {
+            if ($className !== AutoloadableClassWithTwoDirectories::class) {
+                return false;
+            }
+
+            self::assertFalse(is_file(__DIR__ . '/AutoloadableClassWithTwoDirectories.php'));
+            self::assertTrue(is_file(__DIR__ . '/../../Fixture/AutoloadableClassWithTwoDirectories.php'));
+
+            include __DIR__ . '/../../Fixture/AutoloadableClassWithTwoDirectories.php';
+
+            return true;
+        };
+
+        spl_autoload_register($autoload);
 
         self::assertNotNull(
             (new AutoloadSourceLocator($this->astLocator))
@@ -395,28 +413,11 @@ public function testCanAutoloadPsr4ClassesInPotentiallyMultipleDirectories(): vo
                 ),
         );
 
-        spl_autoload_unregister([$this, 'autoload']);
+        spl_autoload_unregister($autoload);
 
         self::assertFalse(class_exists(AutoloadableClassWithTwoDirectories::class, false));
     }
 
-    /**
-     * A test autoloader that simulates Composer PSR-4 autoloader with 2 possible directories for the same namespace.
-     */
-    public function autoload(string $className): bool
-    {
-        if ($className !== AutoloadableClassWithTwoDirectories::class) {
-            return false;
-        }
-
-        self::assertFalse(is_file(__DIR__ . '/AutoloadableClassWithTwoDirectories.php'));
-        self::assertTrue(is_file(__DIR__ . '/../../Fixture/AutoloadableClassWithTwoDirectories.php'));
-
-        include __DIR__ . '/../../Fixture/AutoloadableClassWithTwoDirectories.php';
-
-        return true;
-    }
-
     /**
      * @runInSeparateProcess
      */
