Merge branch 'hotfix/fix_servieces_file_usage' into 'feature/2.3.0'

Fix services for file usage

See merge request metamodels/attribute_translatedfile!51

Author: zonky2

src/DependencyInjection/Configuration.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of MetaModels/attribute_translatedfile.
+ *
+ * (c) 2012-2025 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * @package    MetaModels/attribute_translatedfile
+ * @author     Ingolf Steinhardt <info@e-spin.de>
+ * @copyright  2012-2025 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
+ * @filesource
+ */
+
+declare(strict_types=1);
+
+namespace MetaModels\AttributeTranslatedFileBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * Adds the Contao configuration structure.
+ */
+final class Configuration implements ConfigurationInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder('metamodels_attribute_translatedfile');
+
+        $rootNode = $treeBuilder->getRootNode();
+        assert($rootNode instanceof ArrayNodeDefinition);
+        $children = $rootNode->children();
+        $children->booleanNode('file_usage')->defaultValue(false)->end();
+
+        return $treeBuilder;
+    }
+}

src/DependencyInjection/MetaModelsAttributeTranslatedFileExtension.php

@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/attribute_translatedfile.
  *
- * (c) 2012-2024 The MetaModels team.
+ * (c) 2012-2025 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,18 +14,26 @@
  * @author     David Molineus <david.molineus@netzmacht.de>
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @author     Ingolf Steinhardt <info@e-spin.de>
- * @copyright  2012-2024 The MetaModels team.
+ * @copyright  2012-2025 The MetaModels team.
  * @license    https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 namespace MetaModels\AttributeTranslatedFileBundle\DependencyInjection;
 
+use InspiredMinds\ContaoFileUsage\ContaoFileUsageBundle;
+use MetaModels\AttributeTranslatedFileBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 
+use function assert;
+use function in_array;
+use function is_array;
+use function is_bool;
+
 /**
  * This is the class that loads and manages the bundle configuration
  *
@@ -43,13 +51,33 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('factory.yml');
         $loader->load('event_listeners.yml');
-        $loader->load('services.yml');
 
+        $configuration = $this->getConfiguration($configs, $container);
+        assert($configuration instanceof Configuration);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $bundles = $container->getParameter('kernel.bundles');
+        assert(is_array($bundles));
+
+        // Load configuration for the file usage extension.
+        if (in_array(ContaoFileUsageBundle::class, $bundles, true) && (bool) ($config['file_usage'] ?? false)) {
+            $loader->load('file_usage/services.yml');
+        }
+
+        // Schema manager.
         $typeNames                = $container->hasParameter('metamodels.managed-schema-type-names')
             ? $container->getParameter('metamodels.managed-schema-type-names')
             : null;
-        $managedSchemaTypeNames   = \is_array($typeNames) ? $typeNames : [];
+        $managedSchemaTypeNames   = is_array($typeNames) ? $typeNames : [];
         $managedSchemaTypeNames[] = 'translatedfile';
         $container->setParameter('metamodels.managed-schema-type-names', $managedSchemaTypeNames);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container): ?ConfigurationInterface
+    {
+        return new Configuration();
+    }
 }

src/Resources/config/file_usage/services.yml

@@ -0,0 +1,12 @@
+services:
+  MetaModels\AttributeTranslatedFileBundle\FileUsage\FileUsageProvider:
+    public: true
+    arguments:
+      $factory: '@metamodels.factory'
+      $urlGenerator: '@router'
+      $requestStack: '@request_stack'
+      $csrfTokenManager: '@contao.csrf.token_manager'
+      $csrfTokenName: '%contao.csrf_token_name%'
+    tags:
+      - { name: contao_file_usage.provider }
+

src/Resources/config/services.yml

@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/attribute_translatedfile.
  *
- * (c) 2012-2024 The MetaModels team.
+ * (c) 2012-2025 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,23 +15,16 @@
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Ingolf Steinhardt <info@e-spin.de>
- * @copyright  2012-2024 The MetaModels team.
+ * @copyright  2012-2025 The MetaModels team.
  * @license    https://github.com/MetaModels/attribute_translatedfile/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 namespace MetaModels\AttributeTranslatedFileBundle\Test\DependencyInjection;
 
-use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory;
-use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\DependencyInjection\MetaModelsAttributeTranslatedFileExtension;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\BuildAttributeListener;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\BuildDataDefinitionListener;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\DcGeneral\Table\Attribute\RemoveTypeOptions;
 use MetaModels\AttributeTranslatedFileBundle\EventListener\DcGeneral\Table\DcaSetting\FileWidgetModeOptions;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\DcGeneral\Table\FilterSetting\RemoveAttIdOptions;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\ImageSizeOptionsProvider;
+use MetaModels\AttributeTranslatedFileBundle\MetaModelsAttributeTranslatedFileBundle;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -57,6 +50,7 @@ public function testInstantiation(): void
     public function testFactoryIsRegistered(): void
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles', [MetaModelsAttributeTranslatedFileBundle::class]);
 
         $extension = new MetaModelsAttributeTranslatedFileExtension();
         $extension->load([], $container);