From b70cab6828baad9774fc0f44e6697f7cf0ccd3af Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 1 Aug 2022 14:55:27 +0200 Subject: update to 2.14.0 raise dependency on PHP 7.4 --- composer.json | 22 ++++++++++++++-------- php-laminas-ldap.spec | 36 ++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 6e682a5..20518d5 100644 --- a/composer.json +++ b/composer.json @@ -16,23 +16,29 @@ "forum": "https://discourse.laminas.dev" }, "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + }, + "platform": { + "php": "7.4.99" + }, "sort-packages": true }, "extra": { }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "ext-ldap": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-config": "^3.7.0", - "laminas/laminas-eventmanager": "^3.3", - "laminas/laminas-stdlib": "^3.3", - "php-mock/php-mock-phpunit": "^2.6", - "phpunit/phpunit": "^9.5.8", - "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.13.1" + "laminas/laminas-eventmanager": "^3.4.0", + "laminas/laminas-stdlib": "^3.7.1", + "php-mock/php-mock-phpunit": "^2.6.0", + "phpunit/phpunit": "^9.5.19", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.22.0" }, "suggest": { "laminas/laminas-eventmanager": "Laminas\\EventManager component" diff --git a/php-laminas-ldap.spec b/php-laminas-ldap.spec index fdd6132..339313f 100644 --- a/php-laminas-ldap.spec +++ b/php-laminas-ldap.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 308f7749b12e2c14e91f51ddca4e2296fafe2367 +%global gh_commit f68ae4c5a7525b21dd1dfaac92db035cfdacdf78 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-ldap @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.13.0 +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-ldap # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-config": "^3.7.0", -# "laminas/laminas-eventmanager": "^3.3", -# "laminas/laminas-stdlib": "^3.3", -# "php-mock/php-mock-phpunit": "^2.6", -# "phpunit/phpunit": "^9.5.8", -# "psalm/plugin-phpunit": "^0.16.1", -# "vimeo/psalm": "^4.13.1" +# "laminas/laminas-eventmanager": "^3.4.0", +# "laminas/laminas-stdlib": "^3.7.1", +# "php-mock/php-mock-phpunit": "^2.6.0", +# "phpunit/phpunit": "^9.5.19", +# "psalm/plugin-phpunit": "^0.17.0", +# "vimeo/psalm": "^4.22.0" BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-composer(php-mock/php-mock-phpunit) >= 2.6 with php-composer(php-mock/php-mock-phpunit) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-composer(php-mock/php-mock-phpunit) >= 2.6.0 with php-composer(php-mock/php-mock-phpunit) < 3) # remirepo:7 %else BuildRequires: php-laminas-zendframework-bridge @@ -61,7 +61,7 @@ BuildRequires: php-laminas-stdlib BuildRequires: php-mock-phpunit2 %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.8 +BuildRequires: phpunit9 >= 9.5.19 BuildRequires: php-date BuildRequires: php-iconv BuildRequires: php-json @@ -73,9 +73,9 @@ BuildRequires: php-spl 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", # "ext-ldap": "*" -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 Requires: php-ldap # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -198,6 +198,10 @@ exit $ret %changelog +* Mon Aug 1 2022 Remi Collet - 2.14.0-1 +- update to 2.14.0 +- raise dependency on PHP 7.4 + * Mon Mar 21 2022 Remi Collet - 2.13.0-1 - update to 2.13.0 -- cgit