From e49ccfe1dcbbd7e443d476b65d5170acdf3fe32b Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Sat, 6 Jul 2024 17:10:48 -0600 Subject: [PATCH 1/3] Updated versions to latest in composer.json --- composer.json | 55 ++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index c03d8ca4..614ac99f 100644 --- a/composer.json +++ b/composer.json @@ -36,48 +36,45 @@ ], "homepage": "http://www.doctrine-project.org/", "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "composer-runtime-api": "^2.0", "composer/semver": "^3.0", - "doctrine/annotations": "^1.13.3 || ^2", - "doctrine/cache": "^1.13.0 || ^2.1.0", - "doctrine/collections": "^1.8.0 || ^2.1", + "doctrine/annotations": "^2.0.1", + "doctrine/cache": "^2.1.0", + "doctrine/collections": "^2.2.2", "doctrine/doctrine-laminas-hydrator": "^3.2.0", - "doctrine/event-manager": "^1.2.0 || ^2.0", + "doctrine/event-manager": "^2.0.1", "doctrine/inflector": "^2.0.6", - "doctrine/persistence": "^2.5.5 || ^3.1.0", + "doctrine/persistence": "^3.3.3", "laminas/laminas-authentication": "^2.12.0", - "laminas/laminas-cache": "^3.6.0", - "laminas/laminas-cache-storage-adapter-filesystem": "^2.2.0", - "laminas/laminas-cache-storage-adapter-memory": "^2.1.0", - "laminas/laminas-eventmanager": "^3.5.0", + "laminas/laminas-cache": "^4.0.3", + "laminas/laminas-cache-storage-adapter-filesystem": "^2.4.0", + "laminas/laminas-cache-storage-adapter-memory": "^2.3.0", + "laminas/laminas-eventmanager": "^3.13.1", "laminas/laminas-form": "^3.4.1", - "laminas/laminas-modulemanager": "^2.12.0", + "laminas/laminas-modulemanager": "^2.16.0", "laminas/laminas-mvc": "^3.3.5", "laminas/laminas-paginator": "^2.13.0", - "laminas/laminas-servicemanager": "^3.17.0", + "laminas/laminas-servicemanager": "^4.2.0", "laminas/laminas-stdlib": "^3.13.0", - "laminas/laminas-validator": "^2.25.0", - "psr/container": "^1.1.2", - "symfony/console": "^5.4.16 || ^6.2.1" + "laminas/laminas-validator": "^2.60.0", + "psr/container": "^2.0.2", + "symfony/console": "v7.1.2" }, "require-dev": { "doctrine/coding-standard": "^12.0.0", - "doctrine/mongodb-odm": "^2.5.0", - "doctrine/orm": "^2.13.4", - "jangregor/phpstan-prophecy": "^1.0.0", - "laminas/laminas-i18n": "^2.17.0", + "doctrine/mongodb-odm": "^2.7.1", + "doctrine/orm": "^3.2.1", + "jangregor/phpstan-prophecy": "^1.0.2", + "laminas/laminas-i18n": "^2.27.1", "laminas/laminas-log": "^2.15.3", - "laminas/laminas-serializer": "^2.13.0", - "laminas/laminas-session": "^2.13.0", - "phpstan/phpstan": "^1.9.2", - "phpstan/phpstan-phpunit": "^1.3.0", - "phpunit/phpunit": "^9.5.27", - "predis/predis": "^1.1.10", - "vimeo/psalm": "^5.0" - }, - "conflict": { - "doctrine/orm": "2.12.0" + "laminas/laminas-serializer": "^3.0.0", + "laminas/laminas-session": "^2.21.0", + "phpstan/phpstan": "^1.11.7", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpunit/phpunit": "^11.2.6", + "predis/predis": "^v2.2.2", + "vimeo/psalm": "^5.25.0" }, "suggest": { "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments" From 61b55ce19ba8ebec1c31b8f876f371ddc0671666 Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Sun, 4 Aug 2024 15:55:07 -0600 Subject: [PATCH 2/3] composer.json work in progress --- composer.json | 71 ++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 614ac99f..85351a59 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,9 @@ "type": "library", "keywords": [ "doctrine", - "module", - "laminas" + "laminas", + "mezzio", + "module" ], "authors": [ { @@ -37,44 +38,30 @@ "homepage": "http://www.doctrine-project.org/", "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "composer-runtime-api": "^2.0", - "composer/semver": "^3.0", - "doctrine/annotations": "^2.0.1", - "doctrine/cache": "^2.1.0", - "doctrine/collections": "^2.2.2", - "doctrine/doctrine-laminas-hydrator": "^3.2.0", - "doctrine/event-manager": "^2.0.1", - "doctrine/inflector": "^2.0.6", - "doctrine/persistence": "^3.3.3", - "laminas/laminas-authentication": "^2.12.0", - "laminas/laminas-cache": "^4.0.3", - "laminas/laminas-cache-storage-adapter-filesystem": "^2.4.0", - "laminas/laminas-cache-storage-adapter-memory": "^2.3.0", - "laminas/laminas-eventmanager": "^3.13.1", - "laminas/laminas-form": "^3.4.1", - "laminas/laminas-modulemanager": "^2.16.0", - "laminas/laminas-mvc": "^3.3.5", - "laminas/laminas-paginator": "^2.13.0", - "laminas/laminas-servicemanager": "^4.2.0", - "laminas/laminas-stdlib": "^3.13.0", - "laminas/laminas-validator": "^2.60.0", - "psr/container": "^2.0.2", - "symfony/console": "v7.1.2" + "composer-runtime-api": "*", + "composer/semver": "^3.4", + "doctrine/annotations": "^2.0", + "doctrine/cache": "^2.2", + "doctrine/collections": "^2.2", + "doctrine/doctrine-laminas-hydrator": "^3.4", + "doctrine/event-manager": "^2.0", + "doctrine/inflector": "^2.0", + "doctrine/persistence": "^3.3", + "laminas/laminas-authentication": "^2.17", + "laminas/laminas-cache": "^4.0", + "laminas/laminas-eventmanager": "^3.13", + "laminas/laminas-paginator": "^2.18", + "laminas/laminas-servicemanager": "^4.2", + "laminas/laminas-stdlib": "^3.19", + "psr/container": "^2.0", + "symfony/console": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^12.0.0", - "doctrine/mongodb-odm": "^2.7.1", - "doctrine/orm": "^3.2.1", - "jangregor/phpstan-prophecy": "^1.0.2", - "laminas/laminas-i18n": "^2.27.1", - "laminas/laminas-log": "^2.15.3", - "laminas/laminas-serializer": "^3.0.0", - "laminas/laminas-session": "^2.21.0", - "phpstan/phpstan": "^1.11.7", - "phpstan/phpstan-phpunit": "^1.4.0", - "phpunit/phpunit": "^11.2.6", - "predis/predis": "^v2.2.2", - "vimeo/psalm": "^5.25.0" + "doctrine/coding-standard": "^12.0", + "php-parallel-lint/php-parallel-lint": "^1.4", + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^3.7", + "vimeo/psalm": "^5.25" }, "suggest": { "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments" @@ -108,7 +95,8 @@ } }, "scripts": { - "check": [ + "test": [ + "@parallel-lint", "@cs-check", "@phpstan", "@psalm", @@ -116,9 +104,10 @@ ], "cs-check": "phpcs", "cs-fix": "phpcbf", + "parallel-lint": "parallel-lint src tests bin", "phpstan": "phpstan analyse", "psalm": "psalm --stats", - "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover=coverage.xml" + "phpunit": "phpunit --colors=always", + "coverage-clover": "phpunit --colors=always --coverage-clover=coverage.xml" } } From 6b3d24c00bbfdb0a318eb91b553d73532b8217ee Mon Sep 17 00:00:00 2001 From: Tom H Anderson Date: Mon, 5 Aug 2024 13:42:56 -0600 Subject: [PATCH 3/3] Remove psalm because it does not require php-parser ^5 --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 85351a59..355c810a 100644 --- a/composer.json +++ b/composer.json @@ -60,8 +60,7 @@ "doctrine/coding-standard": "^12.0", "php-parallel-lint/php-parallel-lint": "^1.4", "phpstan/phpstan": "^1.11", - "phpunit/phpunit": "^3.7", - "vimeo/psalm": "^5.25" + "phpunit/phpunit": "^11.3" }, "suggest": { "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments"