Merge pull request #46 from saimaz/patch-filtername-conflict

Twig function name conflict fix

Author: saimaz

Resources/views/Pager/paginate.html.twig

@@ -1,15 +1,15 @@
 <ul class="pagination">
     {% if pager.isFirstPage == false %}
-        <li class="first"><a href="{{ paginate_path(route, pager.getFirstPage, parameters) }}">&laquo;</a></li>
-        <li class="previous"><a href="{{ paginate_path(route, pager.getPreviousPage, parameters) }}">&lsaquo;</a></li>
+        <li class="first"><a href="{{ ongr_paginate_path(route, pager.getFirstPage, parameters) }}">&laquo;</a></li>
+        <li class="previous"><a href="{{ ongr_paginate_path(route, pager.getPreviousPage, parameters) }}">&lsaquo;</a></li>
     {% endif %}
     {% for page in pager.getPages %}
         <li class="{% if page == pager.getPage %}active{% endif %}">
-            <a href="{{ paginate_path(route, page, parameters) }}">{{ page }}</a>
+            <a href="{{ ongr_paginate_path(route, page, parameters) }}">{{ page }}</a>
         </li>
     {% endfor %}
     {% if pager.isLastPage == false %}
-        <li class="next"><a href="{{ paginate_path(route, pager.getNextPage, parameters) }}">&rsaquo;</a></li>
-        <li class="last"><a href="{{ paginate_path(route, pager.getLastPage, parameters) }}">&raquo;</a></li>
+        <li class="next"><a href="{{ ongr_paginate_path(route, pager.getNextPage, parameters) }}">&rsaquo;</a></li>
+        <li class="last"><a href="{{ ongr_paginate_path(route, pager.getLastPage, parameters) }}">&raquo;</a></li>
     {% endif %}
 </ul>

Twig/PagerExtension.php

@@ -22,7 +22,7 @@ class PagerExtension extends \Twig_Extension
     /**
      * Twig extension name.
      */
-    const NAME = 'ongr.pager';
+    const NAME = 'ongr_pager';
 
     /**
      * @var RouterInterface
@@ -56,8 +56,8 @@ public function initRuntime(\Twig_Environment $environment)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('paginate', [$this, 'paginate'], ['is_safe' => ['html']]),
-            new \Twig_SimpleFunction('paginate_path', [$this, 'path'], ['is_safe' => ['html']]),
+            new \Twig_SimpleFunction('ongr_paginate', [$this, 'paginate'], ['is_safe' => ['html']]),
+            new \Twig_SimpleFunction('ongr_paginate_path', [$this, 'path'], ['is_safe' => ['html']]),
         ];
     }