Merge pull request #6793 from orklah/unevaluatedCode

emit UnevaluatedCode after exit or never returning functionlike
vimeo · Nov 1, 2021 · 96ae8e7 · 96ae8e7
2 parents 81ca05f + 500571b
commit 96ae8e7
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 32 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -209,6 +209,10 @@ public static function analyze(
 
             $statements_analyzer->node_data->setType($real_stmt, $stmt_type);
 
+            if ($stmt_type->isNever()) {
+                $context->has_returned = true;
+            }
+
             $event = new AfterEveryFunctionCallAnalysisEvent(
                 $stmt,
                 $function_call_info->function_id,

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
@@ -362,6 +362,10 @@ function (?Type\Union $type_1, Type\Union $type_2) use ($codebase): Type\Union {
 
         if ($stmt_type) {
             $statements_analyzer->node_data->setType($stmt, $stmt_type);
+
+            if ($stmt_type->isNever()) {
+                $context->has_returned = true;
+            }
         }
 
         if ($result->returns_by_ref) {

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ExitAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ExitAnalyzer.php
@@ -139,6 +139,8 @@ public static function analyze(
 
         $statements_analyzer->node_data->setType($stmt, Type::getEmpty());
 
+        $context->has_returned = true;
+
         return true;
     }
 }
diff --git a/tests/BinaryOperationTest.php b/tests/BinaryOperationTest.php
@@ -17,8 +17,6 @@ public function testGMPOperations()
     {
         if (class_exists('GMP') === false) {
             $this->markTestSkipped('Cannot run test, base class "GMP" does not exist!');
-
-            return;
         }
 
         $this->addFile(

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -15,8 +15,6 @@ public function testExtendsMysqli()
     {
         if (class_exists('mysqli') === false) {
             $this->markTestSkipped('Cannot run test, base class "mysqli" does not exist!');
-
-            return;
         }
 
         $this->addFile(

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -161,8 +161,6 @@ public function testIgnoreSymlinkedProjectDirectory()
 
             if (is_array($last_error) && $no_symlinking_error === $last_error['message']) {
                 $this->markTestSkipped($no_symlinking_error);
-
-                return;
             }
         }
 

diff --git a/tests/EndToEnd/DestructiveAutoloaderTest.php b/tests/EndToEnd/DestructiveAutoloaderTest.php
@@ -11,8 +11,6 @@ public function testSucceedsWithEmptyFile(): void
     {
         if (\version_compare(\PHP_VERSION, '7.2.0', '<')) {
             $this->markTestSkipped('Test case requires PHP 7.2.');
-
-            return;
         }
 
         $this->runPsalm(['--no-cache'], __DIR__ . '/' . '../fixtures/DestructiveAutoloader/', true);

diff --git a/tests/EndToEnd/SuicidalAutoloaderTest.php b/tests/EndToEnd/SuicidalAutoloaderTest.php
@@ -11,8 +11,6 @@ public function testSucceedsWithEmptyFile(): void
     {
         if (\version_compare(\PHP_VERSION, '7.2.0', '<')) {
             $this->markTestSkipped('Test case requires PHP 7.2.');
-
-            return;
         }
 
         $this->runPsalm(['--no-cache'], __DIR__ . '/' . '../fixtures/SuicidalAutoloader/');

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -17,8 +17,6 @@ public function testExtendDocblockParamType()
     {
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(

diff --git a/tests/MethodSignatureTest.php b/tests/MethodSignatureTest.php
@@ -19,8 +19,6 @@ public function testExtendSoapClientWithDocblockTypes()
     {
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(
@@ -58,8 +56,6 @@ public function testExtendSoapClientWithNoDocblockTypes()
     {
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(
@@ -89,8 +85,6 @@ public function testExtendSoapClientWithParamType()
     {
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(
@@ -265,8 +259,6 @@ public function testExtendDocblockParamTypeWithWrongDocblockParam()
         $this->expectException(\Psalm\Exception\CodeException::class);
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(
@@ -304,8 +296,6 @@ public function testExtendDocblockParamTypeWithWrongParam() : void
 
         if (class_exists('SoapClient') === false) {
             $this->markTestSkipped('Cannot run test, base class "SoapClient" does not exist!');
-
-            return;
         }
 
         $this->addFile(

diff --git a/tests/Traits/InvalidCodeAnalysisTestTrait.php b/tests/Traits/InvalidCodeAnalysisTestTrait.php
@@ -40,14 +40,10 @@ public function testInvalidCode(
         if (strpos($test_name, 'PHP71-') !== false) {
             if (version_compare(PHP_VERSION, '7.1.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 7.1.');
-
-                return;
             }
         } elseif (strpos($test_name, 'PHP80-') !== false) {
             if (version_compare(PHP_VERSION, '8.0.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 8.0.');
-
-                return;
             }
         } elseif (strpos($test_name, 'SKIPPED-') !== false) {
             $this->markTestSkipped('Skipped due to a bug.');

diff --git a/tests/Traits/ValidCodeAnalysisTestTrait.php b/tests/Traits/ValidCodeAnalysisTestTrait.php
@@ -40,20 +40,14 @@ public function testValidCode(
         if (strpos($test_name, 'PHP73-') !== false) {
             if (version_compare(PHP_VERSION, '7.3.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 7.3.');
-
-                return;
             }
         } elseif (strpos($test_name, 'PHP71-') !== false) {
             if (version_compare(PHP_VERSION, '7.1.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 7.1.');
-
-                return;
             }
         } elseif (strpos($test_name, 'PHP80-') !== false) {
             if (version_compare(PHP_VERSION, '8.0.0', '<')) {
                 $this->markTestSkipped('Test case requires PHP 8.0.');
-
-                return;
             }
         } elseif (strpos($test_name, 'SKIPPED-') !== false) {
             $this->markTestSkipped('Skipped due to a bug.');

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -1491,6 +1491,45 @@ function f(IWorker $worker): void {
                 ',
                 'error_message' => 'UnusedFunctionCall',
             ],
+            'functionNeverUnevaluatedCode' => [
+                '<?php
+                    /** @return never */
+                    function neverReturns() {
+                        die();
+                    }
+
+                    function f(): void {
+                        neverReturns();
+                        echo "hello";
+                    }
+                ',
+                'error_message' => 'UnevaluatedCode',
+            ],
+            'methodNeverUnevaluatedCode' => [
+                '<?php
+                    class A{
+                        /** @return never */
+                        function neverReturns() {
+                            die();
+                        }
+
+                        function f(): void {
+                            $this->neverReturns();
+                            echo "hello";
+                        }
+                    }
+                ',
+                'error_message' => 'UnevaluatedCode',
+            ],
+            'exitNeverUnevaluatedCode' => [
+                '<?php
+                    function f(): void {
+                        exit();
+                        echo "hello";
+                    }
+                ',
+                'error_message' => 'UnevaluatedCode',
+            ],
         ];
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ public function testGMPOperations() @@
         {
             if (class_exists('GMP') === false) {
                 $this->markTestSkipped('Cannot run test, base class "GMP" does not exist!');
-                return;
             }
             $this->addFile(
@@ Expand Down @@