Merge pull request #159 from symfony-cmf/styleci

Added styleci

Author: dbu

.styleci.yml

@@ -0,0 +1 @@
+preset: symfony

Candidates/Candidates.php

@@ -60,7 +60,7 @@ public function setLocales(array $locales)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * Always returns true.
      */
@@ -70,7 +70,7 @@ public function isCandidate($name)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * Does nothing.
      */
@@ -79,7 +79,7 @@ public function restrictQuery($queryBuilder)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getCandidates(Request $request)
     {
@@ -99,7 +99,7 @@ public function getCandidates(Request $request)
      *
      * @param string $url The url to determine the locale from.
      *
-     * @return string|boolean The locale if $url starts with one of the allowed locales.
+     * @return string|bool The locale if $url starts with one of the allowed locales.
      */
     protected function determineLocale($url)
     {
@@ -108,7 +108,7 @@ protected function determineLocale($url)
         }
 
         $matches = array();
-        if (preg_match('#(' . implode('|', $this->locales) . ')(/|$)#', $url, $matches)) {
+        if (preg_match('#('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
             return $matches[1];
         }
 
@@ -132,7 +132,7 @@ protected function getCandidatesFor($url, $prefix = '')
         if ('/' !== $url) {
             // handle format extension, like .html or .json
             if (preg_match('/(.+)\.[a-z]+$/i', $url, $matches)) {
-                $candidates[] = $prefix . $url;
+                $candidates[] = $prefix.$url;
                 $url = $matches[1];
             }
 
@@ -142,7 +142,7 @@ protected function getCandidatesFor($url, $prefix = '')
                 if (++$count > $this->limit) {
                     return $candidates;
                 }
-                $candidates[] = $prefix . $part;
+                $candidates[] = $prefix.$part;
                 $part = substr($url, 0, $pos);
             }
         }

Candidates/CandidatesInterface.php

@@ -33,7 +33,7 @@ public function getCandidates(Request $request);
      *
      * @param string $name
      *
-     * @return boolean
+     * @return bool
      */
     public function isCandidate($name);
 

ChainRouteCollection.php

@@ -57,7 +57,7 @@ public function count()
     {
         $count = 0;
         foreach ($this->routeCollections as $routeCollection) {
-            $count+= $routeCollection->count();
+            $count += $routeCollection->count();
         }
 
         return $count;
@@ -106,11 +106,11 @@ public function get($name)
             }
         }
 
-        return null;
+        return;
     }
 
     /**
-     * Removes a route or an array of routes by name from the collection
+     * Removes a route or an array of routes by name from the collection.
      *
      * @param string|array $name The route name or an array of route names
      */

ChainRouter.php

@@ -38,7 +38,8 @@ class ChainRouter implements ChainRouterInterface, WarmableInterface
     private $context;
 
     /**
-     * Array of arrays of routers grouped by priority
+     * Array of arrays of routers grouped by priority.
+     *
      * @var array
      */
     private $routers = array();
@@ -117,7 +118,7 @@ public function all()
 
     /**
      * Sort routers by priority.
-     * The highest priority number is the highest priority (reverse sorting)
+     * The highest priority number is the highest priority (reverse sorting).
      *
      * @return RouterInterface[]
      */
@@ -308,13 +309,12 @@ public function getRouteCollection()
     }
 
     /**
-     * Identify if any routers have been added into the chain yet
+     * Identify if any routers have been added into the chain yet.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasRouters()
     {
-    	return !empty($this->routers);
+        return !empty($this->routers);
     }
-
 }

ChainRouterInterface.php

@@ -26,7 +26,7 @@ interface ChainRouterInterface extends RouterInterface, RequestMatcherInterface
      *
      * @param RouterInterface $router   The router instance. Instead of RouterInterface, may also
      *                                  be RequestMatcherInterface and UrlGeneratorInterface.
-     * @param integer         $priority The priority
+     * @param int             $priority The priority
      */
     public function add($router, $priority = 0);
 

ContentAwareGenerator.php

@@ -37,16 +37,16 @@ class ContentAwareGenerator extends ProviderBasedGenerator
 
     /**
      * The content repository used to find content by it's id
-     * This can be used to specify a parameter content_id when generating urls
+     * This can be used to specify a parameter content_id when generating urls.
      *
      * This is optional and might not be initialized.
      *
-     * @var  ContentRepositoryInterface
+     * @var ContentRepositoryInterface
      */
     protected $contentRepository;
 
     /**
-     * Set an optional content repository to find content by ids
+     * Set an optional content repository to find content by ids.
      *
      * @param ContentRepositoryInterface $contentRepository
      */
@@ -56,7 +56,7 @@ public function setContentRepository(ContentRepositoryInterface $contentReposito
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * @param string $name       ignored.
      * @param array  $parameters must either contain the field 'route' with a
@@ -76,7 +76,7 @@ public function generate($name, $parameters = array(), $absolute = UrlGeneratorI
             $route = $this->getRouteByContent($name, $parameters);
         }
 
-        if (! $route instanceof SymfonyRoute) {
+        if (!$route instanceof SymfonyRoute) {
             $hint = is_object($route) ? get_class($route) : gettype($route);
             throw new RouteNotFoundException('Route of this document is not an instance of Symfony\Component\Routing\Route but: '.$hint);
         }
@@ -87,7 +87,7 @@ public function generate($name, $parameters = array(), $absolute = UrlGeneratorI
     }
 
     /**
-     * Get the route by a string name
+     * Get the route by a string name.
      *
      * @param string $route
      * @param array  $parameters
@@ -100,7 +100,7 @@ protected function getRouteByName($name, array $parameters)
     {
         $route = $this->provider->getRouteByName($name);
         if (empty($route)) {
-            throw new RouteNotFoundException('No route found for name: ' . $name);
+            throw new RouteNotFoundException('No route found for name: '.$name);
         }
 
         return $this->getBestLocaleRoute($route, $parameters);
@@ -117,12 +117,12 @@ protected function getRouteByName($name, array $parameters)
      */
     protected function getBestLocaleRoute(SymfonyRoute $route, $parameters)
     {
-        if (! $route instanceof RouteObjectInterface) {
+        if (!$route instanceof RouteObjectInterface) {
             // this route has no content, we can't get the alternatives
             return $route;
         }
         $locale = $this->getLocale($parameters);
-        if (! $this->checkLocaleRequirement($route, $locale)) {
+        if (!$this->checkLocaleRequirement($route, $locale)) {
             $content = $route->getContent();
             if ($content instanceof RouteReferrersReadInterface) {
                 $routes = $content->getRoutes();
@@ -168,10 +168,10 @@ protected function getRouteByContent($name, &$parameters)
         ) {
             $content = $this->contentRepository->findById($parameters['content_id']);
             if (empty($content)) {
-                throw new RouteNotFoundException('The content repository found nothing at id ' . $parameters['content_id']);
+                throw new RouteNotFoundException('The content repository found nothing at id '.$parameters['content_id']);
             }
             if (!$content instanceof RouteReferrersReadInterface) {
-                throw new RouteNotFoundException('Content repository did not return a RouteReferrersReadInterface instance for id ' . $parameters['content_id']);
+                throw new RouteNotFoundException('Content repository did not return a RouteReferrersReadInterface instance for id '.$parameters['content_id']);
             }
         } else {
             $hint = is_object($name) ? get_class($name) : gettype($name);
@@ -183,7 +183,7 @@ protected function getRouteByContent($name, &$parameters)
             $hint = ($this->contentRepository && $this->contentRepository->getContentId($content))
                 ? $this->contentRepository->getContentId($content)
                 : get_class($content);
-            throw new RouteNotFoundException('Content document has no route: ' . $hint);
+            throw new RouteNotFoundException('Content document has no route: '.$hint);
         }
 
         unset($parameters['content_id']);
@@ -210,7 +210,7 @@ protected function getRouteByContent($name, &$parameters)
     protected function getRouteByLocale($routes, $locale)
     {
         foreach ($routes as $route) {
-            if (! $route instanceof SymfonyRoute) {
+            if (!$route instanceof SymfonyRoute) {
                 continue;
             }
 
@@ -239,7 +239,7 @@ private function checkLocaleRequirement(SymfonyRoute $route, $locale)
     }
 
     /**
-     * Determine the locale to be used with this request
+     * Determine the locale to be used with this request.
      *
      * @param array $parameters the parameters determined by the route
      *
@@ -272,24 +272,24 @@ public function setDefaultLocale($locale)
     }
 
     /**
-     * We additionally support empty name and data in parameters and RouteAware content
+     * We additionally support empty name and data in parameters and RouteAware content.
      */
     public function supports($name)
     {
-        return ! $name || parent::supports($name) || $name instanceof RouteReferrersReadInterface;
+        return !$name || parent::supports($name) || $name instanceof RouteReferrersReadInterface;
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getRouteDebugMessage($name, array $parameters = array())
     {
         if (empty($name) && isset($parameters['content_id'])) {
-            return 'Content id ' . $parameters['content_id'];
+            return 'Content id '.$parameters['content_id'];
         }
 
         if ($name instanceof RouteReferrersReadInterface) {
-            return 'Route aware content ' . parent::getRouteDebugMessage($name, $parameters);
+            return 'Route aware content '.parent::getRouteDebugMessage($name, $parameters);
         }
 
         return parent::getRouteDebugMessage($name, $parameters);

DynamicRouter.php

@@ -59,15 +59,15 @@ class DynamicRouter implements RouterInterface, RequestMatcherInterface, Chained
     protected $enhancers = array();
 
     /**
-     * Cached sorted list of enhancers
+     * Cached sorted list of enhancers.
      *
      * @var RouteEnhancerInterface[]
      */
     protected $sortedEnhancers = array();
 
     /**
      * The regexp pattern that needs to be matched before a dynamic lookup is
-     * made
+     * made.
      *
      * @var string
      */
@@ -99,7 +99,7 @@ public function __construct(RequestContext $context,
                                 RouteProviderInterface $provider = null
     ) {
         $this->context = $context;
-        if (! $matcher instanceof RequestMatcherInterface && ! $matcher instanceof UrlMatcherInterface) {
+        if (!$matcher instanceof RequestMatcherInterface && !$matcher instanceof UrlMatcherInterface) {
             throw new \InvalidArgumentException('Matcher must implement either Symfony\Component\Routing\Matcher\RequestMatcherInterface or Symfony\Component\Routing\Matcher\UrlMatcherInterface');
         }
         $this->matcher = $matcher;
@@ -112,7 +112,7 @@ public function __construct(RequestContext $context,
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getRouteCollection()
     {
@@ -181,9 +181,9 @@ public function generate($name, $parameters = array(), $referenceType = false)
     }
 
     /**
-     * Delegate to our generator
+     * Delegate to our generator.
      *
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function supports($name)
     {
@@ -216,19 +216,19 @@ public function supports($name)
     public function match($pathinfo)
     {
         @trigger_error(__METHOD__.'() is deprecated since version 1.3 and will be removed in 2.0. Use matchRequest() instead.', E_USER_DEPRECATED);
-        
+
         $request = Request::create($pathinfo);
         if ($this->eventDispatcher) {
             $event = new RouterMatchEvent();
             $this->eventDispatcher->dispatch(Events::PRE_DYNAMIC_MATCH, $event);
         }
 
-        if (! empty($this->uriFilterRegexp) && ! preg_match($this->uriFilterRegexp, $pathinfo)) {
+        if (!empty($this->uriFilterRegexp) && !preg_match($this->uriFilterRegexp, $pathinfo)) {
             throw new ResourceNotFoundException("$pathinfo does not match the '{$this->uriFilterRegexp}' pattern");
         }
 
         $matcher = $this->getMatcher();
-        if (! $matcher instanceof UrlMatcherInterface) {
+        if (!$matcher instanceof UrlMatcherInterface) {
             throw new \InvalidArgumentException('Wrong matcher type, you need to call matchRequest');
         }
 
@@ -259,8 +259,8 @@ public function matchRequest(Request $request)
             $this->eventDispatcher->dispatch(Events::PRE_DYNAMIC_MATCH_REQUEST, $event);
         }
 
-        if (! empty($this->uriFilterRegexp)
-            && ! preg_match($this->uriFilterRegexp, $request->getPathInfo())
+        if (!empty($this->uriFilterRegexp)
+            && !preg_match($this->uriFilterRegexp, $request->getPathInfo())
         ) {
             throw new ResourceNotFoundException("{$request->getPathInfo()} does not match the '{$this->uriFilterRegexp}' pattern");
         }
@@ -276,7 +276,7 @@ public function matchRequest(Request $request)
     }
 
     /**
-     * Apply the route enhancers to the defaults, according to priorities
+     * Apply the route enhancers to the defaults, according to priorities.
      *
      * @param array   $defaults
      * @param Request $request
@@ -372,7 +372,7 @@ public function getContext()
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * Forwards to the generator.
      */