Merge pull request #199 from alandolsi/typo3v12

Update Extension for TYPO3 v12 Compatibility
pixelant · Aug 16, 2024 · f561ddc · f561ddc
2 parents c314eec + e611db7
commit f561ddc
Show file tree

Hide file tree

Showing 72 changed files with 2,032 additions and 687 deletions.
diff --git a/Classes/Controller/AdministrationController.php b/Classes/Controller/AdministrationController.php
diff --git a/Classes/Controller/EidController.php b/Classes/Controller/EidController.php
@@ -21,7 +21,7 @@
  */
 class EidController
 {
-    const IDENTIFIER = 'pxa_social_feed_fb_access_token';
+    public const IDENTIFIER = 'pxa_social_feed_fb_access_token';
 
     /**
      * @var TokenRepository

diff --git a/Classes/Controller/FeedsController.php b/Classes/Controller/FeedsController.php
@@ -3,6 +3,7 @@
 namespace Pixelant\PxaSocialFeed\Controller;
 
 use Pixelant\PxaSocialFeed\Domain\Repository\FeedRepository;
+use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 
@@ -49,25 +50,29 @@ public function injectFeedRepository(FeedRepository $feedRepository): void
         $this->feedRepository = $feedRepository;
     }
 
+    protected function initializeView($view) {}
+
     /**
      * List action
      */
-    public function listAction()
+    public function listAction(): ResponseInterface
     {
         $limit = $this->settings['feedsLimit'] ? (int)($this->settings['feedsLimit']) : 10;
         $configurations = GeneralUtility::intExplode(',', $this->settings['configuration'], true);
 
         $feeds = $this->feedRepository->findByConfigurations($configurations, $limit);
 
         $this->view->assign('feeds', $feeds);
+        return $this->htmlResponse();
     }
 
     /**
      * List ajax action
      * Prepare view for later ajax request
      */
-    public function listAjaxAction()
+    public function listAjaxAction(): ResponseInterface
     {
+        return $this->htmlResponse();
     }
 
     /**

diff --git a/Classes/Database/Query/Restriction/BackendGroupRestriction.php b/Classes/Database/Query/Restriction/BackendGroupRestriction.php
@@ -61,6 +61,6 @@ public function buildExpression(array $queriedTables, ExpressionBuilder $express
             }
         }
 
-        return $expressionBuilder->orX(...$constraints);
+        return $expressionBuilder->or(...$constraints);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return $expressionBuilder->orX(...$constraints);
+            return $expressionBuilder->or(...$constraints);
         }
     }