Fix various things

vimeo · Sep 14, 2020 · c4450b9 · weirdan · Sep 14, 2020 · c4450b9
1 parent 3f91166
commit c4450b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-tokenizer": "*",
+        "ext-mbstring": "*",
         "amphp/amp": "^2.1",
         "amphp/byte-stream": "^1.5",
         "composer/package-versions-deprecated": "^1.8.0",

diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfAnalyzer.php
@@ -703,7 +703,7 @@ function (Type\Union $_): bool {
                         new DocblockTypeContradiction(
                             'if (false) is impossible',
                             new CodeLocation($statements_analyzer, $cond),
-                            'false falsy',
+                            'false falsy'
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -714,7 +714,7 @@ function (Type\Union $_): bool {
                         new TypeDoesNotContainType(
                             'if (false) is impossible',
                             new CodeLocation($statements_analyzer, $cond),
-                            'false falsy',
+                            'false falsy'
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -727,7 +727,7 @@ function (Type\Union $_): bool {
                         new RedundantConditionGivenDocblockType(
                             'if (true) is redundant',
                             new CodeLocation($statements_analyzer, $cond),
-                            'true falsy',
+                            'true falsy'
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {
@@ -738,7 +738,7 @@ function (Type\Union $_): bool {
                         new RedundantCondition(
                             'if (true) is redundant',
                             new CodeLocation($statements_analyzer, $cond),
-                            'true falsy',
+                            'true falsy'
                         ),
                         $statements_analyzer->getSuppressedIssues()
                     )) {

diff --git a/tests/StubTest.php b/tests/StubTest.php
@@ -48,7 +48,7 @@ private function getProjectAnalyzerWithConfig(Config $config): \Psalm\Internal\A
                 new Provider\FakeParserCacheProvider()
             )
         );
-        $project_analyzer->setPhpVersion('7.3');
+        $project_analyzer->setPhpVersion('7.4');
 
         $config->setIncludeCollector(new IncludeCollector());
         $config->visitComposerAutoloadFiles($project_analyzer, null);
@@ -1134,13 +1134,13 @@ public function testStubOverridingMissingClass(): void
             )
         );
 
-        $this->project_analyzer->setPhpVersion('7.4');
-
         $file_path = getcwd() . '/src/somefile.php';
 
         $this->addFile(
             $file_path,
-            '<?php'
+            '<?php
+
+                echo "hello";'
         );
 
         $this->expectException(\Psalm\Exception\InvalidClasslikeOverrideException::class);
@@ -1165,13 +1165,13 @@ public function testStubOverridingMissingMethod(): void
             )
         );
 
-        $this->project_analyzer->setPhpVersion('7.4');
-
         $file_path = getcwd() . '/src/somefile.php';
 
         $this->addFile(
             $file_path,
-            '<?php'
+            '<?php
+
+                echo "hello";'
         );
 
         $this->expectException(\Psalm\Exception\InvalidMethodOverrideException::class);