From cdb9894a3dad4e8ccf62776e85c0633cad38093c Mon Sep 17 00:00:00 2001 From: divyajose Date: Tue, 30 May 2023 14:26:41 +0530 Subject: [PATCH] code cleanup --- composer.json | 2 +- .../ApigeeX/Normalizer/ApiProductNormalizer.php | 7 +------ .../Normalizer/CompanyMembershipNormalizer.php | 5 +---- .../Normalizer/ApiPackageNormalizer.php | 7 +------ .../Monetization/Normalizer/EntityNormalizer.php | 7 +------ src/Normalizer/CredentialProductNormalizer.php | 5 +---- src/Normalizer/ObjectNormalizer.php | 15 ++++++++++----- src/Normalizer/PropertiesPropertyNormalizer.php | 5 +---- 8 files changed, 17 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 8654d6e2..79734f95 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "php-http/guzzle7-adapter": "^1.0", "php-http/mock-client": "^1.1.0", "phpmetrics/phpmetrics": "^2.7", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "sebastian/comparator": "^4.0.5", "symfony/cache": "~3.4 || ~4.0", "vimeo/psalm": "^3.18.2 || ^5.0" diff --git a/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php b/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php index 42622f9a..3facc018 100755 --- a/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php +++ b/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php @@ -50,12 +50,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory */ public function normalize($object, $format = null, array $context = []) { - $normalized = (array) parent::normalize($object, $format, $context); - - //convert to ArrayObject as symfony normalizer throws error for std object. - //set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $normalized = new \ArrayObject($normalized, $array_as_props); + $normalized = parent::normalize($object, $format, $context); return $normalized; } diff --git a/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php b/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php index c8b54953..c4f856a9 100644 --- a/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php +++ b/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php @@ -41,10 +41,7 @@ public function normalize($object, $format = null, array $context = []) //convert to ArrayObject as symfony normalizer throws error for std object. //set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $normalized = new \ArrayObject($normalized, $array_as_props); - - return $normalized; + return new \ArrayObject($normalized, \ArrayObject::ARRAY_AS_PROPS); } /** diff --git a/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php b/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php index 3a194d8d..5a30f3d9 100644 --- a/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php +++ b/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php @@ -57,12 +57,7 @@ public function normalize($object, $format = null, array $context = []) $normalized['product'][$id] = (object) ['id' => $data['id']]; } - //convert to ArrayObject as symfony normalizer throws error for std object. - //set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $normalized = new \ArrayObject($normalized, $array_as_props); - - return $normalized; + return $this->convertToArrayObject($normalized); } /** diff --git a/src/Api/Monetization/Normalizer/EntityNormalizer.php b/src/Api/Monetization/Normalizer/EntityNormalizer.php index 1eb4be54..f3124a9b 100644 --- a/src/Api/Monetization/Normalizer/EntityNormalizer.php +++ b/src/Api/Monetization/Normalizer/EntityNormalizer.php @@ -96,12 +96,7 @@ public function normalize($object, $format = null, array $context = []) } } - //convert to ArrayObject as symfony normalizer throws error for std object. - //set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $normalized = new \ArrayObject($normalized, $array_as_props); - - return $normalized; + return $this->convertToArrayObject($normalized); } /** diff --git a/src/Normalizer/CredentialProductNormalizer.php b/src/Normalizer/CredentialProductNormalizer.php index 771a85f7..2f882a70 100644 --- a/src/Normalizer/CredentialProductNormalizer.php +++ b/src/Normalizer/CredentialProductNormalizer.php @@ -42,10 +42,7 @@ public function normalize($object, $format = null, array $context = []) //Need to convert to ArrayObject as symfony normalizer throws error for std object. //Need to set ARRAY_AS_PROPS flag as we need Entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $asObject = new \ArrayObject($asObject, $array_as_props); - - return $asObject; + return new \ArrayObject($asObject, \ArrayObject::ARRAY_AS_PROPS); } /** diff --git a/src/Normalizer/ObjectNormalizer.php b/src/Normalizer/ObjectNormalizer.php index d3ad37ec..f24e5ce4 100644 --- a/src/Normalizer/ObjectNormalizer.php +++ b/src/Normalizer/ObjectNormalizer.php @@ -102,12 +102,8 @@ public function normalize($object, $format = null, array $context = []) return !is_null($value); }); ksort($asArray); - //Need to convert to ArrayObject as symfony normalizer throws error for std object. - //Need to set ARRAY_AS_PROPS flag as we need Entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $asArray = new \ArrayObject($asArray, $array_as_props); - return $asArray; + return $this->convertToArrayObject($asArray); } /** @@ -129,4 +125,13 @@ public function setSerializer(SerializerInterface $serializer): void $this->serializer = $serializer; $this->objectNormalizer->setSerializer($serializer); } + + /** + * {@inheritDoc} + */ + public function convertToArrayObject($normalized, $array_as_props = \ArrayObject::ARRAY_AS_PROPS) + { + //default set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. + return new \ArrayObject($normalized, $array_as_props); + } } diff --git a/src/Normalizer/PropertiesPropertyNormalizer.php b/src/Normalizer/PropertiesPropertyNormalizer.php index 1d95944e..1ea099d0 100644 --- a/src/Normalizer/PropertiesPropertyNormalizer.php +++ b/src/Normalizer/PropertiesPropertyNormalizer.php @@ -41,10 +41,7 @@ public function normalize($object, $format = null, array $context = []) //convert to ArrayObject as symfony normalizer throws error for std object. //set ARRAY_AS_PROPS flag as we need entries to be accessed as properties. - $array_as_props = \ArrayObject::ARRAY_AS_PROPS; - $return = new \ArrayObject($return, $array_as_props); - - return $return; + return new \ArrayObject($return, \ArrayObject::ARRAY_AS_PROPS); } /**