Merge branch '1.1' into 1.2

* 1.1: Change application's version to v1.1.9-DEV Generate changelog for v1.1.8 Change application's version to v1.1.8 Use ...Prototype() instead of prototype('...') in Symfony configuration
Sylius · Jul 5, 2018 · 549b8ff · 549b8ff
2 parents 9606f20 + 96197c7
commit 549b8ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -111,7 +111,7 @@ private function addSettingsSection(ArrayNodeDefinition $node): void
                         ->variableNode('paginate')->defaultNull()->end()
                         ->variableNode('limit')->defaultNull()->end()
                         ->arrayNode('allowed_paginate')
-                            ->prototype('integer')->end()
+                            ->integerPrototype()->end()
                             ->defaultValue([10, 20, 30])
                         ->end()
                         ->integerNode('default_page_size')->defaultValue(10)->end()
@@ -150,7 +150,7 @@ private function addDriversSection(ArrayNodeDefinition $node): void
             ->children()
                 ->arrayNode('drivers')
                     ->defaultValue([SyliusResourceBundle::DRIVER_DOCTRINE_ORM])
-                    ->prototype('enum')->values(SyliusResourceBundle::getAvailableDrivers())->end()
+                    ->enumPrototype()->values(SyliusResourceBundle::getAvailableDrivers())->end()
                 ->end()
             ->end()
         ;

diff --git a/Routing/Configuration.php b/Routing/Configuration.php
@@ -36,7 +36,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('identifier')->defaultValue('id')->end()
                 ->arrayNode('criteria')
                     ->useAttributeAsKey('identifier')
-                    ->prototype('scalar')
+                    ->scalarPrototype()
                     ->end()
                 ->end()
                 ->booleanNode('filterable')->end()
@@ -48,10 +48,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('grid')->cannotBeEmpty()->end()
                 ->booleanNode('permission')->defaultValue(false)->end()
                 ->arrayNode('except')
-                    ->prototype('scalar')->end()
+                    ->scalarPrototype()->end()
                 ->end()
                 ->arrayNode('only')
-                    ->prototype('scalar')->end()
+                    ->scalarPrototype()->end()
                 ->end()
                 ->variableNode('vars')->cannotBeEmpty()->end()
             ->end()