From 84d3a6825f9f66d618cd412c9cb06b12a46b8d6e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 08:49:11 +0200 Subject: update to 2.14.0 raise dependency on PHP 7.4 raise dependency on laminas-stdlib 3.7.1 open https://github.com/laminas/laminas-db/issues/241 CI seems broken (2.14 is unusable) --- composer.json | 20 +++++++++++++------- php-laminas-db.spec | 35 +++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index f00f335..8a47892 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,13 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.4.99" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "extra": { "laminas": { @@ -25,15 +31,15 @@ } }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", - "laminas/laminas-stdlib": "^3.6" + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas/laminas-stdlib": "^3.7.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-eventmanager": "^3.4", + "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-eventmanager": "^3.4.0", "laminas/laminas-hydrator": "^3.2 || ^4.3", - "laminas/laminas-servicemanager": "^3.7", - "phpunit/phpunit": "^9.5.5" + "laminas/laminas-servicemanager": "^3.10.0", + "phpunit/phpunit": "^9.5.19" }, "suggest": { "laminas/laminas-eventmanager": "Laminas\\EventManager component", diff --git a/php-laminas-db.spec b/php-laminas-db.spec index e97746b..c343196 100644 --- a/php-laminas-db.spec +++ b/php-laminas-db.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-db # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 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 cdabb4bfa669c2c0edb0cb4e014c15b41afd3fb1 +%global gh_commit f0c039e3d99cd0ebf053077b436caa4d7791728a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-db @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.13.4 +Version: 2.14.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -34,24 +34,24 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-date BuildRequires: php-pcre BuildRequires: php-pdo BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~2.2.1", -# "laminas/laminas-eventmanager": "^3.4", +# "laminas/laminas-coding-standard": "^2.3.0", +# "laminas/laminas-eventmanager": "^3.4.0", # "laminas/laminas-hydrator": "^3.2 || ^4.3", -# "laminas/laminas-servicemanager": "^3.7", -# "phpunit/phpunit": "^9.5.5" +# "laminas/laminas-servicemanager": "^3.10.0", +# "phpunit/phpunit": "^9.5.19" BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 3.2 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) # remirepo:7 %else @@ -62,19 +62,19 @@ BuildRequires: php-laminas-hydrator3 BuildRequires: php-laminas-servicemanager %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.5 +BuildRequires: phpunit9 >= 9.5.18 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "php": "^7.4 || ~8.0.0 || ~8.1.0", # "laminas/laminas-stdlib": "^3.6", -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-eventmanager": "Laminas\\EventManager component", @@ -202,6 +202,13 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.14.0-1 +- update to 2.14.0 +- raise dependency on PHP 7.4 +- raise dependency on laminas-stdlib 3.7.1 +- open https://github.com/laminas/laminas-db/issues/241 + CI seems broken (2.14 is unusable) + * Fri Sep 24 2021 Remi Collet - 2.13.4-1 - update to 2.13.4 - keep compatibility using laminas-zendframework-bridge -- cgit