fix(di): avoid error on legacy v13 installation with deactivated admi…

…n panel related: #127
brotkrueml · Jan 23, 2025 · 5c05b34 · 5c05b34
1 parent e830ebf
commit 5c05b34
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+- Error on legacy v13 installation with deactivated admin panel (#127)
+
 ## [3.9.0] - 2025-01-13
 
 ### Added

diff --git a/Configuration/Services.php b/Configuration/Services.php
@@ -26,6 +26,7 @@
 use Brotkrueml\Schema\TypoScript\SchemaContentObject;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use TYPO3\CMS\Adminpanel\Service\ConfigurationService as AdminPanelConfigurationService;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $configurator, ContainerBuilder $builder): void {
@@ -37,10 +38,15 @@
         ->autowire()
         ->autoconfigure();
 
+    $excludes = [
+        __DIR__ . '/../Classes/Extension.php',
+    ];
+    if (! $builder->hasDefinition(AdminPanelConfigurationService::class)) {
+        $excludes[] = __DIR__ . '/../Classes/AdminPanel';
+    }
+
     $services->load('Brotkrueml\Schema\\', __DIR__ . '/../Classes/*')
-        ->exclude([
-            __DIR__ . '/../Classes/Extension.php',
-        ]);
+        ->exclude($excludes);
 
     $services->set('schema.configuration', Configuration::class)
         ->factory([

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -11,6 +11,12 @@ to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 `Unreleased <https://github.com/brotkrueml/schema/compare/v3.9.0...HEAD>`_
 ------------------------------------------------------------------------------
 
+Fixed
+^^^^^
+
+
+* Error on legacy v13 installation with deactivated admin panel (#127)
+
 `3.9.0 <https://github.com/brotkrueml/schema/compare/v3.8.0...v3.9.0>`_ - 2025-01-13
 ----------------------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up @@
     `Unreleased <https://github.com/brotkrueml/schema/compare/v3.9.0...HEAD>`_
     ------------------------------------------------------------------------------
+    Fixed
+    ^^^^^
+    * Error on legacy v13 installation with deactivated admin panel (#127)
     `3.9.0 <https://github.com/brotkrueml/schema/compare/v3.8.0...v3.9.0>`_ - 2025-01-13
     ----------------------------------------------------------------------------------------
@@ Expand Down @@