SUPESC-849 Fixed PHPStan issue (#319)

spryker-sdk · Jun 4, 2024 · 9318473 · 9318473
1 parent ee3c99f
commit 9318473
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/...aluator/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcher.php b/...aluator/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcher.php
@@ -138,15 +138,15 @@ protected function fetchNewFileError(string $file, array $message): ?FileErrorDt
         $this->assertArrayKeyExists($message, 'line');
         $this->assertArrayKeyExists($message, 'message');
 
-        $fileError = new FileErrorDto($file, $message['line'], $message['message']);
+        $fileError = new FileErrorDto($file, (int)$message['line'], (string)$message['message']);
 
         if ($this->baselineStorage->hasFileError($fileError)) {
             return null;
         }
 
         $this->baselineStorage->addFileError($fileError);
 
-        return new FileErrorDto($file, $message['line'], $message['message']);
+        return new FileErrorDto($file, (int)$message['line'], (string)$message['message']);
     }
 
     /**
@@ -212,7 +212,7 @@ public function reset(): void
      */
     protected function assertArrayKeyExists(array $data, string $key, bool $isArray = false): void
     {
-        if (!isset($data[$key]) || ($isArray && !is_array($data[$key]))) {
+        if (!array_key_exists($key, $data) || ($isArray && !is_array($data[$key]))) {
             throw new InvalidArgumentException(sprintf(
                 'Unable to find %s key or it\'s not an array in %s. Tooling export format is changes.',
                 $key,

diff --git a/...est/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcherTest.php b/...est/Application/Checker/BrokenPhpFilesChecker/FileErrorsFetcher/FileErrorsFetcherTest.php
@@ -74,13 +74,16 @@ public function testFetchProjectFileErrorsAndSaveInBaseLineShouldReturnEmptyWhen
     }
 
     /**
+     * @dataProvider projectFileErrorsDataProvider
+     *
+     * @param array<mixed> $toolOutput
+     * @param array<mixed> $expectedResult
+     *
      * @return void
      */
-    public function testFetchProjectFileErrorsAndSaveInBaseLineShouldFetchFileErrors(): void
+    public function testFetchProjectFileErrorsAndSaveInBaseLineShouldFetchFileErrors(array $toolOutput, array $expectedResult): void
     {
         // Arrange
-        $toolOutput = ['files' => ['src/someClass.php' => ['messages' => [['line' => 1, 'message' => 'test message']]]]];
-
         $baseLineStorage = new BaselineStorage();
         $fileErrorsFetcher = new FileErrorsFetcher('', '', $this->createProcessRunnerServiceMock($toolOutput), $baseLineStorage, $this->createLoggerMock());
 
@@ -89,9 +92,30 @@ public function testFetchProjectFileErrorsAndSaveInBaseLineShouldFetchFileErrors
 
         // Assert
         $this->assertCount(1, $fileErrors);
-        $this->assertSame('src/someClass.php', $fileErrors[0]->getFilename());
-        $this->assertSame(1, $fileErrors[0]->getLine());
-        $this->assertSame('test message', $fileErrors[0]->getMessage());
+        $this->assertSame($expectedResult['expectedClass'], $fileErrors[0]->getFilename());
+        $this->assertSame($expectedResult['expectedLine'], $fileErrors[0]->getLine());
+        $this->assertSame($expectedResult['expectedMessage'], $fileErrors[0]->getMessage());
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    public function projectFileErrorsDataProvider(): array
+    {
+        return [
+            [
+                ['files' => ['src/someClass.php' => ['messages' => [['line' => 1, 'message' => 'test message']]]]],
+                ['expectedClass' => 'src/someClass.php', 'expectedLine' => 1, 'expectedMessage' => 'test message'],
+            ],
+            [
+                ['files' => ['src/someClass.php' => ['messages' => [['line' => null, 'message' => 'test message']]]]],
+                ['expectedClass' => 'src/someClass.php', 'expectedLine' => 0, 'expectedMessage' => 'test message'],
+            ],
+            [
+                ['files' => ['src/someClass.php' => ['messages' => [['line' => 1, 'message' => null]]]]],
+                ['expectedClass' => 'src/someClass.php', 'expectedLine' => 1, 'expectedMessage' => ''],
+            ],
+        ];
     }
 
     /**