Merge pull request #121 from stof/patch-3

Improve the travis configuration
sampart · Sep 1, 2015 · f329d7b · f329d7b
2 parents 0922449 + 4a259a4
commit f329d7b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,29 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
 
-env:
-  - SYMFONY_VERSION=2.2.*
-  - SYMFONY_VERSION=2.3.*
+matrix:
+  include:
+    # Force testing against LTS versions
+    - php: 5.6
+      env: SYMFONY_VERSION=2.3.*
+    - php: 5.6
+      env: SYMFONY_VERSION=2.7.*
 
-before_script:
-  - composer require symfony/symfony:${SYMFONY_VERSION} --dev --no-update
-  - composer install --dev
+sudo: false
 
-script: php tests.php
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
+before_install:
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
+
+install:
+  - composer install
+
+script: php tests.php
diff --git a/TestsProject/src/WhiteOctober/PagerfantaTestBundle/Controller/PagerfantaController.php b/TestsProject/src/WhiteOctober/PagerfantaTestBundle/Controller/PagerfantaController.php
@@ -31,22 +31,16 @@ public function viewWithOptionsAction()
 
     public function defaultTranslatedViewAction()
     {
-        $this->setLocale('es');
-
         return $this->renderPagerfanta('defaultTranslatedView');
     }
 
     public function twitterBootstrapTranslatedViewAction()
     {
-        $this->setLocale('es');
-
         return $this->renderPagerfanta('twitterBootstrapTranslatedView');
     }
 
     public function twitterBootstrap3TranslatedViewAction()
     {
-        $this->setLocale('es');
-
         return $this->renderPagerfanta('twitterBootstrap3TranslatedView');
     }
 
@@ -55,7 +49,6 @@ public function myView1Action()
         return $this->renderPagerfanta('myView1');
     }
 
-
     public function viewWithRouteParamsAction($test = null)
     {
         return $this->renderPagerfanta('viewWithRouteParams');
@@ -103,9 +96,4 @@ private function createAdapter()
 
         return new FixedAdapter($nbResults, $results);
     }
-
-    private function setLocale($locale)
-    {
-        $this->getRequest()->setLocale($locale);
-    }
 }
diff --git a/TestsProject/src/WhiteOctober/PagerfantaTestBundle/Resources/config/routing.yml b/TestsProject/src/WhiteOctober/PagerfantaTestBundle/Resources/config/routing.yml
@@ -21,15 +21,15 @@ pagerfanta_view_with_route_params:
 
 pagerfanta_default_translated_view:
     path:      /pagerfanta/default-translated-view
-    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:defaultTranslatedView }
+    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:defaultTranslatedView, _locale: es }
 
 pagerfanta_twitter_bootstrap_translated_view:
     path:      /pagerfanta/twitter-bootstrap-translated-view
-    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:twitterBootstrapTranslatedView }
+    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:twitterBootstrapTranslatedView, _locale: es }
 
 pagerfanta_twitter_bootstrap3_translated_view:
     path:      /pagerfanta/twitter-bootstrap3-translated-view
-    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:twitterBootstrap3TranslatedView }
+    defaults:  { _controller: WhiteOctoberPagerfantaTestBundle:Pagerfanta:twitterBootstrap3TranslatedView, _locale: es }
 
 pagerfanta_my_view_1:
     path:      /pagerfanta/my-view-1