SDK-5463: Adjust the upgrade process so it runs phpstan between itera… (

#299)

config/DynamicEvaluator/checker_phpstan.neon

@@ -6,3 +6,5 @@ parameters:
         analyse:
             - %currentWorkingDirectory%/src/Generated/*
             - %currentWorkingDirectory%/src/Orm/*
+            - %currentWorkingDirectory%/src/Pyz/Zed/*/Persistence/*Repository.php
+            - %currentWorkingDirectory%/src/Pyz/Zed/*/Persistence/*QueryContainer.php

config/DynamicEvaluator/services.yaml

@@ -1,7 +1,6 @@
 parameters:
     checker_broken_php_files_executable_path: '%kernel.project_dir%/vendor/bin/phpstan'
     checker_broken_php_files_config_executable_path: '%upgrader.root_dir%/config/DynamicEvaluator/checker_phpstan.neon'
-    checker_broken_php_files_with_project_config_executable_path: '%upgrader.root_dir%/config/DynamicEvaluator/checker_phpstan_include_project.neon'
 
 services:
     _defaults:
@@ -18,7 +17,6 @@ services:
     DynamicEvaluator\Application\Checker\BrokenPhpFilesChecker\FileErrorsFetcher\FileErrorsFetcher:
         arguments:
             - '%checker_broken_php_files_config_executable_path%'
-            - '%checker_broken_php_files_with_project_config_executable_path%'
             - '%checker_broken_php_files_executable_path%'
             - '@SprykerSdk\Utils\Infrastructure\Service\ProcessRunnerService'
 

src/DynamicEvaluator/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcher.php

@@ -25,11 +25,6 @@ class FileErrorsFetcher implements FileErrorsFetcherInterface
      */
     protected string $executableConfig;
 
-    /**
-     * @var string
-     */
-    protected string $executableProjectConfig;
-
     /**
      * @var string
      */
@@ -57,7 +52,6 @@ class FileErrorsFetcher implements FileErrorsFetcherInterface
 
     /**
      * @param string $executableConfig
-     * @param string $executableProjectConfig
      * @param string $executable
      * @param \SprykerSdk\Utils\Infrastructure\Service\ProcessRunnerServiceInterface $processRunnerService
      * @param \DynamicEvaluator\Application\Checker\BrokenPhpFilesChecker\Baseline\BaselineStorageInterface $baselineStorage
@@ -66,15 +60,13 @@ class FileErrorsFetcher implements FileErrorsFetcherInterface
      */
     public function __construct(
         string $executableConfig,
-        string $executableProjectConfig,
         string $executable,
         ProcessRunnerServiceInterface $processRunnerService,
         BaselineStorageInterface $baselineStorage,
         LoggerInterface $logger,
         string $phpstanNeonFileName = 'phpstan.neon'
     ) {
         $this->executableConfig = $executableConfig;
-        $this->executableProjectConfig = $executableProjectConfig;
         $this->executable = $executable;
         $this->processRunnerService = $processRunnerService;
         $this->baselineStorage = $baselineStorage;
@@ -94,7 +86,7 @@ public function fetchProjectFileErrorsAndSaveInBaseLine(array $dirs = []): array
         try {
             $errors = $this->fetchErrorsArray($dirs);
         } catch (ProcessTimedOutException $e) {
-            $this->logger->debug($e->getMessage());
+            $this->logger->warning($e->getMessage());
 
             return [
                 new FileErrorDto(
@@ -107,7 +99,7 @@ public function fetchProjectFileErrorsAndSaveInBaseLine(array $dirs = []): array
                 ),
             ];
         } catch (Exception $e) {
-            $this->logger->debug($e->getMessage());
+            $this->logger->warning($e->getMessage());
 
             return [
                 new FileErrorDto(
@@ -170,7 +162,7 @@ protected function fetchErrorsArray(array $dirs): array
             $this->executable,
             'analyse',
             '-c',
-            file_exists(getcwd() . DIRECTORY_SEPARATOR . $this->phpstanNeonFileName) ? $this->executableProjectConfig : $this->executableConfig,
+            $this->executableConfig,
             '--error-format',
             'prettyJson',
             ...$dirs,

tests/DynamicEvaluatorTest/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcherTest.php

@@ -34,7 +34,7 @@ public function testFetchProjectFileErrorsAndSaveInBaseLineShouldValidate(array
         // Arrange
         $this->expectException(InvalidArgumentException::class);
 
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $this->createProcessRunnerServiceMock($toolOutput), new BaselineStorage(), $this->createLoggerMock());
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $this->createProcessRunnerServiceMock($toolOutput), new BaselineStorage(), $this->createLoggerMock());
 
         // Act
         $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
@@ -64,7 +64,7 @@ public function testFetchProjectFileErrorsAndSaveInBaseLineShouldReturnEmptyWhen
         $baseLineStorage = new BaselineStorage();
         $baseLineStorage->addFileError(new FileErrorDto('src/someClass.php', 1, 'test message'));
 
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $this->createProcessRunnerServiceMock($toolOutput), $baseLineStorage, $this->createLoggerMock());
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $this->createProcessRunnerServiceMock($toolOutput), $baseLineStorage, $this->createLoggerMock());
 
         // Act
         $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
@@ -82,7 +82,7 @@ public function testFetchProjectFileErrorsAndSaveInBaseLineShouldFetchFileErrors
         $toolOutput = ['files' => ['src/someClass.php' => ['messages' => [['line' => 1, 'message' => 'test message']]]]];
 
         $baseLineStorage = new BaselineStorage();
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $this->createProcessRunnerServiceMock($toolOutput), $baseLineStorage, $this->createLoggerMock());
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $this->createProcessRunnerServiceMock($toolOutput), $baseLineStorage, $this->createLoggerMock());
 
         // Act
         $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
@@ -103,7 +103,7 @@ public function testResetShouldInvokeBaselineStorageResetting(): void
         $baseLineStorageMock = $this->createMock(BaselineStorage::class);
         $baseLineStorageMock->expects($this->once())->method('clear');
 
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $this->createProcessRunnerServiceMock([]), $baseLineStorageMock, $this->createLoggerMock());
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $this->createProcessRunnerServiceMock([]), $baseLineStorageMock, $this->createLoggerMock());
 
         // Act
         $fileErrorsFetcher->reset();
@@ -150,32 +150,7 @@ public function testRunWithoutProjectConfig(): void
             ->with(['phpstan', 'analyse', '-c', 'internal', '--error-format', 'prettyJson'])
             ->willReturn($processMock);
 
-        $fileErrorsFetcher = new FileErrorsFetcher('internal', 'project', 'phpstan', $processRunnerServiceMock, new BaselineStorage(), $this->createLoggerMock(), 'nonexist.neon');
-
-        // Act
-        $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
-
-        // Assert
-        $this->assertEmpty($fileErrors);
-    }
-
-    /**
-     * @return void
-     */
-    public function testRunWithProjectConfig(): void
-    {
-        // Arrange
-        $toolOutput = ['files' => []];
-        $processMock = $this->createMock(Process::class);
-        $processMock->method('getOutput')->willReturn(json_encode($toolOutput, \JSON_THROW_ON_ERROR));
-        /** @var \SprykerSdk\Utils\Infrastructure\Service\ProcessRunnerServiceInterface&\PHPUnit\Framework\MockObject\MockObject $processRunnerServiceMock */
-        $processRunnerServiceMock = $this->createMock(ProcessRunnerServiceInterface::class);
-        $processRunnerServiceMock
-            ->method('run')
-            ->with(['phpstan', 'analyse', '-c', 'project', '--error-format', 'prettyJson'])
-            ->willReturn($processMock);
-
-        $fileErrorsFetcher = new FileErrorsFetcher('internal', 'project', 'phpstan', $processRunnerServiceMock, new BaselineStorage(), $this->createLoggerMock(), 'phpstan.neon');
+        $fileErrorsFetcher = new FileErrorsFetcher('internal', 'phpstan', $processRunnerServiceMock, new BaselineStorage(), $this->createLoggerMock(), 'nonexist.neon');
 
         // Act
         $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
@@ -202,7 +177,7 @@ public function testRunProcessWithTimeout(): void
             ->method('run')
             ->willThrowException(new ProcessTimedOutException($processMock, ProcessTimedOutException::TYPE_GENERAL));
 
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $processRunnerServiceMock, new BaselineStorage(), $loggerMock, 'phpstan.neon');
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $processRunnerServiceMock, new BaselineStorage(), $loggerMock, 'phpstan.neon');
 
         // Act
         $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();
@@ -231,7 +206,7 @@ public function testRunProcessWithException(): void
             ->method('run')
             ->willThrowException(new Exception('error'));
 
-        $fileErrorsFetcher = new FileErrorsFetcher('', '', '', $processRunnerServiceMock, new BaselineStorage(), $loggerMock, 'phpstan.neon');
+        $fileErrorsFetcher = new FileErrorsFetcher('', '', $processRunnerServiceMock, new BaselineStorage(), $loggerMock, 'phpstan.neon');
 
         // Act
         $fileErrors = $fileErrorsFetcher->fetchProjectFileErrorsAndSaveInBaseLine();