From 500d64b6065e189bdbb39b37e574619581d89509 Mon Sep 17 00:00:00 2001 From: LeJeanbono Date: Thu, 24 Oct 2019 23:49:57 +0200 Subject: [PATCH] Remove deprecated json_array type --- src/GeneratorTwigHelper.php | 1 - src/Maker/MakeEntity.php | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GeneratorTwigHelper.php b/src/GeneratorTwigHelper.php index 0376f1082..eeb6d7c56 100644 --- a/src/GeneratorTwigHelper.php +++ b/src/GeneratorTwigHelper.php @@ -51,7 +51,6 @@ public function getEntityFieldPrintCode($entity, $field): string $printCode .= ' ? '.$printCode.'|date(\'H:i:s\') : \'\''; break; case 'json': - case 'json_array': $printCode .= ' ? '.$printCode.'|json_encode : \'\''; break; case 'array': diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php index d2ccb1fa4..57e034f33 100644 --- a/src/Maker/MakeEntity.php +++ b/src/Maker/MakeEntity.php @@ -318,8 +318,12 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity } $type = null; + $types = Type::getTypesMap(); + // remove deprecated json_array + unset($types[Type::JSON_ARRAY]); + $allValidTypes = array_merge( - array_keys(Type::getTypesMap()), + array_keys($types), EntityRelation::getValidRelationTypes(), ['relation'] );