From ee53eff6d4c2eb5173f7e24ce2c77435fc2e785e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Feb 2022 11:42:56 +0100 Subject: update to 4.3.5 --- composer.json | 11 ++++++--- php-cakephp4.spec | 59 +++++++++++++++++++++++++++++--------------- src/Cache/composer.json | 2 +- src/Datasource/composer.json | 4 +-- src/Log/composer.json | 2 +- 5 files changed, 50 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index 3c08e1f..ad66e1a 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,8 @@ "psr/http-client": "^1.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", - "psr/log": "^1.0.0", - "psr/simple-cache": "^1.0.0" + "psr/log": "^1.0 || ^2.0", + "psr/simple-cache": "^1.0 || ^2.0" }, "replace": { "cakephp/cache": "self.version", @@ -69,7 +69,10 @@ }, "config": { "process-timeout": 900, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "autoload": { "psr-4": { @@ -111,7 +114,7 @@ "@psalm" ], "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", + "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.4.0 psalm/phar:~4.19.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", diff --git a/php-cakephp4.spec b/php-cakephp4.spec index 4101109..29debc9 100644 --- a/php-cakephp4.spec +++ b/php-cakephp4.spec @@ -12,7 +12,7 @@ # https://github.com/cakephp/cakephp/releases -%global gh_commit 0cb68fe68e2fb79889b3b49a03e8cbb720e98311 +%global gh_commit 856741f34393bef25284b86da703e840071c4341 %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.4 +Version: 4.3.5 Release: 1%{?dist} Summary: The CakePHP framework @@ -102,13 +102,13 @@ Summary: CakePHP Collection Library # From composer.json "require": { # "php": ">=7.2.0", # "cakephp/core": "^4.0", -# "psr/simple-cache": "^1.0.0" +# "psr/simple-cache": "^1.0 || ^2.0" Requires: php(language) >= 7.2 Requires: php-composer(%{pk_vendor}/core) = %{version} # from main composer.json %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) -Requires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) +BuildRequires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 3) +Requires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 3) # Optional (from phpcompatinfo report) Recommends: php-apcu Suggests: php-memcached @@ -291,15 +291,15 @@ Summary: CakePHP Datasource Library # From composer.json "require": { # "php": ">=7.2.0", # "cakephp/core": "^4.0", -# "psr/log": "^1.1", -# "psr/simple-cache": "^1.0" +# "psr/log": "^1.0 || ^2.0", +# "psr/simple-cache": "^1.0 || ^2.0" Requires: php(language) >= 7.2 Requires: php-composer(%{pk_vendor}/core) = %{version} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 2) -Requires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) -Requires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3) +Requires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3) +BuildRequires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 3) +Requires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 3) %else BuildRequires: php-psr-simple-cache >= 1.0.0 Requires: php-psr-simple-cache >= 1.0.0 @@ -486,12 +486,12 @@ Summary: logging library # From composer.json "require": { # "php": ">=7.2.0", # "cakephp/core": "^4.0", -# "psr/log": "^1.0.0" +# "psr/log": "^1.0 || ^2.0" Requires: php(language) >= 7.2 Requires: php-composer(%{pk_vendor}/core) = %{version} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 2) -Requires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3) +Requires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3) %else BuildRequires: php-PsrLog >= 1.0.0 Requires: php-PsrLog >= 1.0.0 @@ -621,8 +621,13 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; __DIR__ . '/I18n/functions.php', __DIR__ . '/Routing/functions.php', __DIR__ . '/Utility/bootstrap.php', - '%{php_home}/Psr/Log/autoload.php', - '%{php_home}/Psr/SimpleCache/autoload.php', + [ + '%{php_home}/Psr/Log2/autoload.php', + '%{php_home}/Psr/Log/autoload.php', + ], [ + '%{php_home}/Psr/SimpleCache2/autoload.php', + '%{php_home}/Psr/SimpleCache/autoload.php', + ], '%{php_home}/Psr/Http/Client/autoload.php', '%{php_home}/Psr/Http/Message/autoload.php', '%{php_home}/Psr/Http/Server/autoload.php', @@ -664,7 +669,10 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Cache\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ dirname(__DIR__) . '/Core/autoload.php', - '%{php_home}/Psr/SimpleCache/autoload.php', + [ + '%{php_home}/Psr/SimpleCache2/autoload.php', + '%{php_home}/Psr/SimpleCache/autoload.php', + ], ]); EOF @@ -742,8 +750,13 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Datasource\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ dirname(__DIR__) . '/Core/autoload.php', - '%{php_home}/Psr/Log/autoload.php', - '%{php_home}/Psr/SimpleCache/autoload.php', + [ + '%{php_home}/Psr/Log2/autoload.php', + '%{php_home}/Psr/Log/autoload.php', + ], [ + '%{php_home}/Psr/SimpleCache2/autoload.php', + '%{php_home}/Psr/SimpleCache/autoload.php', + ], ]); EOF @@ -821,7 +834,10 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Log\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ dirname(__DIR__) . '/Core/autoload.php', - '%{php_home}/Psr/Log/autoload.php', + [ + '%{php_home}/Psr/Log2/autoload.php', + '%{php_home}/Psr/Log/autoload.php', + ], ]); EOF @@ -1134,6 +1150,9 @@ exit $ret %changelog +* Mon Feb 7 2022 Remi Collet - 4.3.5-1 +- update to 4.3.5 + * Mon Jan 17 2022 Remi Collet - 4.3.4-1 - update to 4.3.4 diff --git a/src/Cache/composer.json b/src/Cache/composer.json index f78e504..001a8a9 100644 --- a/src/Cache/composer.json +++ b/src/Cache/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=7.2.0", "cakephp/core": "^4.0", - "psr/simple-cache": "^1.0.0" + "psr/simple-cache": "^1.0 || ^2.0" }, "provide": { "psr/simple-cache-implementation": "^1.0.0" diff --git a/src/Datasource/composer.json b/src/Datasource/composer.json index ffd623c..ca90fc1 100644 --- a/src/Datasource/composer.json +++ b/src/Datasource/composer.json @@ -26,8 +26,8 @@ "require": { "php": ">=7.2.0", "cakephp/core": "^4.0", - "psr/log": "^1.1", - "psr/simple-cache": "^1.0" + "psr/log": "^1.0 || ^2.0", + "psr/simple-cache": "^1.0 || ^2.0" }, "suggest": { "cakephp/utility": "If you decide to use EntityTrait.", diff --git a/src/Log/composer.json b/src/Log/composer.json index 0d43640..81d234e 100644 --- a/src/Log/composer.json +++ b/src/Log/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=7.2.0", "cakephp/core": "^4.0", - "psr/log": "^1.0.0" + "psr/log": "^1.0 || ^2.0" }, "provide": { "psr/log-implementation": "^1.0.0" -- cgit