Permalink
Browse files

fixed CS

  • Loading branch information...
1 parent d5ecbda commit 84363ee909d6d4ac9b06519c3ca2cdd69971c2b8 @fabpot fabpot committed Dec 11, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −1 Generator/UrlGenerator.php
  2. +1 −0 Matcher/ApacheUrlMatcher.php
  3. +1 −1 RouteCollection.php
  4. +1 −1 RouteCompiler.php
@@ -29,7 +29,7 @@
class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInterface
{
/**
- * @var RouteCollection
+ * @var RouteCollection
*/
protected $routes;
@@ -83,6 +83,7 @@ public function match($pathinfo)
if (null !== $route) {
$parameters['_route'] = $route;
+
return $this->mergeDefaults($parameters, $defaults);
} elseif (0 < count($allow)) {
throw new MethodNotAllowedException($allow);
View
@@ -86,7 +86,7 @@ public function getRoot()
/**
* Gets the current RouteCollection as an Iterator that includes all routes.
- *
+ *
* It implements \IteratorAggregate.
*
* @see all()
View
@@ -131,7 +131,7 @@ private function compilePattern(Route $route, $pattern, $isHostname)
if (('' !== $nextSeparator && !preg_match('#^\{\w+\}#', $followingPattern)) || '' === $followingPattern) {
// When we have a separator, which is disallowed for the variable, we can optimize the regex with a possessive
// quantifier. This prevents useless backtracking of PCRE and improves performance by 20% for matching those patterns.
- // Given the above example, there is no point in backtracking into {page} (that forbids the dot) when a dot must follow
+ // Given the above example, there is no point in backtracking into {page} (that forbids the dot) when a dot must follow
// after it. This optimization cannot be applied when the next char is no real separator or when the next variable is
// directly adjacent, e.g. '/{x}{y}'.
$regexp .= '+';

0 comments on commit 84363ee

Please sign in to comment.