Rename stub to avoid phpstorm conflict (#5213)

vimeo · Feb 13, 2021 · a80d5b7 · a80d5b7
1 parent 15a9eec
commit a80d5b7
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 40 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -1659,7 +1659,7 @@ public function visitPreloadedStubFiles(Codebase $codebase, ?Progress $progress
         $core_generic_files = [];
 
         if (\PHP_VERSION_ID < 80000 && $codebase->php_major_version >= 8) {
-            $stringable_path = dirname(__DIR__, 2) . '/stubs/Php80.php';
+            $stringable_path = dirname(__DIR__, 2) . '/stubs/Php80.phpstub';
 
             if (!file_exists($stringable_path)) {
                 throw new \UnexpectedValueException('Cannot locate PHP 8.0 classes');
@@ -1734,7 +1734,7 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
         ];
 
         if (\PHP_VERSION_ID >= 80000 && $codebase->php_major_version >= 8) {
-            $stringable_path = dirname(__DIR__, 2) . '/stubs/Php80.php';
+            $stringable_path = dirname(__DIR__, 2) . '/stubs/Php80.phpstub';
 
             if (!file_exists($stringable_path)) {
                 throw new \UnexpectedValueException('Cannot locate PHP 8.0 classes');
@@ -1744,7 +1744,7 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
         }
 
         if (\extension_loaded('PDO')) {
-            $ext_pdo_path = dirname(__DIR__, 2) . '/stubs/pdo.php';
+            $ext_pdo_path = dirname(__DIR__, 2) . '/stubs/pdo.phpstub';
 
             if (!file_exists($ext_pdo_path)) {
                 throw new \UnexpectedValueException('Cannot locate pdo classes');
@@ -1754,7 +1754,7 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
         }
 
         if (\extension_loaded('soap')) {
-            $ext_pdo_path = dirname(__DIR__, 2) . '/stubs/soap.php';
+            $ext_pdo_path = dirname(__DIR__, 2) . '/stubs/soap.phpstub';
 
             if (!file_exists($ext_pdo_path)) {
                 throw new \UnexpectedValueException('Cannot locate soap classes');
@@ -1764,7 +1764,7 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
         }
 
         if (\extension_loaded('ds')) {
-            $ext_ds_path = dirname(__DIR__, 2) . '/stubs/ext-ds.php';
+            $ext_ds_path = dirname(__DIR__, 2) . '/stubs/ext-ds.phpstub';
 
             if (!file_exists($ext_ds_path)) {
                 throw new \UnexpectedValueException('Cannot locate ext-ds classes');
@@ -1776,7 +1776,7 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
         $stub_files = array_merge($core_generic_files, $this->stub_files);
 
         if ($this->load_xdebug_stub) {
-            $xdebug_stub_path = dirname(__DIR__, 2) . '/stubs/Xdebug.php';
+            $xdebug_stub_path = dirname(__DIR__, 2) . '/stubs/Xdebug.phpstub';
 
             if (!file_exists($xdebug_stub_path)) {
                 throw new \UnexpectedValueException('Cannot locate Xdebug stub');

diff --git a/stubs/Php80.php → stubs/Php80.phpstub b/stubs/Php80.php → stubs/Php80.phpstub
diff --git a/stubs/Xdebug.php → stubs/Xdebug.phpstub b/stubs/Xdebug.php → stubs/Xdebug.phpstub
diff --git a/stubs/ext-ds.php → stubs/ext-ds.phpstub b/stubs/ext-ds.php → stubs/ext-ds.phpstub
diff --git a/stubs/ext-geos.php → stubs/ext-geos.phpstub b/stubs/ext-geos.php → stubs/ext-geos.phpstub
diff --git a/stubs/pdo.php → stubs/pdo.phpstub b/stubs/pdo.php → stubs/pdo.phpstub
diff --git a/stubs/soap.php → stubs/soap.phpstub b/stubs/soap.php → stubs/soap.phpstub
diff --git a/tests/Config/PluginTest.php b/tests/Config/PluginTest.php
@@ -494,7 +494,7 @@ public function testFloatCheckerPluginIssueSuppressionByDocblock(): void
 
     public function testInheritedHookHandlersAreCalled(): void
     {
-        require_once dirname(__DIR__) . '/fixtures/stubs/extending_plugin_entrypoint.php';
+        require_once dirname(__DIR__) . '/fixtures/stubs/extending_plugin_entrypoint.phpstub';
 
         $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
             TestConfig::loadFromXML(

diff --git a/tests/IncludeTest.php b/tests/IncludeTest.php
@@ -545,7 +545,7 @@ public function __construct() {
                 'files' => [
                     getcwd() . DIRECTORY_SEPARATOR . 'file1.php' => '<?php
                         function getEndpoints() : void {
-                            $listFile = "tests/fixtures/stubs/custom_functions.php";
+                            $listFile = "tests/fixtures/stubs/custom_functions.phpstub";
                             if (!file_exists($listFile)) {
                                 throw new RuntimeException("Endpoint list not found");
                             }

diff --git a/tests/StubTest.php b/tests/StubTest.php
@@ -71,7 +71,7 @@ public function testNonexistentStubFile(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="stubs/invalidfile.php" />
+                        <file name="stubs/invalidfile.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -92,7 +92,7 @@ public function testStubFileClass(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/systemclass.php" />
+                        <file name="tests/fixtures/stubs/systemclass.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -132,13 +132,13 @@ public function testLoadStubFileWithRelativePath(): void
                     errorLevel="1"
                 >
                     <stubs>
-                        <file name="./tests/../tests/fixtures/stubs/systemclass.php" />
+                        <file name="./tests/../tests/fixtures/stubs/systemclass.phpstub" />
                     </stubs>
                 </psalm>'
             )
         );
 
-        $path = $this->getOperatingSystemStyledPath('tests/fixtures/stubs/systemclass.php');
+        $path = $this->getOperatingSystemStyledPath('tests/fixtures/stubs/systemclass.phpstub');
         $stub_files = $this->project_analyzer->getConfig()->getStubFiles();
         $this->assertStringContainsString($path, \reset($stub_files));
     }
@@ -154,13 +154,13 @@ public function testLoadStubFileWithAbsolutePath(): void
                     errorLevel="1"
                 >
                     <stubs>
-                        <file name="' . $runDir . '/tests/fixtures/stubs/systemclass.php" />
+                        <file name="' . $runDir . '/tests/fixtures/stubs/systemclass.phpstub" />
                     </stubs>
                 </psalm>'
             )
         );
 
-        $path = $this->getOperatingSystemStyledPath('tests/fixtures/stubs/systemclass.php');
+        $path = $this->getOperatingSystemStyledPath('tests/fixtures/stubs/systemclass.phpstub');
         $stub_files = $this->project_analyzer->getConfig()->getStubFiles();
         $this->assertStringContainsString($path, \reset($stub_files));
     }
@@ -179,7 +179,7 @@ public function testStubFileConstant(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/systemclass.php" />
+                        <file name="tests/fixtures/stubs/systemclass.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -302,7 +302,7 @@ public function testNamespacedStubClass(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/namespaced_class.php" />
+                        <file name="tests/fixtures/stubs/namespaced_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -339,7 +339,7 @@ public function testStubRegularFunction(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/custom_functions.php" />
+                        <file name="tests/fixtures/stubs/custom_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -370,7 +370,7 @@ public function testStubVariadicFunction(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/custom_functions.php" />
+                        <file name="tests/fixtures/stubs/custom_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -403,7 +403,7 @@ public function testStubVariadicFunctionWrongArgType(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/custom_functions.php" />
+                        <file name="tests/fixtures/stubs/custom_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -464,7 +464,7 @@ public function testPolyfilledFunction(): void
                 '<?xml version="1.0"?>
                 <psalm
                     errorLevel="1"
-                    autoloader="tests/fixtures/stubs/polyfill.php"
+                    autoloader="tests/fixtures/stubs/polyfill.phpstub"
                 >
                     <projectFiles>
                         <directory name="src" />
@@ -496,7 +496,7 @@ public function testConditionalConstantDefined(): void
                 '<?xml version="1.0"?>
                 <psalm
                     errorLevel="1"
-                    autoloader="tests/fixtures/stubs/conditional_constant_define_inferred.php"
+                    autoloader="tests/fixtures/stubs/conditional_constant_define_inferred.phpstub"
                 >
                     <projectFiles>
                         <directory name="src" />
@@ -528,7 +528,7 @@ public function testClassAlias(): void
                 '<?xml version="1.0"?>
                 <psalm
                     errorLevel="1"
-                    autoloader="tests/fixtures/stubs/class_alias.php"
+                    autoloader="tests/fixtures/stubs/class_alias.phpstub"
                 >
                     <projectFiles>
                         <directory name="src" />
@@ -592,7 +592,7 @@ public function testStubFunctionWithFunctionExists(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/custom_functions.php" />
+                        <file name="tests/fixtures/stubs/custom_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -624,7 +624,7 @@ public function testNamespacedStubFunctionWithFunctionExists(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/custom_functions.php" />
+                        <file name="tests/fixtures/stubs/custom_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -686,7 +686,7 @@ public function testNamespacedStubFunction(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/namespaced_functions.php" />
+                        <file name="tests/fixtures/stubs/namespaced_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -717,7 +717,7 @@ public function testConditionalNamespacedStubFunction(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/conditional_namespaced_functions.php" />
+                        <file name="tests/fixtures/stubs/conditional_namespaced_functions.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -748,7 +748,7 @@ public function testConditionallyExtendingInterface(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/conditional_interface.php" />
+                        <file name="tests/fixtures/stubs/conditional_interface.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -795,7 +795,7 @@ public function testStubFileWithExistingClassDefinition(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/DomainException.php" />
+                        <file name="tests/fixtures/stubs/DomainException.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -826,7 +826,7 @@ public function testStubFileWithPartialClassDefinitionWithMoreMethods(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/partial_class.php" />
+                        <file name="tests/fixtures/stubs/partial_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -874,7 +874,7 @@ public function testExtendOnlyStubbedClass(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/partial_class.php" />
+                        <file name="tests/fixtures/stubs/partial_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -909,7 +909,7 @@ public function testStubFileWithExtendedStubbedClass(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/partial_class.php" />
+                        <file name="tests/fixtures/stubs/partial_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -946,7 +946,7 @@ public function testStubFileWithPartialClassDefinitionWithCoercion(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/partial_class.php" />
+                        <file name="tests/fixtures/stubs/partial_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -991,7 +991,7 @@ public function testStubFileWithPartialClassDefinitionGeneralReturnType(): void
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/partial_class.php" />
+                        <file name="tests/fixtures/stubs/partial_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -1032,7 +1032,7 @@ public function testStubFileWithTemplatedClassDefinitionAndMagicMethodOverride()
                     </projectFiles>
 
                     <stubs>
-                        <file name="tests/fixtures/stubs/templated_class.php" />
+                        <file name="tests/fixtures/stubs/templated_class.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -1128,7 +1128,7 @@ public function testStubOverridingMissingClass(): void
                         <directory name="src" />
                     </projectFiles>
                     <stubs>
-                        <file name="tests/fixtures/stubs/MissingClass.php" />
+                        <file name="tests/fixtures/stubs/MissingClass.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -1159,7 +1159,7 @@ public function testStubOverridingMissingMethod(): void
                         <directory name="src" />
                     </projectFiles>
                     <stubs>
-                        <file name="tests/fixtures/stubs/MissingMethod.php" />
+                        <file name="tests/fixtures/stubs/MissingMethod.phpstub" />
                     </stubs>
                 </psalm>'
             )
@@ -1190,7 +1190,7 @@ public function testStubReplacingInterfaceDocblock(): void
                         <directory name="src" />
                     </projectFiles>
                     <stubs>
-                        <file name="tests/fixtures/stubs/Doctrine.php" />
+                        <file name="tests/fixtures/stubs/Doctrine.phpstub" />
                     </stubs>
                 </psalm>'
             )

diff --git a/tests/VariadicTest.php b/tests/VariadicTest.php
@@ -42,7 +42,7 @@ public function testVariadicFunctionFromAutoloadFile(): void
                 dirname(__DIR__),
                 '<?xml version="1.0"?>
                 <psalm
-                    autoloader="tests/fixtures/stubs/custom_functions.php"
+                    autoloader="tests/fixtures/stubs/custom_functions.phpstub"
                 >
                     <projectFiles>
                         <directory name="src" />

diff --git a/tests/fixtures/stubs/Doctrine.php → tests/fixtures/stubs/Doctrine.phpstub b/tests/fixtures/stubs/Doctrine.php → tests/fixtures/stubs/Doctrine.phpstub
diff --git a/tests/fixtures/stubs/DomainException.php → tests/fixtures/stubs/DomainException.phpstub b/tests/fixtures/stubs/DomainException.php → tests/fixtures/stubs/DomainException.phpstub
diff --git a/tests/fixtures/stubs/MissingClass.php → tests/fixtures/stubs/MissingClass.phpstub b/tests/fixtures/stubs/MissingClass.php → tests/fixtures/stubs/MissingClass.phpstub
diff --git a/tests/fixtures/stubs/MissingMethod.php → tests/fixtures/stubs/MissingMethod.phpstub b/tests/fixtures/stubs/MissingMethod.php → tests/fixtures/stubs/MissingMethod.phpstub
diff --git a/tests/fixtures/stubs/base_plugin.php → tests/fixtures/stubs/base_plugin.phpstub b/tests/fixtures/stubs/base_plugin.php → tests/fixtures/stubs/base_plugin.phpstub
diff --git a/tests/fixtures/stubs/class_alias.php → tests/fixtures/stubs/class_alias.phpstub b/tests/fixtures/stubs/class_alias.php → tests/fixtures/stubs/class_alias.phpstub
diff --git a/.../conditional_constant_define_inferred.php → ...ditional_constant_define_inferred.phpstub b/.../conditional_constant_define_inferred.php → ...ditional_constant_define_inferred.phpstub
diff --git a/.../fixtures/stubs/conditional_interface.php → ...tures/stubs/conditional_interface.phpstub b/.../fixtures/stubs/conditional_interface.php → ...tures/stubs/conditional_interface.phpstub
diff --git a/...tubs/conditional_namespaced_functions.php → .../conditional_namespaced_functions.phpstub b/...tubs/conditional_namespaced_functions.php → .../conditional_namespaced_functions.phpstub
diff --git a/tests/fixtures/stubs/custom_functions.php → ...s/fixtures/stubs/custom_functions.phpstub b/tests/fixtures/stubs/custom_functions.php → ...s/fixtures/stubs/custom_functions.phpstub
diff --git a/tests/fixtures/stubs/extending_plugin.php → ...s/fixtures/stubs/extending_plugin.phpstub b/tests/fixtures/stubs/extending_plugin.php → ...s/fixtures/stubs/extending_plugin.phpstub
@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/base_plugin.php';
+require_once __DIR__ . '/base_plugin.phpstub';
 
 class ExtendingPlugin extends BasePlugin
 {

diff --git a/...res/stubs/extending_plugin_entrypoint.php → ...stubs/extending_plugin_entrypoint.phpstub b/...res/stubs/extending_plugin_entrypoint.php → ...stubs/extending_plugin_entrypoint.phpstub
@@ -3,7 +3,7 @@
 use Psalm\Plugin\PluginEntryPointInterface;
 use Psalm\Plugin\RegistrationInterface;
 
-require_once __DIR__ . '/extending_plugin.php';
+require_once __DIR__ . '/extending_plugin.phpstub';
 
 class ExtendingPluginRegistration implements PluginEntryPointInterface
 {

diff --git a/tests/fixtures/stubs/namespaced_class.php → ...s/fixtures/stubs/namespaced_class.phpstub b/tests/fixtures/stubs/namespaced_class.php → ...s/fixtures/stubs/namespaced_class.phpstub
diff --git a/...s/fixtures/stubs/namespaced_functions.php → ...xtures/stubs/namespaced_functions.phpstub b/...s/fixtures/stubs/namespaced_functions.php → ...xtures/stubs/namespaced_functions.phpstub
diff --git a/tests/fixtures/stubs/partial_class.php → tests/fixtures/stubs/partial_class.phpstub b/tests/fixtures/stubs/partial_class.php → tests/fixtures/stubs/partial_class.phpstub
diff --git a/tests/fixtures/stubs/polyfill.php → tests/fixtures/stubs/polyfill.phpstub b/tests/fixtures/stubs/polyfill.php → tests/fixtures/stubs/polyfill.phpstub
diff --git a/tests/fixtures/stubs/systemclass.php → tests/fixtures/stubs/systemclass.phpstub b/tests/fixtures/stubs/systemclass.php → tests/fixtures/stubs/systemclass.phpstub
diff --git a/tests/fixtures/stubs/templated_class.php → tests/fixtures/stubs/templated_class.phpstub b/tests/fixtures/stubs/templated_class.php → tests/fixtures/stubs/templated_class.phpstub