Merge pull request #38 from the-coding-owl/bugfix_optionalWidget

Bugfix optional widget
the-coding-owl · Nov 6, 2021 · ff022a1 · ff022a1
2 parents a282a70 + f85178d
commit ff022a1
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 27 deletions.
diff --git a/Classes/Toolbar/Clock.php b/Classes/Toolbar/Clock.php
@@ -32,6 +32,7 @@ public function __construct()
         $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');
         $rootPaths = [
             'template' => [

diff --git a/Classes/Widgets/ClockWidget.php b/Classes/Widgets/ClockWidget.php
@@ -78,14 +78,18 @@ class ClockWidget implements WidgetInterface, RequireJsModuleInterface, Addition
     /**
      * Constructor of the ClockWidget
      * 
-     * @var StandaloneView $view
+     * @param StandaloneView $view
      */
     public function __construct(StandaloneView $view)
     {
         $this->view = $view;
         /** @var ExtensionConfiguration $extensionConfiguration */
         $extensionConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class);
-        $this->extConf = $extensionConfiguration->get('oclock');
+        /** @var array{dashboard:string[],additionalTemplateRootPath:string,additionalPartialRootPath:string,additionalLayoutRootPath:string} $extConf */
+        $extConf = $extensionConfiguration->get('oclock');
+        if (is_array($extConf)) {
+            $this->extConf = $extConf;
+        }
     }
 
     /**

diff --git a/Configuration/Icons.php b/Configuration/Icons.php
@@ -0,0 +1,7 @@
+<?php
+return [
+    'the-coding-owl-clock' => [
+        'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+        'source' => 'EXT:oclock/Resources/Public/Icons/clock.svg'
+    ]
+];
diff --git a/Configuration/Services.php b/Configuration/Services.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+namespace Vendor\ExtName;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Reference;
+use TYPO3\CMS\Dashboard\Widgets\WidgetInterface;
+
+return function (ContainerConfigurator $configurator, ContainerBuilder $containerBuilder) {
+    $services = $configurator->services();
+
+    if ($containerBuilder->hasDefinition(WidgetInterface::class)) {
+        $services->set('widgets.dashboard.widget.clockWidget')
+            ->class(TheCodingOwl\Oclock\Widgets\ClockWidget::class)
+            ->arg('$view', new Reference('dashboard.views.widget'))
+            ->tag('dashboard.widget', [
+                'identifier' => 'theCodingOwlClock',
+                'groupNames' => 'systemInfo',
+                'title' => 'Clock Widget',
+                'description' => 'Displays a clock',
+                'iconIdentifier' => 'the-coding-owl-clock',
+                'height' => 'medium',
+                'width' => 'medium'
+            ]);
+    }
+};
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -3,16 +3,6 @@ services:
         autowire: true
         autoconfigure: true
         public: false
-    dashboard.widget.custom:
-        class: 'TheCodingOwl\Oclock\Widgets\ClockWidget'
-        arguments:
-            $view: '@dashboard.views.widget'
-        tags:
-            - name: dashboard.widget
-              identifier: theCodingOwlClock
-              groupNames: 'systemInfo'
-              title: 'Clock Widget'
-              description: 'Displays a clock'
-              iconIdentifier: 'the-coding-owl-clock'
-              height: 'medium'
-              width: 'medium'
+
+    TheCodingOwl\Oclock\:
+        resource: '../Classes/*'
diff --git a/composer.json b/composer.json
@@ -39,10 +39,12 @@
     "typo3-ter/oclock": "self.version"
   },
   "require-dev": {
-    "phpstan/phpstan": "^0.12.18",
-    "saschaegerer/phpstan-typo3": "^0.13.1",
-    "phpstan/extension-installer": "^1.0",
-    "squizlabs/php_codesniffer": "^3.5"
+    "phpstan/phpstan": "^1.0.1",
+    "saschaegerer/phpstan-typo3": "^1.0.0",
+    "phpstan/extension-installer": "^1.1.0",
+    "squizlabs/php_codesniffer": "^3.6.1",
+    "roave/security-advisories": "dev-master",
+    "friendsofphp/php-cs-fixer": "^3.2"
   },
   "extra": {
     "typo3/cms": {

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,13 +1,19 @@
 <?php
 
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+
 call_user_func(function($extKey) {
     $GLOBALS['TYPO3_CONF_VARS']['BE']['toolbarItems'][] = \TheCodingOwl\Oclock\Toolbar\Clock::class;
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-    $iconRegistry->registerIcon(
-        'the-coding-owl-clock',
-        \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-        [
-            'source' => 'EXT:oclock/Resources/Public/Icons/clock.svg'
-        ]
-    );
+    if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '11.4.0', '<')) {
+        $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+            \TYPO3\CMS\Core\Imaging\IconRegistry::class
+        );
+        $iconRegistry->registerIcon(
+            'the-coding-owl-clock',
+            \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+            [
+                'source' => 'EXT:oclock/Resources/Public/Icons/clock.svg'
+            ]
+        );
+    }
 }, 'oclock');