CS cleanups

Author: dbu

Candidates/Candidates.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Component\Routing\Candidates;
 
-use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -98,7 +97,7 @@ public function getCandidates(Request $request)
     /**
      * Determine the locale of this URL.
      *
-     * @param string          $url The url to determine the locale from.
+     * @param string $url The url to determine the locale from.
      *
      * @return string|boolean The locale if $url starts with one of the allowed locales.
      */
@@ -125,7 +124,7 @@ protected function determineLocale($url)
      * @param string $prefix A prefix to prepend to every pattern.
      *
      * @return array Paths that could represent routes that match $url and are
-     *      child of $prefix.
+     *               child of $prefix.
      */
     protected function getCandidatesFor($url, $prefix = '')
     {

Candidates/CandidatesInterface.php

@@ -26,7 +26,7 @@ interface CandidatesInterface
      *
      * @return array a list of PHPCR-ODM ids
      */
-    function getCandidates(Request $request);
+    public function getCandidates(Request $request);
 
     /**
      * Determine if $name is a valid candidate, e.g. in getRouteByName.
@@ -35,13 +35,13 @@ function getCandidates(Request $request);
      *
      * @return boolean
      */
-    function isCandidate($name);
+    public function isCandidate($name);
 
     /**
      * Provide a best effort query restriction to limit a query to only find
      * routes that are supported.
      *
      * @param object $queryBuilder A query builder suited for the storage backend.
      */
-    function restrictQuery($queryBuilder);
+    public function restrictQuery($queryBuilder);
 }

ChainRouteCollection.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\Config\Resource\ResourceInterface;
@@ -60,6 +59,7 @@ public function count()
         foreach ($this->routeCollections as $routeCollection) {
             $count+= $routeCollection->count();
         }
+
         return $count;
     }
 
@@ -128,7 +128,7 @@ public function remove($name)
      * Adds a route collection at the end of the current set by appending all
      * routes of the added collection.
      *
-     * @param RouteCollection $collection      A RouteCollection instance
+     * @param RouteCollection $collection A RouteCollection instance
      */
     public function addCollection(RouteCollection $collection)
     {

ChainRouter.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\Routing\RouterInterface;

ChainedRouterInterface.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\Routing\RouterInterface;

ContentAwareGenerator.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 use Doctrine\Common\Collections\Collection;
@@ -58,10 +57,11 @@ public function setContentRepository(ContentRepositoryInterface $contentReposito
     /**
      * {@inheritDoc}
      *
-     * @param string $name       ignored
+     * @param string $name       ignored.
      * @param array  $parameters must either contain the field 'route' with a
-     *      RouteObjectInterface or the field 'content_id' with a document
-     *      id to get the route for (implementing RouteReferrersReadInterface)
+     *                           RouteObjectInterface or the field 'content_id'
+     *                           with the id of a document implementing
+     *                           RouteReferrersReadInterface.
      *
      * @throws RouteNotFoundException If there is no such route in the database
      */
@@ -152,7 +152,7 @@ protected function getBestLocaleRoute(SymfonyRoute $route, $parameters)
      *
      * @param mixed $name
      * @param array $parameters which should contain a content field containing
-     *      a RouteReferrersReadInterface object
+     *                          a RouteReferrersReadInterface object
      *
      * @return SymfonyRoute the route instance
      *
@@ -225,8 +225,9 @@ protected function getRouteByLocale($routes, $locale)
      * @param SymfonyRoute $route
      * @param string       $locale
      *
-     * @return bool TRUE if there is either no $locale, no _locale requirement
-     *      on the route or if the requirement and the passed $locale match.
+     * @return bool true if there is either no $locale, no _locale requirement
+     *              on the route or if the requirement and the passed $locale
+     *              match.
      */
     private function checkLocaleRequirement(SymfonyRoute $route, $locale)
     {
@@ -242,8 +243,8 @@ private function checkLocaleRequirement(SymfonyRoute $route, $locale)
      * @param array $parameters the parameters determined by the route
      *
      * @return string the locale following of the parameters or any other
-     *  information the router has available. defaultLocale if no other locale
-     *  can be determined.
+     *                information the router has available. defaultLocale if no
+     *                other locale can be determined.
      */
     protected function getLocale($parameters)
     {

ContentRepositoryInterface.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 /**

DependencyInjection/Compiler/RegisterRouteEnhancersPass.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

DependencyInjection/Compiler/RegisterRoutersPass.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

DynamicRouter.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -191,13 +190,13 @@ public function supports($name)
      * exceptions documented below.
      *
      * @param string $pathinfo The path info to be parsed (raw format, i.e. not
-     *      urldecoded)
+     *                         urldecoded)
      *
      * @return array An array of parameters
      *
      * @throws ResourceNotFoundException If the resource could not be found
      * @throws MethodNotAllowedException If the resource was found but the
-     *      request method is not allowed
+     *                                   request method is not allowed
      *
      * @api
      */
@@ -236,7 +235,7 @@ public function match($pathinfo)
      *
      * @throws ResourceNotFoundException If no matching resource could be found
      * @throws MethodNotAllowedException If a matching resource was found but
-     *      the request method is not allowed
+     *                                   the request method is not allowed
      */
     public function matchRequest(Request $request)
     {