Merge branch '3.0.x' into 3.1.x

* 3.0.x: Switch back to stable dependencies (#11210) Update branch metadata
doctrine · Feb 4, 2024 · 517d038 · 517d038
2 parents 3db79eb + 7527b78
commit 517d038
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -6,11 +6,23 @@
     "docsSlug": "doctrine-orm",
     "versions": [
         {
-            "name": "3.0",
-            "branchName": "3.0.x",
+            "name": "4.0",
+            "branchName": "4.0.x",
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "3.1",
+            "branchName": "3.1.x",
+            "slug": "3.1",
+            "upcoming": true
+        },
+        {
+            "name": "3.0",
+            "branchName": "3.0.x",
+            "slug": "3.0",
+            "current": true
+        },
         {
             "name": "2.19",
             "branchName": "2.19.x",
@@ -21,7 +33,7 @@
             "name": "2.18",
             "branchName": "2.18.x",
             "slug": "2.18",
-            "current": true
+            "maintained": true
         },
         {
             "name": "2.17",

diff --git a/composer.json b/composer.json
@@ -45,7 +45,6 @@
         "symfony/cache": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "5.16.0"
     },
-    "minimum-stability": "RC",
     "suggest": {
         "ext-dom": "Provides support for XSD validation for XML mapping files",
         "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0"