Merge pull request #285 from FriendsOfSymfony/tests

GuilhemN · web-flow · commit 30c08e7106ef · 2017-08-09T11:58:49.000+02:00
Fix tests
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 /phpunit.xml
 /composer.lock
 /composer.phar
-/vendor/
+/vendor/
+/node_modules/
+/.phpunit/
diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,30 @@
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
 matrix:
   include:
-    - php: 5.6
-      env: SYMFONY_VERSION='2.3.*'
-    - php: 5.6
-      env: SYMFONY_VERSION='2.5.*'
-    - php: 5.6
-      env: SYMFONY_VERSION='3.0.*'
+    - php: 5.3
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.1
+    - php: 7.1
+      env: SYMFONY_VERSION='2.8.*'
 
 sudo: false
 
 cache:
   directory:
-    - $HOME/.composer/cache
+    - .phpunit
+    - $HOME/.composer/cache/files
 
 before_install:
-  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
 
 install:
-  - composer install
+  - composer update $COMPOSER_FLAGS --prefer-dist
+  - npm install google-closure-library
 
 script:
-  - phpunit --coverage-text
+  - ./phpunit
   - phantomjs Resources/js/run_jsunit.js Resources/js/router_test.html
 
 notifications:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,18 +35,25 @@ Before running the test suite, execute the following Composer command to install
 the dependencies used by the bundle:
 
 ```bash
-$ composer install --dev
+$ composer update
 ```
 
 Then, execute the tests executing:
 
 ```bash
-$ phpunit
+$ ./phpunit
 ```
 
 ### JavaScript Test Suite
 
-First, install [PhantomJS](http://phantomjs.org/) and then, execute this command:
+First, install [PhantomJS](http://phantomjs.org/) and [Google Closure
+Library](https://github.com/google/closure-library):
+
+```bash
+$ npm install google-closure-library
+```
+
+Run the JS test suite with:
 
 ```bash
 $ phantomjs Resources/js/run_jsunit.js Resources/js/router_test.html
diff --git a/Resources/js/router_test.html b/Resources/js/router_test.html
@@ -5,7 +5,7 @@
         <title>Router Test</title>
     </head>
     <body>
-        <script language="javascript" type="text/javascript" src="https://rawgit.com/google/closure-library/master/closure/goog/base.js"></script>
+        <script language="javascript" type="text/javascript" src="../../node_modules/google-closure-library/closure/goog/base.js"></script>
         <script language="javascript" type="text/javascript" src="router.js"></script>
         <script language="javascript" type="text/javascript" src="router.test.js"></script>
     </body>
diff --git a/Tests/Controller/ControllerTest.php b/Tests/Controller/ControllerTest.php
@@ -4,14 +4,15 @@
 
 use FOS\JsRoutingBundle\Controller\Controller;
 use FOS\JsRoutingBundle\Extractor\ExtractedRoute;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpFoundation\Session;
 
-class ControllerTest extends \PHPUnit_Framework_TestCase
+class ControllerTest extends TestCase
 {
     private $cachePath;
 
@@ -129,7 +130,7 @@ public function testCacheControl()
 
     private function getExtractor(array $exposedRoutes = array(), $baseUrl = '')
     {
-        $extractor = $this->getMock('FOS\\JsRoutingBundle\\Extractor\\ExposedRoutesExtractorInterface');
+        $extractor = $this->getMockBuilder('FOS\\JsRoutingBundle\\Extractor\\ExposedRoutesExtractorInterface')->getMock();
         $extractor
             ->expects($this->any())
             ->method('getRoutes')
@@ -179,7 +180,7 @@ private function getRequest($uri, $method = 'GET', $parameters = array(), $cooki
 
         if (version_compare(strtolower(Kernel::VERSION), '2.1.0-dev', '<')) {
             $request->setSession(new Session(
-                $this->getMock('Symfony\Component\HttpFoundation\SessionStorage\SessionStorageInterface')
+                $this->getMockBuilder('Symfony\Component\HttpFoundation\SessionStorage\SessionStorageInterface')->getMock()
             ));
         }
 
diff --git a/Tests/DependencyInjection/FOSJsRoutingExtensionTest.php b/Tests/DependencyInjection/FOSJsRoutingExtensionTest.php
@@ -3,9 +3,10 @@
 namespace FOS\JsRoutingBundle\Tests\DependencyInjection;
 
 use FOS\JsRoutingBundle\DependencyInjection\FOSJsRoutingExtension;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class FOSJsRoutingExtensionTest extends \PHPUnit_Framework_TestCase
+class FOSJsRoutingExtensionTest extends TestCase
 {
     public function setUp()
     {
diff --git a/Tests/Extractor/ExposedRoutesExtractorTest.php b/Tests/Extractor/ExposedRoutesExtractorTest.php
@@ -13,6 +13,7 @@
 
 use FOS\JsRoutingBundle\Extractor\ExposedRoutesExtractor;
 use FOS\JsRoutingBundle\Extractor\ExtractedRoute;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\HttpKernel\Kernel;
@@ -22,7 +23,7 @@
  *
  * @author William DURAND <william.durand1@gmail.com>
  */
-class ExposedRoutesExtractorTest extends \PHPUnit_Framework_TestCase
+class ExposedRoutesExtractorTest extends TestCase
 {
     private $cacheDir;
 
@@ -100,7 +101,9 @@ public function testGetRoutesWithPatterns()
 
     public function testGetCachePath()
     {
-        $router = $this->getMock('Symfony\\Component\\Routing\\Router', array(), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\\Component\\Routing\\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $extractor = new ExposedRoutesExtractor($router, array(), $this->cacheDir, array());
         $this->assertEquals($this->cacheDir . DIRECTORY_SEPARATOR . 'fosJsRouting' . DIRECTORY_SEPARATOR . 'data.json', $extractor->getCachePath(''));
@@ -113,7 +116,9 @@ public function testGetHostOverHttp($host, $httpPort, $expected)
     {
         $requestContext = new RequestContext('/app_dev.php', 'GET', $host, 'http', $httpPort);
 
-        $router = $this->getMock('Symfony\\Component\\Routing\\Router', array(), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\\Component\\Routing\\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
         $router->expects($this->atLeastOnce())
             ->method('getContext')
             ->will($this->returnValue($requestContext));
@@ -137,7 +142,9 @@ public function testGetHostOverHttps($host, $httpsPort, $expected)
     {
         $requestContext = new RequestContext('/app_dev.php', 'GET', $host, 'https', 80, $httpsPort);
 
-        $router = $this->getMock('Symfony\\Component\\Routing\\Router', array(), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\\Component\\Routing\\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
         $router->expects($this->atLeastOnce())
             ->method('getContext')
             ->will($this->returnValue($requestContext));
@@ -160,13 +167,17 @@ public function provideTestGetHostOverHttps()
      */
     private function getRouter(array $routes)
     {
-        $routeCollection = $this->getMock('Symfony\\Component\\Routing\\RouteCollection', array(), array(), '', false);
+        $routeCollection = $this->getMockBuilder('Symfony\\Component\\Routing\\RouteCollection')
+            ->disableOriginalConstructor()
+            ->getMock();
         $routeCollection
             ->expects($this->atLeastOnce())
             ->method('all')
             ->will($this->returnValue($routes));
 
-        $router = $this->getMock('Symfony\\Component\\Routing\\Router', array(), array(), '', false);
+        $router = $this->getMockBuilder('Symfony\\Component\\Routing\\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
         $router
             ->expects($this->atLeastOnce())
             ->method('getRouteCollection')
diff --git a/composer.json b/composer.json
@@ -17,16 +17,15 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~2.0|3.*",
-        "symfony/serializer": "~2.0|3.*",
-        "symfony/console": "~2.0|3.*",
+        "symfony/framework-bundle": "~2.3|3.*",
+        "symfony/serializer": "~2.3|3.*",
+        "symfony/console": "~2.3|3.*",
         "willdurand/jsonp-callback-validator": "~1.0"
     },
     "require-dev": {
-        "symfony/expression-language": "~2.4|3.*"
+        "symfony/expression-language": "~2.4|3.*",
+        "symfony/phpunit-bridge": "^3.3"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "autoload": {
         "psr-4": { "FOS\\JsRoutingBundle\\": "" }
     },
diff --git a/phpunit b/phpunit
@@ -0,0 +1,14 @@
+#!/usr/bin/env php
+<?php
+
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/29fa7b8196870591f35e1554dd69def482e01fb2
+
+if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
+    echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
+    exit(1);
+}
+if (\PHP_VERSION_ID >= 70000 && !getenv('SYMFONY_PHPUNIT_VERSION')) {
+    putenv('SYMFONY_PHPUNIT_VERSION=6.0');
+}
+putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
+require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`namespace FOS\JsRoutingBundle\Tests\DependencyInjection;`
`4`	`4`
`5`	`5`	`use FOS\JsRoutingBundle\DependencyInjection\FOSJsRoutingExtension;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`6`	`7`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`7`	`8`
`8`		`-class FOSJsRoutingExtensionTest extends \PHPUnit_Framework_TestCase`
	`9`	`+class FOSJsRoutingExtensionTest extends TestCase`
`9`	`10`	`{`
`10`	`11`	`public function setUp()`
`11`	`12`	`{`