Extract the factory services in own service yml

Author: baumannsven

src/DependencyInjection/MetaModelsAttributeTranslatedFileExtension.php

@@ -36,6 +36,7 @@ class MetaModelsAttributeTranslatedFileExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('factory.yml');
         $loader->load('services.yml');
     }
 }

…ventListener/AddAttributeInformation.php …ener/Factory/AddAttributeInformation.phpsrc/EventListener/AddAttributeInformation.php renamed to src/EventListener/Factory/AddAttributeInformation.php src/EventListener/AddAttributeInformation.php renamed to src/EventListener/Factory/AddAttributeInformation.php

@@ -17,7 +17,7 @@
  * @filesource
  */
 
-namespace MetaModels\AttributeTranslatedFileBundle\EventListener;
+namespace MetaModels\AttributeTranslatedFileBundle\EventListener\Factory;
 
 use MetaModels\Attribute\Events\CollectMetaModelAttributeInformationEvent;
 

src/Resources/config/factory.yml

@@ -0,0 +1,22 @@
+services:
+    metamodels.attribute_translatedfile.factory:
+        class: MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory
+        arguments:
+            - "@database_connection"
+        tags:
+            - { name: metamodels.attribute_factory }
+
+    metamodels.attribute_translatedfile_order.factory:
+        class: MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory
+        arguments:
+            - "@database_connection"
+        tags:
+            - { name: metamodels.attribute_factory }
+
+    metamodels.attribute_translatedfile.event_listener_factory.add_attribute_information:
+        class: MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation
+        tags:
+            -   name: kernel.event_listener
+                event: metamodels.metamodel.collect-metamodel-attribute-information
+                method: addInformation
+                priority: -1

src/Resources/config/services.yml

@@ -1,26 +1,4 @@
 services:
-    metamodels.attribute_translatedfile.factory:
-        class: MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory
-        arguments:
-            - "@database_connection"
-        tags:
-            - { name: metamodels.attribute_factory }
-
-    metamodels.attribute_translatedfile_order.factory:
-        class: MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory
-        arguments:
-            - "@database_connection"
-        tags:
-            - { name: metamodels.attribute_factory }
-
-    metamodels.attribute_translatedfile.event_listener_factory.add_attribute_information:
-        class: MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation
-        tags:
-            -   name: kernel.event_listener
-                event: metamodels.metamodel.collect-metamodel-attribute-information
-                method: addInformation
-                priority: -1
-
     metamodels.attribute_translatedfile.event_listener.build_data_definition:
         class: MetaModels\AttributeTranslatedFileBundle\EventListener\BuildDataDefinitionListener
         tags:

tests/Attribute/TranslatedFileAttributeTypeFactoryTest.php

@@ -21,15 +21,15 @@
 
 namespace MetaModels\AttributeTranslatedFileBundle\Test\Attribute;
 
+use Doctrine\DBAL\Connection;
 use MetaModels\Attribute\Events\CollectMetaModelAttributeInformationEvent;
 use MetaModels\Attribute\IAttribute;
-use Doctrine\DBAL\Connection;
 use MetaModels\Attribute\IAttributeTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\Attribute\TranslatedFile;
 use MetaModels\AttributeTranslatedFileBundle\Attribute\TranslatedFileOrder;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation;
+use MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation;
 use MetaModels\IMetaModel;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -39,7 +39,7 @@
  *
  * @covers \MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory
  * @covers \MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory
- * @covers \MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation
+ * @covers \MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation
  */
 class TranslatedFileAttributeTypeFactoryTest extends TestCase
 {

tests/DependencyInjection/MetaModelsAttributeTranslatedFileExtensionTest.php

@@ -24,16 +24,16 @@
 use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeOrderTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\Attribute\AttributeTypeFactory;
 use MetaModels\AttributeTranslatedFileBundle\DependencyInjection\MetaModelsAttributeTranslatedFileExtension;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation;
 use MetaModels\AttributeTranslatedFileBundle\EventListener\BuildAttributeListener;
 use MetaModels\AttributeTranslatedFileBundle\EventListener\BuildDataDefinitionListener;
 use MetaModels\AttributeTranslatedFileBundle\EventListener\DcGeneral\Table\Attribute\RemoveTypeOptions;
 use MetaModels\AttributeTranslatedFileBundle\EventListener\DcGeneral\Table\FilterSetting\RemoveAttIdOptions;
+use MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation;
+use MetaModels\AttributeTranslatedFileBundle\EventListener\ImageSizeOptions;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\ImageSizeOptions;
 
 /**
  * This test case test the extension.

tests/EventListener/AddAttributeInformationTest.php

@@ -20,15 +20,15 @@
 namespace MetaModels\AttributeTranslatedFileBundle\Test\EventListener;
 
 use MetaModels\Attribute\Events\CollectMetaModelAttributeInformationEvent;
-use MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation;
+use MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation;
 use MetaModels\IMetaModel;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
  * This test the event listener add attribute information.
  *
- * @covers \MetaModels\AttributeTranslatedFileBundle\EventListener\AddAttributeInformation
+ * @covers \MetaModels\AttributeTranslatedFileBundle\EventListener\Factory\AddAttributeInformation
  */
 class AddAttributeInformationTest extends TestCase
 {