From 34ed17bee57501c74e4687e6d5a30f47d3c5246c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Dec 2021 14:14:16 +0100 Subject: update to 2.15.0 --- composer.json | 10 +++++++--- php-laminas-log.spec | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index e4e3626..33a0c64 100644 --- a/composer.json +++ b/composer.json @@ -26,13 +26,17 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "laminas/laminas-servicemanager": "^3.3.0", "laminas/laminas-stdlib": "^3.0", "psr/log": "^1.1.2" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "ext-dom": "*", + "ext-json": "*", + "ext-xml": "*", + "firephp/firephp-core": "^0.5.3", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-db": "^2.6", "laminas/laminas-escaper": "^2.5", "laminas/laminas-filter": "^2.5", @@ -40,7 +44,7 @@ "laminas/laminas-validator": "^2.10.1", "mikey179/vfsstream": "^1.6.7", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4.1" + "phpunit/phpunit": "^9.5.10" }, "provide": { "psr/log-implementation": "1.0.0" diff --git a/php-laminas-log.spec b/php-laminas-log.spec index 0a9ef6d..fcf3ae1 100644 --- a/php-laminas-log.spec +++ b/php-laminas-log.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 39f3dcbd77fd0d84b190ff1332f5d3d28d56527e +%global gh_commit 91964dd3afec183c09cca5bc2b21a930a56d5237 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-log @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.14.0 +Version: 2.15.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -41,6 +41,7 @@ BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl +BuildRequires: php-xml # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) @@ -48,7 +49,11 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) BuildRequires: (php-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", +# "ext-dom": "*", +# "ext-json": "*", +# "ext-xml": "*", +# "firephp/firephp-core": "^0.5.3", +# "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-db": "^2.6", # "laminas/laminas-escaper": "^2.5", # "laminas/laminas-filter": "^2.5", @@ -56,7 +61,7 @@ BuildRequires: (php-composer(psr/log) >= 1.1. # "laminas/laminas-validator": "^2.10.1", # "mikey179/vfsstream": "^1.6.7", # "phpspec/prophecy-phpunit": "^2.0", -# "phpunit/phpunit": "^9.4.1" +# "phpunit/phpunit": "^9.5.10" BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.6 with php-autoloader(%{gh_owner}/laminas-db) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.5 with php-autoloader(%{gh_owner}/laminas-filter) < 3) @@ -79,7 +84,7 @@ BuildRequires: php-laminas-mail BuildRequires: php-laminas-validator %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.4.1 +BuildRequires: phpunit9 >= 9.5.10 # Optional dep BuildRequires: php-autoloader(%{gh_owner}/laminas-mime) >= 2.5 %endif @@ -87,7 +92,7 @@ BuildRequires: php-autoloader(%{gh_owner}/laminas-mime) >= 2.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", +# "php": "^7.3 || ~8.0.0 || ~8.1.0", # "laminas/laminas-servicemanager": "^3.3.0", # "laminas/laminas-stdlib": "^3.0", # "psr/log": "^1.1.2" @@ -244,6 +249,9 @@ exit $ret %changelog +* Tue Dec 7 2021 Remi Collet - 2.15.0-1 +- update to 2.15.0 + * Fri Dec 3 2021 Remi Collet - 2.14.0-1 - update to 2.14.0 - keep compatibility using laminas-zendframework-bridge -- cgit