Merge pull request #257 from symfony-cmf/fix-ci

adjust for symfony cs rules

Author: dbu

.styleci.yml

@@ -18,13 +18,8 @@ preset: symfony
 
 enabled:
   - combine_consecutive_unsets
-  - short_array_syntax
-  - newline_after_open_tag
-  - no_php4_constructor
   - no_useless_else
   - ordered_use
-  - strict
-  - php_unit_construct
 
 disabled:
   - single_line_class_definition

src/Candidates/CandidatesInterface.php

@@ -22,8 +22,6 @@
 interface CandidatesInterface
 {
     /**
-     * @param Request $request
-     *
      * @return array a list of paths
      */
     public function getCandidates(Request $request);

src/ChainRouter.php

@@ -55,7 +55,7 @@ class ChainRouter implements ChainRouterInterface, WarmableInterface
     private $routeCollection;
 
     /**
-     * @var null|LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 

src/ContentAwareGenerator.php

@@ -47,8 +47,6 @@ class ContentAwareGenerator extends ProviderBasedGenerator
 
     /**
      * Set an optional content repository to find content by ids.
-     *
-     * @param ContentRepositoryInterface $contentRepository
      */
     public function setContentRepository(ContentRepositoryInterface $contentRepository)
     {
@@ -109,7 +107,6 @@ public function generate($name, $parameters = [], $absolute = UrlGeneratorInterf
      * Get the route by a string name.
      *
      * @param string $name
-     * @param array  $parameters
      *
      * @return SymfonyRoute
      *
@@ -129,8 +126,7 @@ protected function getRouteByName($name, array $parameters)
      * Determine if there is a route with matching locale associated with the
      * given route via associated content.
      *
-     * @param SymfonyRoute $route
-     * @param array        $parameters
+     * @param array $parameters
      *
      * @return SymfonyRoute either the passed route or an alternative with better locale
      */
@@ -252,8 +248,7 @@ protected function getRouteByLocale($routes, $locale)
     }
 
     /**
-     * @param SymfonyRoute $route
-     * @param string       $locale
+     * @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

src/DynamicRouter.php

@@ -80,11 +80,8 @@ class DynamicRouter implements RouterInterface, RequestMatcherInterface, Chained
     private $routeCollection;
 
     /**
-     * @param RequestContext                              $context
      * @param RequestMatcherInterface|UrlMatcherInterface $matcher
-     * @param UrlGeneratorInterface                       $generator
      * @param string                                      $uriFilterRegexp
-     * @param EventDispatcherInterface|null               $eventDispatcher
      * @param RouteProviderInterface                      $provider
      *
      * @throws \InvalidArgumentException If the matcher is not a request or url matcher

src/Enhancer/FieldPresenceEnhancer.php

@@ -44,7 +44,7 @@ class FieldPresenceEnhancer implements RouteEnhancerInterface
     private $value;
 
     /**
-     * @param null|string $source the field name of the class, null to disable the check
+     * @param string|null $source the field name of the class, null to disable the check
      * @param string      $target the field name to set from the map
      * @param string      $value  value to set target field to if source field exists
      */

src/Enhancer/RouteEnhancerTrait.php

@@ -37,8 +37,7 @@ trait RouteEnhancerTrait
     /**
      * Apply the route enhancers to the defaults, according to priorities.
      *
-     * @param array   $defaults
-     * @param Request $request
+     * @param array $defaults
      *
      * @return array
      */
@@ -58,8 +57,7 @@ protected function applyRouteEnhancers($defaults, Request $request)
      * The order of the enhancers is determined by the priority, the higher the
      * value, the earlier the enhancer is run.
      *
-     * @param RouteEnhancerInterface $enhancer
-     * @param int                    $priority
+     * @param int $priority
      *
      * @return self
      */

src/Event/RouterGenerateEvent.php

@@ -91,8 +91,6 @@ public function getParameters()
 
     /**
      * Set the route parameters.
-     *
-     * @param array $parameters
      */
     public function setParameters(array $parameters)
     {

src/NestedMatcher/NestedMatcher.php

@@ -99,10 +99,9 @@ public function setRouteProvider(RouteProviderInterface $provider)
      *
      * Partial matchers will be run in the order in which they are added.
      *
-     * @param RouteFilterInterface $filter
-     * @param int                  $priority (optional) The priority of the
-     *                                       filter. Higher number filters will
-     *                                       be used first. Defaults to 0
+     * @param int $priority (optional) The priority of the
+     *                      filter. Higher number filters will
+     *                      be used first. Defaults to 0
      *
      * @return NestedMatcher this object to have a fluent interface
      */

src/ProviderBasedGenerator.php

@@ -32,8 +32,7 @@ class ProviderBasedGenerator extends UrlGenerator implements VersatileGeneratorI
     protected $provider;
 
     /**
-     * @param RouteProviderInterface $provider
-     * @param LoggerInterface        $logger
+     * @param LoggerInterface $logger
      */
     public function __construct(RouteProviderInterface $provider, LoggerInterface $logger = null)
     {