[TASK] Cleanup from PHPStan baseline (tomasnorre#733)

AOEpeople · Mar 30, 2021 · b64f757 · b64f757
1 parent 53e2fa0
commit b64f757
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 722 deletions.
diff --git a/Classes/Backend/RequestForm/StartRequestForm.php b/Classes/Backend/RequestForm/StartRequestForm.php
@@ -239,6 +239,11 @@ private function getScheduledTime(string $time)
                 $scheduledTime = time();
                 break;
         }
+
+        if (! $scheduledTime) {
+            return time();
+        }
+
         return $scheduledTime;
     }
 }
diff --git a/Classes/Controller/CrawlerController.php b/Classes/Controller/CrawlerController.php
@@ -1228,26 +1228,25 @@ public function readUrl($queueId, $force = false)
             /** @var JsonCompatibilityConverter $jsonCompatibilityConverter */
             $jsonCompatibilityConverter = GeneralUtility::makeInstance(JsonCompatibilityConverter::class);
             $resultData = $jsonCompatibilityConverter->convert($result['content']);
-        }
 
-        //atm there's no need to point to specific pollable extensions
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) {
-                // only check the success value if the instruction is runnig
-                // it is important to name the pollSuccess key same as the procInstructions key
-                if (is_array($resultData['parameters']['procInstructions'])
-                    && in_array(
-                        $pollable,
-                        $resultData['parameters']['procInstructions'], true
-                    )
-                ) {
-                    if (! empty($resultData['success'][$pollable]) && $resultData['success'][$pollable]) {
-                        $ret |= self::CLI_STATUS_POLLABLE_PROCESSED;
+            //atm there's no need to point to specific pollable extensions
+            if (is_array($resultData) && is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'])) {
+                foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) {
+                    // only check the success value if the instruction is runnig
+                    // it is important to name the pollSuccess key same as the procInstructions key
+                    if (is_array($resultData['parameters']['procInstructions'])
+                        && in_array(
+                            $pollable,
+                            $resultData['parameters']['procInstructions'], true
+                        )
+                    ) {
+                        if (! empty($resultData['success'][$pollable]) && $resultData['success'][$pollable]) {
+                            $ret |= self::CLI_STATUS_POLLABLE_PROCESSED;
+                        }
                     }
                 }
             }
         }
-
         // Set result in log which also denotes the end of the processing of this entry.
         $field_array = ['result_data' => json_encode($result)];
 

diff --git a/Classes/Domain/Model/ProcessCollection.php b/Classes/Domain/Model/ProcessCollection.php
@@ -39,7 +39,7 @@ class ProcessCollection extends \ArrayObject
 {
     /**
      * Method to retrieve an element from the collection.
-     *
+     * @param mixed $index
      * @throws NoIndexFoundException
      */
     public function offsetGet($index): Process
@@ -53,6 +53,7 @@ public function offsetGet($index): Process
     /**
      * Method to add an element to the collection-
      *
+     * @param mixed $index
      * @param Process $subject
      * @throws \InvalidArgumentException
      */

diff --git a/Classes/Domain/Repository/QueueRepository.php b/Classes/Domain/Repository/QueueRepository.php
@@ -511,7 +511,7 @@ public function cleanUpOldQueueEntries(): void
         }
     }
 
-    public function fetchRecordsToBeCrawled(int $countInARun)
+    public function fetchRecordsToBeCrawled(int $countInARun): array
     {
         $queryBuilderSelect = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable($this->tableName);
         return $queryBuilderSelect

diff --git a/Classes/Service/ProcessService.php b/Classes/Service/ProcessService.php
@@ -208,8 +208,10 @@ public function startProcess(): bool
             $completePath = '(' . $this->getCrawlerCliPath() . ' &) > /dev/null';
         }
 
-        $fileHandler = CommandUtility::exec($completePath);
-        if ($fileHandler === false) {
+        $output = null;
+        $returnValue = 0;
+        CommandUtility::exec($completePath, $output, $returnValue);
+        if ($returnValue !== 0) {
             throw new ProcessException('could not start process!');
         }
         for ($i = 0; $i < 10; $i++) {
@@ -273,11 +275,9 @@ private function startRequiredProcesses()
         }
         for ($i = 0; $i < $startProcessCount; $i++) {
             usleep(100);
-            if ($this->startProcess()) {
-                if ($this->verbose) {
-                    echo '.';
-                    $ret = true;
-                }
+            if ($this->startProcess() && $this->verbose) {
+                echo '.';
+                $ret = true;
             }
         }
         if ($this->verbose) {