From 0b95e8ea787cb3dc44a53167bb1933eafeaaeaab Mon Sep 17 00:00:00 2001 From: Gilles Gauthier Date: Thu, 7 Oct 2021 09:45:54 +0200 Subject: [PATCH] Freeze to Doctrine orm 2.9 (#349) --- Event/Subscriber/DoctrineDBALSubscriber.php | 2 +- Event/Subscriber/DoctrineMongodbSubscriber.php | 2 +- Event/Subscriber/DoctrineORMSubscriber.php | 2 +- Filter/Form/FilterExtension.php | 2 +- Filter/Form/Type/BooleanFilterType.php | 4 ++-- Filter/Form/Type/CheckboxFilterType.php | 4 ++-- Filter/Form/Type/ChoiceFilterType.php | 4 ++-- Filter/Form/Type/CollectionAdapterFilterType.php | 4 ++-- Filter/Form/Type/DateFilterType.php | 4 ++-- Filter/Form/Type/DateRangeFilterType.php | 2 +- Filter/Form/Type/DateTimeFilterType.php | 4 ++-- Filter/Form/Type/DateTimeRangeFilterType.php | 2 +- Filter/Form/Type/DocumentFilterType.php | 4 ++-- Filter/Form/Type/EntityFilterType.php | 4 ++-- Filter/Form/Type/NumberFilterType.php | 4 ++-- Filter/Form/Type/NumberRangeFilterType.php | 2 +- Filter/Form/Type/SharedableFilterType.php | 2 +- Filter/Form/Type/TextFilterType.php | 4 ++-- Tests/Fixtures/Filter/FormType.php | 3 +++ Tests/Fixtures/Filter/ItemCallbackFilterType.php | 3 +++ Tests/Fixtures/Filter/ItemEmbeddedOptionsFilterType.php | 3 +++ Tests/Fixtures/Filter/ItemFilterType.php | 3 +++ Tests/Fixtures/Filter/OptionFilterType.php | 3 +++ Tests/Fixtures/Filter/RangeFilterType.php | 3 +++ composer.json | 2 +- 25 files changed, 47 insertions(+), 29 deletions(-) diff --git a/Event/Subscriber/DoctrineDBALSubscriber.php b/Event/Subscriber/DoctrineDBALSubscriber.php index aa59f60..ee80158 100644 --- a/Event/Subscriber/DoctrineDBALSubscriber.php +++ b/Event/Subscriber/DoctrineDBALSubscriber.php @@ -12,7 +12,7 @@ class DoctrineDBALSubscriber extends AbstractDoctrineSubscriber implements EventSubscriberInterface { /** - * {@inheritDoc} + * @return array */ public static function getSubscribedEvents() { diff --git a/Event/Subscriber/DoctrineMongodbSubscriber.php b/Event/Subscriber/DoctrineMongodbSubscriber.php index 4e3b2be..99749db 100644 --- a/Event/Subscriber/DoctrineMongodbSubscriber.php +++ b/Event/Subscriber/DoctrineMongodbSubscriber.php @@ -16,7 +16,7 @@ class DoctrineMongodbSubscriber implements EventSubscriberInterface { /** - * {@inheritDoc} + * @return array */ public static function getSubscribedEvents() { diff --git a/Event/Subscriber/DoctrineORMSubscriber.php b/Event/Subscriber/DoctrineORMSubscriber.php index b8cc6e8..27ba22d 100644 --- a/Event/Subscriber/DoctrineORMSubscriber.php +++ b/Event/Subscriber/DoctrineORMSubscriber.php @@ -19,7 +19,7 @@ class DoctrineORMSubscriber extends AbstractDoctrineSubscriber implements EventSubscriberInterface { /** - * {@inheritDoc} + * @return array */ public static function getSubscribedEvents() { diff --git a/Filter/Form/FilterExtension.php b/Filter/Form/FilterExtension.php index 72ecd56..29f3454 100644 --- a/Filter/Form/FilterExtension.php +++ b/Filter/Form/FilterExtension.php @@ -13,7 +13,7 @@ class FilterExtension extends AbstractExtension { /** - * {@inheritdoc} + * @return array */ protected function loadTypes() { diff --git a/Filter/Form/Type/BooleanFilterType.php b/Filter/Form/Type/BooleanFilterType.php index 6bcb8fb..9bd9f58 100644 --- a/Filter/Form/Type/BooleanFilterType.php +++ b/Filter/Form/Type/BooleanFilterType.php @@ -18,7 +18,7 @@ class BooleanFilterType extends AbstractType const VALUE_NO = 'n'; /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -26,7 +26,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/CheckboxFilterType.php b/Filter/Form/Type/CheckboxFilterType.php index 83d43ba..a176316 100644 --- a/Filter/Form/Type/CheckboxFilterType.php +++ b/Filter/Form/Type/CheckboxFilterType.php @@ -28,7 +28,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -36,7 +36,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/ChoiceFilterType.php b/Filter/Form/Type/ChoiceFilterType.php index d72887e..a786cca 100644 --- a/Filter/Form/Type/ChoiceFilterType.php +++ b/Filter/Form/Type/ChoiceFilterType.php @@ -28,7 +28,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -36,7 +36,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/CollectionAdapterFilterType.php b/Filter/Form/Type/CollectionAdapterFilterType.php index 02565b6..2184ab4 100644 --- a/Filter/Form/Type/CollectionAdapterFilterType.php +++ b/Filter/Form/Type/CollectionAdapterFilterType.php @@ -65,7 +65,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -73,7 +73,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/DateFilterType.php b/Filter/Form/Type/DateFilterType.php index d6f7848..f7fa9e7 100644 --- a/Filter/Form/Type/DateFilterType.php +++ b/Filter/Form/Type/DateFilterType.php @@ -28,7 +28,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -36,7 +36,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/DateRangeFilterType.php b/Filter/Form/Type/DateRangeFilterType.php index b27f498..a662627 100644 --- a/Filter/Form/Type/DateRangeFilterType.php +++ b/Filter/Form/Type/DateRangeFilterType.php @@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/DateTimeFilterType.php b/Filter/Form/Type/DateTimeFilterType.php index 475ea9c..62f4928 100644 --- a/Filter/Form/Type/DateTimeFilterType.php +++ b/Filter/Form/Type/DateTimeFilterType.php @@ -28,7 +28,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -36,7 +36,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/DateTimeRangeFilterType.php b/Filter/Form/Type/DateTimeRangeFilterType.php index 950edfc..a6add7b 100644 --- a/Filter/Form/Type/DateTimeRangeFilterType.php +++ b/Filter/Form/Type/DateTimeRangeFilterType.php @@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/DocumentFilterType.php b/Filter/Form/Type/DocumentFilterType.php index 15df6e2..29873a7 100644 --- a/Filter/Form/Type/DocumentFilterType.php +++ b/Filter/Form/Type/DocumentFilterType.php @@ -47,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -55,7 +55,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/EntityFilterType.php b/Filter/Form/Type/EntityFilterType.php index d04dbb1..f61b4b6 100644 --- a/Filter/Form/Type/EntityFilterType.php +++ b/Filter/Form/Type/EntityFilterType.php @@ -28,7 +28,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -36,7 +36,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/NumberFilterType.php b/Filter/Form/Type/NumberFilterType.php index 8af97d0..70cbf2f 100644 --- a/Filter/Form/Type/NumberFilterType.php +++ b/Filter/Form/Type/NumberFilterType.php @@ -72,7 +72,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -80,7 +80,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/NumberRangeFilterType.php b/Filter/Form/Type/NumberRangeFilterType.php index c251cdc..7e55b57 100644 --- a/Filter/Form/Type/NumberRangeFilterType.php +++ b/Filter/Form/Type/NumberRangeFilterType.php @@ -45,7 +45,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/SharedableFilterType.php b/Filter/Form/Type/SharedableFilterType.php index 1f2b070..0b88227 100644 --- a/Filter/Form/Type/SharedableFilterType.php +++ b/Filter/Form/Type/SharedableFilterType.php @@ -34,7 +34,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Filter/Form/Type/TextFilterType.php b/Filter/Form/Type/TextFilterType.php index cf0789e..347110d 100644 --- a/Filter/Form/Type/TextFilterType.php +++ b/Filter/Form/Type/TextFilterType.php @@ -83,7 +83,7 @@ public function configureOptions(OptionsResolver $resolver) } /** - * {@inheritdoc} + * @return ?string */ public function getParent() { @@ -91,7 +91,7 @@ public function getParent() } /** - * {@inheritdoc} + * @return string */ public function getBlockPrefix() { diff --git a/Tests/Fixtures/Filter/FormType.php b/Tests/Fixtures/Filter/FormType.php index 3c72f50..97b79e0 100644 --- a/Tests/Fixtures/Filter/FormType.php +++ b/Tests/Fixtures/Filter/FormType.php @@ -36,6 +36,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) )); } + /** + * @return string + */ public function getBlockPrefix() { return 'my_form'; diff --git a/Tests/Fixtures/Filter/ItemCallbackFilterType.php b/Tests/Fixtures/Filter/ItemCallbackFilterType.php index cd27f3b..b2d29f7 100644 --- a/Tests/Fixtures/Filter/ItemCallbackFilterType.php +++ b/Tests/Fixtures/Filter/ItemCallbackFilterType.php @@ -38,6 +38,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) )); } + /** + * @return string + */ public function getBlockPrefix() { return 'item_filter'; diff --git a/Tests/Fixtures/Filter/ItemEmbeddedOptionsFilterType.php b/Tests/Fixtures/Filter/ItemEmbeddedOptionsFilterType.php index 67acf9d..a5bd509 100644 --- a/Tests/Fixtures/Filter/ItemEmbeddedOptionsFilterType.php +++ b/Tests/Fixtures/Filter/ItemEmbeddedOptionsFilterType.php @@ -49,6 +49,9 @@ public function configureOptions(OptionsResolver $resolver) )); } + /** + * @return string + */ public function getBlockPrefix() { return 'item_filter'; diff --git a/Tests/Fixtures/Filter/ItemFilterType.php b/Tests/Fixtures/Filter/ItemFilterType.php index 72427e3..fed10ec 100644 --- a/Tests/Fixtures/Filter/ItemFilterType.php +++ b/Tests/Fixtures/Filter/ItemFilterType.php @@ -52,6 +52,9 @@ public function configureOptions(OptionsResolver $resolver) )); } + /** + * @return string + */ public function getBlockPrefix() { return 'item_filter'; diff --git a/Tests/Fixtures/Filter/OptionFilterType.php b/Tests/Fixtures/Filter/OptionFilterType.php index ca0f167..a91c612 100644 --- a/Tests/Fixtures/Filter/OptionFilterType.php +++ b/Tests/Fixtures/Filter/OptionFilterType.php @@ -20,6 +20,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add('rank', NumberFilterType::class); } + /** + * @return string + */ public function getBlockPrefix() { return 'options_filter'; diff --git a/Tests/Fixtures/Filter/RangeFilterType.php b/Tests/Fixtures/Filter/RangeFilterType.php index 2c1cf27..c0ae9e2 100644 --- a/Tests/Fixtures/Filter/RangeFilterType.php +++ b/Tests/Fixtures/Filter/RangeFilterType.php @@ -51,6 +51,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } + /** + * @return string + */ public function getBlockPrefix() { return 'item_filter'; diff --git a/composer.json b/composer.json index c456f77..58460a0 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=7.1", - "doctrine/orm": "^2.7", + "doctrine/orm": "2.9.*", "symfony/form": "^4.4|^5.1", "symfony/framework-bundle": "^4.4|^5.1" },