Merge branch '1.2'

* 1.2:
  Mention roadmap in README
  Unify catch block in ShopBasedCartContext
  handle dynamically templates with or without bundle
  fix phpspec for resource loader
  fix routing templates for sf4
  [HOTFIX] Missing configuration for channel in sonata
  the name of file was wrong

README.md

@@ -25,6 +25,12 @@ Documentation
 
 Documentation is available at [docs.sylius.com](http://docs.sylius.com).
 
+Roadmap
+-------
+
+Our roadmap is available to browse, vote and comment as a [Github project](https://github.com/orgs/Sylius/projects/2). 
+You can also see all roadmap related issues by filtering [those labeled with "Roadmap"](https://github.com/Sylius/Sylius/labels/Roadmap).
+
 Community
 ---------
 

docs/cookbook/shop/custom-redirect-after-cart-add-action.rst

@@ -1,7 +1,7 @@
 How to change a redirect after the add to cart action?
 ======================================================
 
-Currently **Sylius** by default is using route definition and **sylus-add-to-cart.js** script to handle redirect after successful add to cart action.
+Currently **Sylius** by default is using route definition and **sylius-add-to-cart.js** script to handle redirect after successful add to cart action.
 
 .. code-block:: yaml
 

src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml

@@ -103,6 +103,7 @@ sonata_block:
                 address: ~
                 addresses: ~
                 cart: ~
+                channel: ~
                 customer: ~
                 form: ~
                 order: ~

src/Sylius/Bundle/ResourceBundle/Routing/ResourceLoader.php

@@ -185,7 +185,11 @@ private function createRoute(
             $defaults['_sylius']['filterable'] = $configuration['filterable'];
         }
         if (isset($configuration['templates']) && in_array($actionName, ['show', 'index', 'create', 'update'], true)) {
-            $defaults['_sylius']['template'] = sprintf('%s:%s.html.twig', $configuration['templates'], $actionName);
+            $defaults['_sylius']['template'] = sprintf(
+                false === strpos($configuration['templates'], ':') ? '%s/%s.html.twig' : '%s:%s.html.twig',
+                $configuration['templates'],
+                $actionName
+            );
         }
         if (isset($configuration['redirect']) && in_array($actionName, ['create', 'update'], true)) {
             $defaults['_sylius']['redirect'] = $this->getRouteName($metadata, $configuration, $configuration['redirect']);

src/Sylius/Bundle/ResourceBundle/spec/Routing/ResourceLoaderSpec.php

@@ -730,7 +730,7 @@ function it_generates_routing_for_a_section(
         $this->load($configuration, 'sylius.resource')->shouldReturn($routeCollection);
     }
 
-    function it_generates_routing_with_custom_templates_namespace(
+    function it_generates_routing_with_custom_templates_namespace_in_bundle(
         RegistryInterface $resourceRegistry,
         MetadataInterface $metadata,
         RouteFactoryInterface $routeFactory,
@@ -840,6 +840,116 @@ function it_generates_routing_with_custom_templates_namespace(
         $this->load($configuration, 'sylius.resource')->shouldReturn($routeCollection);
     }
 
+    function it_generates_routing_with_custom_templates_namespace_out_of_bundle(
+        RegistryInterface $resourceRegistry,
+        MetadataInterface $metadata,
+        RouteFactoryInterface $routeFactory,
+        RouteCollection $routeCollection,
+        Route $showRoute,
+        Route $indexRoute,
+        Route $createRoute,
+        Route $updateRoute,
+        Route $bulkDeleteRoute,
+        Route $deleteRoute
+    ): void {
+        $resourceRegistry->get('sylius.product')->willReturn($metadata);
+        $metadata->getApplicationName()->willReturn('sylius');
+        $metadata->getName()->willReturn('product');
+        $metadata->getPluralName()->willReturn('products');
+        $metadata->getServiceId('controller')->willReturn('sylius.controller.product');
+
+        $routeFactory->createRouteCollection()->willReturn($routeCollection);
+
+        $configuration =
+            <<<EOT
+alias: sylius.product
+templates: admin/product
+EOT;
+
+        $showDefaults = [
+            '_controller' => 'sylius.controller.product:showAction',
+            '_sylius' => [
+                'template' => 'admin/product/show.html.twig',
+                'permission' => false,
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/{id}', $showDefaults, [], [], '', [], ['GET'])
+            ->willReturn($showRoute)
+        ;
+        $routeCollection->add('sylius_product_show', $showRoute)->shouldBeCalled();
+
+        $indexDefaults = [
+            '_controller' => 'sylius.controller.product:indexAction',
+            '_sylius' => [
+                'template' => 'admin/product/index.html.twig',
+                'permission' => false,
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/', $indexDefaults, [], [], '', [], ['GET'])
+            ->willReturn($indexRoute)
+        ;
+        $routeCollection->add('sylius_product_index', $indexRoute)->shouldBeCalled();
+
+        $createDefaults = [
+            '_controller' => 'sylius.controller.product:createAction',
+            '_sylius' => [
+                'template' => 'admin/product/create.html.twig',
+                'permission' => false,
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/new', $createDefaults, [], [], '', [], ['GET', 'POST'])
+            ->willReturn($createRoute)
+        ;
+        $routeCollection->add('sylius_product_create', $createRoute)->shouldBeCalled();
+
+        $updateDefaults = [
+            '_controller' => 'sylius.controller.product:updateAction',
+            '_sylius' => [
+                'template' => 'admin/product/update.html.twig',
+                'permission' => false,
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/{id}/edit', $updateDefaults, [], [], '', [], ['GET', 'PUT', 'PATCH'])
+            ->willReturn($updateRoute)
+        ;
+        $routeCollection->add('sylius_product_update', $updateRoute)->shouldBeCalled();
+
+        $bulkDeleteDefaults = [
+            '_controller' => 'sylius.controller.product:bulkDeleteAction',
+            '_sylius' => [
+                'permission' => false,
+                'paginate' => false,
+                'repository' => [
+                    'method' => 'findById',
+                    'arguments' => ['$ids'],
+                ],
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/bulk-delete', $bulkDeleteDefaults, [], [], '', [], ['DELETE'])
+            ->willReturn($bulkDeleteRoute)
+        ;
+        $routeCollection->add('sylius_product_bulk_delete', $bulkDeleteRoute)->shouldBeCalled();
+
+        $deleteDefaults = [
+            '_controller' => 'sylius.controller.product:deleteAction',
+            '_sylius' => [
+                'permission' => false,
+            ],
+        ];
+        $routeFactory
+            ->createRoute('/products/{id}', $deleteDefaults, [], [], '', [], ['DELETE'])
+            ->willReturn($deleteRoute)
+        ;
+        $routeCollection->add('sylius_product_delete', $deleteRoute)->shouldBeCalled();
+
+        $this->load($configuration, 'sylius.resource')->shouldReturn($routeCollection);
+    }
+
     function it_excludes_specific_routes_if_configured(
         RegistryInterface $resourceRegistry,
         MetadataInterface $metadata,

src/Sylius/Component/Core/Cart/Context/ShopBasedCartContext.php

@@ -72,11 +72,7 @@ public function getCart(): BaseOrderInterface
             $cart->setChannel($channel);
             $cart->setCurrencyCode($channel->getBaseCurrency()->getCode());
             $cart->setLocaleCode($this->shopperContext->getLocaleCode());
-        } catch (ChannelNotFoundException $exception) {
-            throw new CartNotFoundException('Sylius was not able to prepare the cart.', $exception);
-        } catch (CurrencyNotFoundException $exception) {
-            throw new CartNotFoundException('Sylius was not able to prepare the cart.', $exception);
-        } catch (LocaleNotFoundException $exception) {
+        } catch (ChannelNotFoundException | CurrencyNotFoundException | LocaleNotFoundException $exception) {
             throw new CartNotFoundException('Sylius was not able to prepare the cart.', $exception);
         }