Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4:
  Remove unneeded phpdocs
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents 6262c12 + 255a834 commit 671f4bb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 25 deletions.
19 changes: 8 additions & 11 deletions Loader/XmlFileLoader.php
Expand Up @@ -63,10 +63,9 @@ public function load($file, string $type = null)
/**
* Parses a node from a loaded XML file.
*
* @param RouteCollection $collection Collection to associate with the node
* @param \DOMElement $node Element to parse
* @param string $path Full path of the XML file being processed
* @param string $file Loaded file name
* @param \DOMElement $node Element to parse
* @param string $path Full path of the XML file being processed
* @param string $file Loaded file name
*
* @throws \InvalidArgumentException When the XML is invalid
*/
Expand Down Expand Up @@ -99,9 +98,8 @@ public function supports($resource, string $type = null)
/**
* Parses a route and adds it to the RouteCollection.
*
* @param RouteCollection $collection RouteCollection instance
* @param \DOMElement $node Element to parse that represents a Route
* @param string $path Full path of the XML file being processed
* @param \DOMElement $node Element to parse that represents a Route
* @param string $path Full path of the XML file being processed
*
* @throws \InvalidArgumentException When the XML is invalid
*/
Expand Down Expand Up @@ -140,10 +138,9 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
/**
* Parses an import and adds the routes in the resource to the RouteCollection.
*
* @param RouteCollection $collection RouteCollection instance
* @param \DOMElement $node Element to parse that represents a Route
* @param string $path Full path of the XML file being processed
* @param string $file Loaded file name
* @param \DOMElement $node Element to parse that represents a Route
* @param string $path Full path of the XML file being processed
* @param string $file Loaded file name
*
* @throws \InvalidArgumentException When the XML is invalid
*/
Expand Down
5 changes: 1 addition & 4 deletions Matcher/UrlMatcher.php
Expand Up @@ -120,8 +120,7 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
/**
* Tries to match a URL with a set of routes.
*
* @param string $pathinfo The path info to be parsed
* @param RouteCollection $routes The set of routes
* @param string $pathinfo The path info to be parsed
*
* @return array An array of parameters
*
Expand Down Expand Up @@ -208,7 +207,6 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
* in matchers that do not have access to the matched Route instance
* (like the PHP and Apache matcher dumpers).
*
* @param Route $route The route we are matching against
* @param string $name The name of the route
* @param array $attributes An array of attributes from the matcher
*
Expand All @@ -231,7 +229,6 @@ protected function getAttributes(Route $route, $name, array $attributes)
*
* @param string $pathinfo The path
* @param string $name The route name
* @param Route $route The route
*
* @return array The first element represents the status, the second contains additional information
*/
Expand Down
4 changes: 0 additions & 4 deletions Route.php
Expand Up @@ -259,8 +259,6 @@ public function getOptions()
*
* This method implements a fluent interface.
*
* @param array $options The options
*
* @return $this
*/
public function setOptions(array $options)
Expand All @@ -277,8 +275,6 @@ public function setOptions(array $options)
*
* This method implements a fluent interface.
*
* @param array $options The options
*
* @return $this
*/
public function addOptions(array $options)
Expand Down
3 changes: 0 additions & 3 deletions RouteCollection.php
Expand Up @@ -66,9 +66,6 @@ public function count()
return \count($this->routes);
}

/**
* Adds a route.
*/
public function add(string $name, Route $route)
{
unset($this->routes[$name]);
Expand Down
4 changes: 1 addition & 3 deletions RouteCollectionBuilder.php
Expand Up @@ -115,8 +115,7 @@ public function createBuilder()
/**
* Add a RouteCollectionBuilder.
*
* @param string $prefix
* @param RouteCollectionBuilder $builder
* @param string $prefix
*/
public function mount($prefix, self $builder)
{
Expand All @@ -127,7 +126,6 @@ public function mount($prefix, self $builder)
/**
* Adds a Route object to the builder.
*
* @param Route $route
* @param string|null $name
*
* @return $this
Expand Down

0 comments on commit 671f4bb

Please sign in to comment.