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

dbu · web-flow · commit 0af839682d98 · 2020-09-23T11:48:58.000+02:00
fix cs config
diff --git a/.styleci.yml b/.styleci.yml
@@ -15,11 +15,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/Controller/ResourceController.php b/src/Controller/ResourceController.php
@@ -48,10 +48,6 @@ class ResourceController
      */
     private $authorizationChecker;
 
-    /**
-     * @param SerializerInterface         $serializer
-     * @param RepositoryRegistryInterface $registry
-     */
     public function __construct(SerializerInterface $serializer, RepositoryRegistryInterface $registry, ResourceHandler $resourceHandler, AuthorizationCheckerInterface $authorizationChecker = null)
     {
         $this->serializer = $serializer;
@@ -84,10 +80,7 @@ public function getResourceAction(Request $request, $repositoryName, $path)
 
             return $this->createResponse($resource);
         } catch (ResourceNotFoundException $e) {
-            throw new NotFoundHttpException(
-                sprintf('No resource found at path "%s" for repository "%s"', $path, $repositoryName),
-                $e
-            );
+            throw new NotFoundHttpException(sprintf('No resource found at path "%s" for repository "%s"', $path, $repositoryName), $e);
         }
     }
 
@@ -105,9 +98,8 @@ public function getResourceAction(Request $request, $repositoryName, $path)
      *
      * changing payload properties isn't supported yet.
      *
-     * @param string  $repositoryName
-     * @param string  $path
-     * @param Request $request
+     * @param string $repositoryName
+     * @param string $path
      *
      * @return Response
      */
diff --git a/src/DependencyInjection/CmfResourceRestExtension.php b/src/DependencyInjection/CmfResourceRestExtension.php
@@ -30,7 +30,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $processor->processConfiguration($configuration, $configs);
 
         $bundles = $container->getParameter('kernel.bundles');
-        if (!array_key_exists('JMSSerializerBundle', $bundles)) {
+        if (!\array_key_exists('JMSSerializerBundle', $bundles)) {
             throw new \LogicException('The JMSSerializerBundle must be registered in order to use the CmfResourceRestBundle.');
         }
 
diff --git a/src/Registry/PayloadAliasRegistry.php b/src/Registry/PayloadAliasRegistry.php
@@ -32,10 +32,6 @@ class PayloadAliasRegistry
      */
     private $repositoryRegistry;
 
-    /**
-     * @param RepositoryRegistryInterface $repositoryRegistry
-     * @param array                       $aliases
-     */
     public function __construct(RepositoryRegistryInterface $repositoryRegistry, array $aliases = [])
     {
         $this->repositoryRegistry = $repositoryRegistry;
@@ -52,8 +48,6 @@ public function __construct(RepositoryRegistryInterface $repositoryRegistry, arr
     /**
      * Return the alias for the given PHPCR resource.
      *
-     * @param PuliResource $resource
-     *
      * @return string
      */
     public function getPayloadAlias(PuliResource $resource)
diff --git a/src/Security/ResourcePathVoter.php b/src/Security/ResourcePathVoter.php
@@ -36,8 +36,8 @@ public function __construct(AccessDecisionManagerInterface $accessDecisionManage
      */
     protected function supports($attribute, $subject)
     {
-        return in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE])
-            && is_array($subject) && isset($subject['repository_name']) && isset($subject['path']);
+        return \in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE])
+            && \is_array($subject) && isset($subject['repository_name']) && isset($subject['path']);
     }
 
     /**
@@ -60,7 +60,7 @@ protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
 
     private function ruleMatches($rule, $attribute, $subject)
     {
-        if (!in_array($attribute, $rule['attributes'])) {
+        if (!\in_array($attribute, $rule['attributes'])) {
             return false;
         }
 
diff --git a/src/Serializer/Jms/EventSubscriber/PhpcrNodeSubscriber.php b/src/Serializer/Jms/EventSubscriber/PhpcrNodeSubscriber.php
@@ -33,9 +33,6 @@ public static function getSubscribedEvents()
         ];
     }
 
-    /**
-     * @param PreSerializeEvent $event
-     */
     public function onPreSerialize(PreSerializeEvent $event)
     {
         $object = $event->getObject();
diff --git a/src/Serializer/Jms/EventSubscriber/ResourceSubscriber.php b/src/Serializer/Jms/EventSubscriber/ResourceSubscriber.php
@@ -33,9 +33,6 @@ public static function getSubscribedEvents()
         ];
     }
 
-    /**
-     * @param PreSerializeEvent $event
-     */
     public function onPreSerialize(PreSerializeEvent $event)
     {
         $object = $event->getObject();
diff --git a/src/Serializer/Jms/Handler/PhpcrNodeHandler.php b/src/Serializer/Jms/Handler/PhpcrNodeHandler.php
@@ -37,10 +37,7 @@ public static function getSubscribingMethods()
     }
 
     /**
-     * @param JsonSerializationVisitor $visitor
-     * @param NodeInterface            $nodeInterface
-     * @param array                    $type
-     * @param Context                  $context
+     * @param NodeInterface $nodeInterface
      */
     public function serializePhpcrNode(
         JsonSerializationVisitor $visitor,
diff --git a/src/Serializer/Jms/Handler/ResourceHandler.php b/src/Serializer/Jms/Handler/ResourceHandler.php
@@ -67,10 +67,7 @@ public static function getSubscribingMethods()
     }
 
     /**
-     * @param JsonSerializationVisitor $visitor
-     * @param NodeInterface            $resourceInterface
-     * @param array                    $type
-     * @param Context                  $context
+     * @param NodeInterface $resourceInterface
      */
     public function serializeResource(
         JsonSerializationVisitor $visitor,
diff --git a/tests/Features/Context/ResourceContext.php b/tests/Features/Context/ResourceContext.php
@@ -100,7 +100,7 @@ public function createFile($filename, PyStringNode $content)
     {
         $filesytem = new Filesystem();
         $file = str_replace('%kernel.root_dir%', $this->kernel->getRootDir(), $filename);
-        $filesytem->mkdir(dirname($file));
+        $filesytem->mkdir(\dirname($file));
 
         file_put_contents($file, (string) $content);
     }
@@ -120,10 +120,7 @@ public function createDocument($class, $path, TableNode $fields)
         }
 
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Class "%s" does not exist',
-                $class
-            ));
+            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
         }
 
         $document = new $class();
@@ -148,10 +145,7 @@ public function thereIsADocumentAt($class, $path, TableNode $fields = null)
         $path = '/tests'.$path;
 
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Class "%s" does not exist',
-                $class
-            ));
+            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
         }
 
         $document = $this->manager->find($class, $path);
@@ -176,10 +170,7 @@ public function thereIsNoDocumentAt($class, $path)
         $path = '/tests'.$path;
 
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Class "%s" does not exist',
-                $class
-            ));
+            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
         }
 
         $this->session->refresh(true);
diff --git a/tests/Fixtures/App/Security/ResourceVoter.php b/tests/Fixtures/App/Security/ResourceVoter.php
@@ -19,7 +19,7 @@ class ResourceVoter extends Voter
 {
     protected function supports($attribute, $subject)
     {
-        return in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE]);
+        return \in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE]);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,6 @@ class ResourceController`
`48`	`48`	`*/`
`49`	`49`	`private $authorizationChecker;`
`50`	`50`
`51`		`- /**`
`52`		`- * @param SerializerInterface $serializer`
`53`		`- * @param RepositoryRegistryInterface $registry`
`54`		`- */`
`55`	`51`	`public function __construct(SerializerInterface $serializer, RepositoryRegistryInterface $registry, ResourceHandler $resourceHandler, AuthorizationCheckerInterface $authorizationChecker = null)`
`56`	`52`	`{`
`57`	`53`	`$this->serializer = $serializer;`
`@@ -84,10 +80,7 @@ public function getResourceAction(Request $request, $repositoryName, $path)`
`84`	`80`
`85`	`81`	`return $this->createResponse($resource);`
`86`	`82`	`} catch (ResourceNotFoundException $e) {`
`87`		`- throw new NotFoundHttpException(`
`88`		`- sprintf('No resource found at path "%s" for repository "%s"', $path, $repositoryName),`
`89`		`- $e`
`90`		`- );`
	`83`	`+ throw new NotFoundHttpException(sprintf('No resource found at path "%s" for repository "%s"', $path, $repositoryName), $e);`
`91`	`84`	`}`
`92`	`85`	`}`
`93`	`86`
`@@ -105,9 +98,8 @@ public function getResourceAction(Request $request, $repositoryName, $path)`
`105`	`98`	`*`
`106`	`99`	`* changing payload properties isn't supported yet.`
`107`	`100`	`*`
`108`		`- * @param string $repositoryName`
`109`		`- * @param string $path`
`110`		`- * @param Request $request`
	`101`	`+ * @param string $repositoryName`
	`102`	`+ * @param string $path`
`111`	`103`	`*`
`112`	`104`	`* @return Response`
`113`	`105`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function load(array $configs, ContainerBuilder $container)`
`30`	`30`	`$config = $processor->processConfiguration($configuration, $configs);`
`31`	`31`
`32`	`32`	`$bundles = $container->getParameter('kernel.bundles');`
`33`		`- if (!array_key_exists('JMSSerializerBundle', $bundles)) {`
	`33`	`+ if (!\array_key_exists('JMSSerializerBundle', $bundles)) {`
`34`	`34`	`throw new \LogicException('The JMSSerializerBundle must be registered in order to use the CmfResourceRestBundle.');`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public function __construct(AccessDecisionManagerInterface $accessDecisionManage`
`36`	`36`	`*/`
`37`	`37`	`protected function supports($attribute, $subject)`
`38`	`38`	`{`
`39`		`- return in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE])`
`40`		`- && is_array($subject) && isset($subject['repository_name']) && isset($subject['path']);`
	`39`	`+ return \in_array($attribute, [ResourceController::ROLE_RESOURCE_READ, ResourceController::ROLE_RESOURCE_WRITE])`
	`40`	`+ && \is_array($subject) && isset($subject['repository_name']) && isset($subject['path']);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`@@ -60,7 +60,7 @@ protected function voteOnAttribute($attribute, $subject, TokenInterface $token)`
`60`	`60`
`61`	`61`	`private function ruleMatches($rule, $attribute, $subject)`
`62`	`62`	`{`
`63`		`- if (!in_array($attribute, $rule['attributes'])) {`
	`63`	`+ if (!\in_array($attribute, $rule['attributes'])) {`
`64`	`64`	`return false;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,6 @@ public static function getSubscribedEvents()`
`33`	`33`	`];`
`34`	`34`	`}`
`35`	`35`
`36`		`- /**`
`37`		`- * @param PreSerializeEvent $event`
`38`		`- */`
`39`	`36`	`public function onPreSerialize(PreSerializeEvent $event)`
`40`	`37`	`{`
`41`	`38`	`$object = $event->getObject();`