Merge pull request #291 from symfony-cmf/php7-patch

Test against PHP7

Author: dbu

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - nightly
 
 sudo: false
 
@@ -31,6 +32,7 @@ matrix:
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
       env: SYMFONY_VERSION=3.0.*
+    - php: nightly
 
 before_script:
   - composer self-update

Tests/WebTest/RedirectRouteAdminTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\HttpFoundation\Response;
 
 class RedirectRouteAdminTest extends BaseTestCase
 {
@@ -33,15 +34,15 @@ public function testRedirectRouteList()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/redirectroute/list');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
         $this->assertCount(1, $crawler->filter('html:contains("redirect-route-1")'));
     }
 
     public function testRedirectRouteEdit()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/redirectroute/test/routing/redirect-route-1/edit');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
         $this->assertCount(1, $crawler->filter('input[value="redirect-route-1"]'));
 
         $this->assertFrontendLinkPresent($crawler);
@@ -51,14 +52,14 @@ public function testRedirectRouteShow()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/redirectroute/test/routing/redirect-route-1/show');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
     }
 
     public function testRedirectRouteCreate()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/redirectroute/create');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
 
         $this->assertFrontendLinkNotPresent($crawler);
 
@@ -94,4 +95,9 @@ private function assertFrontendLinkNotPresent(Crawler $crawler)
     {
         $this->assertCount(0, $crawler->filter('a[class="sonata-admin-frontend-link"]'));
     }
+    
+    private function assertResponseOk(Response $response)
+    {
+        $this->assertEquals(200, $response->getStatusCode(), $response->getContent());
+    }
 }

Tests/WebTest/RouteAdminTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\HttpFoundation\Response;
 
 class RouteAdminTest extends BaseTestCase
 {
@@ -33,15 +34,15 @@ public function testRouteList()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/route/list');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
         $this->assertCount(1, $crawler->filter('html:contains("route-1")'));
     }
 
     public function testRouteEdit()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/route/test/routing/route-1/edit');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
         $this->assertCount(1, $crawler->filter('input[value="route-1"]'));
 
         $this->assertFrontendLinkPresent($crawler);
@@ -51,14 +52,14 @@ public function testRouteShow()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/route/test/routing/route-1/show');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
     }
 
     public function testRouteCreate()
     {
         $crawler = $this->client->request('GET', '/admin/cmf/routing/route/create');
         $res = $this->client->getResponse();
-        $this->assertEquals(200, $res->getStatusCode());
+        $this->assertResponseOk($res);
 
         $this->assertFrontendLinkNotPresent($crawler);
 
@@ -94,4 +95,9 @@ private function assertFrontendLinkNotPresent(Crawler $crawler)
     {
         $this->assertCount(0, $crawler->filter('a[class="sonata-admin-frontend-link"]'));
     }
+    
+    private function assertResponseOk(Response $response)
+    {
+        $this->assertEquals(200, $response->getStatusCode(), $response->getContent());
+    }
 }