From 165e59c2b226f6f0615c883fd1971714a87e3602 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Dec 2021 15:00:45 +0100 Subject: update to 3.10.0 keep compatibility using laminas-zendframework-bridge as this is only used using compat autolader raise dependency on PHP 7.4 --- composer.json | 20 ++++++++++---------- php-laminas-servicemanager.spec | 38 ++++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/composer.json b/composer.json index 6c367cf..d910c3e 100644 --- a/composer.json +++ b/composer.json @@ -24,22 +24,21 @@ "sort-packages": true }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "container-interop/container-interop": "^1.2", "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0", "psr/container": "^1.0" }, "require-dev": { "composer/package-versions-deprecated": "^1.0", - "laminas/laminas-coding-standard": "~2.2.0", + "laminas/laminas-coding-standard": "~2.2.1", "laminas/laminas-container-config-test": "^0.3", "laminas/laminas-dependency-plugin": "^2.1.2", - "mikey179/vfsstream": "^1.6.8", - "ocramius/proxy-manager": "^2.2.3", - "phpbench/phpbench": "^1.0.4", + "mikey179/vfsstream": "^1.6.10@alpha", + "ocramius/proxy-manager": "^2.11", + "phpbench/phpbench": "^1.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4", + "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.16.1", "vimeo/psalm": "^4.8" }, @@ -49,6 +48,7 @@ }, "conflict": { "zendframework/zend-code": "<3.3.1", + "zendframework/zend-servicemanager": "*", "laminas/laminas-code": "<3.3.1" }, "suggest": { @@ -60,6 +60,9 @@ } }, "autoload-dev": { + "files": [ + "test/autoload.php" + ], "psr-4": { "LaminasTest\\ServiceManager\\": "test/", "LaminasBench\\ServiceManager\\": "benchmarks/" @@ -80,8 +83,5 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", "static-analysis" : "psalm --shepherd --stats" - }, - "replace": { - "zendframework/zend-servicemanager": "^3.4.0" } } diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec index 910ba5b..d63ee4e 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 2b0aee477fdbd3191af7c302b93dbc5fda0626f4 +%global gh_commit e52b985909e0940bf22d34f322eb3f48bbef6bd1 %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.7.0 +Version: 3.10.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.3 +BuildRequires: php(language) >= 7. # 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) @@ -56,41 +56,41 @@ BuildRequires: php-json BuildRequires: php-spl # From composer, "require-dev": { # "composer/package-versions-deprecated": "^1.0", -# "laminas/laminas-coding-standard": "~2.2.0", +# "laminas/laminas-coding-standard": "~2.2.", # "laminas/laminas-container-config-test": "^0.3", # "laminas/laminas-dependency-plugin": "^2.1.2", -# "mikey179/vfsstream": "^1.6.8", -# "ocramius/proxy-manager": "^2.2.3", -# "phpbench/phpbench": "^1.0.4", +# "mikey179/vfsstream": "^1.6.10@alpha", +# "ocramius/proxy-manager": "^2.11", +# "phpbench/phpbench": "^1.1", # "phpspec/prophecy-phpunit": "^2.0", -# "phpunit/phpunit": "^9.4", +# "phpunit/phpunit": "^9.5.5", # "psalm/plugin-phpunit": "^0.16.1", # "vimeo/psalm": "^4.8" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.5 with php-composer(mikey179/vfsstream) < 2) -BuildRequires: (php-composer(ocramius/proxy-manager) >= 2.2 with php-composer(ocramius/proxy-manager) < 3) +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 %else BuildRequires: php-composer(mikey179/vfsStream) < 2 -BuildRequires: php-composer(mikey179/vfsStream) >= 1.6.5 +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.4 +BuildRequires: phpunit9 >= 9.5.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ^8.0.0", +# "php": "~7.4.0 || ~8.0.0 || ~8.1.0", # "container-interop/container-interop": "^1.2", # "laminas/laminas-stdlib": "^3.2.1", -# "laminas/laminas-zendframework-bridge": "^1.0", # "psr/container": "^1.0" -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) @@ -202,7 +202,7 @@ EOF rm test/ContainerTest.php ret=0 -for cmd in php php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd %{_bindir}/phpunit9 --verbose || ret=1 fi @@ -231,6 +231,12 @@ exit $ret %changelog +* Fri Dec 3 2021 Remi Collet - 3.10.0-1 +- update to 3.10.0 +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader +- raise dependency on PHP 7.4 + * Mon Jul 26 2021 Remi Collet - 3.7.0-1 - update to 3.7.0 -- cgit