From 4a6c1f8c1fcde3c121bea8c79fb834138edb39f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Apr 2018 14:06:48 +0200 Subject: v2.10.0 --- 79.patch | 36 ------------------------------------ composer.json | 9 ++++----- php-zendframework-zend-log.spec | 24 +++++++++--------------- 3 files changed, 13 insertions(+), 56 deletions(-) delete mode 100644 79.patch diff --git a/79.patch b/79.patch deleted file mode 100644 index aba4b16..0000000 --- a/79.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c310b2920e0278e017df821144d27fd297980a73 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 24 Oct 2017 12:19:45 +0200 -Subject: [PATCH] Fix #76 incompatible prototype - ---- - src/Writer/FingersCrossed.php | 2 +- - src/Writer/MongoDB.php | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Writer/FingersCrossed.php b/src/Writer/FingersCrossed.php -index bfc9b863..b4abd971 100644 ---- a/src/Writer/FingersCrossed.php -+++ b/src/Writer/FingersCrossed.php -@@ -245,7 +245,7 @@ public function reset() - * @param string|FormatterInterface $formatter - * @return WriterInterface - */ -- public function setFormatter($formatter) -+ public function setFormatter($formatter, array $options = null) - { - return $this->writer; - } -diff --git a/src/Writer/MongoDB.php b/src/Writer/MongoDB.php -index 38157674..1ef4f23f 100644 ---- a/src/Writer/MongoDB.php -+++ b/src/Writer/MongoDB.php -@@ -104,7 +104,7 @@ public function __construct($manager, $database = null, $collection = null, $wri - * @param string|FormatterInterface $formatter - * @return WriterInterface - */ -- public function setFormatter($formatter) -+ public function setFormatter($formatter, array $options = null) - { - return $this; - } diff --git a/composer.json b/composer.json index 689c87e..99e3c39 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "zendframework/zend-escaper": "^2.5", "zendframework/zend-filter": "^2.5", "zendframework/zend-mail": "^2.6.1", - "zendframework/zend-validator": "^2.6" + "zendframework/zend-validator": "^2.10.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -40,8 +40,8 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" }, "zf": { "component": "Zend\\Log", @@ -70,7 +70,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-log.spec b/php-zendframework-zend-log.spec index 35aeec0..89f9616 100644 --- a/php-zendframework-zend-log.spec +++ b/php-zendframework-zend-log.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit bf7489578d092d6ff7508117d1d920a4764fbd6a +%global gh_commit 9cec3b092acb39963659c2f32441cccc56b3f430 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-log @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.9.2 -Release: 4%{?dist} +Version: 2.10.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,8 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-log/pull/79.patch - BuildArch: noarch # Tests %if %{with_tests} @@ -53,19 +51,15 @@ BuildRequires: php-composer(psr/log) >= 1.0 # "zendframework/zend-escaper": "^2.5", # "zendframework/zend-filter": "^2.5", # "zendframework/zend-mail": "^2.6.1", -# "zendframework/zend-validator": "^2.6" +# "zendframework/zend-validator": "^2.10.1" BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.6 BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-mail) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6 -%if 0%{?fedora} >= 26 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 %global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif BuildRequires: %{phpunit} # Optional dep BuildRequires: php-autoloader(%{gh_owner}/zend-mime) >= 2.5 @@ -94,7 +88,6 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 # "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", # "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", # "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" -%if 0%{?fedora} >= 21 Suggests: php-pecl(mongo) Suggests: php-pecl(mongodb) Suggests: php-autoloader(%{gh_owner}/zend-console) @@ -103,7 +96,6 @@ Suggests: php-autoloader(%{gh_owner}/zend-escaper) Suggests: php-autoloader(%{gh_owner}/zend-mail) Suggests: php-autoloader(%{gh_owner}/zend-validator) %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.6.0 @@ -132,7 +124,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -181,7 +172,7 @@ EOF rm test/Writer/MongoDBTest.php ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" php70 php71 php72; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -202,6 +193,9 @@ exit $ret %changelog +* Wed Apr 11 2018 Remi Collet - 2.10.0-2 +- update to 2.10.0 + * Tue Dec 12 2017 Remi Collet - 2.9.2-4 - switch from zend-loader to fedora/autoloader -- cgit