Upgrade v13

.github/workflows/testTYPO3v12.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         env:
           cache-name: cache-composer-dependencies
         with:

.github/workflows/testTYPO3v10.yml → .github/workflows/testTYPO3v13.yml

@@ -1,4 +1,4 @@
-name: "TYPO3 10 Test"
+name: "TYPO3 13 Test"
 
 on:
   pull_request:
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         env:
           cache-name: cache-composer-dependencies
         with:
@@ -26,5 +26,6 @@ jobs:
       - name: "Run tests"
         uses: php-actions/composer@v6
         with:
-          php_version: 7.4
-          command: run testTYPO3v10
+          php_version: 8.4
+          php_extensions: intl
+          command: run testTYPO3v13

Classes/Toolbar/Clock.php

@@ -3,37 +3,27 @@
 
 use TYPO3\CMS\Backend\Toolbar\ToolbarItemInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Page\PageRenderer;
-use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\View\ViewFactoryData;
+use TYPO3\CMS\Core\View\ViewInterface;
+use TYPO3\CMS\Fluid\View\FluidViewFactory;
 
 /**
  * Clock toolbar class
  */
-class Clock implements ToolbarItemInterface {
-    /**
-     * @var StandaloneView
-     */
-    protected $view;
-
-    /**
-     * @var PageRenderer
-     */
-    protected $pageRenderer;
-
+class Clock implements ToolbarItemInterface
+{
     /**
      * Constructs the Clock toolbar item
      */
-    public function __construct() 
+    public function __construct(protected readonly ExtensionConfiguration $extensionConfiguration, protected readonly FluidViewFactory $viewFactory)
+    {
+    }
+
+    protected function createView(): ViewInterface
     {
-        $this->pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Oclock/Luxon');
-        $this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Oclock/Clock');
-        $this->view = GeneralUtility::makeInstance(StandaloneView::class);
-        /** @var ExtensionConfiguration $extensionConfiguration */
-        $extensionConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class);
         /** @var array{dashboard:string[],additionalTemplateRootPath:string,additionalPartialRootPath:string,additionalLayoutRootPath:string} $extConf */
-        $extConf = $extensionConfiguration->get('oclock');
+        $extConf = $this->extensionConfiguration->get('oclock');
         $rootPaths = [
             'template' => [
                 'EXT:oclock/Resources/Private/Templates/'
@@ -46,26 +36,30 @@ public function __construct()
             ]
         ];
         if (!empty($extConf['additionalTemplateRootPath'])) {
-            $templateRootPaths['template'][] = $extConf['additionalTemplateRootPath'];
+            $rootPaths['template'][] = $extConf['additionalTemplateRootPath'];
         }
         if (!empty($extConf['additionalPartialRootPath'])) {
-            $templateRootPaths['partial'][] = $extConf['additionalPartialRootPath'];
+            $rootPaths['partial'][] = $extConf['additionalPartialRootPath'];
         }
         if (!empty($extConf['additionalLayoutRootPath'])) {
-            $templateRootPaths['layout'][] = $extConf['additionalLayoutRootPath'];
+            $rootPaths['layout'][] = $extConf['additionalLayoutRootPath'];
         }
-        $this->view->setTemplateRootPaths($rootPaths['template']);
-        $this->view->setPartialRootPaths($rootPaths['partial']);
-        $this->view->setLayoutRootPaths($rootPaths['layout']);
-
+
+        $viewData = GeneralUtility::makeInstance(
+            ViewFactoryData::class,
+            $rootPaths['template'],
+            $rootPaths['partial'],
+            $rootPaths['layout']
+        );
+        return $this->viewFactory->create($viewData);
     }
 
     /**
      * Checks the access rights to the Clock ToolbarItem
      *
      * @return bool
      */
-    public function checkAccess(): bool 
+    public function checkAccess(): bool
     {
         return true;
     }
@@ -75,11 +69,11 @@ public function checkAccess(): bool
      *
      * @return string
      */
-    public function getItem(): string 
+    public function getItem(): string
     {
-        $this->view->setTemplate('Toolbar/Item');
-        $this->view->assign('date', new \DateTime());
-        return $this->view->render();
+        $view = $this->createView();
+        $view->assign('date', new \DateTime());
+        return $view->render('Toolbar/Item');
     }
 
     /**
@@ -99,9 +93,9 @@ public function hasDropDown(): bool
      */
     public function getDropDown(): string
     {
-        $this->view->setTemplate('Toolbar/DropDown');
-        $this->view->assign('date', new \DateTime());
-        return $this->view->render();
+        $view = $this->createView();
+        $view->assign('date', new \DateTime());
+        return $view->render('Toolbar/DropDown');
     }
 
     /**

Configuration/JavaScriptModules.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'dependencies' => [
+        'backend'
+    ],
+    'imports' => [
+        '@the-coding-owl/oclock/' => 'EXT:oclock/Resources/Public/JavaScript/'
+    ]
+];