Enable casing plugin and fix issues it found

vimeo · Jan 12, 2019 · b43a6a3 · b43a6a3
1 parent a49b5af
commit b43a6a3
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 11 deletions.
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -38,6 +38,10 @@
         <file name="src/Psalm/Internal/Stubs/SabreEvent.php"/>
     </stubs>
 
+    <plugins>
+        <plugin filename="examples/plugins/FunctionCasingChecker.php" />
+    </plugins>
+
     <issueHandlers>
         <MisplacedRequiredParam errorLevel="suppress"/>
         <PossiblyNullOperand errorLevel="suppress"/>

diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -463,7 +463,7 @@ public static function loadFromXML($base_dir, $file_contents)
 
             $old_dom_document = $dom_document;
             $dom_document = new \DOMDocument();
-            $dom_document->loadXML($old_dom_document->saveXml());
+            $dom_document->loadXML($old_dom_document->saveXML());
         }
 
         // Enable user error handling

diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
@@ -150,7 +150,7 @@ public static function loadFromXMLElement(
 
                 while ($iterator->valid()) {
                     if (!$iterator->isDot() && $iterator->isLink()) {
-                        $linked_path = readlink($iterator->getPathName());
+                        $linked_path = readlink($iterator->getPathname());
 
                         if (stripos($linked_path, $directory_path) !== 0) {
                             if ($ignore_type_stats && $filter instanceof ProjectFileFilter) {

diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -694,7 +694,7 @@ function (FunctionLikeParameter $param) {
                         $fake_param = (new PhpParser\Builder\Param($param->name));
                         if ($param->signature_type) {
                             /** @psalm-suppress DeprecatedMethod */
-                            $fake_param->setTypehint((string)$param->signature_type);
+                            $fake_param->setTypeHint((string)$param->signature_type);
                         }
 
                         return $fake_param->getNode();

diff --git a/src/Psalm/Internal/PluginManager/ConfigFile.php b/src/Psalm/Internal/PluginManager/ConfigFile.php
@@ -111,7 +111,7 @@ private function readXml(): DomDocument
             }
         }
 
-        $doc->loadXml($file_contents);
+        $doc->loadXML($file_contents);
         return $doc;
     }
 

diff --git a/tests/DocumentationTest.php b/tests/DocumentationTest.php
@@ -125,7 +125,7 @@ public function testInvalidCode($code, $error_message, $error_levels = [], $chec
         }
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $file_path = self::$src_dir_path . 'somefile.php';
 

diff --git a/tests/FileUpdates/ErrorAfterUpdateTest.php b/tests/FileUpdates/ErrorAfterUpdateTest.php
@@ -87,7 +87,7 @@ public function testErrorAfterUpdate(
         }
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $codebase->reloadFiles($this->project_analyzer, array_keys($end_files));
 

diff --git a/tests/IncludeTest.php b/tests/IncludeTest.php
@@ -81,7 +81,7 @@ public function testInvalidInclude(
         $config = $codebase->config;
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $codebase->scanFiles();
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -78,7 +78,7 @@ public function setUp()
     public function addFile($file_path, $contents)
     {
         $this->file_provider->registerFile($file_path, $contents);
-        $this->project_analyzer->getCodeBase()->scanner->addFileToShallowScan($file_path);
+        $this->project_analyzer->getCodebase()->scanner->addFileToShallowScan($file_path);
     }
 
     /**

diff --git a/tests/Traits/InvalidCodeAnalysisTestTrait.php b/tests/Traits/InvalidCodeAnalysisTestTrait.php
@@ -44,7 +44,7 @@ public function testInvalidCode($code, $error_message, $error_levels = [], $stri
         }
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $file_path = self::$src_dir_path . 'somefile.php';
 

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -87,7 +87,7 @@ public function testInvalidCode($code, $error_message, $error_levels = [])
         }
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $file_path = self::$src_dir_path . 'somefile.php';
 

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -87,7 +87,7 @@ public function testInvalidCode($code, $error_message, $error_levels = [])
         }
 
         $this->expectException('\Psalm\Exception\CodeException');
-        $this->expectExceptionMessageRegexp('/\b' . preg_quote($error_message, '/') . '\b/');
+        $this->expectExceptionMessageRegExp('/\b' . preg_quote($error_message, '/') . '\b/');
 
         $file_path = self::$src_dir_path . 'somefile.php';