[FIX] Can't create SchedulerTask

The bug was introduced by inattention of type hinting declarations and/or IDEs suggestions. Relates: #2976 Fixes: #3116
TYPO3-Solr · Dec 10, 2021 · 05ae55e · 05ae55e
1 parent 3529986
commit 05ae55e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php b/Classes/Task/IndexQueueWorkerTaskAdditionalFieldProvider.php
@@ -167,13 +167,13 @@ public function saveAdditionalFields(
     /**
      * Check that a task is an instance of IndexQueueWorkerTask
      *
-     * @param AbstractTask $task
+     * @param ?AbstractTask $task
      * @return boolean
      * @throws LogicException
      */
-    protected function isTaskInstanceofIndexQueueWorkerTask(AbstractTask $task): bool
+    protected function isTaskInstanceofIndexQueueWorkerTask(?AbstractTask $task): bool
     {
-        if (!($task instanceof IndexQueueWorkerTask)) {
+        if ((!is_null($task)) && !($task instanceof IndexQueueWorkerTask)) {
             throw new LogicException(
                 '$task must be an instance of IndexQueueWorkerTask, '
                 .'other instances are not supported.', 1487499814

diff --git a/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php b/Classes/Task/OptimizeIndexTaskAdditionalFieldProvider.php
@@ -266,7 +266,7 @@ protected function getPageRenderer(): ?PageRenderer
     /**
      * Check that a task is an instance of ReIndexTask
      *
-     * @param AbstractTask|null $task
+     * @param ?AbstractTask $task
      * @return boolean
      */
     protected function isTaskInstanceofOptimizeIndexTask(?AbstractTask $task): bool

diff --git a/Classes/Task/ReIndexTaskAdditionalFieldProvider.php b/Classes/Task/ReIndexTaskAdditionalFieldProvider.php
@@ -30,6 +30,7 @@
 use ApacheSolrForTypo3\Solr\Backend\SiteSelectorField;
 use ApacheSolrForTypo3\Solr\Domain\Site\SiteRepository;
 use ApacheSolrForTypo3\Solr\Domain\Site\Site;
+use LogicException;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Scheduler\AbstractAdditionalFieldProvider;
@@ -238,14 +239,13 @@ protected function getPageRenderer()
     /**
      * Check that a task is an instance of ReIndexTask
      *
-     * @param AbstractTask $task
+     * @param ?AbstractTask $task
      * @return boolean
-     * @throws \LogicException
      */
-    protected function isTaskInstanceofReIndexTask($task)
+    protected function isTaskInstanceofReIndexTask(?AbstractTask $task)
     {
         if ((!is_null($task)) && (!($task instanceof ReIndexTask))) {
-            throw new \LogicException(
+            throw new LogicException(
                 '$task must be an instance of ReIndexTask, '
                 . 'other instances are not supported.', 1487500366
             );