fixup! Fix tests

olsavmic · olsavmic · commit 38a34381fed9 · 2022-05-23T19:50:40.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -55,7 +55,7 @@ public function __construct(
         parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
         $this->allowNormalizationOfObjectsWithoutAnyGetters = $allowNormalizationOfObjectsWithoutAnyGetters;
 
-        if (func_num_args() < 7) {
+        if (\func_num_args() < 7) {
             trigger_deprecation('symfony/serializer', '6.1', '$allowNormalizationOfObjectsWithoutAnyGetters parameter of %s::__construct() should be explicitly provided since the default value will change to `true` in symfony/serializer >=7.0', __CLASS__);
         }
     }
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
-use Symfony\Component\Uid\AbstractUid;
 
 /**
  * Converts between objects and arrays by mapping properties.
@@ -51,7 +50,7 @@ public function __construct(
         parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
         $this->allowNormalizationOfObjectsWithoutAnyProperties = $allowNormalizationOfObjectsWithoutAnyProperties;
 
-        if (func_num_args() < 7) {
+        if (\func_num_args() < 7) {
             trigger_deprecation('symfony/serializer', '6.1', '$allowNormalizationOfObjectsWithoutAnyProperties parameter of %s::__construct() should be explicitly provided since the default value will change to `true` in symfony/serializer >=7.0', __CLASS__);
         }
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -284,7 +284,7 @@ protected function getDenormalizerForGroups(): GetSetMethodNormalizer
     public function testGroupsNormalizeWithNameConverter()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $this->normalizer = new GetSetMethodNormalizer($classMetadataFactory, new CamelCaseToSnakeCaseNameConverter(),null, null, null, [], true);
+        $this->normalizer = new GetSetMethodNormalizer($classMetadataFactory, new CamelCaseToSnakeCaseNameConverter(), null, null, null, [], true);
         $this->normalizer->setSerializer($this->serializer);
 
         $obj = new GroupDummy();

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __construct(`
`55`	`55`	`parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);`
`56`	`56`	`$this->allowNormalizationOfObjectsWithoutAnyGetters = $allowNormalizationOfObjectsWithoutAnyGetters;`
`57`	`57`
`58`		`- if (func_num_args() < 7) {`
	`58`	`+ if (\func_num_args() < 7) {`
`59`	`59`	trigger_deprecation('symfony/serializer', '6.1', '$allowNormalizationOfObjectsWithoutAnyGetters parameter of %s::__construct() should be explicitly provided since the default value will change to `true` in symfony/serializer >=7.0', __CLASS__);
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolverInterface;`
`17`	`17`	`use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;`
`18`	`18`	`use Symfony\Component\Serializer\NameConverter\NameConverterInterface;`
`19`		`-use Symfony\Component\Uid\AbstractUid;`
`20`	`19`
`21`	`20`	`/**`
`22`	`21`	`* Converts between objects and arrays by mapping properties.`
`@@ -51,7 +50,7 @@ public function __construct(`
`51`	`50`	`parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);`
`52`	`51`	`$this->allowNormalizationOfObjectsWithoutAnyProperties = $allowNormalizationOfObjectsWithoutAnyProperties;`
`53`	`52`
`54`		`- if (func_num_args() < 7) {`
	`53`	`+ if (\func_num_args() < 7) {`
`55`	`54`	trigger_deprecation('symfony/serializer', '6.1', '$allowNormalizationOfObjectsWithoutAnyProperties parameter of %s::__construct() should be explicitly provided since the default value will change to `true` in symfony/serializer >=7.0', __CLASS__);
`56`	`55`	`}`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ protected function getDenormalizerForGroups(): GetSetMethodNormalizer`
`284`	`284`	`public function testGroupsNormalizeWithNameConverter()`
`285`	`285`	`{`
`286`	`286`	`$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
`287`		`- $this->normalizer = new GetSetMethodNormalizer($classMetadataFactory, new CamelCaseToSnakeCaseNameConverter(),null, null, null, [], true);`
	`287`	`+ $this->normalizer = new GetSetMethodNormalizer($classMetadataFactory, new CamelCaseToSnakeCaseNameConverter(), null, null, null, [], true);`
`288`	`288`	`$this->normalizer->setSerializer($this->serializer);`
`289`	`289`
`290`	`290`	`$obj = new GroupDummy();`