summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-31 11:06:03 +0100
committerRemi Collet <remi@remirepo.net>2018-01-31 11:06:03 +0100
commit5b05be9974ea8b90630912207f992f21b98401bf (patch)
tree0a66df60d7488d7d1200c0dd6d4d46fef36baefb
parentb4cf710a388e1ed8ee3e6e862e6b8674ff1dc7f0 (diff)
Update to 2.7.0
raise dependency on PHP >= 5.6
-rw-r--r--composer.json14
-rw-r--r--php-zendframework-zend-soap.spec29
2 files changed, 24 insertions, 19 deletions
diff --git a/composer.json b/composer.json
index 173e294..40b5f49 100644
--- a/composer.json
+++ b/composer.json
@@ -13,16 +13,17 @@
}
},
"require": {
- "php": "^5.5 || ^7.0",
+ "php": "^5.6 || ^7.0",
+ "ext-soap": "*",
"zendframework/zend-server": "^2.6.1",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
"zendframework/zend-uri": "^2.5.2"
},
"require-dev": {
+ "phpunit/phpunit": "^5.7.21 || ^6.3",
+ "zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-config": "^2.6",
- "zendframework/zend-http": "^2.5.4",
- "phpunit/PHPUnit": "^4.8",
- "squizlabs/php_codesniffer": "^2.3.1"
+ "zendframework/zend-http": "^2.5.4"
},
"suggest": {
"zendframework/zend-http": "Zend\\Http component"
@@ -31,8 +32,8 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
},
"autoload-dev": {
@@ -49,7 +50,6 @@
"@cs-check",
"@test"
],
- "upload-coverage": "coveralls -v",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit",
diff --git a/php-zendframework-zend-soap.spec b/php-zendframework-zend-soap.spec
index e28fae7..3cdb516 100644
--- a/php-zendframework-zend-soap.spec
+++ b/php-zendframework-zend-soap.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-soap
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 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 2d6012e7231cce550219eccfc80836a028d20bf1
+%global gh_commit af03c32f0db2b899b3df8cfe29aeb2b49857d284
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-soap
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.6.0
+Version: 2.7.0
Release: 1%{?dist}
Summary: Zend Framework %{library} component
@@ -33,7 +33,7 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.5
+BuildRequires: php(language) >= 5.6
BuildRequires: php-curl
BuildRequires: php-dom
BuildRequires: php-libxml
@@ -44,23 +44,25 @@ BuildRequires: php-composer(%{gh_owner}/zend-server) >= 2.6.1
BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7
BuildRequires: php-composer(%{gh_owner}/zend-uri) >= 2.5.2
# From composer, "require-dev": {
+# "phpunit/phpunit": "^5.7.21 || ^6.3",
+# "zendframework/zend-coding-standard": "~1.0.0",
# "zendframework/zend-config": "^2.6",
-# "zendframework/zend-http": "^2.5.4",
-# "phpunit/PHPUnit": "^4.8",
-# "squizlabs/php_codesniffer": "^2.3.1"
+# "zendframework/zend-http": "^2.5.4"
+BuildRequires: php-composer(phpunit/phpunit) >= 5.7.21
BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6
BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4
-BuildRequires: php-composer(phpunit/phpunit) >= 4.8
# Autoloader
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
%endif
# From composer, "require": {
-# "php": "^5.5 || ^7.0",
+# "php": "^5.6 || ^7.0",
+# "ext-soap": "*",
# "zendframework/zend-server": "^2.6.1",
# "zendframework/zend-stdlib": "^2.7 || ^3.0",
# "zendframework/zend-uri": "^2.5.2"
-Requires: php(language) >= 5.5
+Requires: php(language) >= 5.6
+Requires: php-soap
%if ! %{bootstrap}
Requires: php-composer(%{gh_owner}/zend-server) >= 2.6.1
Requires: php-composer(%{gh_owner}/zend-server) < 3
@@ -79,7 +81,6 @@ Requires: php-curl
Requires: php-dom
Requires: php-libxml
Requires: php-pcre
-Requires: php-soap
Requires: php-spl
Obsoletes: php-ZendFramework2-%{library} < 2.5
@@ -127,7 +128,7 @@ require_once 'test/TestAsset/call_user_func.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php70 php71 php72; do
if which $cmd; then
$cmd %{_bindir}/phpunit || ret=1
fi
@@ -147,6 +148,10 @@ exit $ret
%changelog
+* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 2.7.0-1
+- Update to 2.7.0
+- raise dependency on PHP >= 5.6
+
* Fri Apr 22 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
- update to 2.6.0
- raise dependency on PHP >= 5.5