Merge branch 'master' into bugfix/ps-1007-search-query-is-lost-during…

…-category-navigation

composer.json

@@ -4,26 +4,26 @@
   "license": "proprietary",
   "require": {
     "php": ">=7.1",
-    "spryker-shop/shop-application": "^0.2.0 || ^0.3.0 || ^0.4.0",
+    "spryker-shop/shop-application": "^1.0.0",
+    "spryker-shop/shop-router-extension": "^1.0.0",
+    "spryker-shop/shop-ui": "^1.0.0",
     "spryker/catalog": "^5.2.0",
-    "spryker/category-storage": "^0.1.0 || ^0.2.0 || ^0.3.0 || ^1.0.0",
+    "spryker/category-storage": "^1.0.0",
     "spryker/kernel": "^3.16.0",
     "spryker/locale": "^3.1.0",
     "spryker/product-category-filter": "^1.2.0",
-    "spryker/product-category-filter-storage": "^0.1.0 || ^1.0.0",
+    "spryker/product-category-filter-storage": "^1.0.0",
     "spryker/search": "^7.0.0 || ^8.0.0",
     "spryker/storage": "^3.4.0",
     "spryker/symfony": "^3.1.0",
     "spryker/twig": "^3.3.0",
     "spryker/util-text": "^1.2.0"
   },
   "require-dev": {
-    "spryker-shop/shop-router": "*",
     "spryker/silex": "*"
   },
   "suggest": {
-    "spryker-shop/shop-router": "TODO: add suggestion description",
-    "spryker/silex": "TODO: add suggestion description"
+    "spryker/silex": "Use this module when using plugins that need Silex dependencies."
   },
   "autoload": {
     "psr-4": {

dependency.json

@@ -0,0 +1,5 @@
+{
+  "include": {
+    "ShopUi": "ShopUi provides basic frontend infrastructure."
+  }
+}

phpstan.json

@@ -1,3 +1,3 @@
 {
-  "defaultLevel": 4
+  "defaultLevel": 5
 }

src/SprykerShop/Yves/CatalogPage/ActiveSearchFilter/UrlGenerator.php

@@ -32,7 +32,7 @@ public function __construct(CatalogPageToSearchClientInterface $searchClient)
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Spryker\Shared\Kernel\Transfer\TransferInterface $searchResultTransfer
+     * @param \Generated\Shared\Transfer\FacetSearchResultTransfer|\Generated\Shared\Transfer\RangeSearchResultTransfer $searchResultTransfer
      * @param string $filterValue
      *
      * @return string
@@ -48,7 +48,7 @@ public function generateUrlWithoutActiveSearchFilter(Request $request, TransferI
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param array $facetFilters
+     * @param \Generated\Shared\Transfer\FacetSearchResultTransfer[]|\Generated\Shared\Transfer\RangeSearchResultTransfer[] $facetFilters
      *
      * @return string
      */
@@ -70,7 +70,7 @@ public function generateUrlWithoutAllActiveSearchFilters(Request $request, array
 
     /**
      * @param array $params
-     * @param \Spryker\Shared\Kernel\Transfer\TransferInterface $searchResultTransfer
+     * @param \Generated\Shared\Transfer\FacetSearchResultTransfer|\Generated\Shared\Transfer\RangeSearchResultTransfer $searchResultTransfer
      * @param string|null $filterValue
      *
      * @throws \InvalidArgumentException

src/SprykerShop/Yves/CatalogPage/ActiveSearchFilter/UrlGeneratorInterface.php

@@ -14,7 +14,7 @@ interface UrlGeneratorInterface
 {
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Spryker\Shared\Kernel\Transfer\TransferInterface $searchResultTransfer
+     * @param \Generated\Shared\Transfer\FacetSearchResultTransfer|\Generated\Shared\Transfer\RangeSearchResultTransfer $searchResultTransfer
      * @param string $filterValue
      *
      * @return string
@@ -23,7 +23,7 @@ public function generateUrlWithoutActiveSearchFilter(Request $request, TransferI
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Spryker\Shared\Kernel\Transfer\TransferInterface[] $facetFilters
+     * @param \Generated\Shared\Transfer\FacetSearchResultTransfer[]|\Generated\Shared\Transfer\RangeSearchResultTransfer[] $facetFilters
      *
      * @return string
      */

src/SprykerShop/Yves/CatalogPage/CatalogPageFactory.php

@@ -46,7 +46,7 @@ public function getLocaleClient(): CatalogPageToLocaleClientInterface
     /**
      * @return \SprykerShop\Yves\CatalogPage\Dependency\Client\CatalogPageToSearchClientInterface
      */
-    protected function getSearchClient(): CatalogPageToSearchClientInterface
+    public function getSearchClient(): CatalogPageToSearchClientInterface
     {
         return $this->getProvidedDependency(CatalogPageDependencyProvider::CLIENT_SEARCH);
     }

src/SprykerShop/Yves/CatalogPage/Controller/CatalogController.php

@@ -32,8 +32,27 @@ class CatalogController extends AbstractController
      */
     public function indexAction(array $categoryNode, Request $request)
     {
-        $searchString = $request->query->get('q', '');
         $idCategoryNode = $categoryNode['node_id'];
+
+        $viewData = $this->executeIndexAction($categoryNode, $idCategoryNode, $request);
+
+        return $this->view(
+            $viewData,
+            $this->getFactory()->getCatalogPageWidgetPlugins(),
+            $this->getCategoryNodeTemplate($idCategoryNode)
+        );
+    }
+
+    /**
+     * @param array $categoryNode
+     * @param int $idCategoryNode
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     *
+     * @return array
+     */
+    protected function executeIndexAction(array $categoryNode, int $idCategoryNode, Request $request): array
+    {
+        $searchString = $request->query->get('q', '');
         $idCategory = $categoryNode['id_category'];
 
         $parameters = $request->query->all();
@@ -61,22 +80,31 @@ public function indexAction(array $categoryNode, Request $request)
                 ->getCatalogViewMode($request),
         ];
 
-        $searchResults = array_merge($searchResults, $metaAttributes);
-        $template = $this->getCategoryNodeTemplate($idCategoryNode);
+        return array_merge($searchResults, $metaAttributes);
+    }
+
+    /**
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     *
+     * @return \Spryker\Yves\Kernel\View\View
+     */
+    public function fulltextSearchAction(Request $request)
+    {
+        $viewData = $this->executeFulltextSearchAction($request);
 
         return $this->view(
-            $searchResults,
+            $viewData,
             $this->getFactory()->getCatalogPageWidgetPlugins(),
-            $template
+            '@CatalogPage/views/search/search.twig'
         );
     }
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
      *
-     * @return \Spryker\Yves\Kernel\View\View
+     * @return array
      */
-    public function fulltextSearchAction(Request $request)
+    protected function executeFulltextSearchAction(Request $request): array
     {
         $searchString = $request->query->get('q');
 
@@ -91,11 +119,7 @@ public function fulltextSearchAction(Request $request)
             ->getCatalogClient()
             ->getCatalogViewMode($request);
 
-        return $this->view(
-            $searchResults,
-            $this->getFactory()->getCatalogPageWidgetPlugins(),
-            '@CatalogPage/views/search/search.twig'
-        );
+        return $searchResults;
     }
 
     /**

src/SprykerShop/Yves/CatalogPage/Plugin/CatalogPageResourceCreatorPlugin.php

@@ -9,7 +9,7 @@
 
 use Spryker\Shared\CategoryStorage\CategoryStorageConstants;
 use Spryker\Yves\Kernel\AbstractPlugin;
-use SprykerShop\Yves\ShopRouter\Dependency\Plugin\ResourceCreatorPluginInterface;
+use SprykerShop\Yves\ShopRouterExtension\Dependency\Plugin\ResourceCreatorPluginInterface;
 
 /**
  * @method \SprykerShop\Yves\CatalogPage\CatalogPageFactory getFactory()

src/SprykerShop/Yves/CatalogPage/Plugin/Provider/CatalogPageControllerProvider.php

@@ -23,18 +23,44 @@ class CatalogPageControllerProvider extends AbstractYvesControllerProvider
      */
     protected function defineControllers(Application $app)
     {
-        $allowedLocalesPattern = $this->getAllowedLocalesPattern();
+        $this->addFulltextSearchRoute()
+            ->addSuggestionRoute()
+            ->addChangeViewRoute();
+    }
 
+    /**
+     * @return $this
+     */
+    protected function addFulltextSearchRoute(): self
+    {
         $this->createController('/{search}', self::ROUTE_SEARCH, 'CatalogPage', 'Catalog', 'fulltextSearch')
-            ->assert('search', $allowedLocalesPattern . 'search|search')
+            ->assert('search', $this->getAllowedLocalesPattern() . 'search|search')
             ->value('search', 'search');
 
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    protected function addSuggestionRoute(): self
+    {
         $this->createController('/{search}/suggestion', self::ROUTE_SUGGESTION, 'CatalogPage', 'Suggestion', 'index')
-            ->assert('search', $allowedLocalesPattern . 'search|search')
+            ->assert('search', $this->getAllowedLocalesPattern() . 'search|search')
             ->value('search', 'search');
 
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    protected function addChangeViewRoute(): self
+    {
         $this->createController('/{catalog}/change-view-mode', static::ROUTER_CHANGE_VIEW_MODE, 'CatalogPage', 'Catalog', 'changeViewMode')
-            ->assert('catalog', $allowedLocalesPattern . 'catalog|catalog')
+            ->assert('catalog', $this->getAllowedLocalesPattern() . 'catalog|catalog')
             ->value('catalog', 'catalog');
+
+        return $this;
     }
 }