Merge branch '5.1.x' into 5.0.x-merge-up-into-5.1.x_ukSuNM1L

doctrine · Apr 23, 2022 · e8f405e · e8f405e
2 parents ca463a3 + 61dc078
commit e8f405e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -4,25 +4,31 @@
   "slug": "doctrine-module",
   "versions": [
     {
-      "name": "5.0",
-      "branchName": "5.0.x",
-      "slug": "5.0",
-      "aliases":[
+      "name": "5.1",
+      "branchName": "5.1.x",
+      "slug": "5.1",
+      "aliases": [
         "latest"
       ],
       "upcoming": true
     },
     {
-      "name": "4.4",
-      "branchName": "4.4.x",
-      "slug": "4.4",
-      "aliases":[
+      "name": "5.0",
+      "branchName": "5.0.x",
+      "slug": "5.0",
+      "aliases": [
         "current",
         "stable"
       ],
       "current": true,
       "maintained": true
     },
+    {
+      "name": "4.4",
+      "branchName": "4.4.x",
+      "slug": "4.4",
+      "maintained": true
+    },
     {
       "name": "4.3",
       "branchName": "4.3.x",

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -23,8 +23,6 @@ jobs:
         include:
           - php-version: "7.4"
             dependencies: "lowest"
-          - php-version: "7.4"
-            dependencies: "lowest"
 
     steps:
       - name: "Checkout"

diff --git a/composer.json b/composer.json
@@ -47,28 +47,28 @@
         "doctrine/annotations": "^1.13.2",
         "doctrine/cache": "^1.12.1",
         "doctrine/collections": "^1.6.8",
-        "doctrine/doctrine-laminas-hydrator": "^2.2.1 || ^3.0.0",
+        "doctrine/doctrine-laminas-hydrator": "^3.0.0",
         "doctrine/event-manager": "^1.1.1",
         "doctrine/inflector": "^2.0.4",
-        "doctrine/persistence": "^2.2.3",
+        "doctrine/persistence": "^2.3.0",
         "laminas/laminas-authentication": "^2.9.0",
         "laminas/laminas-cache": "^3.1.2",
         "laminas/laminas-eventmanager": "^3.4.0",
-        "laminas/laminas-form": "^3.0.1",
+        "laminas/laminas-form": "^3.1.1",
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.0",
-        "laminas/laminas-paginator": "^2.12.1",
+        "laminas/laminas-paginator": "^2.12.2",
         "laminas/laminas-servicemanager": "^3.10.0",
-        "laminas/laminas-stdlib": "^3.6.4",
-        "laminas/laminas-validator": "^2.15.1",
-        "symfony/console": "^5.4.1 || ^6.0.1"
+        "laminas/laminas-stdlib": "^3.7.1",
+        "laminas/laminas-validator": "^2.16.0",
+        "symfony/console": "^5.4.3 || ^6.0.3"
     },
     "provide": {
         "laminas/laminas-cache-storage-implementation": "1.0.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0.0",
-        "doctrine/orm": "^2.10.5",
+        "doctrine/orm": "^2.11.1",
         "jangregor/phpstan-prophecy": "^1.0.0",
         "laminas/laminas-cache-storage-adapter-blackhole": "^2.0.0",
         "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
@@ -77,18 +77,17 @@
         "laminas/laminas-serializer": "^2.12.0",
         "laminas/laminas-session": "^2.12.0",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpstan/phpstan": "^1.2.0",
+        "phpstan/phpstan": "^1.4.6",
         "phpstan/phpstan-phpunit": "^1.0.0",
-        "phpunit/phpunit": "^9.5.11",
-        "predis/predis": "^1.1.9",
-        "vimeo/psalm": "^4.16.1"
+        "phpunit/phpunit": "^9.5.13",
+        "predis/predis": "^1.1.10",
+        "vimeo/psalm": "^4.20.0"
     },
     "conflict": {
         "doctrine/orm": "2.12.0"
     },
     "suggest": {
-        "doctrine/data-fixtures":         "Data Fixtures if you want to generate test data or bootstrap data for your deployments",
-        "laminas/laminas-mvc-console":    "^1.1.11 if you want to use the Laminas console libraries"
+        "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments"
     },
     "autoload": {
         "psr-4": {