Merge pull request #3 from stephskuola/master

Bad GET parameters removed from meta next and prev tags.

.gitignore

@@ -1 +1,2 @@
 vendor/
+.idea

Extension/Twig/PaginationMetaExtension.php

@@ -3,6 +3,7 @@
 namespace OpenSkuola\SeoBundle\Extension\Twig;
 
 use Knp\Bundle\PaginatorBundle\Pagination\SlidingPagination;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\RouterInterface;
@@ -33,12 +34,18 @@ class PaginationMetaExtension extends \Twig_Extension
      */
     protected $accessor;
 
+    /**
+     * @var array
+     */
+    protected $badRouteInfoParams;
+
     /**
      * PaginationMetaExtension constructor.
      * @param RouterInterface $router
      */
-    public function __construct(RouterInterface $router)
+    public function __construct(RouterInterface $router, array $badRouteInfoParams)
     {
+        $this->badRouteInfoParams = $badRouteInfoParams;
         $this->router = $router;
         $this->accessor = PropertyAccess::createPropertyAccessor();
     }
@@ -127,16 +134,34 @@ function($parameter) use (&$routeInfo, $request) {
             );
         }
 
+        $routeInfo['params'] = $this->cleanRouteInfoParams($routeInfo['params']);
+
+        $generatedUrl = $this->router->generate(
+            $routeInfo['name'],
+            $routeInfo['params'],
+            UrlGenerator::ABSOLUTE_URL
+        );
+
         return sprintf('<link rel="%s" href="%s">',
             $direction,
-            $this->router->generate(
-                $routeInfo['name'],
-                $routeInfo['params'],
-                UrlGenerator::ABSOLUTE_URL
-            )
+            $generatedUrl
         );
     }
 
+    /**
+     * @param array
+     * @return array
+     */
+    public function cleanRouteInfoParams($routeInfoParams)
+    {
+        foreach($this->badRouteInfoParams as $badParam)
+        {
+            if(isset($routeInfoParams[$badParam])) unset($routeInfoParams[$badParam]);
+        }
+
+        return $routeInfoParams;
+    }
+
     /**
      * @return RequestStack
      */

Resources/config/parameters.yml

@@ -1,2 +1,3 @@
 parameters:
-    skuola_seo.twig_pagination_meta.extension.class: OpenSkuola\SeoBundle\Extension\Twig\PaginationMetaExtension
+    skuola_seo.twig_pagination_meta.extension.class: OpenSkuola\SeoBundle\Extension\Twig\PaginationMetaExtension
+    skuola_seo.bad_route_info_params: ["direction", "sort"]

Resources/config/twig.yml

@@ -1,7 +1,7 @@
 services:
     skuola_seo.twig_pagination_meta.extension:
         class: "%skuola_seo.twig_pagination_meta.extension.class%"
-        arguments: [ "@router"]
+        arguments: [ "@router", "%skuola_seo.bad_route_info_params%"]
         calls:
             - [setRequestStack, [ "@request_stack" ]]
         tags: