Check if json_array type exists before unsetting it

symfony · Oct 11, 2021 · 8b1806d · 8b1806d
1 parent c1ead85
commit 8b1806d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php
@@ -374,9 +374,7 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity
         }
 
         $type = null;
-        $types = Type::getTypesMap();
-        // remove deprecated json_array
-        unset($types[Type::JSON_ARRAY]);
+        $types = $this->getTypesMap();
 
         $allValidTypes = array_merge(
             array_keys($types),
@@ -428,9 +426,7 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity
 
     private function printAvailableTypes(ConsoleStyle $io)
     {
-        $allTypes = Type::getTypesMap();
-        // remove deprecated json_array
-        unset($allTypes[Type::JSON_ARRAY]);
+        $allTypes = $this->getTypesMap();
 
         if ('Hyper' === getenv('TERM_PROGRAM')) {
             $wizard = 'wizard 🧙';
@@ -885,4 +881,16 @@ private function getEntityNamespace(): string
     {
         return $this->doctrineHelper->getEntityNamespace();
     }
+
+    private function getTypesMap(): array
+    {
+        $types = Type::getTypesMap();
+
+        // remove deprecated json_array if it exists
+        if (\defined(sprintf('%s::JSON_ARRAY', Type::class))) {
+            unset($types[Type::JSON_ARRAY]);
+        }
+
+        return $types;
+    }
 }