summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--php-zendframework-zend-http.spec23
2 files changed, 16 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index 07e1d89..878af9b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require": {
"php": "^5.6 || ^7.0",
"zendframework/zend-loader": "^2.5.1",
- "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
+ "zendframework/zend-stdlib": "^3.2.1",
"zendframework/zend-uri": "^2.5.2",
"zendframework/zend-validator": "^2.10.1"
},
@@ -47,8 +47,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"
}
},
"scripts": {
diff --git a/php-zendframework-zend-http.spec b/php-zendframework-zend-http.spec
index 3e24f7e..1901e26 100644
--- a/php-zendframework-zend-http.spec
+++ b/php-zendframework-zend-http.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-http
#
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 2c8aed3d25522618573194e7cc51351f8cd4a45b
+%global gh_commit 7027fa2f70f8f9865ec14728cea05087a5f4d9c0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-http
@@ -20,8 +20,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.8.2
-Release: 3%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
Summary: Zend Framework %{library} component
License: BSD
@@ -48,7 +48,7 @@ BuildRequires: php-zlib
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5.1 with php-autoloader(%{gh_owner}/zend-loader) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.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)
BuildRequires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-uri) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/zend-config) >= 2.6 with php-autoloader(%{gh_owner}/zend-config) < 4)
@@ -59,7 +59,7 @@ BuildRequires: phpunit7 >= 7.1.2
BuildRequires: php-autoloader(%{gh_owner}/zend-loader) < 3
BuildRequires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5.1
BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1
BuildRequires: php-autoloader(%{gh_owner}/zend-uri) < 3
BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5.2
BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3
@@ -76,7 +76,7 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^5.6 || ^7.0",
# "zendframework/zend-loader": "^2.5.1",
-# "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
+# "zendframework/zend-stdlib": "^3.2.1",
# "zendframework/zend-uri": "^2.5.2",
# "zendframework/zend-validator": "^2.10.1"
Requires: php(language) >= 5.6
@@ -84,7 +84,7 @@ Requires: php(language) >= 5.6
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/zend-loader) >= 2.5.1 with php-autoloader(%{gh_owner}/zend-loader) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.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)
Requires: (php-autoloader(%{gh_owner}/zend-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-uri) < 3)
Requires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3)
# remirepo:10
@@ -92,7 +92,7 @@ Requires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with p
Requires: php-autoloader(%{gh_owner}/zend-loader) < 3
Requires: php-autoloader(%{gh_owner}/zend-loader) >= 2.5.1
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7
+Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1
Requires: php-autoloader(%{gh_owner}/zend-uri) < 3
Requires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5
Requires: php-autoloader(%{gh_owner}/zend-validator) < 3
@@ -162,7 +162,6 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-# TODO 7.3 stdlib => "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?
for cmdarg in "php %{phpunit}" php71 php72 php73; do
if which $cmdarg; then
set $cmdarg
@@ -186,6 +185,10 @@ exit $ret
%changelog
+* Wed Jan 9 2019 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0
+- raise dependency on zend-stdlib 3.2.1
+
* Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 2.8.2-3
- skip 2 failing tests with recent PHP