浏览代码

replace new keyword by GeneralUtility::makeInstance

Olivier Massot 5 年之前
父节点
当前提交
ff49d617a2

+ 3 - 3
ot_templating/Classes/Controller/OtCustomizerController.php

@@ -18,7 +18,7 @@ class OtCustomizerController extends ActionController {
 
 
     /**
     /**
      * Index action (default action)
      * Index action (default action)
-     * Displays the customize page on the backend
+     * Displays the customizer page on the backend
      */
      */
     public function indexAction() {
     public function indexAction() {
 
 
@@ -35,7 +35,7 @@ class OtCustomizerController extends ActionController {
         $this->view->assign('rootPage', $rootPageUid);
         $this->view->assign('rootPage', $rootPageUid);
         $this->view->assign('templates', OtPageRepository::templates);
         $this->view->assign('templates', OtPageRepository::templates);
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         $this->view->assign('currentTemplate', $pageRepository->getCurrentTemplate($rootPageUid));
         $this->view->assign('currentTemplate', $pageRepository->getCurrentTemplate($rootPageUid));
         $this->view->assign('preferences', $pageRepository->getTemplatePreferences($rootPageUid));
         $this->view->assign('preferences', $pageRepository->getTemplatePreferences($rootPageUid));
 
 
@@ -127,7 +127,7 @@ class OtCustomizerController extends ActionController {
         $pageId = (int) GeneralUtility::_GP('id');
         $pageId = (int) GeneralUtility::_GP('id');
 
 
         // Get the root page of the site
         // Get the root page of the site
-        $otPageRepository = new OtPageRepository();
+        $otPageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         $rootPage = $otPageRepository->getRootPageFor($pageId);
         $rootPage = $otPageRepository->getRootPageFor($pageId);
 
 
         if (!$rootPage['uid'] > 0) {
         if (!$rootPage['uid'] > 0) {

+ 2 - 1
ot_templating/Classes/News/NewsFilter.php

@@ -4,11 +4,12 @@ namespace Opentalent\OtTemplating\News;
 
 
 use GeorgRinger\News\Utility\Page;
 use GeorgRinger\News\Utility\Page;
 use Opentalent\OtTemplating\Page\OtPageRepository;
 use Opentalent\OtTemplating\Page\OtPageRepository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 
 class NewsFilter
 class NewsFilter
 {
 {
     public function createDemandObjectFromSettings($params) {
     public function createDemandObjectFromSettings($params) {
-        $pageRepo = new OtPageRepository();
+        $pageRepo = GeneralUtility::makeInstance(OtPageRepository::class);
         $rootUid = $pageRepo->getRootPageFor($GLOBALS['TSFE']->id);
         $rootUid = $pageRepo->getRootPageFor($GLOBALS['TSFE']->id);
         $params['demand']->setStoragePage(Page::extendPidListByChildren(
         $params['demand']->setStoragePage(Page::extendPidListByChildren(
             '' . $rootUid['uid'],
             '' . $rootUid['uid'],

+ 1 - 1
ot_templating/Classes/Utility/CacheManager.php

@@ -60,7 +60,7 @@ class CacheManager
      */
      */
     public static function clearAssetsTempfiles()
     public static function clearAssetsTempfiles()
     {
     {
-        $typo3tempFileService = new Typo3tempFileService();
+        $typo3tempFileService = GeneralUtility::makeInstance(Typo3tempFileService::class);
 
 
         try {
         try {
             $typo3tempFileService->clearAssetsFolder("/typo3temp/assets/css");
             $typo3tempFileService->clearAssetsFolder("/typo3temp/assets/css");

+ 2 - 1
ot_templating/Classes/ViewHelpers/EventsPage/GetIdViewHelper.php

@@ -4,6 +4,7 @@ namespace Opentalent\OtTemplating\ViewHelpers\EventsPage;
 
 
 use Closure;
 use Closure;
 use Opentalent\OtTemplating\Page\OtPageRepository;
 use Opentalent\OtTemplating\Page\OtPageRepository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 
@@ -42,7 +43,7 @@ class GetIdViewHelper extends AbstractViewHelper
             $renderChildrenClosure,
             $renderChildrenClosure,
             $renderingContext
             $renderingContext
         );
         );
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
 
 
         $subpages = $pageRepository->getAllSubpagesForPage($rootId);
         $subpages = $pageRepository->getAllSubpagesForPage($rootId);
 
 

+ 2 - 1
ot_templating/Classes/ViewHelpers/GetPageUidViewHelper.php

@@ -6,6 +6,7 @@ namespace Opentalent\OtTemplating\ViewHelpers;
 use Closure;
 use Closure;
 use Opentalent\OtTemplating\Page\OtPageRepository;
 use Opentalent\OtTemplating\Page\OtPageRepository;
 use Opentalent\OtTemplating\ViewHelpers\RootPage\GetIdViewHelper;
 use Opentalent\OtTemplating\ViewHelpers\RootPage\GetIdViewHelper;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 
@@ -57,7 +58,7 @@ class GetPageUidViewHelper extends AbstractViewHelper
             $renderingContext
             $renderingContext
         );
         );
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
 
 
         $subpages = $pageRepository->getAllSubpagesForPage($rootId);
         $subpages = $pageRepository->getAllSubpagesForPage($rootId);
 
 

+ 2 - 1
ot_templating/Classes/ViewHelpers/RootPage/GetIdViewHelper.php

@@ -4,6 +4,7 @@ namespace Opentalent\OtTemplating\ViewHelpers\RootPage;
 
 
 use Closure;
 use Closure;
 use Opentalent\OtTemplating\Page\OtPageRepository;
 use Opentalent\OtTemplating\Page\OtPageRepository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 
@@ -35,7 +36,7 @@ class GetIdViewHelper extends AbstractViewHelper
     ) {
     ) {
         $pageUid = $GLOBALS['TSFE']->id;
         $pageUid = $GLOBALS['TSFE']->id;
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         return $pageRepository->getRootPageFor($pageUid)['uid'];
         return $pageRepository->getRootPageFor($pageUid)['uid'];
     }
     }
 }
 }

+ 1 - 1
ot_templating/Classes/ViewHelpers/Template/CurrentViewHelper.php

@@ -40,7 +40,7 @@ class CurrentViewHelper extends AbstractViewHelper
             $pageUid = (int) GeneralUtility::_GP('id');
             $pageUid = (int) GeneralUtility::_GP('id');
         }
         }
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         return $pageRepository->getCurrentTemplate($pageUid);
         return $pageRepository->getCurrentTemplate($pageUid);
     }
     }
 
 

+ 1 - 1
ot_templating/Classes/ViewHelpers/Template/GetPreferenceViewHelper.php

@@ -54,7 +54,7 @@ class GetPreferenceViewHelper extends AbstractViewHelper
             $pageUid = (int) GeneralUtility::_GP('id');
             $pageUid = (int) GeneralUtility::_GP('id');
         }
         }
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         $preferences = $pageRepository->getTemplatePreferences($pageUid);
         $preferences = $pageRepository->getTemplatePreferences($pageUid);
         $key = $arguments['key'];
         $key = $arguments['key'];
         return $preferences[$key];
         return $preferences[$key];

+ 1 - 1
ot_templating/Classes/ViewHelpers/Template/GetPreferencesViewHelper.php

@@ -39,7 +39,7 @@ class PreferencesViewHelper extends AbstractViewHelper
             $pageUid = (int) GeneralUtility::_GP('id');
             $pageUid = (int) GeneralUtility::_GP('id');
         }
         }
 
 
-        $pageRepository = new OtPageRepository();
+        $pageRepository = GeneralUtility::makeInstance(OtPageRepository::class);
         return $pageRepository->getTemplatePreferences($pageUid);
         return $pageRepository->getTemplatePreferences($pageUid);
     }
     }