Merge pull request #382 from alies-dev/autoload-common-stubs

Use symfony/finder to find all stubs

composer.json

@@ -26,6 +26,7 @@
         "nikic/php-parser": "^4.18 || ^5.0",
         "orchestra/testbench-core": "^8.22 || ^9.0",
         "symfony/console": "^6.0 || ^7.0",
+        "symfony/finder": "^6.0 || ^7.0",
         "vimeo/psalm": "^5.20"
     },
     "require-dev": {

src/Plugin.php

@@ -22,12 +22,14 @@
 use Psalm\Plugin\PluginEntryPointInterface;
 use Psalm\Plugin\RegistrationInterface;
 use SimpleXMLElement;
+use Symfony\Component\Finder\Finder;
 
 use function array_merge;
 use function dirname;
 use function fwrite;
 use function explode;
 use function glob;
+use function is_string;
 
 /**
  * @psalm-suppress UnusedClass
@@ -49,38 +51,34 @@ public function __invoke(RegistrationInterface $registration, ?SimpleXMLElement
         $this->registerStubs($registration);
     }
 
-    /** @return array<array-key, string> */
+    /** @return list<string> */
     protected function getCommonStubs(): array
     {
-        return array_merge(
-            glob(dirname(__DIR__) . '/stubs/Collections/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Contracts/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/Eloquent/Concerns/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/Eloquent/Relations/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/Eloquent/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/Migrations/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/Query/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Database/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Foundation/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Http/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/legacy-factories/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Pagination/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Notifications/**/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Routing/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Support/*.stubphp'),
-            glob(dirname(__DIR__) . '/stubs/Support/**/*.stubphp'),
-        );
+        $stubFilepaths = [];
+
+        $basePath = dirname(__DIR__) . \DIRECTORY_SEPARATOR . 'stubs' . \DIRECTORY_SEPARATOR . 'common';
+
+        $stubFiles = Finder::create()->files()->name('*.stubphp')->in($basePath);
+
+        foreach ($stubFiles as $stubFile) {
+            $stubFilepath = $stubFile->getRealPath();
+            if (is_string($stubFilepath)) {
+                $stubFilepaths[] = $stubFilepath;
+            }
+        }
+
+        return $stubFilepaths;
     }
 
-    /** @return array<array-key, string> */
+    /** @return list<string> */
     protected function getTaintAnalysisStubs(): array
     {
         return array_merge(
             glob(dirname(__DIR__) . '/stubs/TaintAnalysis/Http/*.stubphp'),
         );
     }
 
-    /** @return array<array-key, string> */
+    /** @return list<string> */
     protected function getStubsForVersion(string $version): array
     {
         [$majorVersion] = explode('.', $version);

tests/Type/README.md

@@ -0,0 +1,7 @@
+# PHPT tests
+
+These tests are written using PHPT: syntax, originally created to test PHP interpreter itself.
+
+For the basic usage, please check [phpyh/psalm-tester](https://github.com/phpyh/psalm-tester).
+
+To go deeper with PHPT syntax, please check [PHPT](https://qa.php.net/phpt_details.php) official guide.