From 66fcc089a79ac779e15dc2bc50e5f99f0eabd3c7 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Mon, 10 Dec 2018 22:18:43 +0100 Subject: [PATCH 1/3] start implementing ORM Route --- composer.json | 3 +- tests/Functional/Doctrine/Orm/OrmTestCase.php | 4 + tests/Functional/Doctrine/Orm/RouteTest.php | 89 +++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 tests/Functional/Doctrine/Orm/RouteTest.php diff --git a/composer.json b/composer.json index 657b254c..2f0f0a55 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,8 @@ "php": "^7.1", "symfony-cmf/routing": "^2.1.0", "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0", - "twig/twig": "^1.35 || ^2.4.4" + "twig/twig": "^1.35 || ^2.4.4", + "symfony/symfony": "4.1.x" }, "require-dev": { "doctrine/phpcr-odm": "^1.4|^2.0", diff --git a/tests/Functional/Doctrine/Orm/OrmTestCase.php b/tests/Functional/Doctrine/Orm/OrmTestCase.php index 400d4257..7dd859f7 100644 --- a/tests/Functional/Doctrine/Orm/OrmTestCase.php +++ b/tests/Functional/Doctrine/Orm/OrmTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional\Doctrine\Orm; +use Doctrine\Common\Persistence\ObjectManager; use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Orm\Route; use Symfony\Cmf\Component\Testing\Functional\BaseTestCase as ComponentBaseTestCase; @@ -40,6 +41,9 @@ protected function clearDb($model) $this->getDm()->flush(); } + /** + * @return ObjectManager + */ protected function getDm() { return $this->db('ORM')->getOm(); diff --git a/tests/Functional/Doctrine/Orm/RouteTest.php b/tests/Functional/Doctrine/Orm/RouteTest.php new file mode 100644 index 00000000..0fb228ae --- /dev/null +++ b/tests/Functional/Doctrine/Orm/RouteTest.php @@ -0,0 +1,89 @@ + + */ +class RouteTest extends OrmTestCase +{ + const ROUTE_ROOT = '/test/routing'; + + public function setUp() + { + parent::setUp(); + $this->clearDb(Route::class); + + $this->repository = $this->getContainer()->get('cmf_routing.route_provider'); + + $this->createRoute('root', self::ROUTE_ROOT); + } + + public function testPersist() + { + $route = new Route(); + $root = $this->getDm()->find(Route::class, self::ROUTE_ROOT); + + $route->setContent($root); // this happens to be a referenceable node + $route->setName('testroute'); + $route->setPosition(87); + $route->setDefault('x', 'y'); + $route->setRequirement('testreq', 'testregex'); + $route->setOptions(['test' => 'value']); + $route->setOption('another', 'value2'); + + + $this->getDm()->persist($route); + $this->getDm()->flush(); + $this->assertEquals('testroute', $route->getName()); + + $this->getDm()->clear(); + + $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute'); + + $this->assertNotNull($route->getContent()); + $this->assertEquals('/testroute', $route->getPath()); + + $this->assertEquals('y', $route->getDefault('x')); + $defaults = $route->getDefaults(); + $this->assertArrayHasKey('x', $defaults); + $this->assertEquals('y', $defaults['x']); + + $requirements = $route->getRequirements(); + $this->assertArrayHasKey('testreq', $requirements); + $this->assertEquals('testregex', $requirements['testreq']); + + $options = $route->getOptions(); + $this->assertArrayHasKey('test', $options); + $this->assertEquals('value', $options['test']); + $this->assertArrayHasKey('another', $options); + $this->assertEquals('value2', $options['another']); + } + + public function testPersistEmptyOptions() + { + $route = new Route(); + $root = $this->getDm()->find(Route::class, self::ROUTE_ROOT); + + $route->setPosition($root, 'empty'); + $this->getDm()->persist($route); + $this->getDm()->flush(); + + $this->getDm()->clear(); + + $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/empty'); + + $defaults = $route->getDefaults(); + $this->assertCount(0, $defaults); + + $requirements = $route->getRequirements(); + $this->assertCount(0, $requirements); + + $options = $route->getOptions(); + $this->assertTrue(1 >= count($options)); // there is a default option for the compiler + + return $route; + } +} From 3e4560091a3afe5b48ea4d3852fa3c576555a6e2 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Tue, 11 Dec 2018 02:15:22 +0100 Subject: [PATCH 2/3] get tests running, expose issue --- tests/Functional/Doctrine/Orm/OrmTestCase.php | 21 +++- tests/Functional/Doctrine/Orm/RouteTest.php | 116 ++++++++++++++---- 2 files changed, 112 insertions(+), 25 deletions(-) diff --git a/tests/Functional/Doctrine/Orm/OrmTestCase.php b/tests/Functional/Doctrine/Orm/OrmTestCase.php index 7dd859f7..d13b9c89 100644 --- a/tests/Functional/Doctrine/Orm/OrmTestCase.php +++ b/tests/Functional/Doctrine/Orm/OrmTestCase.php @@ -49,20 +49,33 @@ protected function getDm() return $this->db('ORM')->getOm(); } - protected function createRoute($name, $path) + /** + * @param string $name + * @param string $path + * + * @param array $options + * @param bool $persist + * + * @return Route + */ + protected function createRoute($name, $path, $options = [], $persist = true) { // split path in static and variable part preg_match('{^(.*?)(/[^/]*\{.*)?$}', $path, $paths); - $route = new Route(); + $route = new Route($options); $route->setName($name); $route->setStaticPrefix($paths[1]); if (isset($paths[2])) { $route->setVariablePattern($paths[2]); } - $this->getDm()->persist($route); - $this->getDm()->flush(); + if ($persist) { + echo "\n + + + Persist the route + + + \n"; + $this->getDm()->persist($route); + $this->getDm()->flush(); + $this->getDm()->clear(); + } return $route; } diff --git a/tests/Functional/Doctrine/Orm/RouteTest.php b/tests/Functional/Doctrine/Orm/RouteTest.php index 0fb228ae..a50774f9 100644 --- a/tests/Functional/Doctrine/Orm/RouteTest.php +++ b/tests/Functional/Doctrine/Orm/RouteTest.php @@ -9,25 +9,20 @@ */ class RouteTest extends OrmTestCase { - const ROUTE_ROOT = '/test/routing'; - public function setUp() { parent::setUp(); $this->clearDb(Route::class); - $this->repository = $this->getContainer()->get('cmf_routing.route_provider'); - - $this->createRoute('root', self::ROUTE_ROOT); + $this->createRoute('root', '/test/'); } public function testPersist() { - $route = new Route(); - $root = $this->getDm()->find(Route::class, self::ROUTE_ROOT); + $route = $this->createRoute('test', '/test/testroute', [], false); + $linkedRoute = $this->getDm()->find(Route::class, '/test/'); - $route->setContent($root); // this happens to be a referenceable node - $route->setName('testroute'); + $route->setContent($linkedRoute); // this happens to be a referenceable node $route->setPosition(87); $route->setDefault('x', 'y'); $route->setRequirement('testreq', 'testregex'); @@ -37,14 +32,15 @@ public function testPersist() $this->getDm()->persist($route); $this->getDm()->flush(); - $this->assertEquals('testroute', $route->getName()); + + $this->assertEquals('test', $route->getName()); $this->getDm()->clear(); - $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute'); + $route = $this->getDm()->find(Route::class, '/test/testroute'); $this->assertNotNull($route->getContent()); - $this->assertEquals('/testroute', $route->getPath()); + $this->assertEquals('/test/testroute', $route->getPath()); $this->assertEquals('y', $route->getDefault('x')); $defaults = $route->getDefaults(); @@ -64,16 +60,9 @@ public function testPersist() public function testPersistEmptyOptions() { - $route = new Route(); - $root = $this->getDm()->find(Route::class, self::ROUTE_ROOT); - - $route->setPosition($root, 'empty'); - $this->getDm()->persist($route); - $this->getDm()->flush(); - - $this->getDm()->clear(); + $this->createRoute('testroute', '/test/empty'); - $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/empty'); + $route = $this->getDm()->find(Route::class, '/test/empty'); $defaults = $route->getDefaults(); $this->assertCount(0, $defaults); @@ -86,4 +75,89 @@ public function testPersistEmptyOptions() return $route; } + + + public function testConditionOption() + { + $route = $this->createRoute('testroute', '/test/conditionroute', [], false); + $route->setCondition('foobar'); + + $this->getDm()->persist($route); + $this->getDm()->flush(); + $this->getDm()->clear(); + + $route = $this->getDm()->find(Route::class, '/test/conditionroute'); + + $this->assertEquals('foobar', $route->getCondition()); + } + + public function testRootRoute() + { + $root = $this->getDm()->find(Route::class, '/test/'); + $this->assertEquals('/test/', $root->getPath()); + } + + public function testSetPath() + { + $root = $this->getDm()->find(Route::class, '/test/'); + $this->assertEquals('/test/', $root->getStaticPrefix()); + $root->setPath('/test/{test}'); + $this->assertEquals('{test}', $root->getVariablePattern()); + } + + public function testSetPattern() + { + $root = $this->getDm()->find(Route::class, '/test'); + $root->setVariablePattern('{test}'); + $this->assertEquals('/test/{test}', $root->getPath()); + $this->assertEquals('{test}', $root->getVariablePattern()); + } + + public function testCreateVariablePattern() + { + $this->createRoute('test', '/test/{test}'); + + $route = $this->getDm()->find(Route::class, '/test/{test}'); + $this->assertEquals('/test/{test}', $route->getPath()); + $this->assertEquals('{test}', $route->getVariablePattern()); + } + + /** + * @depends testPersistEmptyOptions + * + * @expectedException \InvalidArgumentException + */ + public function testSetPatternInvalid(Route $route) + { + $route->setPath('/test/impossible'); + } + + /** + * @expectedException \LogicException + */ + public function testInvalidIdPrefix() + { + $root = $this->getDm()->find(Route::class, '/test/'); + $root->setPrefix('/test/changed'); // simulate a problem with the prefix setter listener + $this->assertEquals('/test/', $root->getPath()); + } + + /** + * @expectedException \LogicException + */ + public function testPrefixNonpersisted() + { + $route = new Route(); + $route->getPath(); + } + + public function testDefaultFormat() + { + # $route = new Route(['add_format_pattern' => true]); + $this->createRoute('test', '/test/format'); + + $route = $this->getDm()->find(Route::class, '/test/format'); + + $this->assertEquals('/test/format.{_format}', $route->getPath()); + } } From a0c51d4bac7b3913284182325c38478fd67df00e Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Tue, 11 Dec 2018 02:38:44 +0100 Subject: [PATCH 3/3] there is no path property defined --- tests/Functional/Doctrine/Orm/RouteTest.php | 20 ++--- tests/Functional/Doctrine/Phpcr/RouteTest.php | 85 ------------------- 2 files changed, 10 insertions(+), 95 deletions(-) diff --git a/tests/Functional/Doctrine/Orm/RouteTest.php b/tests/Functional/Doctrine/Orm/RouteTest.php index a50774f9..0dd80e4f 100644 --- a/tests/Functional/Doctrine/Orm/RouteTest.php +++ b/tests/Functional/Doctrine/Orm/RouteTest.php @@ -20,7 +20,7 @@ public function setUp() public function testPersist() { $route = $this->createRoute('test', '/test/testroute', [], false); - $linkedRoute = $this->getDm()->find(Route::class, '/test/'); + $linkedRoute = $this->getDm()->getRepository(Route::class)->findByPath('/test/'); $route->setContent($linkedRoute); // this happens to be a referenceable node $route->setPosition(87); @@ -37,7 +37,7 @@ public function testPersist() $this->getDm()->clear(); - $route = $this->getDm()->find(Route::class, '/test/testroute'); + $route = $this->getDm()->getRepository(Route::class)->findByPath('/test/testroute'); $this->assertNotNull($route->getContent()); $this->assertEquals('/test/testroute', $route->getPath()); @@ -62,7 +62,7 @@ public function testPersistEmptyOptions() { $this->createRoute('testroute', '/test/empty'); - $route = $this->getDm()->find(Route::class, '/test/empty'); + $route = $this->getDm()->getRepository(Route::class)->findByPath('/test/empty'); $defaults = $route->getDefaults(); $this->assertCount(0, $defaults); @@ -86,20 +86,20 @@ public function testConditionOption() $this->getDm()->flush(); $this->getDm()->clear(); - $route = $this->getDm()->find(Route::class, '/test/conditionroute'); + $route = $this->getDm()->getRepository(Route::class)->findByPath('/test/conditionroute'); $this->assertEquals('foobar', $route->getCondition()); } public function testRootRoute() { - $root = $this->getDm()->find(Route::class, '/test/'); + $root = $this->getDm()->getRepository(Route::class)->findByPath('/test/'); $this->assertEquals('/test/', $root->getPath()); } public function testSetPath() { - $root = $this->getDm()->find(Route::class, '/test/'); + $root = $this->getDm()->getRepository(Route::class)->findByPath('/test/'); $this->assertEquals('/test/', $root->getStaticPrefix()); $root->setPath('/test/{test}'); $this->assertEquals('{test}', $root->getVariablePattern()); @@ -107,7 +107,7 @@ public function testSetPath() public function testSetPattern() { - $root = $this->getDm()->find(Route::class, '/test'); + $root = $this->getDm()->getRepository(Route::class)->findByPath('/test'); $root->setVariablePattern('{test}'); $this->assertEquals('/test/{test}', $root->getPath()); $this->assertEquals('{test}', $root->getVariablePattern()); @@ -117,7 +117,7 @@ public function testCreateVariablePattern() { $this->createRoute('test', '/test/{test}'); - $route = $this->getDm()->find(Route::class, '/test/{test}'); + $route = $this->getDm()->getRepository(Route::class)->findByPath('/test/{test}'); $this->assertEquals('/test/{test}', $route->getPath()); $this->assertEquals('{test}', $route->getVariablePattern()); } @@ -137,7 +137,7 @@ public function testSetPatternInvalid(Route $route) */ public function testInvalidIdPrefix() { - $root = $this->getDm()->find(Route::class, '/test/'); + $root = $this->getDm()->getRepository(Route::class)->findByPath('/test/'); $root->setPrefix('/test/changed'); // simulate a problem with the prefix setter listener $this->assertEquals('/test/', $root->getPath()); } @@ -156,7 +156,7 @@ public function testDefaultFormat() # $route = new Route(['add_format_pattern' => true]); $this->createRoute('test', '/test/format'); - $route = $this->getDm()->find(Route::class, '/test/format'); + $route = $this->getDm()->getRepository(Route::class)->findByPath('/test/format'); $this->assertEquals('/test/format.{_format}', $route->getPath()); } diff --git a/tests/Functional/Doctrine/Phpcr/RouteTest.php b/tests/Functional/Doctrine/Phpcr/RouteTest.php index 51fccd38..f434fe05 100644 --- a/tests/Functional/Doctrine/Phpcr/RouteTest.php +++ b/tests/Functional/Doctrine/Phpcr/RouteTest.php @@ -88,89 +88,4 @@ public function testPersistEmptyOptions() return $route; } - - public function testConditionOption() - { - $route = new Route(); - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - - $route->setPosition($root, 'conditionroute'); - $route->setCondition('foobar'); - - $this->getDm()->persist($route); - $this->getDm()->flush(); - $this->getDm()->clear(); - - $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/conditionroute'); - - $this->assertEquals('foobar', $route->getCondition()); - } - - public function testRootRoute() - { - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - $this->assertEquals('/', $root->getPath()); - } - - public function testSetPath() - { - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - $this->assertEquals('/', $root->getStaticPrefix()); - $root->setPath('/{test}'); - $this->assertEquals('{test}', $root->getVariablePattern()); - } - - public function testSetPattern() - { - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - $root->setVariablePattern('{test}'); - $this->assertEquals('/{test}', $root->getPath()); - $this->assertEquals('{test}', $root->getVariablePattern()); - } - - /** - * @depends testPersistEmptyOptions - * - * @expectedException \InvalidArgumentException - */ - public function testSetPatternInvalid(Route $route) - { - $route->setPath('/impossible'); - } - - /** - * @expectedException \LogicException - */ - public function testInvalidIdPrefix() - { - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - $root->setPrefix('/changed'); // simulate a problem with the prefix setter listener - $this->assertEquals('/', $root->getPath()); - } - - /** - * @expectedException \LogicException - */ - public function testPrefixNonpersisted() - { - $route = new Route(); - $route->getPath(); - } - - public function testDefaultFormat() - { - $route = new Route(['add_format_pattern' => true]); - - $root = $this->getDm()->find(null, self::ROUTE_ROOT); - - $route->setPosition($root, 'format'); - $this->getDm()->persist($route); - $this->getDm()->flush(); - - $this->getDm()->clear(); - - $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/format'); - - $this->assertEquals('/format.{_format}', $route->getPath()); - } }