Merge 2.x into 3.x

sonata-project · Oct 1, 2021 · 838b41c · 838b41c
2 parents 501611f + 8fe9b79
commit 838b41c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "symfony-bundle",
         "xls"
     ],
-    "homepage": "https://github.com/sonata-project/Exporter",
+    "homepage": "https://docs.sonata-project.org/projects/exporter",
     "license": "MIT",
     "authors": [
         {
@@ -24,13 +24,14 @@
         "php": "^7.3 || ^8.0"
     },
     "conflict": {
-        "doctrine/mongodb-odm": "<2.0"
+        "doctrine/mongodb-odm": "<2.0",
+        "doctrine/orm": "<2.8"
     },
     "require-dev": {
         "doctrine/annotations": "^1.13",
-        "doctrine/dbal": "^2.5",
+        "doctrine/dbal": "^2.10",
         "doctrine/mongodb-odm": "^2.0",
-        "doctrine/orm": "^2.4.5",
+        "doctrine/orm": "^2.8",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "phpstan/extension-installer": "^1.0",

diff --git a/src/Source/SourceIteratorInterface.php b/src/Source/SourceIteratorInterface.php
@@ -14,6 +14,10 @@
 namespace Sonata\Exporter\Source;
 
 /**
+ * NEXT_MAJOR: Remove this interface.
+ *
+ * @deprecated since 2.x use \Iterator instead.
+ *
  * @phpstan-extends \Iterator<array<mixed>>
  */
 interface SourceIteratorInterface extends \Iterator