code cleanup

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"

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;
     }

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);
     }
 
     /**

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);
     }
 
     /**

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);
     }
 
     /**

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);
     }
 
     /**

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);
+    }
 }

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);
     }
 
     /**