Added extra tests for new and deprecated behaviour

Author: acrobat

tests/Unit/Routing/ChainRouterTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Cmf\Component\Routing\ChainRouter;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\VersatileGeneratorInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
@@ -717,6 +718,54 @@ public function testGenerateObjectName()
         $this->assertEquals($name, $result);
     }
 
+    public function testGenerateWithObjectNameInParametersNotFoundVersatile()
+    {
+        $name = RouteObjectInterface::OBJECT_BASED_ROUTE_NAME;
+        $parameters = ['test' => 'value', '_route_object' => new \stdClass()];
+
+        $chainedRouter = $this->createMock(VersatileRouter::class);
+        $chainedRouter
+            ->expects($this->once())
+            ->method('supports')
+            ->willReturn(true)
+        ;
+        $chainedRouter->expects($this->once())
+            ->method('generate')
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
+            ->will($this->throwException(new RouteNotFoundException()))
+        ;
+        $chainedRouter->expects($this->once())
+            ->method('getRouteDebugMessage')
+            ->with($name, $parameters)
+            ->willReturn('message')
+        ;
+
+        $this->router->add($chainedRouter, 10);
+
+        $this->expectException(RouteNotFoundException::class);
+        $this->router->generate($name, $parameters);
+    }
+
+    public function testGenerateWithObjectNameInParameters()
+    {
+        $name = RouteObjectInterface::OBJECT_BASED_ROUTE_NAME;
+        $parameters = ['test' => 'value', '_route_object' => new \stdClass()];
+
+        $defaultRouter = $this->createMock(RouterInterface::class);
+
+        $defaultRouter
+            ->expects($this->once())
+            ->method('generate')
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
+            ->willReturn($name)
+        ;
+
+        $this->router->add($defaultRouter, 200);
+
+        $result = $this->router->generate($name, $parameters);
+        $this->assertEquals($name, $result);
+    }
+
     public function testWarmup()
     {
         $dir = 'test_dir';

tests/Unit/Routing/ContentAwareGeneratorTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Routing\ContentAwareGenerator;
 use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 use Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock;
@@ -87,6 +88,19 @@ public function testGenerateFromContent()
         $this->assertEquals('result_url', $this->generator->generate($this->contentDocument));
     }
 
+    public function testGenerateFromContentInParameters()
+    {
+        $this->provider->expects($this->never())
+            ->method('getRouteByName')
+        ;
+        $this->routeDocument->expects($this->once())
+            ->method('compile')
+            ->willReturn($this->routeCompiled)
+        ;
+
+        $this->assertEquals('result_url', $this->generator->generate(RouteObjectInterface::OBJECT_BASED_ROUTE_NAME, [RouteObjectInterface::ROUTE_OBJECT => $this->routeDocument]));
+    }
+
     public function testGenerateFromContentId()
     {
         $this->provider->expects($this->never())