From 481f47de15a23eb5d07366fd36083b3f15287d51 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Fri, 31 Dec 2021 12:39:07 +0100 Subject: [PATCH 1/5] updated branch names --- .doctrine-project.json | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index 24a259a4..eec7ef3f 100644 --- 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", From 2edb48d1a6e8879eb3d98c282ed0f0840caabd37 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Mon, 14 Feb 2022 08:47:32 +0100 Subject: [PATCH 2/5] update doctrine-laminas-hydrator to ^3.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 915cf999..57a03dbd 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "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", From d3a07259d49d3093845b548860e9d62971fe3728 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Mon, 14 Feb 2022 08:49:34 +0100 Subject: [PATCH 3/5] removed outdated suggested package --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 57a03dbd..ed33fc85 100644 --- a/composer.json +++ b/composer.json @@ -84,8 +84,7 @@ "vimeo/psalm": "^4.16.1" }, "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": { From c007cb7b7c7f6b6075f9829fbb476b1389304e57 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Mon, 14 Feb 2022 08:49:49 +0100 Subject: [PATCH 4/5] raise minimum constraints for dependencies --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index ed33fc85..46d86bab 100644 --- a/composer.json +++ b/composer.json @@ -50,25 +50,25 @@ "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.4", + "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,11 +77,11 @@ "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" }, "suggest": { "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments" From 82600d9c81a5111e0cdc992ba86c7da8da34fe57 Mon Sep 17 00:00:00 2001 From: Dennis Riehle Date: Mon, 14 Feb 2022 08:53:40 +0100 Subject: [PATCH 5/5] do not run CI for PHP 7.4 with lowest dependencies twice --- .github/workflows/continuous-integration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3570038b..494b0d88 100644 --- 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"