magento#31176: Updated AnalysisResult constructor arguments

(cherry picked from commit 841b172)
hostep · Mar 30, 2021 · c906698 · c906698
1 parent 8f2a4bf
commit c906698
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -96,7 +96,7 @@
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
-        "phpstan/phpstan": "^0.12.3",
+        "phpstan/phpstan": "^0.12.77",
         "phpunit/phpunit": "^9",
         "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php b/dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php
@@ -41,9 +41,11 @@
 class FilteredErrorFormatter implements ErrorFormatter
 {
     private const MUTE_ERROR_ANNOTATION = 'phpstan:ignore';
-
     private const NO_ERRORS = 0;
 
+    /**
+     * @var TableErrorFormatter
+     */
     private $tableErrorFormatter;
 
     /**
@@ -60,22 +62,18 @@ public function __construct(TableErrorFormatter $tableErrorFormatter)
     public function formatErrors(AnalysisResult $analysisResult, Output $output): int
     {
         if (!$analysisResult->hasErrors()) {
-            $style = $output->getStyle();
-            $style->success('No errors');
+            $output->getStyle()->success('No errors');
             return self::NO_ERRORS;
         }
 
-        $fileSpecificErrorsWithoutIgnoredErrors = $this->clearIgnoredErrors(
-            $analysisResult->getFileSpecificErrors()
-        );
-
         $clearedAnalysisResult = new AnalysisResult(
-            $fileSpecificErrorsWithoutIgnoredErrors,
+            $this->clearIgnoredErrors($analysisResult->getFileSpecificErrors()),
             $analysisResult->getNotFileSpecificErrors(),
+            $analysisResult->getInternalErrors(),
             $analysisResult->getWarnings(),
             $analysisResult->isDefaultLevelUsed(),
-            $analysisResult->hasInferrablePropertyTypesFromConstructor(),
-            $analysisResult->getProjectConfigFile()
+            $analysisResult->getProjectConfigFile(),
+            $analysisResult->isResultCacheSaved()
         );
 
         return $this->tableErrorFormatter->formatErrors($clearedAnalysisResult, $output);