8000 Fluid interface for building routes in PHP by weaverryan · Pull Request #15778 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Fluid interface for building routes in PHP #15778

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

Closed
wants to merge 34 commits into from
Closed

Fluid interface for building routes in PHP #15778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
51f60fc
Adding a new framework-specific Route class
weaverryan Sep 9, 2015
6891ec8
Adding a class to make adding/importing routes easier and more fluid
weaverryan Sep 9, 2015
4e430a0
Maintaining all the RouteCollection abilities to RouteCollectionBuilder
weaverryan Sep 12, 2015
0ddadc5
Moving the prefix to the builder, so that it's consistent with other …
weaverryan Sep 13, 2015
06ea900
Adding phpdoc
weaverryan Sep 13, 2015
6b922a6
Using InvalidArgumentException
weaverryan Sep 13, 2015
14518ed
No change - renaming variable
weaverryan Sep 13, 2015
7972fc9
Adding many more tests, which included a few small bug fixes with val…
8000 weaverryan Sep 13, 2015
e11b7e0
Removed prefix argument from mount() - and added it instead to create…
weaverryan Sep 13, 2015
4d90916
fabbot!
weaverryan Sep 14, 2015
729ccbb
Renaming flush() to build()
weaverryan Sep 15, 2015
e509953
Not clearing everything on build - unnecessary, and the RouteCollecti…
weaverryan Sep 15, 2015
01e1329
Fixing phpdoc
weaverryan Sep 15, 2015
e39e0c4
Removing the FrameworkBundle Route and the ability to call Route::set…
weaverryan Sep 16, 2015
df1849f
Simplifying by transforming RouteCollection's into RouteCollectionBui…
weaverryan Sep 16, 2015
97b1eea
Fixing a bug with knowing which keys should be auto-generated
weaverryan Sep 16, 2015
e1ecde4
Minor code improvement to centralize things
weaverryan Sep 16, 2015
ecf4346
Renaming methods for clarity and consistency
weaverryan Sep 16, 2015
0dce55d
fabbot and possible test fixes
weaverryan Sep 16, 2015
f3d71ad
Allowing LoaderInterface instead of Loader
weaverryan Sep 17, 2015
8132fcb
Updating setRequirements to avoid deprecated calls
weaverryan Sep 17, 2015
b2676ec
phpdoc typo
weaverryan Sep 26, 2015
bf6790b
Making RouteCollectionBuilder's LoaderInteface optional
weaverryan Sep 30, 2015
61e4bf7
removing extra spaces
weaverryan Sep 30, 2015
8f0b956
moving into the component
weaverryan Sep 30, 2015
fbab6d4
Removing the ability to set a prefix on a builder: that only happens …
weaverryan Sep 30, 2015
012cb92
Removing the prefix from import, and making the user actually put tha…
weaverryan Sep 30, 2015
33255dd
Fixing a bug with route name collission because the prefix wasn't acc…
weaverryan Sep 30, 2015
356b114
Refactoring into private method
weaverryan Sep 30, 2015
7cb8996
fabbot
weaverryan Sep 30, 2015
573a7f1
Small tweaks suggested by fabpot, including removal of addResource(),…
weaverryan Sep 30, 2015
83f3194
stretching out logic into multiple lines: there's some discussion abo…
weaverryan Sep 30, 2015
26d656b
Fabbot
weaverryan Sep 30, 2015
42e73a2
Adding throws
weaverryan Oct 1, 2015
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
Small tweaks suggested by fabpot, including removal of addResource(),… 
… as it probably should not be needed by the end user
  • Loading branch information
@weaverryan
weaverryan committed Sep 30, 2015
commit 573a7f149aa2f214c830fb02a313d5f726ed2946
23 changes: 1 addition & 22 deletions src/Symfony/Component/Routing/RouteCollectionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
class RouteCollectionBuilder
{
/**
* A mixture of different objects that hold routes.
*
* @var Route[]|RouteCollectionBuilder[]
*/
private $routes = array();
Expand All @@ -38,7 +36,6 @@ class RouteCollectionBuilder
private $options = array();
private $schemes;
private $methods;
private $resources = array();

/**
* @param LoaderInterface $loader
Expand Down Expand Up @@ -101,9 +98,7 @@ public function add($path, $controller, $name = null)
*/
public function createBuilder()
{
$builder = new self($this->loader);

return $builder;
return new self($this->loader);
}

/**
Expand Down Expand Up @@ -241,18 +236,6 @@ public function setMethods($methods)
return $this;
}

/**
* Adds a resource for this collection.
*
* @return $this
*/
public function addResource(ResourceInterface $resource)
{
$this->resources[] = $resource;

return $this;
}

/**
* Creates the final ArrayCollection, returns it, and clears everything.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ArrayCollection?

*
Expand Down Expand Up @@ -309,10 +292,6 @@ public function build()
}
}

foreach ($this->resources as $resource) {
$routeCollection->addResource($resource);
}

return $routeCollection;
}

Expand Down
6 changes: 0 additions & 6 deletions src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ public function testFlushOrdering()

// set a default value
$routes->setDefault('_locale', 'fr');
// set an extra resource
$routes->addResource(new FileResource('foo_routing.xml'));

$actualCollection = $routes->build();

Expand All @@ -126,10 +124,6 @@ public function testFlushOrdering()
$defaults = $checkoutRoute->getDefaults();
$this->assertArrayHasKey('_locale', $defaults);
$this->assertEquals('fr', $defaults['_locale']);

// technically, we should expect 2 here (admin_routing.yml + foo_routing.xml)
// but, admin_routing.yml would be added to the collection via the loader, which is mocked
$this->assertCount(1, $actualCollection->getResources(), 'The added resource is included');
}

public function testFlushSetsRouteNames()
Expand Down
0