diff options
| -rw-r--r-- | composer.json | 53 | ||||
| -rw-r--r-- | php-zendframework-zend-escaper.spec | 41 |
2 files changed, 63 insertions, 31 deletions
diff --git a/composer.json b/composer.json index 2abc628..890d03a 100644 --- a/composer.json +++ b/composer.json @@ -1,26 +1,30 @@ { "name": "zendframework/zend-escaper", - "description": " ", + "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "escaper" ], - "homepage": "https://github.com/zendframework/zend-escaper", - "autoload": { - "psr-4": { - "Zend\\Escaper\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-escaper/", + "issues": "https://github.com/zendframework/zend-escaper/issues", + "source": "https://github.com/zendframework/zend-escaper", + "rss": "https://github.com/zendframework/zend-escaper/releases.atom", + "chat": "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.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "autoload": { + "psr-4": { + "Zend\\Escaper\\": "src/" } }, "autoload-dev": { @@ -28,8 +32,23 @@ "ZendTest\\Escaper\\": "test/" } }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.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" } } diff --git a/php-zendframework-zend-escaper.spec b/php-zendframework-zend-escaper.spec index b9ab949..ed1a732 100644 --- a/php-zendframework-zend-escaper.spec +++ b/php-zendframework-zend-escaper.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-escaper # -# 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 2dcd14b61a72d8b8e27d579c6344e12c26141d4e +%global gh_commit 31d8aafae982f9568287cb4dce987e6aff8fd074 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-escaper @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.6.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,23 +32,31 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-ctype BuildRequires: php-iconv BuildRequires: php-mbstring 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.27 || ^6.5.8 || ^7.1.2", +# "zendframework/zend-coding-standard": "~1.0.0" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.2 +# remirepo:4 +%else +%global phpunit %{_bindir}/phpunit +BuildRequires: php-composer(phpunit/phpunit) >= 5.7 +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel %endif # 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.5.1 Requires: php-ctype Requires: php-iconv @@ -101,9 +108,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 @@ -122,6 +130,11 @@ exit $ret %changelog +* Thu Apr 26 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 +- raise dependency on PHP 5.6 +- switch to phpunit7 on F27+ + * Thu Nov 23 2017 Remi Collet <remi@remirepo.net> - 2.5.2-4 - switch from zend-loader to fedora/autoloader |