Freeze to Doctrine orm 2.9 (#349)

lexik · Oct 7, 2021 · 0b95e8e · 0b95e8e
1 parent 99438ef
commit 0b95e8e
Show file tree

Hide file tree

Showing 25 changed files with 47 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -18,15 +18,15 @@ class BooleanFilterType extends AbstractType
     const VALUE_NO  = 'n';
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return ChoiceType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/CheckboxFilterType.php b/Filter/Form/Type/CheckboxFilterType.php
@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return CheckboxType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/ChoiceFilterType.php b/Filter/Form/Type/ChoiceFilterType.php
@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return ChoiceType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/CollectionAdapterFilterType.php b/Filter/Form/Type/CollectionAdapterFilterType.php
@@ -65,15 +65,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return SharedableFilterType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/DateFilterType.php b/Filter/Form/Type/DateFilterType.php
@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return DateType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git 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
@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return DateTimeType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git 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
@@ -47,15 +47,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return DocumentType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/EntityFilterType.php b/Filter/Form/Type/EntityFilterType.php
@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return EntityType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git a/Filter/Form/Type/NumberFilterType.php b/Filter/Form/Type/NumberFilterType.php
@@ -72,15 +72,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return NumberType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git 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
@@ -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
@@ -83,15 +83,15 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     /**
-     * {@inheritdoc}
+     * @return ?string
      */
     public function getParent()
     {
         return TextType::class;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string
      */
     public function getBlockPrefix()
     {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     },