summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-03 07:45:01 +0200
committerRemi Collet <remi@remirepo.net>2018-05-03 07:45:01 +0200
commitc2cc4b91e873c1aed7018d175b366ae21ebcb8f2 (patch)
tree773e3220c339cd41495801a341435786a517974f
parentfef7a3bb5c979ad18481b17ef569af10d725397a (diff)
update to 2.6.0
raise dependency on PHP 5.6 use range dependencies on F27+ switch to phpunit6 or phpunit7
-rw-r--r--composer.json46
-rw-r--r--php-zendframework-zend-memory.spec45
2 files changed, 57 insertions, 34 deletions
diff --git a/composer.json b/composer.json
index 22c9283..36bb385 100644
--- a/composer.json
+++ b/composer.json
@@ -1,34 +1,34 @@
{
"name": "zendframework/zend-memory",
- "description": " ",
+ "description": "Manage data in an environment with limited memory",
"license": "BSD-3-Clause",
"keywords": [
- "zf2",
+ "zf",
+ "zendframework",
"memory"
],
- "homepage": "https://github.com/zendframework/zend-memory",
- "autoload": {
- "psr-4": {
- "Zend\\Memory\\": "src/"
- }
+ "support": {
+ "docs": "https://docs.zendframework.com/zend-memory/",
+ "issues": "https://github.com/zendframework/zend-memory/issues",
+ "source": "https://github.com/zendframework/zend-memory",
+ "rss": "https://github.com/zendframework/zend-memory/releases.atom",
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
- "php": "^5.5 || ^7.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
"zendframework/zend-cache": "^2.7",
- "squizlabs/php_codesniffer": "^2.3.1",
- "phpunit/PHPUnit": "^4.8"
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
"zendframework/zend-cache": "To support swapping memory objects into and out of non-memory cache storage"
},
- "minimum-stability": "dev",
- "prefer-stable": true,
- "extra": {
- "branch-alias": {
- "dev-master": "2.5-dev",
- "dev-develop": "2.6-dev"
+ "autoload": {
+ "psr-4": {
+ "Zend\\Memory\\": "src/"
}
},
"autoload-dev": {
@@ -36,15 +36,23 @@
"ZendTest\\Memory\\": "test/"
}
},
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
+ },
"scripts": {
"check": [
"@cs-check",
"@test"
],
- "upload-coverage": "coveralls -v",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
- "test": "phpunit",
- "test-coverage": "phpunit --coverage-clover clover.xml"
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
diff --git a/php-zendframework-zend-memory.spec b/php-zendframework-zend-memory.spec
index 78bd76d..651f1bb 100644
--- a/php-zendframework-zend-memory.spec
+++ b/php-zendframework-zend-memory.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-memory
#
-# 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 bbf8b9509660b2a97f2d6ccfefabffac3cca6a5c
+%global gh_commit a01d5eb74012c2a170e1ea1e18486152d2eea5f7
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-memory
@@ -20,8 +20,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.5.2
-Release: 4%{?dist}
+Version: 2.6.0
+Release: 2%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -33,28 +33,36 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.5
+BuildRequires: php(language) >= 5.6
BuildRequires: php-spl
# From composer, "require-dev": {
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
# "zendframework/zend-cache": "^2.7",
-# "squizlabs/php_codesniffer": "^2.3.1",
-# "phpunit/PHPUnit": "^4.8"
+# "zendframework/zend-coding-standard": "~1.0.0"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-cache) >= 2.7 with php-autoloader(%{gh_owner}/zend-cache) < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
+# remirepo:6
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-cache) < 3
BuildRequires: php-autoloader(%{gh_owner}/zend-cache) >= 2.7
-BuildRequires: php-composer(phpunit/phpunit) >= 4.8
+%global phpunit %{_bindir}/phpunit6
+BuildRequires: phpunit6 >= 6.5.8
+%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^5.5 || ^7.0"
-Requires: php(language) >= 5.5
+# "php": "^5.6 || ^7.0"
+Requires: php(language) >= 5.6
%if ! %{bootstrap}
# From composer, "suggest": {
# "zendframework/zend-cache": "To support swapping memory objects into and out of non-memory cache storage"
-%if 0%{?fedora} >= 21
Suggests: php-autoloader(%{gh_owner}/zend-cache)
%endif
-%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.5.1
@@ -112,9 +120,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose || ret=1
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do
+ if which $cmdarg; then
+ set $cmdarg
+ $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
fi
done
exit $ret
@@ -132,6 +141,12 @@ exit $ret
%changelog
+* Thu May 3 2018 Remi Collet <remi@remirepo.net> - 2.6.0-2
+- update to 2.6.0
+- raise dependency on PHP 5.6
+- use range dependencies on F27+
+- switch to phpunit6 or phpunit7
+
* Thu Nov 23 2017 Remi Collet <remi@remirepo.net> - 2.5.2-4
- switch from zend-loader to fedora/autoloader