removed necessity of factory

qandidate-labs · May 5, 2017 · cf375c5 · cf375c5
1 parent 5f00e7d
commit cf375c5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 77 deletions.
diff --git a/DependencyInjection/QandidateToggleExtension.php b/DependencyInjection/QandidateToggleExtension.php
@@ -54,13 +54,13 @@ public function load(array $configs, ContainerBuilder $container)
 
                 break;
             case 'symfony' === $config['persistence']:
-                $container->setParameter('qandidate.toggle.parameters', $config['toggles']);
                 $collection = 'factory';
                 $definition = $container->getDefinition('qandidate.toggle.collection.in_memory');
                 $definition->setFactory(array(
-                    new Reference('qandidate.toggle.collection.factory.in_memory'),
-                    'getToggles'
+                    new Reference('qandidate.toggle.collection.serializer.in_memory'),
+                    'deserialize'
                 ));
+                $definition->addArgument($config['toggles']);
 
                 $container->setDefinition('qandidate.toggle.collection.factory', $definition);
                 break;

diff --git a/Factory/InMemoryCollectionFactory.php b/Factory/InMemoryCollectionFactory.php
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -7,14 +7,12 @@
     <parameters>
         <parameter key="qandidate.toggle.manager.class">Qandidate\Toggle\ToggleManager</parameter>
         <parameter key="qandidate.toggle.collection.in_memory.class">Qandidate\Toggle\ToggleCollection\InMemoryCollection</parameter>
-        <parameter key="qandidate.toggle.collection.factory.in_memory.class">Qandidate\Bundle\ToggleBundle\Factory\InMemoryCollectionFactory</parameter>
         <parameter key="qandidate.toggle.collection.serializer.in_memory.class">Qandidate\Toggle\Serializer\InMemoryCollectionSerializer</parameter>
         <parameter key="qandidate.toggle.collection.predis.class">Qandidate\Toggle\ToggleCollection\PredisCollection</parameter>
         <parameter key="qandidate.toggle.user_context_factory.class">Qandidate\Bundle\ToggleBundle\Context\UserContextFactory</parameter>
         <parameter key="qandidate.toggle.twig_extension.class">Qandidate\Bundle\ToggleBundle\Twig\ToggleTwigExtension</parameter>
         <parameter key="qandidate.toggle.toggle.listener.class">Qandidate\Bundle\ToggleBundle\EventListener\ToggleListener</parameter>
         <parameter key="qandidate.toggle.context.class">Qandidate\Toggle\Context</parameter>
-        <parameter key="qandidate.toggle.parameters"></parameter>
     </parameters>
 
     <services>
@@ -23,11 +21,6 @@
 
         <service id="qandidate.toggle.collection.serializer.in_memory" class="%qandidate.toggle.collection.serializer.in_memory.class%" />
 
-        <service id="qandidate.toggle.collection.factory.in_memory" class="%qandidate.toggle.collection.factory.in_memory.class%">
-            <argument>%qandidate.toggle.parameters%</argument>
-            <argument type="service" id="qandidate.toggle.collection.serializer.in_memory" />
-        </service>
-
         <service id="qandidate.toggle.manager" class="%qandidate.toggle.manager.class%">
             <argument type="service" id="qandidate.toggle.collection" />
         </service>

diff --git a/Tests/DependencyInjection/QandidateToggleExtensionTest.php b/Tests/DependencyInjection/QandidateToggleExtensionTest.php
@@ -155,24 +155,6 @@ public function it_aliases_the_context_factory_to_configured_service()
         $this->assertContainerBuilderHasAlias('qandidate.toggle.context_factory', 'acme.yolo');
     }
 
-    /**
-     * @test
-     */
-    public function it_creates_the_toggle_collection_factory_for_symfony()
-    {
-        $this->load([
-            'persistence' => 'symfony',
-        ]);
-
-        $definition = $this->container->getDefinition('qandidate.toggle.collection.factory');
-        $factory = $definition->getFactory();
-        $this->assertArrayHasKey(0, $factory);
-        $this->assertArrayHasKey(1, $factory);
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $factory[0]);
-        $this->assertSame('qandidate.toggle.collection.factory.in_memory', (string) $factory[0]);
-        $this->assertSame('getToggles', $factory[1]);
-    }
-
     /**
      * @test
      */