From ea61000db4fc52ce691e0aa94ef25fe5e2d6ca7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Apr 2018 08:24:13 +0200 Subject: update to 2.8.0 raise dependency on PHP 5.6 raise dependency on zend-stdlib 3.1.0 always use phpunit6 compression extensions are optional --- composer.json | 61 ++++++++++++++++++++--------------- php-zendframework-zend-filter.spec | 65 ++++++++++++++++++++++---------------- 2 files changed, 73 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index e2e1405..46c9b98 100644 --- a/composer.json +++ b/composer.json @@ -3,26 +3,29 @@ "description": "provides a set of commonly needed data filters", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "filter" ], - "homepage": "https://github.com/zendframework/zend-filter", - "autoload": { - "psr-4": { - "Zend\\Filter\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-filter/", + "issues": "https://github.com/zendframework/zend-filter/issues", + "source": "https://github.com/zendframework/zend-filter", + "rss": "https://github.com/zendframework/zend-filter/releases.atom", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "php": "^5.6 || ^7.0", + "zendframework/zend-stdlib": "^2.7.7 || ^3.1" }, "require-dev": { - "pear/archive_tar": "^1.4", - "zendframework/zend-crypt": "^2.6 || ^3.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-uri": "^2.5", - "phpunit/PHPUnit": "^6.0.10 || ^5.7.17", - "zendframework/zend-coding-standard": "~1.0.0" + "pear/archive_tar": "^1.4.3", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-crypt": "^3.2.1", + "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", + "zendframework/zend-uri": "^2.6" }, "suggest": { "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters", @@ -30,23 +33,32 @@ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality", "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter" }, - "minimum-stability": "dev", - "prefer-stable": true, + "conflict": { + "zendframework/zend-validator": "<2.10.1" + }, + "autoload": { + "psr-4": { + "Zend\\Filter\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "ZendTest\\Filter\\": "test/" + } + }, + "config": { + "sort-packages": true + }, "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" }, "zf": { "component": "Zend\\Filter", "config-provider": "Zend\\Filter\\ConfigProvider" } }, - "autoload-dev": { - "psr-4": { - "ZendTest\\Filter\\": "test/" - } - }, "scripts": { "check": [ "@cs-check", @@ -55,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-filter.spec b/php-zendframework-zend-filter.spec index 7e572d1..495ea6c 100644 --- a/php-zendframework-zend-filter.spec +++ b/php-zendframework-zend-filter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b8d0ff872f126631bf63a932e33aa2d22d467175 +%global gh_commit 7b997dbe79459f1652deccc8786d7407fb66caa9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-filter @@ -21,8 +21,8 @@ %global php_version %(php -r 'echo PHP_VERSION;') Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.2 -Release: 4%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -34,7 +34,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-date BuildRequires: php-iconv BuildRequires: php-mbstring @@ -42,33 +42,29 @@ BuildRequires: php-mcrypt BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-zip -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1.0 # From composer, "require-dev": { -# "pear/archive_tar": "^1.4", -# "zendframework/zend-crypt": "^2.6 || ^3.0", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "zendframework/zend-uri": "^2.5", -# "phpunit/PHPUnit": "^6.0.10 || ^5.7.17", -# "zendframework/zend-coding-standard": "~1.0.0" -BuildRequires: php-autoloader(pear/archive_tar) >= 1.4 -BuildRequires: php-autoloader(%{gh_owner}/zend-crypt) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5 -%if 0%{?fedora} >= 26 +# "pear/archive_tar": "^1.4.3", +# "phpunit/phpunit": "^5.7.23 || ^6.4.3", +# "zendframework/zend-coding-standard": "~1.0.0", +# "zendframework/zend-crypt": "^3.2.1", +# "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", +# "zendframework/zend-uri": "^2.6" +BuildRequires: php-autoloader(pear/archive_tar) >= 1.4.3 %global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif -BuildRequires: %{phpunit} +BuildRequires: phpunit6 >= 6.4.3 %endif +BuildRequires: php-autoloader(%{gh_owner}/zend-crypt) >= 3.2.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8 +BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.6 # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.5 || ^7.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" -Requires: php(language) >= 5.5 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +# "php": "^5.6 || ^7.0", +# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" +Requires: php(language) >= 5.6 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1.0 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 %if ! %{bootstrap} # From composer, "suggest": { @@ -76,22 +72,28 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 # "zendframework/zend-i18n": "Zend\\I18n component", # "zendframework/zend-servicemanager": "Zend\\ServiceManager component", # "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter" -%if 0%{?fedora} >= 21 Suggests: php-autoloader(%{gh_owner}/zend-crypt) Suggests: php-autoloader(%{gh_owner}/zend-i18n) Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) Suggests: php-autoloader(%{gh_owner}/zend-uri) %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.2 +# From phpcompatinfo report for version 2.8.0 Requires: php-date Requires: php-iconv Requires: php-mbstring +Requires: php-openssl Requires: php-pcre Requires: php-spl -Requires: php-zip +# optional compression extensions +Requires: php-bz2 +Requires: php-zlib +Suggests: php-lzf +Recommends: php-zip +# remirepo:2 +Suggests: php-snappy +Suggests: php-rar Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} @@ -168,6 +170,13 @@ exit $ret %changelog +* Thu Apr 12 2018 Remi Collet - 2.8.0-1 +- update to 2.8.0 +- raise dependency on PHP 5.6 +- raise dependency on zend-stdlib 3.1.0 +- always use phpunit6 +- compression extensions are optional + * Tue Dec 19 2017 Remi Collet - 2.7.2-4 - use Archive_Tar autoloader -- cgit