From 0e4d27ab9fb9e5b5f45a280f770b40d03be95b69 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Sep 2019 08:22:38 +0200 Subject: - update to 2.9.0 - raise dependency on zend-stdlib >= 3.2.1 - switch to phpunit7 --- composer.json | 12 ++++++------ php-zendframework-zend-session.spec | 30 ++++++++++++++++++------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 94e77b8..fb5b17b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "zendframework/zend-session", - "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client", + "description": "Object-oriented interface to PHP sessions and storage", "license": "BSD-3-Clause", "keywords": [ "zf", @@ -12,19 +12,19 @@ "issues": "https://github.com/zendframework/zend-session/issues", "source": "https://github.com/zendframework/zend-session", "rss": "https://github.com/zendframework/zend-session/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", + "chat": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { "php": "^5.6 || ^7.0", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "container-interop/container-interop": "^1.1", "mongodb/mongodb": "^1.0.1", "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", - "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", @@ -58,8 +58,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" }, "zf": { "component": "Zend\\Session", diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec index e8b6a72..bc5d490 100644 --- a/php-zendframework-zend-session.spec +++ b/php-zendframework-zend-session.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 8fd50220888167d08cf0113ced5b023f6da06923 +%global gh_commit 0a0c7ae4d8be608e30ecff714c86164ccca19ca3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-session @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.7 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -41,19 +41,19 @@ BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # remirepo:6 %else BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From composer, "require-dev": { # "container-interop/container-interop": "^1.1", # "mongodb/mongodb": "^1.0.1", # "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", -# "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16", # "zendframework/zend-cache": "^2.6.1", # "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-db": "^2.7", @@ -78,7 +78,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6 %endif -BuildRequires: phpunit6 +BuildRequires: phpunit7 BuildRequires: php-mock-phpunit2 >= 2.1.0 %endif # Autoloader @@ -87,19 +87,19 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) # remirepo:6 %else Requires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 %endif # From composer, "suggest": { # "mongodb/mongodb": "If you want to use the MongoDB session save handler" @@ -108,6 +108,7 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # "zendframework/zend-http": "Zend\\Http component", # "zendframework/zend-servicemanager": "Zend\\ServiceManager component", # "zendframework/zend-validator": "Zend\\Validator component" +# remirepo:1 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-composer(mongodb/mongodb) Suggests: php-autoloader(%{gh_owner}/zend-cache) @@ -115,6 +116,7 @@ Suggests: php-autoloader(%{gh_owner}/zend-db) Suggests: php-autoloader(%{gh_owner}/zend-http) Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) Suggests: php-autoloader(%{gh_owner}/zend-validator) +# remirepo:1 %endif %endif # Autoloader @@ -188,8 +190,7 @@ EOF ret=0 for cmd in php php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit6 \ - --filter '^((?!(testConfigurationWithoutInputIsValid)).)*$' \ + $cmd %{_bindir}/phpunit7 \ --verbose || ret=1 fi done @@ -209,6 +210,11 @@ exit $ret %changelog +* Mon Sep 23 2019 Remi Collet - 2.9.0-1 +- update to 2.9.0 +- raise dependency on zend-stdlib >= 3.2.1 +- switch to phpunit7 + * Fri Sep 20 2019 Remi Collet - 2.8.7-2 - update to 2.8.7 -- cgit