Skip to content

Commit 3c67bc3

Browse files
dunglasdunglas
committed
Merge branch '2.3'
2 parents c3e631e + 78cd201 commit 3c67bc3

File tree

13 files changed

+28
-28
lines changed

13 files changed

+28
-28
lines changed

‎features/bootstrap/FeatureContext.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ public function thereAreDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string
502502
{
503503
$descriptions = ['Smart dummy.', 'Not so smart dummy.'];
504504

505-
if (\in_array($bool, ['true', '1', 1], true)) {
505+
if (in_array($bool, ['true', '1', 1], true)) {
506506
$bool = true;
507-
} elseif (\in_array($bool, ['false', '0', 0], true)) {
507+
} elseif (in_array($bool, ['false', '0', 0], true)) {
508508
$bool = false;
509509
} else {
510510
$expected = ['true', 'false', '1', '0'];
@@ -612,9 +612,9 @@ public function thereAreDummyObjectsWithDummyPrice(int $nb)
612612
*/
613613
public function thereAreDummyObjectsWithDummyBoolean(int $nb, string $bool)
614614
{
615-
if (\in_array($bool, ['true', '1', 1], true)) {
615+
if (in_array($bool, ['true', '1', 1], true)) {
616616
$bool = true;
617-
} elseif (\in_array($bool, ['false', '0', 0], true)) {
617+
} elseif (in_array($bool, ['false', '0', 0], true)) {
618618
$bool = false;
619619
} else {
620620
$expected = ['true', 'false', '1', '0'];
@@ -640,9 +640,9 @@ public function thereAreDummyObjectsWithDummyBoolean(int $nb, string $bool)
640640
*/
641641
public function thereAreDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bool)
642642
{
643-
if (\in_array($bool, ['true', '1', 1], true)) {
643+
if (in_array($bool, ['true', '1', 1], true)) {
644644
$bool = true;
645-
} elseif (\in_array($bool, ['false', '0', 0], true)) {
645+
} elseif (in_array($bool, ['false', '0', 0], true)) {
646646
$bool = false;
647647
} else {
648648
$expected = ['true', 'false', '1', '0'];
@@ -667,9 +667,9 @@ public function thereAreDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bo
667667
*/
668668
public function thereAreDummyObjectsWithRelationEmbeddedDummyBoolean(int $nb, string $bool)
669669
{
670-
if (\in_array($bool, ['true', '1', 1], true)) {
670+
if (in_array($bool, ['true', '1', 1], true)) {
671671
$bool = true;
672-
} elseif (\in_array($bool, ['false', '0', 0], true)) {
672+
} elseif (in_array($bool, ['false', '0', 0], true)) {
673673
$bool = false;
674674
} else {
675675
$expected = ['true', 'false', '1', '0'];

‎features/bootstrap/HydraContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ public function assertOperationNodeValueContains(string $nodeName, string $opera
142142
*/
143143
public function assertNbOperationsExist(int $nb, string $className)
144144
{
145-
Assert::assertEquals($nb, \count($this->getOperations($className)));
145+
Assert::assertEquals($nb, count($this->getOperations($className)));
146146
}
147147

148148
/**
149149
* @Then :nb properties are available for Hydra class :class
150150
*/
151151
public function assertNbPropertiesExist(int $nb, string $className)
152152
{
153-
Assert::assertEquals($nb, \count($this->getProperties($className)));
153+
Assert::assertEquals($nb, count($this->getProperties($className)));
154154
}
155155

156156
/**

‎features/bootstrap/JsonContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public function __construct(HttpCallResultPool $httpCallResultPool)
2626

2727
private function sortArrays($obj)
2828
{
29-
$isObject = \is_object($obj);
29+
$isObject = is_object($obj);
3030

3131
foreach ($obj as $key => $value) {
3232
if (null === $value || is_scalar($value)) {
3333
continue;
3434
}
3535

36-
if (\is_array($value)) {
36+
if (is_array($value)) {
3737
sort($value);
3838
}
3939

‎features/bootstrap/SwaggerContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function assertPropertyExistForTheOpenApiClass(string $propertyName, stri
129129
*/
130130
public function assertPropertyIsRequiredForSwagger(string $propertyName, string $className)
131131
{
132-
if (!\in_array($propertyName, $this->getClassInfo($className)->required, true)) {
132+
if (!in_array($propertyName, $this->getClassInfo($className)->required, true)) {
133133
throw new ExpectationFailedException(sprintf('Property "%s" of class "%s" should be required', $propertyName, $className));
134134
}
135135
}

‎src/Bridge/Doctrine/Common/DataPersister.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private function getManager($data)
9393
private function isDeferredExplicit(DoctrineObjectManager $manager, $data)
9494
{
9595
$classMetadata = $manager->getClassMetadata($this->getObjectClass($data));
96-
if ($classMetadata instanceof ClassMetadataInfo && \method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {
96+
if ($classMetadata instanceof ClassMetadataInfo && method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {
9797
return $classMetadata->isChangeTrackingDeferredExplicit();
9898
}
9999

‎src/Bridge/Doctrine/Orm/Extension/OrderExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
6161
}
6262

6363
$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)])) {
6565
// Configure default filter with property
6666
$field = "{$rootAlias}.{$field}";
6767
} else {

‎src/Bridge/Doctrine/Orm/Extension/PaginationExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
117117
if ($request->attributes->get('_graphql')) {
118118
$collectionArgs = $request->attributes->get('_graphql_collections_args', []);
119119
if (isset($collectionArgs[$resourceClass]['after'])) {
120-
$after = \base64_decode($collectionArgs[$resourceClass]['after'], true);
120+
$after = base64_decode($collectionArgs[$resourceClass]['after'], true);
121121
$firstResult = (int) $after;
122122
$firstResult = false === $after ? $firstResult : ++$firstResult;
123123
}

‎src/GraphQl/Action/EntrypointAction.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ private function parseRequest(Request $request): array
7676
$query = $request->query->get('query');
7777
$operation = $request->query->get('operation');
7878
if ($variables = $request->query->get('variables', [])) {
79-
$variables = \json_decode($variables, true);
79+
$variables = json_decode($variables, true);
8080
}
8181

8282
if (!$request->isMethod('POST')) {
8383
return [$query, $operation, $variables];
8484
}
8585

8686
if ('json' === $request->getContentType()) {
87-
$input = \json_decode((string) $request->getContent(), true);
87+
$input = json_decode((string) $request->getContent(), true);
8888

8989
if (isset($input['query'])) {
9090
$query = $input['query'];
9191
}
9292

9393
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);
9595
}
9696

9797
if (isset($input['operation'])) {

‎src/Hal/Serializer/ItemNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private function populateRelation(array $data, $object, string $format = null, a
164164
{
165165
$class = $this->getObjectClass($object);
166166

167-
$attributesMetadata = \array_key_exists($class, $this->attributesMetadataCache) ?
167+
$attributesMetadata = array_key_exists($class, $this->attributesMetadataCache) ?
168168
$this->attributesMetadataCache[$class] :
169169
$this->attributesMetadataCache[$class] = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($object)->getAttributesMetadata() : null;
170170

‎src/Metadata/Property/Factory/ExtractorPropertyMetadataFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private function update(PropertyMetadata $propertyMetadata, array $metadata): Pr
123123
/**
124124
* Creates a SubresourceMetadata.
125125
*
126-
* @param bool|null|array $subresource the subresource metadata coming from XML or YAML
126+
* @param bool|array|null $subresource the subresource metadata coming from XML or YAML
127127
* @param PropertyMetadata $propertyMetadata the current property metadata
128128
*
129129
* @return SubresourceMetadata|null

0 commit comments

Comments
 (0)