[BUGFIX:BP:11] Use always string instead of null in all trim() calls

Fixes: #195
TYPO3-Solr · Sep 28, 2022 · ef2028b · ef2028b
1 parent e4f062e
commit ef2028b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Process.php b/Classes/Process.php
@@ -123,7 +123,7 @@ public function findPid(): ?int
         exec($ps, $output);
 
         foreach ($output as $line) {
-            [$pid, $command] = explode(' ', trim($line), 2);
+            [$pid, $command] = explode(' ', trim($line ?? ''), 2);
             $command = $this->escapePsOutputCommand($command);
             if ($command == $processCommand) {
                 return (int)$pid;

diff --git a/Classes/Service/Tika/AbstractService.php b/Classes/Service/Tika/AbstractService.php
@@ -110,7 +110,7 @@ protected function getAdditionalCommandOptions(): string
         // Combine matched command options with escaped argument value
         $commandOptionsString = '';
         foreach (array_combine($matches['property'], $matches['value']) as $property => $unescapedValue) {
-            $escapedValue = CommandUtility::escapeShellArgument(trim($unescapedValue, '"\''));
+            $escapedValue = CommandUtility::escapeShellArgument(trim($unescapedValue ?? '', '"\''));
             $commandOptionsString .= sprintf(' -D%s=%s', $property, $escapedValue);
         }
 

diff --git a/Classes/Service/Tika/AppService.php b/Classes/Service/Tika/AppService.php
@@ -235,10 +235,10 @@ public function buildSupportedMimeTypes(): array
     }
 
     /**
-     * Takes shell output from exec() and turns it into an array of key => value
+     * Takes the shell output from exec() and turns it into an array of key => value
      * pairs.
      *
-     * @param array $shellOutput An array containing shell output from exec() with one line per entry
+     * @param array $shellOutput An array containing the shell output from exec() with one line per entry
      * @return array Key => value pairs
      */
     protected function shellOutputToArray(array $shellOutput): array
@@ -247,7 +247,7 @@ protected function shellOutputToArray(array $shellOutput): array
 
         foreach ($shellOutput as $line) {
             [$key, $value] = explode(':', $line, 2);
-            $value = trim($value);
+            $value = trim($value ?? '');
 
             if (in_array($key, [
                 'dc',
@@ -263,7 +263,7 @@ protected function shellOutputToArray(array $shellOutput): array
                 [$key, $value] = explode(':', $value, 2);
 
                 $key = $keyPrefix . ':' . $key;
-                $value = trim($value);
+                $value = trim($value ?? '');
             }
 
             if (array_key_exists($key, $metaData)) {