From 38851ac37635c0f2a0b1693eb86fefe9aef747ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Nov 2021 08:14:06 +0100 Subject: update to 4.3.2 raise dependency on league/container 4.2.0 --- composer.json | 6 ++++-- php-cakephp4.spec | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index fc8677c..3c08e1f 100644 --- a/composer.json +++ b/composer.json @@ -30,8 +30,8 @@ "composer/ca-bundle": "^1.2", "laminas/laminas-diactoros": "^2.2.2", "laminas/laminas-httphandlerrunner": "^1.1", - "league/container": "^4.1.1", - "psr/container": "^2.0", + "league/container": "^4.2.0", + "psr/container": "^1.1 || ^2.0", "psr/http-client": "^1.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", @@ -112,6 +112,8 @@ ], "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon", "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.0.0 psalm/phar:~4.11.0 && mv composer.backup composer.json", + "lowest": "validate-prefer-lowest", + "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json", "test": "phpunit", "test-coverage": "phpunit --coverage-clover=clover.xml" }, diff --git a/php-cakephp4.spec b/php-cakephp4.spec index b2e1e7e..059d569 100644 --- a/php-cakephp4.spec +++ b/php-cakephp4.spec @@ -12,7 +12,7 @@ # https://github.com/cakephp/cakephp/releases -%global gh_commit 6b1cf0e74bbfbb73ecdb1e8a5d0fd36230930931 +%global gh_commit bc44fd0a383592c5bf52eab17b25fbd9d929b851 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cakephp %global gh_project cakephp @@ -28,7 +28,7 @@ %global chronos_version 2.3.0 Name: php-%{pk_vendor}%{major} -Version: 4.3.1 +Version: 4.3.2 Release: 1%{?dist} Summary: The CakePHP framework @@ -216,13 +216,13 @@ Requires: php-composer(%{pk_vendor}/utility) = %{version} BuildRequires: (php-composer(psr/http-server-handler) >= 1.0.0 with php-composer(psr/http-server-handler) < 2) Requires: (php-composer(psr/http-server-handler) >= 1.0.0 with php-composer(psr/http-server-handler) < 2) # Optional for core but required by full framework -BuildRequires: (php-composer(league/container) >= 4.1.1 with php-composer(league/container) < 5) -Requires: (php-composer(league/container) >= 4.1.1 with php-composer(league/container) < 5) +BuildRequires: (php-composer(league/container) >= 4.2.0 with php-composer(league/container) < 5) +Requires: (php-composer(league/container) >= 4.2.0 with php-composer(league/container) < 5) %else BuildRequires: php-psr-http-server-handler >= 1.0.0 Requires: php-psr-http-server-handler >= 1.0.0 -BuildRequires: php-league-container4 >= 4.1.1 -Requires: php-league-container4 >= 4.1.1 +BuildRequires: php-league-container4 >= 4.2.0 +Requires: php-league-container4 >= 4.2.0 %endif # From phpcompatinfo report Requires: php-reflection @@ -1134,6 +1134,10 @@ exit $ret %changelog +* Mon Nov 29 2021 Remi Collet - 4.3.2-1 +- update to 4.3.2 +- raise dependency on league/container 4.2.0 + * Mon Nov 8 2021 Remi Collet - 4.3.1-1 - update to 4.3.1 - open https://github.com/cakephp/cakephp/issues/16101 -- cgit