[Fixtures] Review fixes & small improvements

src/Sylius/Bundle/FixturesBundle/DependencyInjection/Compiler/FixtureRegistryPass.php

@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
         $fixtureRegistry = $container->findDefinition('sylius_fixtures.fixture_registry');
 
         $taggedServices = $container->findTaggedServiceIds('sylius_fixtures.fixture');
-        foreach ($taggedServices as $id => $tags) {
+        foreach (array_keys($taggedServices) as $id) {
             $fixtureRegistry->addMethodCall('addFixture', [new Reference($id)]);
         }
     }

src/Sylius/Bundle/FixturesBundle/DependencyInjection/Compiler/ListenerRegistryPass.php

@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
         $listenerRegistry = $container->findDefinition('sylius_fixtures.listener_registry');
 
         $taggedServices = $container->findTaggedServiceIds('sylius_fixtures.listener');
-        foreach ($taggedServices as $id => $tags) {
+        foreach (array_keys($taggedServices) as $id) {
             $listenerRegistry->addMethodCall('addListener', [new Reference($id)]);
         }
     }

src/Sylius/Bundle/FixturesBundle/DependencyInjection/Configuration.php

@@ -39,10 +39,11 @@ public function getConfigTreeBuilder()
     private function buildSuitesNode(ArrayNodeDefinition $rootNode)
     {
         /** @var ArrayNodeDefinition $suitesNode */
-        $suitesNode = $rootNode->children()
-            ->arrayNode('suites')
-                ->useAttributeAsKey('name')
-                ->prototype('array')
+        $suitesNode = $rootNode
+            ->children()
+                ->arrayNode('suites')
+                    ->useAttributeAsKey('name')
+                    ->prototype('array')
         ;
 
         $this->buildFixturesNode($suitesNode);
@@ -55,10 +56,11 @@ private function buildSuitesNode(ArrayNodeDefinition $rootNode)
     private function buildFixturesNode(ArrayNodeDefinition $suitesNode)
     {
         /** @var ArrayNodeDefinition $fixturesNode */
-        $fixturesNode = $suitesNode->children()
-            ->arrayNode('fixtures')
-                ->useAttributeAsKey('name')
-                ->prototype('array')
+        $fixturesNode = $suitesNode
+            ->children()
+                ->arrayNode('fixtures')
+                    ->useAttributeAsKey('name')
+                    ->prototype('array')
         ;
 
         $this->buildAttributesNode($fixturesNode);
@@ -70,10 +72,11 @@ private function buildFixturesNode(ArrayNodeDefinition $suitesNode)
     private function buildListenersNode(ArrayNodeDefinition $suitesNode)
     {
         /** @var ArrayNodeDefinition $listenersNode */
-        $listenersNode = $suitesNode->children()
-            ->arrayNode('listeners')
-                ->useAttributeAsKey('name')
-                ->prototype('array')
+        $listenersNode = $suitesNode
+            ->children()
+                ->arrayNode('listeners')
+                    ->useAttributeAsKey('name')
+                    ->prototype('array')
         ;
 
         $this->buildAttributesNode($listenersNode);
@@ -88,14 +91,9 @@ private function buildAttributesNode(ArrayNodeDefinition $node)
         $attributesNodeBuilder->integerNode('priority')->defaultValue(0);
 
         /** @var ArrayNodeDefinition $optionsNode */
-        $optionsNode = $attributesNodeBuilder->arrayNode('options')->addDefaultChildrenIfNoneSet();
-        $optionsNode
-            ->beforeNormalization()
-                ->always(function ($value) {
-                    return [$value];
-                })
-        ;
-
+        $optionsNode = $attributesNodeBuilder->arrayNode('options');
+        $optionsNode->addDefaultChildrenIfNoneSet();
+        $optionsNode->beforeNormalization()->always(function ($value) { return [$value]; });
         $optionsNode->prototype('variable');
     }
 }

src/Sylius/Bundle/FixturesBundle/DependencyInjection/SyliusFixturesExtension.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Sylius\Bundle\FixturesBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;

src/Sylius/Bundle/FixturesBundle/Fixture/FixtureRegistry.php

@@ -11,6 +11,8 @@
 
 namespace Sylius\Bundle\FixturesBundle\Fixture;
 
+use Webmozart\Assert\Assert;
+
 /**
  * @author Kamil Kokot <kamil.kokot@lakion.com>
  */
@@ -26,12 +28,7 @@ final class FixtureRegistry implements FixtureRegistryInterface
      */
     public function addFixture(FixtureInterface $fixture)
     {
-        if (isset($this->fixtures[$fixture->getName()])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Fixture with name "%s" is already registered.',
-                $fixture->getName()
-            ));
-        }
+        Assert::keyNotExists($this->fixtures, $fixture->getName(), 'Fixture with name "%s" is already registered.');
 
         $this->fixtures[$fixture->getName()] = $fixture;
     }

src/Sylius/Bundle/FixturesBundle/Fixture/FixtureRegistryInterface.php

@@ -21,7 +21,7 @@ interface FixtureRegistryInterface
      *
      * @return FixtureInterface
      *
-     * @throw FixtureNotFoundException
+     * @throws FixtureNotFoundException
      */
     public function getFixture($name);
 

src/Sylius/Bundle/FixturesBundle/Listener/ListenerRegistry.php

@@ -11,6 +11,8 @@
 
 namespace Sylius\Bundle\FixturesBundle\Listener;
 
+use Webmozart\Assert\Assert;
+
 /**
  * @author Kamil Kokot <kamil.kokot@lakion.com>
  */
@@ -26,12 +28,7 @@ final class ListenerRegistry implements ListenerRegistryInterface
      */
     public function addListener(ListenerInterface $listener)
     {
-        if (isset($this->listeners[$listener->getName()])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Listener with name "%s" is already registered.',
-                $listener->getName()
-            ));
-        }
+        Assert::keyNotExists($this->listeners, $listener->getName(), 'Listener with name "%s" is already registered.');
 
         $this->listeners[$listener->getName()] = $listener;
     }

src/Sylius/Bundle/FixturesBundle/Listener/ListenerRegistryInterface.php

@@ -21,7 +21,7 @@ interface ListenerRegistryInterface
      *
      * @return ListenerInterface
      *
-     * @throw ListenerNotFoundException
+     * @throws ListenerNotFoundException
      */
     public function getListener($name);
 

src/Sylius/Bundle/FixturesBundle/Listener/ORMPurgerListener.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Sylius\Bundle\FixturesBundle\Listener;
 
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
@@ -61,15 +70,18 @@ public function getName()
      */
     protected function configureOptionsNode(ArrayNodeDefinition $optionsNode)
     {
-        $optionsNode->children()
+        $optionsNodeBuilder = $optionsNode->children();
+
+        $optionsNodeBuilder
             ->enumNode('mode')
                 ->values(['delete', 'truncate'])
                 ->defaultValue('delete')
-            ->end()
+        ;
+
+        $optionsNodeBuilder
             ->arrayNode('managers')
                 ->defaultValue([null])
                 ->prototype('scalar')
-            ->end()
         ;
     }
 }

src/Sylius/Bundle/FixturesBundle/Loader/FixtureLoader.php

@@ -24,6 +24,6 @@ final class FixtureLoader implements FixtureLoaderInterface
      */
     public function load(SuiteInterface $suite, FixtureInterface $fixture, array $options)
     {
-       $fixture->load($options);
+        $fixture->load($options);
     }
 }

src/Sylius/Bundle/FixturesBundle/Suite/SuiteFactoryInterface.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Sylius\Bundle\FixturesBundle\Suite;
 
 /**

src/Sylius/Bundle/FixturesBundle/spec/Loader/HookableFixtureLoaderSpec.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace spec\Sylius\Bundle\FixturesBundle\Loader;
 
 use PhpSpec\ObjectBehavior;

src/Sylius/Bundle/FixturesBundle/spec/Loader/HookableSuiteLoaderSpec.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace spec\Sylius\Bundle\FixturesBundle\Loader;
 
 use PhpSpec\ObjectBehavior;

src/Sylius/Bundle/FixturesBundle/spec/Suite/SuiteSpec.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace spec\Sylius\Bundle\FixturesBundle\Suite;
 
 use PhpSpec\ObjectBehavior;