Merge pull request #255 from andypost/php8

dbu · web-flow · commit 97c7633c3402 · 2020-10-06T12:13:50.000+02:00
Allow installing on PHP 8
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,8 @@ matrix:
       env: SYMFONY_REQUIRE=4.4.*
     - php: 7.4
       env: SYMFONY_REQUIRE=5.0.*
+    - php: nightly
+      env: COMPOSER_FLAGS="--no-interaction --ignore-platform-reqs" SYMFONY_PHPUNIT_VERSION=9 SYMFONY_REQUIRE=5.0.*
   fast_finish: true
   allow_failures:
 
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "symfony/routing": "^4.4 || ^5.0",
         "symfony/http-kernel": "^4.4 || ^5.0",
         "psr/log": "^1.0"
diff --git a/tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php b/tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php
@@ -22,7 +22,7 @@ class ContentRepositoryEnhancerTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         $cRepository = $this->createMock(ContentRepositoryInterface::class);
         $cRepository
diff --git a/tests/Unit/Enhancer/FieldByClassEnhancerTest.php b/tests/Unit/Enhancer/FieldByClassEnhancerTest.php
@@ -26,7 +26,7 @@ class FieldByClassEnhancerTest extends TestCase
 
     private $document;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->document = $this->createMock(RouteObject::class);
 
diff --git a/tests/Unit/Enhancer/FieldMapEnhancerTest.php b/tests/Unit/Enhancer/FieldMapEnhancerTest.php
@@ -27,7 +27,7 @@ class FieldMapEnhancerTest extends TestCase
      */
     private $enhancer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = Request::create('/test');
         $mapping = ['static_pages' => 'cmf_content.controller:indexAction'];
diff --git a/tests/Unit/Enhancer/FieldPresenceEnhancerTest.php b/tests/Unit/Enhancer/FieldPresenceEnhancerTest.php
@@ -24,7 +24,7 @@ class FieldPresenceEnhancerTest extends TestCase
 
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->mapper = new FieldPresenceEnhancer('_template', '_controller', 'cmf_content.controller:indexAction');
 
diff --git a/tests/Unit/Enhancer/RouteContentEnhancerTest.php b/tests/Unit/Enhancer/RouteContentEnhancerTest.php
@@ -28,7 +28,7 @@ class RouteContentEnhancerTest extends TestCase
 
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->document = $this->createMock(RouteObject::class);
 
diff --git a/tests/Unit/NestedMatcher/NestedMatcherTest.php b/tests/Unit/NestedMatcher/NestedMatcherTest.php
@@ -31,7 +31,7 @@ class NestedMatcherTest extends TestCase
 
     private $finalMatcher;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->provider = $this->createMock(RouteProviderInterface::class);
         $this->routeFilter1 = $this->createMock(RouteFilterInterface::class);
diff --git a/tests/Unit/NestedMatcher/UrlMatcherTest.php b/tests/Unit/NestedMatcher/UrlMatcherTest.php
@@ -54,7 +54,7 @@ class UrlMatcherTest extends TestCase
      */
     private $url = '/foo/bar';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->routeDocument = $this->createMock(RouteMock::class);
         $this->routeCompiled = $this->createMock(CompiledRoute::class);
diff --git a/tests/Unit/Routing/ChainRouterTest.php b/tests/Unit/Routing/ChainRouterTest.php
@@ -42,7 +42,7 @@ class ChainRouterTest extends TestCase
      */
     private $context;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->router = new ChainRouter($this->createMock(LoggerInterface::class));
         $this->context = $this->createMock(RequestContext::class);
diff --git a/tests/Unit/Routing/ContentAwareGeneratorTest.php b/tests/Unit/Routing/ContentAwareGeneratorTest.php
@@ -538,19 +538,19 @@ public function testSupports(): void
 
     public function testGetRouteDebugMessage(): void
     {
-        $this->assertContains('/some/content', $this->generator->getRouteDebugMessage(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['content_id' => '/some/content']));
-        $this->assertContains('Route aware content Symfony\Cmf\Component\Routing\Tests\Routing\RouteAware', $this->generator->getRouteDebugMessage(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, [RouteObjectInterface::ROUTE_OBJECT => new RouteAware()]));
-        $this->assertContains('/some/content', $this->generator->getRouteDebugMessage('/some/content'));
+        $this->assertStringContainsString('/some/content', $this->generator->getRouteDebugMessage(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, ['content_id' => '/some/content']));
+        $this->assertStringContainsString('Route aware content Symfony\Cmf\Component\Routing\Tests\Routing\RouteAware', $this->generator->getRouteDebugMessage(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, [RouteObjectInterface::ROUTE_OBJECT => new RouteAware()]));
+        $this->assertStringContainsString('/some/content', $this->generator->getRouteDebugMessage('/some/content'));
     }
 
     /**
      * @legacy
      */
     public function testGetRouteDebugMessageLegacy(): void
     {
-        $this->assertContains('/some/content', $this->generator->getRouteDebugMessage(null, ['content_id' => '/some/content']));
-        $this->assertContains('Route aware content Symfony\Cmf\Component\Routing\Tests\Routing\RouteAware', $this->generator->getRouteDebugMessage(new RouteAware()));
-        $this->assertContains('/some/content', $this->generator->getRouteDebugMessage('/some/content'));
+        $this->assertStringContainsString('/some/content', $this->generator->getRouteDebugMessage(null, ['content_id' => '/some/content']));
+        $this->assertStringContainsString('Route aware content Symfony\Cmf\Component\Routing\Tests\Routing\RouteAware', $this->generator->getRouteDebugMessage(new RouteAware()));
+        $this->assertStringContainsString('/some/content', $this->generator->getRouteDebugMessage('/some/content'));
     }
 }
 
diff --git a/tests/Unit/Routing/DynamicRouterTest.php b/tests/Unit/Routing/DynamicRouterTest.php
@@ -70,7 +70,7 @@ class DynamicRouterTest extends TestCase
 
     const URL = '/foo/bar';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->routeDocument = $this->createMock(RouteMock::class);
 
@@ -157,7 +157,7 @@ public function testSupportsNonversatile()
     {
         $generator = $this->createMock(UrlGeneratorInterface::class);
         $router = new DynamicRouter($this->context, $this->matcher, $generator);
-        $this->assertInternalType('string', $router->getRouteDebugMessage('test'));
+        $this->assertIsString($router->getRouteDebugMessage('test'));
 
         $this->assertTrue($router->supports('some string'));
         $this->assertFalse($router->supports($this));
@@ -328,7 +328,7 @@ public function testRouteDebugMessageNonversatile()
     {
         $generator = $this->createMock(UrlGeneratorInterface::class);
         $router = new DynamicRouter($this->context, $this->matcher, $generator);
-        $this->assertInternalType('string', $router->getRouteDebugMessage('test'));
+        $this->assertIsString($router->getRouteDebugMessage('test'));
     }
 
     /**
diff --git a/tests/Unit/Routing/PagedRouteCollectionTest.php b/tests/Unit/Routing/PagedRouteCollectionTest.php
@@ -29,7 +29,7 @@ class PagedRouteCollectionTest extends TestCase
      */
     private $routeProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->routeProvider = $this->createMock(PagedRouteProviderInterface::class);
     }
diff --git a/tests/Unit/Routing/ProviderBasedGeneratorTest.php b/tests/Unit/Routing/ProviderBasedGeneratorTest.php
@@ -143,10 +143,10 @@ public function testSupports(): void
 
     public function testGetRouteDebugMessage(): void
     {
-        $this->assertContains('/some/key', $this->generator->getRouteDebugMessage(new RouteObject()));
-        $this->assertContains('/de/test', $this->generator->getRouteDebugMessage(new Route('/de/test')));
-        $this->assertContains('/some/route', $this->generator->getRouteDebugMessage('/some/route'));
-        $this->assertContains('a:1:{s:10:"route_name";s:7:"example";}', $this->generator->getRouteDebugMessage(['route_name' => 'example']));
+        $this->assertStringContainsString('/some/key', $this->generator->getRouteDebugMessage(new RouteObject()));
+        $this->assertStringContainsString('/de/test', $this->generator->getRouteDebugMessage(new Route('/de/test')));
+        $this->assertStringContainsString('/some/route', $this->generator->getRouteDebugMessage('/some/route'));
+        $this->assertStringContainsString('a:1:{s:10:"route_name";s:7:"example";}', $this->generator->getRouteDebugMessage(['route_name' => 'example']));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"require": {`
`18`		`- "php": "^7.2",`
	`18`	`+ "php": "^7.2 \|\| ^8.0",`
`19`	`19`	`"symfony/routing": "^4.4 \|\| ^5.0",`
`20`	`20`	`"symfony/http-kernel": "^4.4 \|\| ^5.0",`
`21`	`21`	`"psr/log": "^1.0"`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ContentRepositoryEnhancerTest extends TestCase`
`22`	`22`	`/**`
`23`	`23`	`* {@inheritdoc}`
`24`	`24`	`*/`
`25`		`- public function setUp()`
	`25`	`+ public function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`$cRepository = $this->createMock(ContentRepositoryInterface::class);`
`28`	`28`	`$cRepository`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class FieldByClassEnhancerTest extends TestCase`
`26`	`26`
`27`	`27`	`private $document;`
`28`	`28`
`29`		`- public function setUp()`
	`29`	`+ public function setUp(): void`
`30`	`30`	`{`
`31`	`31`	`$this->document = $this->createMock(RouteObject::class);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class FieldMapEnhancerTest extends TestCase`
`27`	`27`	`*/`
`28`	`28`	`private $enhancer;`
`29`	`29`
`30`		`- public function setUp()`
	`30`	`+ public function setUp(): void`
`31`	`31`	`{`
`32`	`32`	`$this->request = Request::create('/test');`
`33`	`33`	`$mapping = ['static_pages' => 'cmf_content.controller:indexAction'];`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class FieldPresenceEnhancerTest extends TestCase`
`24`	`24`
`25`	`25`	`private $request;`
`26`	`26`
`27`		`- public function setUp()`
	`27`	`+ public function setUp(): void`
`28`	`28`	`{`
`29`	`29`	`$this->mapper = new FieldPresenceEnhancer('_template', '_controller', 'cmf_content.controller:indexAction');`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class RouteContentEnhancerTest extends TestCase`
`28`	`28`
`29`	`29`	`private $request;`
`30`	`30`
`31`		`- public function setUp()`
	`31`	`+ public function setUp(): void`
`32`	`32`	`{`
`33`	`33`	`$this->document = $this->createMock(RouteObject::class);`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class NestedMatcherTest extends TestCase`
`31`	`31`
`32`	`32`	`private $finalMatcher;`
`33`	`33`
`34`		`- public function setUp()`
	`34`	`+ public function setUp(): void`
`35`	`35`	`{`
`36`	`36`	`$this->provider = $this->createMock(RouteProviderInterface::class);`
`37`	`37`	`$this->routeFilter1 = $this->createMock(RouteFilterInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class UrlMatcherTest extends TestCase`
`54`	`54`	`*/`
`55`	`55`	`private $url = '/foo/bar';`
`56`	`56`
`57`		`- public function setUp()`
	`57`	`+ public function setUp(): void`
`58`	`58`	`{`
`59`	`59`	`$this->routeDocument = $this->createMock(RouteMock::class);`
`60`	`60`	`$this->routeCompiled = $this->createMock(CompiledRoute::class);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class ChainRouterTest extends TestCase`
`42`	`42`	`*/`
`43`	`43`	`private $context;`
`44`	`44`
`45`		`- public function setUp()`
	`45`	`+ public function setUp(): void`
`46`	`46`	`{`
`47`	`47`	`$this->router = new ChainRouter($this->createMock(LoggerInterface::class));`
`48`	`48`	`$this->context = $this->createMock(RequestContext::class);`