Skip to content

Commit

Permalink
cs fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu committed Aug 5, 2013
1 parent dd47bba commit c3e0c82
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 0 additions & 2 deletions Enhancer/FieldByClassEnhancer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

use Symfony\Component\HttpFoundation\Request;

use Symfony\Cmf\Component\Routing\RouteObjectInterface;

/**
* This enhancer sets a field if not yet existing from the class of an object
* in another field.
Expand Down
4 changes: 2 additions & 2 deletions Enhancer/RouteContentEnhancer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

namespace Symfony\Cmf\Component\Routing\Enhancer;

use Symfony\Component\Routing\Route;
use Symfony\Component\HttpFoundation\Request;

use Symfony\Cmf\Component\Routing\RouteObjectInterface;

/**
* This enhancer sets the content to target field if the route provides content
* This enhancer sets the content to target field if the route provides content.
*
* Only works with RouteObjectInterface routes that can return a referenced
* content.
Expand Down Expand Up @@ -56,6 +55,7 @@ public function enhance(array $defaults, Request $request)
// we can't determine the content
return $defaults;
}
/** @var $route RouteObjectInterface */
$route = $defaults[$this->routefield];

$content = $route->getContent();
Expand Down
6 changes: 3 additions & 3 deletions Enhancer/RouteEnhancerInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Symfony\Cmf\Component\Routing\Enhancer;

use Symfony\Component\Routing\Route;
use Symfony\Component\HttpFoundation\Request;

/**
Expand All @@ -19,9 +18,10 @@ interface RouteEnhancerInterface
/**
* Update the defaults based on its own data and the request.
*
* @param array $defaults the getRouteDefaults array
* @param array $defaults the getRouteDefaults array.
*
* @return array the modified defaults. Each enhancer MUST return the $defaults but may add or remove values
* @return array the modified defaults. Each enhancer MUST return the
* $defaults but may add or remove values.
*/
public function enhance(array $defaults, Request $request);
}
5 changes: 2 additions & 3 deletions NestedMatcher/NestedMatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
use Symfony\Component\Routing\Route;
use Symfony\Cmf\Component\Routing\RouteProviderInterface;

/**
Expand Down Expand Up @@ -55,7 +54,7 @@ class NestedMatcher implements RequestMatcherInterface
/**
* Constructs a new NestedMatcher
*
* @param RouteProviderInterface $provider The Route Provider this matcher
* @param RouteProviderInterface $provider The route provider this matcher
* should use
* @param FinalMatcherInterface $final The Final Matcher to match the
* routes
Expand Down Expand Up @@ -135,7 +134,7 @@ public function matchRequest(Request $request)
throw new ResourceNotFoundException();
}

// Route Filters are expected to throw an exception themselves if they
// Route filters are expected to throw an exception themselves if they
// end up filtering the list down to 0.
foreach ($this->getRouteFilters() as $filter) {
$collection = $filter->filter($collection, $request);
Expand Down

0 comments on commit c3e0c82

Please sign in to comment.