From 4333d122036bcd26da18888591f4a5a52b1c6384 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Oct 2022 09:54:09 +0200 Subject: update to 3.19.0 raise dependency on PHP 8.0 --- composer.json | 19 +++++++++---------- php-laminas-servicemanager.spec | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index bc491f0..22bbb43 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "config": { "platform": { - "php": "7.4.99" + "php": "8.0.99" }, "sort-packages": true, "allow-plugins": { @@ -32,22 +32,21 @@ } }, "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "laminas/laminas-stdlib": "^3.2.1", "psr/container": "^1.0" }, "require-dev": { - "composer/package-versions-deprecated": "^1.0", + "composer/package-versions-deprecated": "^1.11.99.5", "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-container-config-test": "^0.7", - "laminas/laminas-dependency-plugin": "^2.1.2", - "mikey179/vfsstream": "^1.6.10@alpha", - "ocramius/proxy-manager": "^2.11", - "phpbench/phpbench": "^1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.5", + "laminas/laminas-dependency-plugin": "^2.2", + "mikey179/vfsstream": "^1.6.11@alpha", + "ocramius/proxy-manager": "^2.14.1", + "phpbench/phpbench": "^1.2.6", + "phpunit/phpunit": "^9.5.25", "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.8" + "vimeo/psalm": "^4.28" }, "provide": { "psr/container-implementation": "^1.0" diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec index 7c5daea..0508b9c 100644 --- a/php-laminas-servicemanager.spec +++ b/php-laminas-servicemanager.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 360be5f16955dd1edbcce1cfaa98ed82a17f02ec +%global gh_commit ed160729bb8721127efdaac799f9a298963345b1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-servicemanager @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 3.17.0 +Version: 3.19.0 Release: 1%{?dist} Summary: Laminas Framework %{library} component @@ -34,7 +34,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7. +BuildRequires: php(language) >= 8.0 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) @@ -51,30 +51,27 @@ BuildRequires: php-date BuildRequires: php-json BuildRequires: php-spl # From composer, "require-dev": { -# "composer/package-versions-deprecated": "^1.0", +# "composer/package-versions-deprecated": "^1.11.99.5", # "laminas/laminas-coding-standard": "~2.4.0", # "laminas/laminas-container-config-test": "^0.6", -# "laminas/laminas-dependency-plugin": "^2.1.2", -# "mikey179/vfsstream": "^1.6.10@alpha", -# "ocramius/proxy-manager": "^2.11", -# "phpbench/phpbench": "^1.1", -# "phpspec/prophecy-phpunit": "^2.0", -# "phpunit/phpunit": "^9.5.5", +# "laminas/laminas-dependency-plugin": "^2.2", +# "mikey179/vfsstream": "^1.6.11@alpha", +# "ocramius/proxy-manager": "^2.14.1", +# "phpbench/phpbench": "^1.2.6", +# "phpunit/phpunit": "^9.5.25", # "psalm/plugin-phpunit": "^0.16.1", -# "vimeo/psalm": "^4.8" +# "vimeo/psalm": "^4.28" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.10 with php-composer(mikey179/vfsstream) < 2) # ignore minimal version BuildRequires: (php-composer(ocramius/proxy-manager) >= 2.2.3 with php-composer(ocramius/proxy-manager) < 3) -BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:7 +# remirepo:6 %else BuildRequires: php-composer(mikey179/vfsStream) < 2 BuildRequires: php-composer(mikey179/vfsStream) >= 1.6.10 BuildRequires: php-composer(ocramius/proxy-manager) < 4 BuildRequires: php-composer(ocramius/proxy-manager) >= 1.0 -BuildRequires: php-phpspec-prophecy-phpunit %endif BuildRequires: phpunit9 >= 9.5.5 %endif @@ -82,10 +79,10 @@ BuildRequires: phpunit9 >= 9.5.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "~7.4.0 || ~8.0.0 || ~8.1.0", +# "php": "~8.0.0 || ~8.1.0 || ~8.2.0", # "laminas/laminas-stdlib": "^3.2.1", # "psr/container": "^1.0" -Requires: php(language) >= 7.4 +Requires: php(language) >= 8.0 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) @@ -189,7 +186,6 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Bench\\%{library}\\', dirname(__DIR__) . '/benchmarks'); \Fedora\Autoloader\Dependencies::required([ '%{php_home}/org/bovigo/vfs/autoload.php', - '%{php_home}/Prophecy/PhpUnit/autoload.php', ]); EOF @@ -197,7 +193,7 @@ EOF rm test/ContainerTest.php ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php80 php81 php82; do if which $cmd; then $cmd %{_bindir}/phpunit9 --verbose || ret=1 fi @@ -226,6 +222,10 @@ exit $ret %changelog +* Tue Oct 11 2022 Remi Collet - 3.19.0-1 +- update to 3.19.0 +- raise dependency on PHP 8.0 + * Thu Sep 22 2022 Remi Collet - 3.17.0-1 - update to 3.17.0 -- cgit