8000 [Routing] removed tree structure from RouteCollection by Tobion · Pull Request #6120 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Routing] removed tree structure from RouteCollection #6120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 6, 2012
Merged

[Routing] removed tree structure from RouteCollection #6120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98f3ca8
[Routing] removed tree structure from RouteCollection
Tobion Nov 26, 2012
50e6259
adjusted tests
Tobion Nov 26, 2012
51223c0
added upgrade instructions
Tobion Nov 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjusted tests
  • Loading branch information
@Tobion
Tobion committed Nov 26, 2012
commit 50e625962c004650e03c8e2481591e7ae8170b42
4 changes: 2 additions & 2 deletions src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ public function getRouteCollections()
$collection3 = new RouteCollection();
$collection3->add('overridden2', new Route('/new'));
$collection3->add('hey', new Route('/hey/'));
$collection1->addCollection($collection2);
$collection2->addCollection($collection3);
$collection1->addCollection($collection2);
$collection->addCollection($collection1, '/multi');

// "dynamic" prefix
Expand Down 8000 Expand Up @@ -216,8 +216,8 @@ public function getRouteCollections()
$collection3 = new RouteCollection();
$collection3->add('c', new Route('/{var}'));

$collection1->addCollection($collection2, '/b');
$collection2->addCollection($collection3, '/c');
$collection1->addCollection($collection2, '/b');
$collection->addCollection($collection1, '/a');

/* test case 2 */
Expand Down
74 changes: 5 additions & 69 deletions src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public function testIteratorWithOverriddenRoutes()
$collection->add('foo', new Route('/foo'));

$collection1 = new RouteCollection();
$collection->addCollection($collection1);
$collection1->add('foo', new Route('/foo1'));
$collection->addCollection($collection1);

$this->assertEquals('/foo1', $this->getFirstNamedRoute($collection, 'foo')->getPattern());
}
Expand All @@ -82,8 +82,8 @@ public function testCount()
$collection->add('foo', new Route('/foo'));

$collection1 = new RouteCollection();
$collection->addCollection($collection1);
$collection1->add('foo1', new Route('/foo1'));
$collection->addCollection($collection1);

$this->assertCount(2, $collection);
}
Expand Down Expand Up @@ -212,19 +212,12 @@ public function testUniqueRouteWithGivenName()
$collection3 = new RouteCollection();
$collection3->add('foo', $new = new Route('/new'));

$collection1->addCollection($collection2);
$collection2->addCollection($collection3);

$collection1->add('stay', new Route('/stay'));

$iterator = $collection1->getIterator();
$collection1->addCollection($collection2);

$this->assertSame($new, $collection1->get('foo'), '->get() returns new route that overrode previous one');
// size of 2 because collection1 contains collection2 and /stay but not /old anymore
$this->assertCount(2, $iterator, '->addCollection() removes previous routes when adding new routes with the same name');
$this->assertInstanceOf('Symfony\Component\Routing\RouteCollection', $iterator->current(), '->getIterator returns both Routes and RouteCollections');
$iterator->next();
$this->assertInstanceOf('Symfony\Component\Routing\Route', $iterator->current(), '->getIterator returns both Routes and RouteCollections');
// size of 1 because collection1 contains /new but not /old anymore
$this->assertCount(1, $collection1->getIterator(), '->addCollection() removes previous routes when adding new routes with the same name');
}

public function testGet()
Expand All @@ -241,63 +234,6 @@ public function testGet()
$this->assertNull($collection1->get(0), '->get() does not disclose internal child RouteCollection');
}

/**
* @expectedException \InvalidArgumentException
*/
public function testCannotSelfJoinCollection()
{
$collection = new RouteCollection();

$collection->addCollection($collection);
}

/**
* @expectedException \InvalidArgumentException
*/
public function testCannotAddExistingCollectionToTree()
{
$collection1 = new RouteCollection();
$collection2 = new RouteCollection();
$collection3 = new RouteCollection();

$collection1->addCollection($collection2);
$collection1->addCollection($collection3);
$collection2->addCollection($collection3);
}

public function testPatternDoesNotChangeWhenDefinitionOrderChanges()
{
$collection1 = new RouteCollection();
$collection1->add('a', new Route('/a...'));
$collection2 = new RouteCollection();
$collection2->add('b', new Route('/b...'));
$collection3 = new RouteCollection();
$collection3->add('c', new Route('/c...'));

$rootCollection_A = new RouteCollection();
$collection2->addCollection($collection3, '/c');
$collection1->addCollection($collection2, '/b');
$rootCollection_A->addCollection($collection1, '/a');

// above should mean the same as below

$collection1 = new RouteCollection();
$collection1->add('a', new Route('/a...'));
$collection2 = new RouteCollection();
$collection2->add('b', new Route('/b...'));
$collection3 = new RouteCollection();
$collection3->add('c', new Route('/c...'));

$rootCollection_B = new RouteCollection();
$collection1->addCollection($collection2, '/b');
$collection2->addCollection($collection3, '/c');
$rootCollection_B->addCollection($collection1, '/a');

// test it now

$this->assertEquals($rootCollection_A, $rootCollection_B);
}

public function testSetHostnamePattern()
{
$collection = new RouteCollection();
Expand Down
0