Fix some phpstan errors

TYPO3 · Feb 17, 2022 · 9e21451 · 9e21451
1 parent d5d0ec1
commit 9e21451
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 32 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,23 +1,8 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$input of function array_filter expects array, array\\<array\\|string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Task/CleanupReleasesTask.php
-
-		-
-			message: "#^Parameter \\#1 \\$input of function array_filter expects array, array\\<array\\|string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Task/Generic/RollbackTask.php
-
-		-
-			message: "#^Parameter \\#1 \\$arg of function escapeshellarg expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Task/TYPO3/CMS/AbstractCliTask.php
-
 		-
 			message: "#^Parameter \\#2 \\$node of method TYPO3\\\\Surf\\\\Domain\\\\Service\\\\ShellCommandService\\:\\:executeOrSimulate\\(\\) expects TYPO3\\\\Surf\\\\Domain\\\\Model\\\\Node, TYPO3\\\\Surf\\\\Domain\\\\Model\\\\Node\\|null given\\.$#"
-			count: 2
+			count: 1
 			path: src/Task/TYPO3/CMS/AbstractCliTask.php
 
 		-

diff --git a/src/Task/CleanupReleasesTask.php b/src/Task/CleanupReleasesTask.php
@@ -64,9 +64,7 @@ public function execute(Node $node, Application $application, Deployment $deploy
         $previousReleaseIdentifier = findPreviousReleaseIdentifier($deployment, $node, $application, $this->shell);
         $allReleases = findAllReleases($deployment, $node, $application, $this->shell);
 
-        $removableReleases = array_map('trim', array_filter($allReleases, static function ($release) use ($currentReleaseIdentifier, $previousReleaseIdentifier): bool {
-            return $release !== '.' && $release !== $currentReleaseIdentifier && $release !== $previousReleaseIdentifier && $release !== 'current' && $release !== 'previous';
-        }));
+        $removableReleases = $this->extractRemovableReleases($allReleases, $currentReleaseIdentifier, $previousReleaseIdentifier);
 
         if (isset($options['onlyRemoveReleasesOlderThan'])) {
             $removeReleases = $this->removeReleasesByAge($options, $removableReleases);
@@ -106,13 +104,17 @@ private function removeReleasesByAge(array $options, array $removableReleases)
         });
     }
 
-    /**
-     * @return array
-     */
     private function removeReleasesByNumber(array $options, array $removableReleases): array
     {
         sort($removableReleases);
         $keepReleases = $options['keepReleases'];
         return array_slice($removableReleases, 0, count($removableReleases) - $keepReleases);
     }
+
+    private function extractRemovableReleases(array $allReleases, ?string $currentReleaseIdentifier, string $previousReleaseIdentifier): array
+    {
+        return array_map('trim', array_filter($allReleases, static function ($release) use ($currentReleaseIdentifier, $previousReleaseIdentifier): bool {
+            return $release !== '.' && $release !== $currentReleaseIdentifier && $release !== $previousReleaseIdentifier && $release !== 'current' && $release !== 'previous';
+        }));
+    }
 }
diff --git a/src/Task/TYPO3/CMS/AbstractCliTask.php b/src/Task/TYPO3/CMS/AbstractCliTask.php
@@ -28,17 +28,13 @@ abstract class AbstractCliTask extends Task implements ShellCommandServiceAwareI
 
     /**
      * The working directory. Either local or remote, and probably in a special application root directory
-     *
-     * @var string|null
      */
-    protected $workingDirectory;
+    protected ?string $workingDirectory = null;
 
     /**
      * Localhost or deployment target node
-     *
-     * @var Node|null
      */
-    protected $targetNode;
+    protected ?Node $targetNode = null;
 
     /**
      * @return bool|mixed
@@ -53,8 +49,12 @@ protected function executeCliCommand(array $cliArguments, Node $node, CMS $appli
         }
         $commandPrefix .= $phpBinaryPathAndFilename . ' ';
 
+        if (!$this->targetNode instanceof Node) {
+            return false;
+        }
+
         return $this->shell->executeOrSimulate([
-            'cd ' . escapeshellarg($this->workingDirectory),
+            'cd ' . escapeshellarg((string)$this->workingDirectory),
             $commandPrefix . implode(' ', array_map('escapeshellarg', $cliArguments))
         ], $this->targetNode, $deployment);
     }

diff --git a/src/functions.php b/src/functions.php
@@ -17,14 +17,20 @@
 /**
  * Find all releases for current application
  *
- * @return array[]|false|string[]
+ * @return string[]
  */
-function findAllReleases(Deployment $deployment, Node $node, Application $application, ShellCommandService $shell)
+function findAllReleases(Deployment $deployment, Node $node, Application $application, ShellCommandService $shell): array
 {
     $releasesPath = $application->getReleasesPath();
     $allReleasesList = $shell->execute("if [ -d $releasesPath/. ]; then find $releasesPath/. -maxdepth 1 -type d -exec basename {} \; ; fi", $node, $deployment);
 
-    return preg_split('/\s+/', $allReleasesList, -1, PREG_SPLIT_NO_EMPTY);
+    $allReleases = preg_split('/\s+/', $allReleasesList, -1, PREG_SPLIT_NO_EMPTY);
+
+    if ($allReleases === false) {
+        return[];
+    }
+
+    return $allReleases;
 }
 
 /**