Merge branch '1.2'

* 1.2: Generate changelog for v1.2.2-DEV Generate changelog for v1.2.1 Change application's version to v1.2.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
ezecosystem · Jul 5, 2018 · 29bb1e5 · 29bb1e5
2 parents 3517781 + dbb9a2e
commit 29bb1e5
Show file tree

Hide file tree

Showing 25 changed files with 105 additions and 54 deletions.
diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -1,5 +1,28 @@
 # CHANGELOG FOR `1.1.X`
 
+## v1.1.8 (2018-07-05)
+
+#### TL;DR
+
+- It's no longer required to put Sylius bundles before Doctrine Bundle ([#9527](https://github.com/Sylius/Sylius/pull/9527))
+- There's an official plugins list in README ([#9493](https://github.com/Sylius/Sylius/pull/9493))
+
+#### Details
+
+- [#9340](https://github.com/Sylius/Sylius/pull/9340) the name of file was wrong in docu (@amirkoklan)
+- [#9345](https://github.com/Sylius/Sylius/pull/9345) [HOTFIX] Missing configuration for channel in sonata (@lchrusciel)
+- [#9487](https://github.com/Sylius/Sylius/pull/9487) Improve use of Semantic's cards in frontend (@mbabker)
+- [#9493](https://github.com/Sylius/Sylius/pull/9493) Document officially supported plugins in the README (@pamil)
+- [#9527](https://github.com/Sylius/Sylius/pull/9527) [ResourceBundle] Fix DoctrineTargetEntitiesResolverPass priority to avoid mapping issues. (@adrienlucas)
+- [#9537](https://github.com/Sylius/Sylius/pull/9537) [Admin] Add missing form parameter to sonata form events (@GSadee)
+- [#9539](https://github.com/Sylius/Sylius/pull/9539) [minor] SCA (@kalessil)
+- [#9540](https://github.com/Sylius/Sylius/pull/9540) PHPStan 0.10 upgrade & road to level 2 checks (@pamil)
+- [#9546](https://github.com/Sylius/Sylius/pull/9546) Added title to product reviews, fixes #9425 (@richardjohn, @adrienlucas, @Zales0123)
+- [#9548](https://github.com/Sylius/Sylius/pull/9548) Unify catch block in ShopBasedCartContext (@pamil)
+- [#9550](https://github.com/Sylius/Sylius/pull/9550) Mention roadmap in README (@pamil)
+- [#9552](https://github.com/Sylius/Sylius/pull/9552) Lower PHPStan level 2 errors from 222 to 9 (@pamil)
+- [#9555](https://github.com/Sylius/Sylius/pull/9555) Add Sylius/CustomerOrderCancellationPlugin to the list of official plugins (@pamil)
+
 ## v1.1.7 (2018-06-12)
 
 #### TL;DR

diff --git a/CHANGELOG-1.2.md b/CHANGELOG-1.2.md
@@ -1,5 +1,33 @@
 # CHANGELOG FOR `1.2.X`
 
+## v1.2.1 (2018-07-05)
+
+#### TL;DR
+
+- It's no longer required to put Sylius bundles before Doctrine Bundle ([#9527](https://github.com/Sylius/Sylius/pull/9527))
+- There's an official plugins list in README ([#9493](https://github.com/Sylius/Sylius/pull/9493))
+- ResourceBundle CRUD routing generator works with bundleless templates ([#9534](https://github.com/Sylius/Sylius/pull/9534))
+
+#### Details
+
+- [#9340](https://github.com/Sylius/Sylius/pull/9340) the name of file was wrong in docu (@amirkoklan)
+- [#9345](https://github.com/Sylius/Sylius/pull/9345) [HOTFIX] Missing configuration for channel in sonata (@lchrusciel)
+- [#9487](https://github.com/Sylius/Sylius/pull/9487) Improve use of Semantic's cards in frontend (@mbabker)
+- [#9488](https://github.com/Sylius/Sylius/pull/9488) Describe upgrade process for 1.1.x -> 1.2.0 (@pamil)
+- [#9493](https://github.com/Sylius/Sylius/pull/9493) Document officially supported plugins in the README (@pamil)
+- [#9527](https://github.com/Sylius/Sylius/pull/9527) [ResourceBundle] Fix DoctrineTargetEntitiesResolverPass priority to avoid mapping issues. (@adrienlucas)
+- [#9534](https://github.com/Sylius/Sylius/pull/9534) [ResourceBundle] fix routing templates for sf4 (@loic425)
+- [#9537](https://github.com/Sylius/Sylius/pull/9537) [Admin] Add missing form parameter to sonata form events (@GSadee)
+- [#9539](https://github.com/Sylius/Sylius/pull/9539) [minor] SCA (@kalessil)
+- [#9540](https://github.com/Sylius/Sylius/pull/9540) PHPStan 0.10 upgrade & road to level 2 checks (@pamil)
+- [#9541](https://github.com/Sylius/Sylius/pull/9541) Require Symfony 4.1.1 and remove hotfixes for 4.1.0 (@pamil)
+- [#9545](https://github.com/Sylius/Sylius/pull/9545) Remove duplicated copyright note (@enekochan)
+- [#9546](https://github.com/Sylius/Sylius/pull/9546) Added title to product reviews, fixes #9425 (@richardjohn, @adrienlucas, @Zales0123)
+- [#9548](https://github.com/Sylius/Sylius/pull/9548) Unify catch block in ShopBasedCartContext (@pamil)
+- [#9550](https://github.com/Sylius/Sylius/pull/9550) Mention roadmap in README (@pamil)
+- [#9552](https://github.com/Sylius/Sylius/pull/9552) Lower PHPStan level 2 errors from 222 to 9 (@pamil)
+- [#9555](https://github.com/Sylius/Sylius/pull/9555) Add Sylius/CustomerOrderCancellationPlugin to the list of official plugins (@pamil)
+
 ## v1.2.0 (2018-06-12)
 
 ## TL;DR

diff --git a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
@@ -187,7 +187,7 @@ private function addScopesSection(ArrayNodeDefinition $node): void
             ->children()
                 ->arrayNode('scopes')
                     ->useAttributeAsKey('name')
-                    ->prototype('scalar')->end()
+                    ->scalarPrototype()->end()
                 ->end()
             ->end()
         ;

diff --git a/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php b/src/Sylius/Bundle/AdminApiBundle/Fixture/ApiClientFixture.php
@@ -35,7 +35,7 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
             ->children()
                 ->scalarNode('random_id')->cannotBeEmpty()->end()
                 ->scalarNode('secret')->cannotBeEmpty()->end()
-                ->arrayNode('allowed_grant_types')->prototype('scalar')->cannotBeEmpty()->defaultValue([])->end()
+                ->arrayNode('allowed_grant_types')->scalarPrototype()->cannotBeEmpty()->defaultValue([])->end()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/AbstractResourceFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/AbstractResourceFixture.php
@@ -105,7 +105,7 @@ final public function getConfigTreeBuilder(): TreeBuilder
         $resourcesNode = $optionsNode->children()->arrayNode('custom');
 
         /** @var ArrayNodeDefinition $resourceNode */
-        $resourceNode = $resourcesNode->requiresAtLeastOneElement()->prototype('array');
+        $resourceNode = $resourcesNode->requiresAtLeastOneElement()->arrayPrototype();
         $this->configureResourceNode($resourceNode);
 
         return $treeBuilder;

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/ChannelFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/ChannelFixture.php
@@ -42,9 +42,9 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->booleanNode('skipping_shipping_step_allowed')->end()
                 ->booleanNode('skipping_payment_step_allowed')->end()
                 ->scalarNode('default_locale')->cannotBeEmpty()->end()
-                ->arrayNode('locales')->prototype('scalar')->end()->end()
+                ->arrayNode('locales')->scalarPrototype()->end()->end()
                 ->scalarNode('base_currency')->cannotBeEmpty()->end()
-                ->arrayNode('currencies')->prototype('scalar')->end()->end()
+                ->arrayNode('currencies')->scalarPrototype()->end()->end()
                 ->scalarNode('theme_name')->end()
                 ->scalarNode('contact_email')->end()
         ;

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/CurrencyFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/CurrencyFixture.php
@@ -74,7 +74,7 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
         $optionsNode
             ->children()
                 ->arrayNode('currencies')
-                    ->prototype('scalar')
+                    ->scalarPrototype()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/GeographicalFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/GeographicalFixture.php
@@ -112,39 +112,39 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
             ->arrayNode('countries')
                 ->performNoDeepMerging()
                 ->defaultValue(array_keys(Intl::getRegionBundle()->getCountryNames()))
-                ->prototype('scalar')
+                ->scalarPrototype()
         ;
 
         /** @var ArrayNodeDefinition $provinceNode */
         $provinceNode = $optionsNodeBuilder
             ->arrayNode('provinces')
                 ->normalizeKeys(false)
                 ->useAttributeAsKey('code')
-                ->prototype('array')
+                ->arrayPrototype()
         ;
 
         $provinceNode
             ->performNoDeepMerging()
             ->normalizeKeys(false)
             ->useAttributeAsKey('code')
-            ->prototype('scalar')
+            ->scalarPrototype()
         ;
 
         /** @var ArrayNodeDefinition $zoneNode */
         $zoneNode = $optionsNodeBuilder
             ->arrayNode('zones')
                 ->normalizeKeys(false)
                 ->useAttributeAsKey('code')
-                ->prototype('array')
+                ->arrayPrototype()
         ;
 
         $zoneNode
             ->performNoDeepMerging()
             ->children()
                 ->scalarNode('name')->cannotBeEmpty()->end()
-                ->arrayNode('countries')->prototype('scalar')->end()->end()
-                ->arrayNode('zones')->prototype('scalar')->end()->end()
-                ->arrayNode('provinces')->prototype('scalar')->end()->end()
+                ->arrayNode('countries')->scalarPrototype()->end()->end()
+                ->arrayNode('zones')->scalarPrototype()->end()->end()
+                ->arrayNode('provinces')->scalarPrototype()->end()->end()
                 ->scalarNode('scope')->end()
         ;
 

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/LocaleFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/LocaleFixture.php
@@ -83,7 +83,7 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
         $optionsNode
             ->children()
                 ->arrayNode('locales')
-                    ->prototype('scalar')
+                    ->scalarPrototype()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/PaymentMethodFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/PaymentMethodFixture.php
@@ -38,8 +38,8 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->scalarNode('instructions')->end()
                 ->scalarNode('gatewayName')->cannotBeEmpty()->end()
                 ->scalarNode('gatewayFactory')->cannotBeEmpty()->end()
-                ->arrayNode('gatewayConfig')->prototype('variable')->end()->end()
-                ->arrayNode('channels')->prototype('scalar')->end()->end()
+                ->arrayNode('gatewayConfig')->variablePrototype()->end()->end()
+                ->arrayNode('channels')->scalarPrototype()->end()->end()
                 ->booleanNode('enabled')->end()
         ;
     }

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/ProductAssociationFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/ProductAssociationFixture.php
@@ -34,7 +34,7 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
             ->children()
                 ->scalarNode('type')->cannotBeEmpty()->end()
                 ->scalarNode('owner')->cannotBeEmpty()->end()
-                ->arrayNode('associated_products')->prototype('scalar')->end()->end()
+                ->arrayNode('associated_products')->scalarPrototype()->end()->end()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/ProductFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/ProductFixture.php
@@ -38,11 +38,11 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->scalarNode('short_description')->cannotBeEmpty()->end()
                 ->scalarNode('description')->cannotBeEmpty()->end()
                 ->scalarNode('main_taxon')->cannotBeEmpty()->end()
-                ->arrayNode('taxons')->prototype('scalar')->end()->end()
-                ->arrayNode('channels')->prototype('scalar')->end()->end()
-                ->arrayNode('product_attributes')->prototype('scalar')->end()->end()
-                ->arrayNode('product_options')->prototype('scalar')->end()->end()
-                ->arrayNode('images')->prototype('scalar')->end()->end()
+                ->arrayNode('taxons')->scalarPrototype()->end()->end()
+                ->arrayNode('channels')->scalarPrototype()->end()->end()
+                ->arrayNode('product_attributes')->scalarPrototype()->end()->end()
+                ->arrayNode('product_options')->scalarPrototype()->end()->end()
+                ->arrayNode('images')->scalarPrototype()->end()->end()
                 ->booleanNode('shipping_required')->end()
         ;
     }

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/ProductOptionFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/ProductOptionFixture.php
@@ -37,7 +37,7 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->arrayNode('values')
                     ->requiresAtLeastOneElement()
                     ->useAttributeAsKey('code')
-                    ->prototype('scalar')
+                    ->scalarPrototype()
                 ->end()
         ;
     }

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/PromotionFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/PromotionFixture.php
@@ -39,12 +39,12 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->booleanNode('coupon_based')->end()
                 ->booleanNode('exclusive')->end()
                 ->integerNode('priority')->min(0)->end()
-                ->arrayNode('channels')->prototype('scalar')->end()->end()
+                ->arrayNode('channels')->scalarPrototype()->end()->end()
                 ->scalarNode('starts_at')->cannotBeEmpty()->end()
                 ->scalarNode('ends_at')->cannotBeEmpty()->end()
                 ->arrayNode('rules')
                     ->requiresAtLeastOneElement()
-                    ->prototype('array')
+                    ->arrayPrototype()
                         ->children()
                             ->scalarNode('type')->cannotBeEmpty()->end()
                             ->variableNode('configuration')->end()
@@ -53,7 +53,7 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->end()
                 ->arrayNode('actions')
                     ->requiresAtLeastOneElement()
-                    ->prototype('array')
+                    ->arrayPrototype()
                         ->children()
                             ->scalarNode('type')->cannotBeEmpty()->end()
                             ->variableNode('configuration')->end()

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/ShippingMethodFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/ShippingMethodFixture.php
@@ -38,7 +38,7 @@ protected function configureResourceNode(ArrayNodeDefinition $resourceNode): voi
                 ->scalarNode('zone')->cannotBeEmpty()->end()
                 ->booleanNode('enabled')->end()
                 ->scalarNode('category')->end()
-                ->arrayNode('channels')->prototype('scalar')->end()->end()
+                ->arrayNode('channels')->scalarPrototype()->end()->end()
                 ->arrayNode('calculator')
                     ->children()
                         ->scalarNode('type')->isRequired()->cannotBeEmpty()->end()

diff --git a/src/Sylius/Bundle/FixturesBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/FixturesBundle/DependencyInjection/Configuration.php
@@ -134,6 +134,6 @@ private function buildAttributesNode(ArrayNodeDefinition $node): void
                 })
         ;
 
-        $optionsNode->prototype('variable')->cannotBeEmpty()->defaultValue([]);
+        $optionsNode->variablePrototype()->cannotBeEmpty()->defaultValue([]);
     }
 }
diff --git a/src/Sylius/Bundle/FixturesBundle/Listener/MongoDBPurgerListener.php b/src/Sylius/Bundle/FixturesBundle/Listener/MongoDBPurgerListener.php
@@ -64,7 +64,7 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
             ->children()
                 ->arrayNode('managers')
                     ->defaultValue([null])
-                    ->prototype('scalar')
+                    ->scalarPrototype()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/FixturesBundle/Listener/ORMPurgerListener.php b/src/Sylius/Bundle/FixturesBundle/Listener/ORMPurgerListener.php
@@ -80,13 +80,13 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
         $optionsNodeBuilder
             ->arrayNode('managers')
                 ->defaultValue([null])
-                ->prototype('scalar')
+                ->scalarPrototype()
         ;
 
         $optionsNodeBuilder
             ->arrayNode('exclude')
                 ->defaultValue([])
-                ->prototype('scalar')
+                ->scalarPrototype()
         ;
     }
 }
diff --git a/src/Sylius/Bundle/FixturesBundle/Listener/PHPCRPurgerListener.php b/src/Sylius/Bundle/FixturesBundle/Listener/PHPCRPurgerListener.php
@@ -64,7 +64,7 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
             ->children()
                 ->arrayNode('managers')
                     ->defaultValue([null])
-                    ->prototype('scalar')
+                    ->scalarPrototype()
         ;
     }
 }