Freeze to Doctrine orm 2.9 (#349)

gilles-g · web-flow · commit 0b95e8ea787c · 2021-10-07T09:45:54.000+02:00
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"
     },

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`class DoctrineDBALSubscriber extends AbstractDoctrineSubscriber implements EventSubscriberInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`		`- * {@inheritDoc}`
	`15`	`+ * @return array`
`16`	`16`	`*/`
`17`	`17`	`public static function getSubscribedEvents()`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`class DoctrineMongodbSubscriber implements EventSubscriberInterface`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`		`- * {@inheritDoc}`
	`19`	`+ * @return array`
`20`	`20`	`*/`
`21`	`21`	`public static function getSubscribedEvents()`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`class DoctrineORMSubscriber extends AbstractDoctrineSubscriber implements EventSubscriberInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * {@inheritDoc}`
	`22`	`+ * @return array`
`23`	`23`	`*/`
`24`	`24`	`public static function getSubscribedEvents()`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class FilterExtension extends AbstractExtension`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * {@inheritdoc}`
	`16`	`+ * @return array`
`17`	`17`	`*/`
`18`	`18`	`protected function loadTypes()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ class BooleanFilterType extends AbstractType`
`18`	`18`	`const VALUE_NO = 'n';`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * {@inheritdoc}`
	`21`	`+ * @return ?string`
`22`	`22`	`*/`
`23`	`23`	`public function getParent()`
`24`	`24`	`{`
`25`	`25`	`return ChoiceType::class;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`29`		`- * {@inheritdoc}`
	`29`	`+ * @return string`
`30`	`30`	`*/`
`31`	`31`	`public function getBlockPrefix()`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ public function configureOptions(OptionsResolver $resolver)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * {@inheritdoc}`
	`31`	`+ * @return ?string`
`32`	`32`	`*/`
`33`	`33`	`public function getParent()`
`34`	`34`	`{`
`35`	`35`	`return CheckboxType::class;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`		`- * {@inheritdoc}`
	`39`	`+ * @return string`
`40`	`40`	`*/`
`41`	`41`	`public function getBlockPrefix()`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,15 @@ public function configureOptions(OptionsResolver $resolver)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`		`- * {@inheritdoc}`
	`68`	`+ * @return ?string`
`69`	`69`	`*/`
`70`	`70`	`public function getParent()`
`71`	`71`	`{`
`72`	`72`	`return SharedableFilterType::class;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
`76`		`- * {@inheritdoc}`
	`76`	`+ * @return string`
`77`	`77`	`*/`
`78`	`78`	`public function getBlockPrefix()`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * {@inheritdoc}`
	`47`	`+ * @return string`
`48`	`48`	`*/`
`49`	`49`	`public function getBlockPrefix()`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,15 @@ public function configureOptions(OptionsResolver $resolver)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * {@inheritdoc}`
	`50`	`+ * @return ?string`
`51`	`51`	`*/`
`52`	`52`	`public function getParent()`
`53`	`53`	`{`
`54`	`54`	`return DocumentType::class;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`58`		`- * {@inheritdoc}`
	`58`	`+ * @return string`
`59`	`59`	`*/`
`60`	`60`	`public function getBlockPrefix()`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,15 @@ public function configureOptions(OptionsResolver $resolver)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * {@inheritdoc}`
	`75`	`+ * @return ?string`
`76`	`76`	`*/`
`77`	`77`	`public function getParent()`
`78`	`78`	`{`
`79`	`79`	`return NumberType::class;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`83`		`- * {@inheritdoc}`
	`83`	`+ * @return string`
`84`	`84`	`*/`
`85`	`85`	`public function getBlockPrefix()`
`86`	`86`	`{`