Merge pull request #454 from symfony-cmf/fix-cs

dbu · web-flow · commit 62f44b2a0e55 · 2020-10-22T15:32:25.000+02:00
codestyle: adjust to symfony default ruleset
diff --git a/.styleci.yml b/.styleci.yml
@@ -7,7 +7,7 @@
 ############################################################################
 # This file is part of the Symfony CMF package.                            #
 #                                                                          #
-# (c) 2011-2017 Symfony CMF                                                #
+# (c) Symfony CMF i                                                        #
 #                                                                          #
 # For the full copyright and license information, please view the LICENSE  #
 # file that was distributed with this source code.                         #
@@ -16,10 +16,10 @@
 
 preset: symfony
 
+risky: true
+
 enabled:
   - combine_consecutive_unsets
-  - short_array_syntax
-  - newline_after_open_tag
   - no_php4_constructor
   - no_useless_else
   - ordered_use
diff --git a/src/CmfRoutingBundle.php b/src/CmfRoutingBundle.php
@@ -33,9 +33,6 @@
  */
 class CmfRoutingBundle extends Bundle
 {
-    /**
-     * @param ContainerBuilder $container
-     */
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
@@ -52,8 +49,6 @@ public function build(ContainerBuilder $container)
     /**
      * Creates and registers compiler passes for PHPCR-ODM mapping if both the
      * phpcr-odm and the phpcr-bundle are present.
-     *
-     * @param ContainerBuilder $container
      */
     private function buildPhpcrCompilerPass(ContainerBuilder $container)
     {
@@ -80,8 +75,6 @@ private function buildPhpcrCompilerPass(ContainerBuilder $container)
     /**
      * Creates and registers compiler passes for ORM mappings if both doctrine
      * ORM and a suitable compiler pass implementation are available.
-     *
-     * @param ContainerBuilder $container
      */
     private function buildOrmCompilerPass(ContainerBuilder $container)
     {
diff --git a/src/Controller/RedirectController.php b/src/Controller/RedirectController.php
@@ -43,8 +43,6 @@ public function __construct(RouterInterface $router)
     /**
      * Action to redirect based on a RedirectRouteInterface route.
      *
-     * @param RedirectRouteInterface $contentDocument
-     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse the response
      */
     public function redirectAction(RedirectRouteInterface $contentDocument)
diff --git a/src/DependencyInjection/CmfRoutingExtension.php b/src/DependencyInjection/CmfRoutingExtension.php
@@ -62,7 +62,7 @@ private function setupFormTypes(array $config, ContainerBuilder $container, Load
     {
         $loader->load('form-type.xml');
 
-        if (array_key_exists('dynamic', $config)) {
+        if (\array_key_exists('dynamic', $config)) {
             $routeTypeTypeDefinition = $container->getDefinition('cmf_routing.route_type_form_type');
 
             foreach (array_keys($config['dynamic']['controllers_by_type']) as $routeType) {
@@ -94,7 +94,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $container->setParameter('cmf_routing.default_controller', $defaultController);
 
         $locales = $config['locales'];
-        if (0 === count($locales) && $config['auto_locale_pattern']) {
+        if (0 === \count($locales) && $config['auto_locale_pattern']) {
             throw new InvalidConfigurationException('It makes no sense to activate auto_locale_pattern when no locales are configured.');
         }
 
@@ -148,17 +148,17 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $dynamic = $container->getDefinition('cmf_routing.dynamic_router');
 
         // if any mappings are defined, set the respective route enhancer
-        if (count($config['controllers_by_type']) > 0) {
+        if (\count($config['controllers_by_type']) > 0) {
             $container->getDefinition('cmf_routing.enhancer.controllers_by_type')
                 ->addTag('dynamic_router_route_enhancer', ['priority' => 60]);
         }
 
-        if (count($config['controllers_by_class']) > 0) {
+        if (\count($config['controllers_by_class']) > 0) {
             $container->getDefinition('cmf_routing.enhancer.controllers_by_class')
                       ->addTag('dynamic_router_route_enhancer', ['priority' => 50]);
         }
 
-        if (count($config['templates_by_class']) > 0) {
+        if (\count($config['templates_by_class']) > 0) {
             $container->getDefinition('cmf_routing.enhancer.templates_by_class')
                       ->addTag('dynamic_router_route_enhancer', ['priority' => 40]);
 
@@ -197,7 +197,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
                       ->addTag('dynamic_router_route_enhancer', ['priority' => -100]);
         }
 
-        if (count($config['route_filters_by_id']) > 0) {
+        if (\count($config['route_filters_by_id']) > 0) {
             $matcher = $container->getDefinition('cmf_routing.nested_matcher');
 
             foreach ($config['route_filters_by_id'] as $id => $priority) {
@@ -217,7 +217,7 @@ private function loadPhpcrProvider(array $config, LoaderInterface $loader, Conta
 
         $container->setParameter('cmf_routing.dynamic.persistence.phpcr.manager_name', $config['manager_name']);
 
-        if (0 === count($locales)) {
+        if (0 === \count($locales)) {
             $container->removeDefinition('cmf_routing.phpcrodm_route_locale_listener');
         } elseif (!$matchImplicitLocale) {
             // remove all but the prefixes configuration from the service definition.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -99,7 +99,7 @@ private function addDynamicSection(ArrayNodeDefinition $root)
                             ->addDefaultsIfNotSet()
                             ->validate()
                                 ->ifTrue(function ($v) {
-                                    return count(array_filter($v, function ($persistence) {
+                                    return \count(array_filter($v, function ($persistence) {
                                         return $persistence['enabled'];
                                     })) > 1;
                                 })
diff --git a/src/Doctrine/DoctrineProvider.php b/src/Doctrine/DoctrineProvider.php
@@ -51,8 +51,7 @@ abstract class DoctrineProvider
     protected $routeCollectionLimit;
 
     /**
-     * @param ManagerRegistry $managerRegistry
-     * @param string          $className
+     * @param string $className
      */
     public function __construct(ManagerRegistry $managerRegistry, $className = null)
     {
diff --git a/src/Doctrine/Orm/ContentRepository.php b/src/Doctrine/Orm/ContentRepository.php
@@ -55,15 +55,15 @@ public function findById($id)
      */
     public function getContentId($content)
     {
-        if (!is_object($content)) {
+        if (!\is_object($content)) {
             return;
         }
 
         try {
-            $class = get_class($content);
+            $class = \get_class($content);
             $meta = $this->getObjectManager()->getClassMetadata($class);
             $ids = $meta->getIdentifierValues($content);
-            if (1 !== count($ids)) {
+            if (1 !== \count($ids)) {
                 throw new \Exception(sprintf('Class "%s" must use only one identifier', $class));
             }
 
diff --git a/src/Doctrine/Orm/RedirectRoute.php b/src/Doctrine/Orm/RedirectRoute.php
@@ -38,8 +38,6 @@ class RedirectRoute extends RedirectRouteModel
      * Additional options:
      *
      * * add_trailing_slash: When set, a trailing slash is appended to the route
-     *
-     * @param array $options
      */
     public function __construct(array $options = [])
     {
@@ -74,7 +72,7 @@ public function getParameters()
     {
         $params = json_decode($this->serialisedParameters);
 
-        return is_array($params) ? $params : [];
+        return \is_array($params) ? $params : [];
     }
 
     /**
@@ -83,7 +81,7 @@ public function getParameters()
     public function getPath()
     {
         $pattern = parent::getPath();
-        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[strlen($pattern) - 1]) {
+        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[\strlen($pattern) - 1]) {
             $pattern .= '/';
         }
 
diff --git a/src/Doctrine/Orm/RouteProvider.php b/src/Doctrine/Orm/RouteProvider.php
@@ -51,7 +51,7 @@ public function getRouteCollectionForRequest(Request $request)
         $collection = new RouteCollection();
 
         $candidates = $this->candidatesStrategy->getCandidates($request);
-        if (0 === count($candidates)) {
+        if (0 === \count($candidates)) {
             return $collection;
         }
         $routes = $this->getRouteRepository()->findByStaticPrefix($candidates, ['position' => 'ASC']);
diff --git a/src/Doctrine/Phpcr/ContentRepository.php b/src/Doctrine/Phpcr/ContentRepository.php
@@ -38,7 +38,7 @@ public function findById($id)
      */
     public function getContentId($content)
     {
-        if (!is_object($content)) {
+        if (!\is_object($content)) {
             return;
         }
 
diff --git a/src/Doctrine/Phpcr/IdPrefixListener.php b/src/Doctrine/Phpcr/IdPrefixListener.php
@@ -35,8 +35,6 @@ class IdPrefixListener
     /**
      * This listener only makes sense together with the PrefixCandidates
      * strategy.
-     *
-     * @param PrefixCandidates $candidates
      */
     public function __construct(PrefixCandidates $candidates)
     {
diff --git a/src/Doctrine/Phpcr/LocaleListener.php b/src/Doctrine/Phpcr/LocaleListener.php
@@ -87,8 +87,6 @@ public function __construct(
 
     /**
      * Specify the list of allowed locales.
-     *
-     * @param array $locales
      */
     public function setLocales(array $locales)
     {
@@ -113,8 +111,6 @@ public function setUpdateAvailableTranslations($update)
 
     /**
      * Update locale after loading a route.
-     *
-     * @param LifecycleEventArgs $args
      */
     public function postLoad(LifecycleEventArgs $args)
     {
@@ -127,8 +123,6 @@ public function postLoad(LifecycleEventArgs $args)
 
     /**
      * Update locale after persisting a route.
-     *
-     * @param LifecycleEventArgs $args
      */
     public function postPersist(LifecycleEventArgs $args)
     {
@@ -141,8 +135,6 @@ public function postPersist(LifecycleEventArgs $args)
 
     /**
      * Update a locale after the route has been moved.
-     *
-     * @param MoveEventArgs $args
      */
     public function postMove(MoveEventArgs $args)
     {
@@ -184,7 +176,7 @@ protected function updateLocale(ModelRoute $doc, $id, DocumentManager $dm, $forc
             return;
         }
 
-        if (in_array($locale = $matches[2], $this->locales)) {
+        if (\in_array($locale = $matches[2], $this->locales)) {
             if ($force || !$doc->getDefault('_locale')) {
                 $doc->setDefault('_locale', $locale);
             }
diff --git a/src/Doctrine/Phpcr/PrefixCandidates.php b/src/Doctrine/Phpcr/PrefixCandidates.php
@@ -87,7 +87,7 @@ public function isCandidate($name)
     public function restrictQuery($queryBuilder)
     {
         $prefixes = $this->getPrefixes();
-        if (in_array('', $prefixes) || !count($prefixes)) {
+        if (\in_array('', $prefixes) || !\count($prefixes)) {
             return;
         }
 
@@ -110,7 +110,7 @@ public function getCandidates(Request $request)
 
         $locale = $this->determineLocale($url);
         if ($locale) {
-            $url = substr($url, strlen($locale) + 1);
+            $url = substr($url, \strlen($locale) + 1);
             foreach ($this->getPrefixes() as $prefix) {
                 $candidates = array_unique(array_merge($candidates, $this->getCandidatesFor($url, $prefix)));
             }
@@ -174,12 +174,12 @@ public function setManagerName($manager)
     protected function isCandidateValid($candidate)
     {
         // Candidates cannot start or end with a space in Jackrabbit.
-        if (' ' === \substr($candidate, 0, 1) || ' ' === \substr($candidate, -1)) {
+        if (' ' === substr($candidate, 0, 1) || ' ' === substr($candidate, -1)) {
             return false;
         }
 
         // Jackrabbit does not allow spaces before or after the path separator.
-        if (false !== \strpos($candidate, ' /') || false !== \strpos($candidate, '/ ')) {
+        if (false !== strpos($candidate, ' /') || false !== strpos($candidate, '/ ')) {
             return false;
         }
 
diff --git a/src/Doctrine/Phpcr/RedirectRoute.php b/src/Doctrine/Phpcr/RedirectRoute.php
@@ -60,8 +60,6 @@ class RedirectRoute extends RedirectRouteModel implements PrefixInterface, Hiera
      * Additional options:
      *
      * * add_trailing_slash: When set, a trailing slash is appended to the route
-     *
-     * @param array $options
      */
     public function __construct(array $options = [])
     {
@@ -222,7 +220,7 @@ public function generateStaticPrefix($id, $idPrefix)
             throw new \LogicException("The id prefix '$idPrefix' does not match the route document path '$id'");
         }
 
-        $url = substr($id, strlen($idPrefix));
+        $url = substr($id, \strlen($idPrefix));
         if ('' === $url) {
             $url = '/';
         }
@@ -236,7 +234,7 @@ public function generateStaticPrefix($id, $idPrefix)
     public function getPath()
     {
         $pattern = parent::getPath();
-        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[strlen($pattern) - 1]) {
+        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[\strlen($pattern) - 1]) {
             $pattern .= '/';
         }
 
diff --git a/src/Doctrine/Phpcr/Route.php b/src/Doctrine/Phpcr/Route.php
@@ -84,8 +84,8 @@ public function __construct(array $options = [])
      */
     public function setParentDocument($parent)
     {
-        if (!is_object($parent)) {
-            throw new InvalidArgumentException('Parent must be an object '.gettype($parent).' given.');
+        if (!\is_object($parent)) {
+            throw new InvalidArgumentException('Parent must be an object '.\gettype($parent).' given.');
         }
 
         $this->parent = $parent;
@@ -159,8 +159,8 @@ public function getName()
      */
     public function setPosition($parent, $name)
     {
-        if (!is_object($parent)) {
-            throw new InvalidArgumentException('Parent must be an object '.gettype($parent).' given.');
+        if (!\is_object($parent)) {
+            throw new InvalidArgumentException('Parent must be an object '.\gettype($parent).' given.');
         }
 
         $this->parent = $parent;
@@ -239,7 +239,7 @@ public function generateStaticPrefix($id, $idPrefix)
             throw new \LogicException("The id prefix '$idPrefix' does not match the route document path '$id'");
         }
 
-        $url = substr($id, strlen($idPrefix));
+        $url = substr($id, \strlen($idPrefix));
         if (!$url) {
             $url = '/';
         }
@@ -255,7 +255,7 @@ public function generateStaticPrefix($id, $idPrefix)
     public function getPath()
     {
         $pattern = parent::getPath();
-        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[strlen($pattern) - 1]) {
+        if ($this->getOption('add_trailing_slash') && '/' !== $pattern[\strlen($pattern) - 1]) {
             $pattern .= '/';
         }
 
diff --git a/src/Doctrine/Phpcr/RouteProvider.php b/src/Doctrine/Phpcr/RouteProvider.php
@@ -58,8 +58,6 @@ public function __construct(
     }
 
     /**
-     * @param Request $request
-     *
      * @return array a list of PHPCR-ODM ids
      */
     public function getCandidates(Request $request)
@@ -88,7 +86,7 @@ public function getRouteCollectionForRequest(Request $request)
 
         $collection = new RouteCollection();
 
-        if (0 === count($candidates)) {
+        if (0 === \count($candidates)) {
             return $collection;
         }
 
diff --git a/src/Doctrine/RouteConditionMetadataListener.php b/src/Doctrine/RouteConditionMetadataListener.php
@@ -40,8 +40,6 @@ public function getSubscribedEvents()
     /**
      * Handle the load class metadata event: remove translated attribute from
      * fields and remove the locale mapping if present.
-     *
-     * @param LoadClassMetadataEventArgs $eventArgs
      */
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
     {
@@ -71,7 +69,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
                 'nullable' => true,
             ]);
         } else {
-            throw new \LogicException(sprintf('Class metadata was neither PHPCR nor ORM but %s', get_class($meta)));
+            throw new \LogicException(sprintf('Class metadata was neither PHPCR nor ORM but %s', \get_class($meta)));
         }
     }
 }
diff --git a/src/Model/Route.php b/src/Model/Route.php
diff --git a/src/Routing/DynamicRouter.php b/src/Routing/DynamicRouter.php
diff --git a/tests/Functional/Doctrine/Orm/OrmTestCase.php b/tests/Functional/Doctrine/Orm/OrmTestCase.php
diff --git a/tests/Functional/Doctrine/Phpcr/RouteTest.php b/tests/Functional/Doctrine/Phpcr/RouteTest.php
diff --git a/tests/Unit/DependencyInjection/Compiler/TemplatingValidatorPassTest.php b/tests/Unit/DependencyInjection/Compiler/TemplatingValidatorPassTest.php
diff --git a/tests/Unit/Validator/Constraints/RouteDefaultsTemplatingValidatorTest.php b/tests/Unit/Validator/Constraints/RouteDefaultsTemplatingValidatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ public function __construct(RouterInterface $router)`
`43`	`43`	`/**`
`44`	`44`	`* Action to redirect based on a RedirectRouteInterface route.`
`45`	`45`	`*`
`46`		`- * @param RedirectRouteInterface $contentDocument`
`47`		`- *`
`48`	`46`	`* @return \Symfony\Component\HttpFoundation\RedirectResponse the response`
`49`	`47`	`*/`
`50`	`48`	`public function redirectAction(RedirectRouteInterface $contentDocument)`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ abstract class DoctrineProvider`
`51`	`51`	`protected $routeCollectionLimit;`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * @param ManagerRegistry $managerRegistry`
`55`		`- * @param string $className`
	`54`	`+ * @param string $className`
`56`	`55`	`*/`
`57`	`56`	`public function __construct(ManagerRegistry $managerRegistry, $className = null)`
`58`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ public function findById($id)`
`55`	`55`	`*/`
`56`	`56`	`public function getContentId($content)`
`57`	`57`	`{`
`58`		`- if (!is_object($content)) {`
	`58`	`+ if (!\is_object($content)) {`
`59`	`59`	`return;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`try {`
`63`		`- $class = get_class($content);`
	`63`	`+ $class = \get_class($content);`
`64`	`64`	`$meta = $this->getObjectManager()->getClassMetadata($class);`
`65`	`65`	`$ids = $meta->getIdentifierValues($content);`
`66`		`- if (1 !== count($ids)) {`
	`66`	`+ if (1 !== \count($ids)) {`
`67`	`67`	`throw new \Exception(sprintf('Class "%s" must use only one identifier', $class));`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ class RedirectRoute extends RedirectRouteModel`
`38`	`38`	`* Additional options:`
`39`	`39`	`*`
`40`	`40`	`* * add_trailing_slash: When set, a trailing slash is appended to the route`
`41`		`- *`
`42`		`- * @param array $options`
`43`	`41`	`*/`
`44`	`42`	`public function __construct(array $options = [])`
`45`	`43`	`{`
`@@ -74,7 +72,7 @@ public function getParameters()`
`74`	`72`	`{`
`75`	`73`	`$params = json_decode($this->serialisedParameters);`
`76`	`74`
`77`		`- return is_array($params) ? $params : [];`
	`75`	`+ return \is_array($params) ? $params : [];`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`/**`
`@@ -83,7 +81,7 @@ public function getParameters()`
`83`	`81`	`public function getPath()`
`84`	`82`	`{`
`85`	`83`	`$pattern = parent::getPath();`
`86`		`- if ($this->getOption('add_trailing_slash') && '/' !== $pattern[strlen($pattern) - 1]) {`
	`84`	`+ if ($this->getOption('add_trailing_slash') && '/' !== $pattern[\strlen($pattern) - 1]) {`
`87`	`85`	`$pattern .= '/';`
`88`	`86`	`}`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getRouteCollectionForRequest(Request $request)`
`51`	`51`	`$collection = new RouteCollection();`
`52`	`52`
`53`	`53`	`$candidates = $this->candidatesStrategy->getCandidates($request);`
`54`		`- if (0 === count($candidates)) {`
	`54`	`+ if (0 === \count($candidates)) {`
`55`	`55`	`return $collection;`
`56`	`56`	`}`
`57`	`57`	`$routes = $this->getRouteRepository()->findByStaticPrefix($candidates, ['position' => 'ASC']);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function findById($id)`
`38`	`38`	`*/`
`39`	`39`	`public function getContentId($content)`
`40`	`40`	`{`
`41`		`- if (!is_object($content)) {`
	`41`	`+ if (!\is_object($content)) {`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`	`44`