Merge pull request #194 from whiteoctober/pagerfanta-1.x

Allow >= 1.1.0 & 2.x for Pagerfanta
sampart · May 21, 2018 · a489542 · a489542
2 parents 0e60ca5 + c16f6a8
commit a489542
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Tests/View/DefaultTranslatedViewTest.php b/Tests/View/DefaultTranslatedViewTest.php
@@ -25,7 +25,7 @@ protected function translatedViewClass()
 
     protected function previousMessageOption()
     {
-        return 'previous_message';
+        return 'prev_message';
     }
 
     protected function nextMessageOption()
@@ -47,4 +47,4 @@ protected function translatedViewName()
     {
         return 'default_translated';
     }
-}
+}
diff --git a/TestsProject/app/config_test.yml b/TestsProject/app/config_test.yml
@@ -20,6 +20,6 @@ services:
         class: Pagerfanta\View\OptionableView
         arguments:
             - '@pagerfanta.view.default'
-            - { proximity: 2, previous_message: Anterior, next_message: Siguiente }
+            - { proximity: 2, prev_message: Anterior, next_message: Siguiente }
         public: false
         tags: [{ name: pagerfanta.view, alias: my_view_1 }]
diff --git a/View/DefaultTranslatedView.php b/View/DefaultTranslatedView.php
@@ -22,7 +22,7 @@ class DefaultTranslatedView extends TranslatedView
 {
     protected function previousMessageOption()
     {
-        return 'previous_message';
+        return 'prev_message';
     }
 
     protected function nextMessageOption()

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.3",
-        "pagerfanta/pagerfanta": "1.0.*",
+        "pagerfanta/pagerfanta": "^1.1.0|^2.0.0",
         "symfony/framework-bundle": "~2.3|~3.0|~4.0",
         "symfony/property-access": "~2.3|~3.0|~4.0",
         "symfony/twig-bundle": "~2.3|~3.0|~4.0"