Merge pull request #2436 from meyerbaptiste/fix-php-cs-fixer-config

dunglas · web-flow · commit 78cd201d8fde · 2019-01-07T17:46:31.000+01:00
Fix CS
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -468,9 +468,9 @@ public function thereAreDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string
     {
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
 
-        if (\in_array($bool, ['true', '1', 1], true)) {
+        if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
-        } elseif (\in_array($bool, ['false', '0', 0], true)) {
+        } elseif (in_array($bool, ['false', '0', 0], true)) {
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
@@ -578,9 +578,9 @@ public function thereAreDummyObjectsWithDummyPrice(int $nb)
      */
     public function thereAreDummyObjectsWithDummyBoolean(int $nb, string $bool)
     {
-        if (\in_array($bool, ['true', '1', 1], true)) {
+        if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
-        } elseif (\in_array($bool, ['false', '0', 0], true)) {
+        } elseif (in_array($bool, ['false', '0', 0], true)) {
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
@@ -606,9 +606,9 @@ public function thereAreDummyObjectsWithDummyBoolean(int $nb, string $bool)
      */
     public function thereAreDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bool)
     {
-        if (\in_array($bool, ['true', '1', 1], true)) {
+        if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
-        } elseif (\in_array($bool, ['false', '0', 0], true)) {
+        } elseif (in_array($bool, ['false', '0', 0], true)) {
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
@@ -633,9 +633,9 @@ public function thereAreDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bo
      */
     public function thereAreDummyObjectsWithRelationEmbeddedDummyBoolean(int $nb, string $bool)
     {
-        if (\in_array($bool, ['true', '1', 1], true)) {
+        if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
-        } elseif (\in_array($bool, ['false', '0', 0], true)) {
+        } elseif (in_array($bool, ['false', '0', 0], true)) {
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
diff --git a/features/bootstrap/HydraContext.php b/features/bootstrap/HydraContext.php
@@ -142,15 +142,15 @@ public function assertOperationNodeValueContains(string $nodeName, string $opera
      */
     public function assertNbOperationsExist(int $nb, string $className)
     {
-        Assert::assertEquals($nb, \count($this->getOperations($className)));
+        Assert::assertEquals($nb, count($this->getOperations($className)));
     }
 
     /**
      * @Then :nb properties are available for Hydra class :class
      */
     public function assertNbPropertiesExist(int $nb, string $className)
     {
-        Assert::assertEquals($nb, \count($this->getProperties($className)));
+        Assert::assertEquals($nb, count($this->getProperties($className)));
     }
 
     /**
diff --git a/features/bootstrap/JsonContext.php b/features/bootstrap/JsonContext.php
@@ -26,14 +26,14 @@ public function __construct(HttpCallResultPool $httpCallResultPool)
 
     private function sortArrays($obj)
     {
-        $isObject = \is_object($obj);
+        $isObject = is_object($obj);
 
         foreach ($obj as $key => $value) {
             if (null === $value || is_scalar($value)) {
                 continue;
             }
 
-            if (\is_array($value)) {
+            if (is_array($value)) {
                 sort($value);
             }
 
diff --git a/features/bootstrap/SwaggerContext.php b/features/bootstrap/SwaggerContext.php
@@ -90,7 +90,7 @@ public function assertPropertyExist(string $propertyName, string $className)
      */
     public function assertPropertyIsRequired(string $propertyName, string $className)
     {
-        if (!\in_array($propertyName, $this->getClassInfo($className)->required, true)) {
+        if (!in_array($propertyName, $this->getClassInfo($className)->required, true)) {
             throw new ExpectationFailedException(sprintf('Property "%s" of class "%s" should be required', $propertyName, $className));
         }
     }
diff --git a/src/Bridge/Doctrine/Common/DataPersister.php b/src/Bridge/Doctrine/Common/DataPersister.php
@@ -93,7 +93,7 @@ private function getManager($data)
     private function isDeferredExplicit(DoctrineObjectManager $manager, $data)
     {
         $classMetadata = $manager->getClassMetadata($this->getObjectClass($data));
-        if ($classMetadata instanceof ClassMetadataInfo && \method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {
+        if ($classMetadata instanceof ClassMetadataInfo && method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {
             return $classMetadata->isChangeTrackingDeferredExplicit();
         }
 
diff --git a/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php b/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
@@ -61,7 +61,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
                     }
 
                     $pos = strpos($field, '.');
-                    if (false === $pos || isset($classMetaData->embeddedClasses[\substr($field, 0, $pos)])) {
+                    if (false === $pos || isset($classMetaData->embeddedClasses[substr($field, 0, $pos)])) {
                         // Configure default filter with property
                         $field = "{$rootAlias}.{$field}";
                     } else {
diff --git a/src/Bridge/Doctrine/Orm/Extension/PaginationExtension.php b/src/Bridge/Doctrine/Orm/Extension/PaginationExtension.php
@@ -117,7 +117,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         if ($request->attributes->get('_graphql')) {
             $collectionArgs = $request->attributes->get('_graphql_collections_args', []);
             if (isset($collectionArgs[$resourceClass]['after'])) {
-                $after = \base64_decode($collectionArgs[$resourceClass]['after'], true);
+                $after = base64_decode($collectionArgs[$resourceClass]['after'], true);
                 $firstResult = (int) $after;
                 $firstResult = false === $after ? $firstResult : ++$firstResult;
             }
diff --git a/src/GraphQl/Action/EntrypointAction.php b/src/GraphQl/Action/EntrypointAction.php
@@ -76,22 +76,22 @@ private function parseRequest(Request $request): array
         $query = $request->query->get('query');
         $operation = $request->query->get('operation');
         if ($variables = $request->query->get('variables', [])) {
-            $variables = \json_decode($variables, true);
+            $variables = json_decode($variables, true);
         }
 
         if (!$request->isMethod('POST')) {
             return [$query, $operation, $variables];
         }
 
         if ('json' === $request->getContentType()) {
-            $input = \json_decode((string) $request->getContent(), true);
+            $input = json_decode((string) $request->getContent(), true);
 
             if (isset($input['query'])) {
                 $query = $input['query'];
             }
 
             if (isset($input['variables'])) {
-                $variables = \is_array($input['variables']) ? $input['variables'] : \json_decode($input['variables'], true);
+                $variables = \is_array($input['variables']) ? $input['variables'] : json_decode($input['variables'], true);
             }
 
             if (isset($input['operation'])) {
diff --git a/src/Hal/Serializer/ItemNormalizer.php b/src/Hal/Serializer/ItemNormalizer.php
@@ -164,7 +164,7 @@ private function populateRelation(array $data, $object, string $format = null, a
     {
         $class = $this->getObjectClass($object);
 
-        $attributesMetadata = \array_key_exists($class, $this->attributesMetadataCache) ?
+        $attributesMetadata = array_key_exists($class, $this->attributesMetadataCache) ?
             $this->attributesMetadataCache[$class] :
             $this->attributesMetadataCache[$class] = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($object)->getAttributesMetadata() : null;
 
diff --git a/src/Metadata/Property/Factory/ExtractorPropertyMetadataFactory.php b/src/Metadata/Property/Factory/ExtractorPropertyMetadataFactory.php
@@ -119,7 +119,7 @@ private function update(PropertyMetadata $propertyMetadata, array $metadata): Pr
     /**
      * Creates a SubresourceMetadata.
      *
-     * @param bool|null|array  $subresource      the subresource metadata coming from XML or YAML
+     * @param bool|array|null  $subresource      the subresource metadata coming from XML or YAML
      * @param PropertyMetadata $propertyMetadata the current property metadata
      *
      * @return SubresourceMetadata|null
diff --git a/tests/Fixtures/TestBundle/Entity/DummyValidation.php b/tests/Fixtures/TestBundle/Entity/DummyValidation.php
@@ -80,15 +80,15 @@ public function setId(int $id)
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getName()
     {
         return $this->name;
     }
 
     /**
-     * @param null|string $name
+     * @param string|null $name
      *
      * @return DummyValidation
      */
@@ -100,15 +100,15 @@ public function setName($name)
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getTitle()
     {
         return $this->title;
     }
 
     /**
-     * @param null|string $title
+     * @param string|null $title
      *
      * @return DummyValidation
      */
diff --git a/tests/Fixtures/TestBundle/Entity/RelatedToDummyFriend.php b/tests/Fixtures/TestBundle/Entity/RelatedToDummyFriend.php
@@ -73,15 +73,15 @@ public function getName()
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getDescription()
     {
         return $this->description;
     }
 
     /**
-     * @param null|string $description
+     * @param string|null $description
      */
     public function setDescription($description)
     {
diff --git a/tests/Serializer/ResourceListTest.php b/tests/Serializer/ResourceListTest.php
@@ -37,6 +37,6 @@ public function testSerialize()
     {
         $this->resourceList['foo'] = 'bar';
 
-        $this->assertEquals('N;', \serialize($this->resourceList));
+        $this->assertEquals('N;', serialize($this->resourceList));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -142,15 +142,15 @@ public function assertOperationNodeValueContains(string $nodeName, string $opera`
`142`	`142`	`*/`
`143`	`143`	`public function assertNbOperationsExist(int $nb, string $className)`
`144`	`144`	`{`
`145`		`- Assert::assertEquals($nb, \count($this->getOperations($className)));`
	`145`	`+ Assert::assertEquals($nb, count($this->getOperations($className)));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/**`
`149`	`149`	`* @Then :nb properties are available for Hydra class :class`
`150`	`150`	`*/`
`151`	`151`	`public function assertNbPropertiesExist(int $nb, string $className)`
`152`	`152`	`{`
`153`		`- Assert::assertEquals($nb, \count($this->getProperties($className)));`
	`153`	`+ Assert::assertEquals($nb, count($this->getProperties($className)));`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public function __construct(HttpCallResultPool $httpCallResultPool)`
`26`	`26`
`27`	`27`	`private function sortArrays($obj)`
`28`	`28`	`{`
`29`		`- $isObject = \is_object($obj);`
	`29`	`+ $isObject = is_object($obj);`
`30`	`30`
`31`	`31`	`foreach ($obj as $key => $value) {`
`32`	`32`	`if (null === $value \|\| is_scalar($value)) {`
`33`	`33`	`continue;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (\is_array($value)) {`
	`36`	`+ if (is_array($value)) {`
`37`	`37`	`sort($value);`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function assertPropertyExist(string $propertyName, string $className)`
`90`	`90`	`*/`
`91`	`91`	`public function assertPropertyIsRequired(string $propertyName, string $className)`
`92`	`92`	`{`
`93`		`- if (!\in_array($propertyName, $this->getClassInfo($className)->required, true)) {`
	`93`	`+ if (!in_array($propertyName, $this->getClassInfo($className)->required, true)) {`
`94`	`94`	`throw new ExpectationFailedException(sprintf('Property "%s" of class "%s" should be required', $propertyName, $className));`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private function getManager($data)`
`93`	`93`	`private function isDeferredExplicit(DoctrineObjectManager $manager, $data)`
`94`	`94`	`{`
`95`	`95`	`$classMetadata = $manager->getClassMetadata($this->getObjectClass($data));`
`96`		`- if ($classMetadata instanceof ClassMetadataInfo && \method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {`
	`96`	`+ if ($classMetadata instanceof ClassMetadataInfo && method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {`
`97`	`97`	`return $classMetadata->isChangeTrackingDeferredExplicit();`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$pos = strpos($field, '.');`
`64`		`- if (false === $pos \|\| isset($classMetaData->embeddedClasses[\substr($field, 0, $pos)])) {`
	`64`	`+ if (false === $pos \|\| isset($classMetaData->embeddedClasses[substr($field, 0, $pos)])) {`
`65`	`65`	`// Configure default filter with property`
`66`	`66`	`$field = "{$rootAlias}.{$field}";`
`67`	`67`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`117`	`117`	`if ($request->attributes->get('_graphql')) {`
`118`	`118`	`$collectionArgs = $request->attributes->get('_graphql_collections_args', []);`
`119`	`119`	`if (isset($collectionArgs[$resourceClass]['after'])) {`
`120`		`- $after = \base64_decode($collectionArgs[$resourceClass]['after'], true);`
	`120`	`+ $after = base64_decode($collectionArgs[$resourceClass]['after'], true);`
`121`	`121`	`$firstResult = (int) $after;`
`122`	`122`	`$firstResult = false === $after ? $firstResult : ++$firstResult;`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,22 +76,22 @@ private function parseRequest(Request $request): array`
`76`	`76`	`$query = $request->query->get('query');`
`77`	`77`	`$operation = $request->query->get('operation');`
`78`	`78`	`if ($variables = $request->query->get('variables', [])) {`
`79`		`- $variables = \json_decode($variables, true);`
	`79`	`+ $variables = json_decode($variables, true);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (!$request->isMethod('POST')) {`
`83`	`83`	`return [$query, $operation, $variables];`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if ('json' === $request->getContentType()) {`
`87`		`- $input = \json_decode((string) $request->getContent(), true);`
	`87`	`+ $input = json_decode((string) $request->getContent(), true);`
`88`	`88`
`89`	`89`	`if (isset($input['query'])) {`
`90`	`90`	`$query = $input['query'];`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (isset($input['variables'])) {`
`94`		`- $variables = \is_array($input['variables']) ? $input['variables'] : \json_decode($input['variables'], true);`
	`94`	`+ $variables = \is_array($input['variables']) ? $input['variables'] : json_decode($input['variables'], true);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (isset($input['operation'])) {`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ private function populateRelation(array $data, $object, string $format = null, a`
`164`	`164`	`{`
`165`	`165`	`$class = $this->getObjectClass($object);`
`166`	`166`
`167`		`- $attributesMetadata = \array_key_exists($class, $this->attributesMetadataCache) ?`
	`167`	`+ $attributesMetadata = array_key_exists($class, $this->attributesMetadataCache) ?`
`168`	`168`	`$this->attributesMetadataCache[$class] :`
`169`	`169`	`$this->attributesMetadataCache[$class] = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($object)->getAttributesMetadata() : null;`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private function update(PropertyMetadata $propertyMetadata, array $metadata): Pr`
`119`	`119`	`/**`
`120`	`120`	`* Creates a SubresourceMetadata.`
`121`	`121`	`*`
`122`		`- * @param bool\|null\|array $subresource the subresource metadata coming from XML or YAML`
	`122`	`+ * @param bool\|array\|null $subresource the subresource metadata coming from XML or YAML`
`123`	`123`	`* @param PropertyMetadata $propertyMetadata the current property metadata`
`124`	`124`	`*`
`125`	`125`	`* @return SubresourceMetadata\|null`