diff options
| -rw-r--r-- | composer.json | 62 | ||||
| -rw-r--r-- | php-zendframework-zend-hydrator.spec | 68 |
2 files changed, 81 insertions, 49 deletions
diff --git a/composer.json b/composer.json index f412993..4f31bab 100644 --- a/composer.json +++ b/composer.json @@ -1,55 +1,64 @@ { "name": "zendframework/zend-hydrator", - "description": " ", + "description": "Serialize objects to arrays, and vice versa", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "hydrator" ], - "homepage": "https://github.com/zendframework/zend-hydrator", - "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-hydrator/", + "issues": "https://github.com/zendframework/zend-hydrator/issues", + "source": "https://github.com/zendframework/zend-hydrator", + "rss": "https://github.com/zendframework/zend-hydrator/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { "php": "^5.6 || ^7.0", "zendframework/zend-stdlib": "^3.0" }, "require-dev": { - "zendframework/zend-eventmanager": "^3.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", + "zendframework/zend-filter": "^2.6", "zendframework/zend-inputfilter": "^2.6", "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-filter": "^2.6", - "phpunit/phpunit": "^5.7.21 || ^6.3", - "zendframework/zend-coding-standard": "~1.0.0" + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", + "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage", "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage", - "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage" + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage" + }, + "autoload": { + "psr-4": { + "Zend\\Hydrator\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "ZendTest\\Hydrator\\": "test/" + } + }, + "config": { + "sort-packages": true }, - "minimum-stability": "dev", - "prefer-stable": true, "extra": { "branch-alias": { - "dev-release-1.0": "1.0-dev", - "dev-release-1.1": "1.1-dev", - "dev-master": "2.3-dev", - "dev-develop": "2.4-dev" + "dev-release-1.0": "1.0.x-dev", + "dev-release-1.1": "1.1.x-dev", + "dev-master": "2.4.x-dev", + "dev-develop": "2.5.x-dev" }, "zf": { "component": "Zend\\Hydrator", "config-provider": "Zend\\Hydrator\\ConfigProvider" } }, - "autoload-dev": { - "psr-4": { - "ZendTest\\Hydrator\\": "test/" - } - }, "scripts": { "check": [ "@cs-check", @@ -58,7 +67,6 @@ "cs-check": "phpcs", "cs-fix": "phpcbf", "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", - "upload-coverage": "coveralls -v" + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-hydrator.spec b/php-zendframework-zend-hydrator.spec index c7b7938..e956bef 100644 --- a/php-zendframework-zend-hydrator.spec +++ b/php-zendframework-zend-hydrator.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-hydrator # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-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 de0d6465fbc4b7ca345fddc148834c321c4b361f +%global gh_commit bd48bc3bc046df007a94125f868dd1aa1b73a813 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-hydrator @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -37,26 +37,41 @@ BuildRequires: php(language) >= 5.6 BuildRequires: php-date BuildRequires: php-reflection BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.0 # From composer, "require-dev": { -# "zendframework/zend-eventmanager": "^3.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", +# "zendframework/zend-coding-standard": "~1.0.0", +# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", +# "zendframework/zend-filter": "^2.6", # "zendframework/zend-inputfilter": "^2.6", # "zendframework/zend-serializer": "^2.6.1", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "zendframework/zend-filter": "^2.6", -# "phpunit/phpunit": "^5.7.21 || ^6.3", -# "zendframework/zend-coding-standard": "~1.0.0" +# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.6 with php-autoloader(%{gh_owner}/zend-inputfilter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-serializer) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.4 +# remirepo:16 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.0 +BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 -BuildRequires: php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-inputfilter) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-inputfilter) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-serializer) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 -%if 0%{?fedora} >= 26 %global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit +BuildRequires: phpunit6 >= 6.5.8 %endif -BuildRequires: %{phpunit} %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -65,19 +80,23 @@ BuildRequires: php-fedora-autoloader-devel # "php": "^5.6 || ^7.0", # "zendframework/zend-stdlib": "^3.0" Requires: php(language) >= 5.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:4 +%else Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.0 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +%endif # From composer, "suggest": { # "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage", +# "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage" # "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage", -# "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage" -%if 0%{?fedora} >= 21 Suggests: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 +Suggests: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 Suggests: php-autoloader(%{gh_owner}/zend-serializer) >= 2.6.1 Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -Suggests: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 1.1.0 @@ -139,10 +158,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} -d memory_limit=1G || ret=1 + $1 ${2:-%{_bindir}/phpunit7} -d memory_limit=1G || ret=1 fi done exit $ret @@ -160,6 +179,11 @@ exit $ret %changelog +* Thu May 3 2018 Remi Collet <remi@remirepo.net> - 2.4.0-1 +- update to 2.4.0 +- use range dependencies on F27+ +- switch to phpunit6 or phpunit7 + * Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 2.3.1-2 - switch from zend-loader to fedora/autoloader |