Merge pull request suncat2000#81 from xabbuh/patch-1

suncat2000 · suncat2000 · commit d800c7590aac · 2016-01-19T22:49:48.000+07:00
improve the Travis CI configuration
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,32 @@
+sudo: false
+
 language:
   - php
 
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
 php:
   - 5.3
   - 5.4
   - 5.5
+  - 7.0
+  - hhvm
 
-env:
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
-  - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
+matrix:
+  include:
+    - php: 5.6
+      env: SYMFONY_VERSION=2.3.*
+    - php: 5.6
+      env: SYMFONY_VERSION=2.7.*
+    - php: 5.6
+      env: COVERAGE=yes
 
 before_script:
-  - composer require symfony/framework-bundle:${SYMFONY_VERSION}
-  - composer update --dev
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}; fi
+  - composer install
+  - if [ "$COVERAGE" != "yes" -a "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
 
 script:
-  - phpunit --coverage-text
+  - if [ "$COVERAGE" = "yes" ]; then ./vendor/bin/phpunit --coverage-text; else ./vendor/bin/phpunit; fi
diff --git a/Tests/EventListener/RequestListenerTest.php b/Tests/EventListener/RequestListenerTest.php
@@ -64,7 +64,10 @@ public function setUp()
 
         $this->mobileDetector = $this->getMockBuilder('SunCat\MobileDetectBundle\DeviceDetector\MobileDetector')->disableOriginalConstructor()->getMock();
         $this->deviceView = $this->getMockBuilder('SunCat\MobileDetectBundle\Helper\DeviceView')->disableOriginalConstructor()->getMock();
-        $this->router = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\Router')->disableOriginalConstructor()->getMock();
+        $this->router = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\Router')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getRouteCollection'))
+            ->getMock();
 
         $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
         $this->request->expects($this->any())->method('getScheme')->will($this->returnValue('http'));
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "mobiledetect/mobiledetectlib": "~2.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.1"
+        "phpunit/phpunit": "~4.1|~5.0"
     },
     "autoload": {
         "psr-0": {
