diff options
| -rw-r--r-- | composer.json | 31 | ||||
| -rw-r--r-- | php-laminas-session.spec | 53 |
2 files changed, 47 insertions, 37 deletions
diff --git a/composer.json b/composer.json index ad69ee8..3e2d75f 100644 --- a/composer.json +++ b/composer.json @@ -25,23 +25,23 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", - "laminas/laminas-eventmanager": "^3.0", - "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0", + "laminas/laminas-eventmanager": "^3.4", + "laminas/laminas-stdlib": "^3.6" }, "require-dev": { "container-interop/container-interop": "^1.1", - "laminas/laminas-cache": "^2.6.1", + "laminas/laminas-cache": "3.0.x-dev", + "laminas/laminas-cache-storage-adapter-memory": "2.0.x-dev", "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-db": "^2.7", - "laminas/laminas-http": "^2.5.4", - "laminas/laminas-servicemanager": "^3.0.3", - "laminas/laminas-validator": "^2.6", - "mongodb/mongodb": "^1.0.1", + "laminas/laminas-db": "^2.13.4", + "laminas/laminas-http": "^2.15", + "laminas/laminas-servicemanager": "^3.7", + "laminas/laminas-validator": "^2.15", + "mongodb/mongodb": "v1.9.x-dev", "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.5.9" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component", @@ -59,7 +59,10 @@ "autoload-dev": { "psr-4": { "LaminasTest\\Session\\": "test/" - } + }, + "files": [ + "autoload-dev/ReturnTypeWillChange.php" + ] }, "scripts": { "check": [ @@ -71,7 +74,7 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-session": "^2.9.1" + "conflict": { + "zendframework/zend-session": "*" } } diff --git a/php-laminas-session.spec b/php-laminas-session.spec index 6f4456b..3ae71a9 100644 --- a/php-laminas-session.spec +++ b/php-laminas-session.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c4e19f1a3bc6f7ecf6f25f79b32717a544236922 +%global gh_commit fc538bba5196e3b5937ae7db3c713fc7c0829881 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-session @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.11.0 +Version: 2.12.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -42,27 +42,29 @@ BuildRequires: php-session BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { # "container-interop/container-interop": "^1.1", -# "laminas/laminas-cache": "^2.6.1", +# "laminas/laminas-cache": "3.0.x-dev", +# "laminas/laminas-cache-storage-adapter-memory": "2.0.x-dev", # "laminas/laminas-coding-standard": "~2.2.1", -# "laminas/laminas-db": "^2.7", -# "laminas/laminas-http": "^2.5.4", -# "laminas/laminas-servicemanager": "^3.0.3", -# "laminas/laminas-validator": "^2.6", -# "mongodb/mongodb": "^1.0.1", +# "laminas/laminas-db": "^2.13.4", +# "laminas/laminas-http": "^2.15", +# "laminas/laminas-servicemanager": "^3.7", +# "laminas/laminas-validator": "^2.15", +# "mongodb/mongodb": "v1.9.x-dev", # "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", # "phpspec/prophecy-phpunit": "^2.0", -# "phpunit/phpunit": "^9.3" +# "phpunit/phpunit": "^9.5.9" BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +# ignore versions BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.7 with php-autoloader(%{gh_owner}/laminas-db) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.6 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.4 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-composer(php-mock/php-mock-phpunit) >= 2.0 with php-composer(php-mock/php-mock-phpunit) < 3) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) # remirepo:13 @@ -79,22 +81,22 @@ BuildRequires: php-laminas-validator BuildRequires: php-mock-phpunit2 >= 2.1.0 BuildRequires: php-phpspec-prophecy-phpunit %endif -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 >= 9.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", -# "laminas/laminas-eventmanager": "^3.0", -# "laminas/laminas-stdlib": "^3.2.1", +# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-eventmanager": "^3.4", +# "laminas/laminas-stdlib": "^3.4", # "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 7.3 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-cache": "Laminas\\Cache component", @@ -200,6 +202,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{php_home}/phpmock2/phpunit/autoload.php', '%{php_home}/Prophecy/PhpUnit/autoload.php', + dirname(__DIR__) . '/autoload-dev/ReturnTypeWillChange.php', ]); \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF @@ -211,9 +214,8 @@ exit (class_exists("\\Zend\\%{library}\\Container") ? 0 : 1); ' : upstream test suite -# Need investifation: testResumeSessionThatFailsAValidatorShouldRaiseException (ok for ZF) ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then $cmd %{_bindir}/phpunit9 \ --verbose || ret=1 @@ -236,6 +238,11 @@ exit $ret %changelog +* Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1 +- update to 2.12.0 +- raise dependency on laminas-eventmanager 3.4 +- raise dependency on laminas-stdlib 3.6 + * Thu Jul 1 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1 - update to 2.11.0 |