1414use Nelmio \ApiDocBundle \Describer \ModelRegistryAwareInterface ;
1515use Nelmio \ApiDocBundle \ModelDescriber \ModelDescriberInterface ;
1616use Nelmio \ApiDocBundle \OpenApiPhp \Util ;
17+ use Nelmio \ApiDocBundle \Util \LegacyTypeConverter ;
1718use OpenApi \Annotations as OA ;
1819use Psr \Log \LoggerAwareTrait ;
1920use Psr \Log \NullLogger ;
20- use Symfony \Component \PropertyInfo \Type ;
21+ use Symfony \Component \PropertyInfo \Type as LegacyType ;
22+ use Symfony \Component \TypeInfo \Type ;
2123
2224final class ModelRegistry
2325{
@@ -74,7 +76,7 @@ public function __construct($modelDescribers, OA\OpenApi $api, array $alternativ
7476
7577 foreach ($ alternativeNamesas $ alternativeName$ criteria
7678 $ modelnew Model (
77- new Type ( ' object ' , false , $ criteria'type ' ]),
79+ LegacyTypeConverter:: createType ( $ criteria'type ' ]),
7880 $ criteria'groups ' ],
7981 $ criteria'options ' ] ?? [],
8082 $ criteria'serializationContext ' ] ?? [],
@@ -170,9 +172,13 @@ public function registerSchemas(): void
170172 $ schema$ this describeSchema ($ model$ name
171173
172174 if (null === $ schema
173- $ errorMessage\sprintf ('Schema of type "%s" can \'t be generated, no describer supports it. ' , $ this typeToString ($ modelgetType ()));
174- if (Type::BUILTIN_TYPE_OBJECT === $ modelgetType ()->getBuiltinType () && !class_exists ($ className$ modelgetType ()->getClassName ())) {
175- $ errorMessage\sprintf (' Class " \\%s" does not exist, did you forget a use statement, or typed it wrong? ' , $ className
175+ $ typeclass_exists (Type::class)
176+ ? $ modelgetTypeInfo ()
177+ : $ modelgetType ();
178+
179+ $ errorMessage\sprintf ('Schema of type "%s" can \'t be generated, no describer supports it. ' , $ this typeToString ($ type
180+ if (method_exists ($ type'getClassName ' ) && null !== $ typegetClassName () && !class_exists ($ className$ typegetClassName ())) {
181+ $ errorMessage\sprintf (' Class "%s" does not exist, did you forget a use statement, or typed it wrong? ' , $ className
176182 }
177183 throw new \LogicException ($ errorMessage
178184 }
@@ -194,8 +200,12 @@ private function determineModelName(Model $model): string
194200 return $ modelname ;
195201 }
196202
203+ $ typeclass_exists (Type::class)
204+ ? $ modelgetTypeInfo ()
205+ : $ modelgetType ();
206+
197207 // 3. Generate from the type
198- return $ this getTypeShortName ($ model -> getType () );
208+ return $ this getTypeShortName ($ type
199209 }
200210
201211 private function generateUniqueModelName (Model $ modelstring
@@ -225,32 +235,45 @@ private function generateUniqueModelName(Model $model): string
225235 */
226236 private function modelToArray (Model $ modelarray
227237 {
228- $ getTypefunction (Type $ typeuse (&$ getTypearray {
229- return [
230- 'class ' => $ typegetClassName (),
231- 'built_in_type ' => $ typegetBuiltinType (),
232- 'nullable ' => $ typeisNullable (),
233- 'collection ' => $ typeisCollection (),
234- 'collection_key_types ' => $ typeisCollection () ? array_map ($ getType$ typegetCollectionKeyTypes ()) : null ,
235- 'collection_value_types ' => $ typeisCollection () ? array_map ($ getType$ typegetCollectionValueTypes ()) : null ,
236- ];
237- };
238+ $ typeclass_exists (Type::class)
239+ ? $ modelgetTypeInfo ()
240+ : $ modelgetType ();
241+
242+ $ dataType$ this typeToString ($ type
238243
239244 return [
240- 'type ' => $ getType ( $ model -> getType ()) ,
245+ 'type ' => $ dataType
241246 'options ' => $ modelgetOptions (),
242247 'groups ' => $ modelgetGroups (),
243248 'serialization_context ' => $ modelgetSerializationContext (),
244249 ];
245250 }
246251
247- private function getTypeShortName (Type $ typestring
252+ private function getTypeShortName (LegacyType | Type $ typestring
248253 {
249- if (null !== $ collectionType$ this getCollectionValueType ($ type
254+ if ($ typeinstanceof Type) {
255+ if ($ typeinstanceof Type \CollectionType) {
256+ return $ this getTypeShortName ($ typegetCollectionValueType ()).'[] ' ;
257+ }
258+
259+ if ($ typeinstanceof Type \ObjectType) {
260+ $ partsexplode ('\\' , $ typegetClassName ());
261+
262+ return end ($ parts
263+ }
264+
265+ if ($ typeinstanceof Type \NullableType) {
266+ return $ this getTypeShortName ($ typegetWrappedType ());
267+ }
268+
269+ return $ type__toString ();
270+ }
271+
272+ if (null !== $ collectionType$ typegetCollectionValueTypes ()[0 ] ?? null )) {
250273 return $ this getTypeShortName ($ collectionType'[] ' ;
251274 }
252275
253- if (Type ::BUILTIN_TYPE_OBJECT === $ typegetBuiltinType ()) {
276+ if (LegacyType ::BUILTIN_TYPE_OBJECT === $ typegetBuiltinType ()) {
254277 $ partsexplode ('\\' , $ typegetClassName ());
255278
256279 return end ($ parts
@@ -259,23 +282,22 @@ private function getTypeShortName(Type $type): string
259282 return $ typegetBuiltinType ();
260283 }
261284
262- private function typeToString (Type $ typestring
285+ private function typeToString (LegacyType | Type $ typestring
263286 {
264- if (Type::BUILTIN_TYPE_OBJECT === $ typegetBuiltinType ()) {
265- return '\\' .$ typegetClassName ();
287+ if ($ typeinstanceof Type) {
288+ return $ type__toString ();
289+ }
290+
291+ if (LegacyType::BUILTIN_TYPE_OBJECT === $ typegetBuiltinType ()) {
292+ return $ typegetClassName ();
266293 } elseif ($ typeisCollection ()) {
267- if (null !== $ collectionType$ this -> getCollectionValueType ( $ type
294+ if (null !== $ collectionType( $ type -> getCollectionValueTypes ()[ 0 ] ?? null )) {
268295 return $ this typeToString ($ collectionType'[] ' ;
269296 } else {
270297 return 'mixed[] ' ;
271298 }
272- } else {
273- return $ typegetBuiltinType ();
274299 }
275- }
276300
277- private function getCollectionValueType (Type $ typeType
278- {
279- return $ typegetCollectionValueTypes ()[0 ] ?? null ;
301+ return $ typegetBuiltinType ();
280302 }
281303}
0 commit comments