diff options
| -rw-r--r-- | composer.json | 53 | ||||
| -rw-r--r-- | php-zendframework-zend-dom.spec | 40 |
2 files changed, 62 insertions, 31 deletions
diff --git a/composer.json b/composer.json index d4e9bb3..3df3bb8 100644 --- a/composer.json +++ b/composer.json @@ -3,24 +3,28 @@ "description": "provides tools for working with DOM documents and structures", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "dom" ], - "homepage": "https://github.com/zendframework/zend-dom", - "autoload": { - "psr-4": { - "Zend\\Dom\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-dom/", + "issues": "https://github.com/zendframework/zend-dom/issues", + "source": "https://github.com/zendframework/zend-dom", + "rss": "https://github.com/zendframework/zend-dom/releases.atom", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": ">=5.5" + "php": "^5.6 || ^7.0" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "autoload": { + "psr-4": { + "Zend\\Dom\\": "src/" } }, "autoload-dev": { @@ -28,8 +32,23 @@ "ZendTest\\Dom\\": "test/" } }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } -}
\ No newline at end of file +} diff --git a/php-zendframework-zend-dom.spec b/php-zendframework-zend-dom.spec index 58bfdb8..1c5ad34 100644 --- a/php-zendframework-zend-dom.spec +++ b/php-zendframework-zend-dom.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-dom # -# 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 a9e145b2b52fe6de5a7a6b0ddb5c773c2c72d59e +%global gh_commit 7a2d3ac8722951dc5ec8eec49f794afbe6a34ff8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-dom @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 -Release: 5%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component -Group: Development/Libraries License: BSD URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -33,22 +32,29 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-dom BuildRequires: php-libxml BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +# "phpunit/phpunit": "^5.7.23 || ^6.4.3", +# "zendframework/zend-coding-standard": "~1.0.0" +# remirepo:1 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +%global phpunit %{_bindir}/phpunit6 +# remirepo:3 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": ">=5.5" -Requires: php(language) >= 5.5 +# "php": "^5.6 || ^7.0" +Requires: php(language) >= 5.6 # From phpcompatinfo report for version 2.6.0 Requires: php-dom Requires: php-libxml @@ -97,9 +103,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 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 fi done exit $ret @@ -118,6 +125,11 @@ exit $ret %changelog +* Fri Mar 30 2018 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 +- raise dependency on PHP 5.6 +- use phpunit6 + * Tue Dec 5 2017 Remi Collet <remi@remirepo.net> - 2.6.0-5 - switch from zend-loader to fedora/autoloader |