Merge pull request Sylius#5360 from pamil/fixtures/parameter-fix

[Fixtures] Allow options to be an array only
pamil · Jun 28, 2016 · d244807 · d244807
2 parents d8de7ed + 164a015
commit d244807
Show file tree

Hide file tree

Showing 43 changed files with 228 additions and 400 deletions.
diff --git a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php
@@ -34,7 +34,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load(sprintf('driver/%s.xml', $config['driver']));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/SyliusApiExtension.php b/src/Sylius/Bundle/ApiBundle/DependencyInjection/SyliusApiExtension.php
@@ -33,7 +33,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ArchetypeBundle/DependencyInjection/SyliusArchetypeExtension.php b/src/Sylius/Bundle/ArchetypeBundle/DependencyInjection/SyliusArchetypeExtension.php
@@ -40,7 +40,7 @@ public function load(array $config, ContainerBuilder $container)
             $config = $this->defineDefaultOrmRepository($config);
         }
 
-        $this->registerResources('sylius', $config['driver'], $this->resolveResources($config['resources'], $container), $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $this->resolveResources($config['resources'], $container));
 
         foreach ($config['resources'] as $subjectName => $subjectConfig) {
             foreach ($subjectConfig as $resourceName => $resourceConfig) {

diff --git a/src/Sylius/Bundle/AssociationBundle/DependencyInjection/SyliusAssociationExtension.php b/src/Sylius/Bundle/AssociationBundle/DependencyInjection/SyliusAssociationExtension.php
@@ -31,7 +31,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load('services.xml');
 
-        $this->registerResources('sylius', $config['driver'], $this->resolveResources($config['resources'], $container), $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $this->resolveResources($config['resources'], $container));
 
         foreach ($config['resources'] as $subjectName => $subjectConfig) {
             foreach ($subjectConfig as $resourceName => $resourceConfig) {

diff --git a/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php b/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php
@@ -38,7 +38,7 @@ public function load(array $config, ContainerBuilder $container)
             $loader->load($configFile);
         }
 
-        $this->registerResources('sylius', $config['driver'], $this->resolveResources($config['resources'], $container), $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $this->resolveResources($config['resources'], $container));
 
         foreach ($config['resources'] as $subjectName => $subjectConfig) {
             foreach ($subjectConfig as $resourceName => $resourceConfig) {

diff --git a/src/Sylius/Bundle/CartBundle/DependencyInjection/SyliusCartExtension.php b/src/Sylius/Bundle/CartBundle/DependencyInjection/SyliusCartExtension.php
@@ -37,7 +37,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load(sprintf('driver/%s.xml', $config['driver']));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ChannelBundle/DependencyInjection/SyliusChannelExtension.php b/src/Sylius/Bundle/ChannelBundle/DependencyInjection/SyliusChannelExtension.php
@@ -33,7 +33,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load(sprintf('driver/%s.xml', $config['driver']));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ContactBundle/DependencyInjection/SyliusContactExtension.php b/src/Sylius/Bundle/ContactBundle/DependencyInjection/SyliusContactExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             // ...

diff --git a/src/Sylius/Bundle/ContentBundle/DependencyInjection/SyliusContentExtension.php b/src/Sylius/Bundle/ContentBundle/DependencyInjection/SyliusContentExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             // ...

diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
@@ -66,7 +66,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/SyliusCurrencyExtension.php b/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/SyliusCurrencyExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/FixturesBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/FixturesBundle/DependencyInjection/Configuration.php
@@ -94,6 +94,6 @@ private function buildAttributesNode(ArrayNodeDefinition $node)
         $optionsNode = $attributesNodeBuilder->arrayNode('options');
         $optionsNode->addDefaultChildrenIfNoneSet();
         $optionsNode->beforeNormalization()->always(function ($value) { return [$value]; });
-        $optionsNode->prototype('variable');
+        $optionsNode->prototype('array')->ignoreExtraKeys(false);
     }
 }
diff --git a/src/Sylius/Bundle/FixturesBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Sylius/Bundle/FixturesBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -168,6 +168,46 @@ public function fixture_options_are_not_replaced_implicitly()
         );
     }
 
+    /**
+     * @test
+     */
+    public function fixtures_options_are_an_array()
+    {
+        $this->assertPartialConfigurationIsInvalid(
+            [['suites' => ['suite' => ['fixtures' => ['fixture' => [
+                'options' => 42,
+            ]]]]]],
+            'suites.*.fixtures'
+        );
+
+        $this->assertPartialConfigurationIsInvalid(
+            [['suites' => ['suite' => ['fixtures' => ['fixture' => [
+                'options' => 'string string',
+            ]]]]]],
+            'suites.*.fixtures'
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function listeners_options_are_an_array()
+    {
+        $this->assertPartialConfigurationIsInvalid(
+            [['suites' => ['suite' => ['listeners' => ['listener' => [
+                'options' => 42,
+            ]]]]]],
+            'suites.*.listeners'
+        );
+
+        $this->assertPartialConfigurationIsInvalid(
+            [['suites' => ['suite' => ['listeners' => ['listener' => [
+                'options' => 'string string',
+            ]]]]]],
+            'suites.*.listeners'
+        );
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Sylius/Bundle/InventoryBundle/DependencyInjection/SyliusInventoryExtension.php b/src/Sylius/Bundle/InventoryBundle/DependencyInjection/SyliusInventoryExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'twig.xml',

diff --git a/src/Sylius/Bundle/LocaleBundle/DependencyInjection/SyliusLocaleExtension.php b/src/Sylius/Bundle/LocaleBundle/DependencyInjection/SyliusLocaleExtension.php
@@ -30,7 +30,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/MailerBundle/DependencyInjection/SyliusMailerExtension.php b/src/Sylius/Bundle/MailerBundle/DependencyInjection/SyliusMailerExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/MetadataBundle/DependencyInjection/SyliusMetadataExtension.php b/src/Sylius/Bundle/MetadataBundle/DependencyInjection/SyliusMetadataExtension.php
@@ -31,7 +31,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $loader->load('services.xml');
         $loader->load('forms.xml');

diff --git a/src/Sylius/Bundle/OrderBundle/DependencyInjection/SyliusOrderExtension.php b/src/Sylius/Bundle/OrderBundle/DependencyInjection/SyliusOrderExtension.php
@@ -30,7 +30,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php b/src/Sylius/Bundle/PaymentBundle/DependencyInjection/SyliusPaymentExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php b/src/Sylius/Bundle/PayumBundle/DependencyInjection/SyliusPayumExtension.php
@@ -31,7 +31,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ProductBundle/DependencyInjection/SyliusProductExtension.php b/src/Sylius/Bundle/ProductBundle/DependencyInjection/SyliusProductExtension.php
@@ -53,7 +53,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load(sprintf('driver/%s.xml', $config['driver']));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/PromotionBundle/DependencyInjection/SyliusPromotionExtension.php b/src/Sylius/Bundle/PromotionBundle/DependencyInjection/SyliusPromotionExtension.php
@@ -44,7 +44,7 @@ public function load(array $config, ContainerBuilder $container)
             $loader->load($configFile);
         }
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
         $this->overwriteCouponFactory($container);
         $this->overwriteActionFactory($container);
 
@@ -87,4 +87,17 @@ private function overwriteActionFactory(ContainerBuilder $container)
 
         $container->setDefinition('sylius.factory.promotion_action', $decoratedPromotionActionFactoryDefinition);
     }
+
+    /**
+     * @param array $config
+     * @param ContainerBuilder $container
+     */
+    private function mapFormValidationGroupsParameters(array $config, ContainerBuilder $container)
+    {
+        if (isset($config['validation_groups'])) {
+            foreach ($config['validation_groups'] as $name => $groups) {
+                $container->setParameter(sprintf('sylius.validation_groups.%s', $name), $groups);
+            }
+        }
+    }
 }
diff --git a/src/Sylius/Bundle/RbacBundle/DependencyInjection/SyliusRbacExtension.php b/src/Sylius/Bundle/RbacBundle/DependencyInjection/SyliusRbacExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
 
         $loader->load(sprintf('driver/%s.xml', $config['driver']));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/src/Sylius/Bundle/ReportBundle/DependencyInjection/SyliusReportExtension.php b/src/Sylius/Bundle/ReportBundle/DependencyInjection/SyliusReportExtension.php
@@ -32,7 +32,7 @@ public function load(array $config, ContainerBuilder $container)
         $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        $this->registerResources('sylius', $config['driver'], $config['resources'], $container);
+        $this->loadResources($container, 'sylius', $config['driver'], $config['resources']);
 
         $configFiles = [
             'services.xml',

diff --git a/...Bundle/ResourceBundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php b/...Bundle/ResourceBundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php