Merge pull request #1495 from mbabker/improve-null-checks

Improve null checks in drivers with a delegate
schmittjoh · Jun 24, 2023 · f87de20 · f87de20
2 parents 926a7d5 + bb647e8
commit f87de20
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/src/Metadata/Driver/AbstractDoctrineTypeDriver.php b/src/Metadata/Driver/AbstractDoctrineTypeDriver.php
@@ -83,6 +83,11 @@ public function __construct(DriverInterface $delegate, ManagerRegistry $registry
     public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadata
     {
         $classMetadata = $this->delegate->loadMetadataForClass($class);
+
+        if (null === $classMetadata) {
+            return null;
+        }
+
         \assert($classMetadata instanceof ClassMetadata);
 
         // Abort if the given class is not a mapped entity

diff --git a/src/Metadata/Driver/DefaultValuePropertyDriver.php b/src/Metadata/Driver/DefaultValuePropertyDriver.php
@@ -30,12 +30,13 @@ public function __construct(DriverInterface $delegate)
     public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
     {
         $classMetadata = $this->delegate->loadMetadataForClass($class);
-        \assert($classMetadata instanceof SerializerClassMetadata);
 
         if (null === $classMetadata) {
             return null;
         }
 
+        \assert($classMetadata instanceof SerializerClassMetadata);
+
         foreach ($classMetadata->propertyMetadata as $key => $propertyMetadata) {
             \assert($propertyMetadata instanceof PropertyMetadata);
             if (null !== $propertyMetadata->hasDefault) {

diff --git a/src/Metadata/Driver/DocBlockDriver.php b/src/Metadata/Driver/DocBlockDriver.php
@@ -45,12 +45,13 @@ public function __construct(DriverInterface $delegate, ?ParserInterface $typePar
     public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
     {
         $classMetadata = $this->delegate->loadMetadataForClass($class);
-        \assert($classMetadata instanceof SerializerClassMetadata);
 
         if (null === $classMetadata) {
             return null;
         }
 
+        \assert($classMetadata instanceof SerializerClassMetadata);
+
         // We base our scan on the internal driver's property list so that we
         // respect any internal allow/blocklist like in the AnnotationDriver
         foreach ($classMetadata->propertyMetadata as $key => $propertyMetadata) {

diff --git a/src/Metadata/Driver/EnumPropertiesDriver.php b/src/Metadata/Driver/EnumPropertiesDriver.php
@@ -30,12 +30,13 @@ public function __construct(DriverInterface $delegate)
     public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
     {
         $classMetadata = $this->delegate->loadMetadataForClass($class);
-        \assert($classMetadata instanceof SerializerClassMetadata);
 
         if (null === $classMetadata) {
             return null;
         }
 
+        \assert($classMetadata instanceof SerializerClassMetadata);
+
         // We base our scan on the internal driver's property list so that we
         // respect any internal allow/blocklist like in the AnnotationDriver
         foreach ($classMetadata->propertyMetadata as $propertyMetadata) {

diff --git a/src/Metadata/Driver/TypedPropertiesDriver.php b/src/Metadata/Driver/TypedPropertiesDriver.php
@@ -67,6 +67,11 @@ private function getDefaultWhiteList(): array
     public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
     {
         $classMetadata = $this->delegate->loadMetadataForClass($class);
+
+        if (null === $classMetadata) {
+            return null;
+        }
+
         \assert($classMetadata instanceof SerializerClassMetadata);
 
         if (PHP_VERSION_ID <= 70400) {