diff options
-rw-r--r-- | composer.json | 18 | ||||
-rw-r--r-- | php-laminas-permissions-acl.spec | 28 |
2 files changed, 28 insertions, 18 deletions
diff --git a/composer.json b/composer.json index f4f6dec..8bfc4e3 100644 --- a/composer.json +++ b/composer.json @@ -16,21 +16,27 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.4.99" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "conflict": { "laminas/laminas-servicemanager": "<3.0", "zendframework/zend-permissions-acl": "*" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-servicemanager": "^3.0.3", + "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-servicemanager": "^3.15.1", "phpunit/phpunit": "^9.5.0", - "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.7" + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "suggest": { "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" diff --git a/php-laminas-permissions-acl.spec b/php-laminas-permissions-acl.spec index 4a3fcd9..f275981 100644 --- a/php-laminas-permissions-acl.spec +++ b/php-laminas-permissions-acl.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-permissions-acl # -# 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 cd5689d8360c9a3f29bb62b32fc8ad45e0947e1e +%global gh_commit e927ae0a3001655fea97eb240eeea9d10638e82f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-permissions-acl @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project} -Version: 2.9.0 +Version: 2.10.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj} component @@ -35,18 +35,18 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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": "~1.0.0", -# "laminas/laminas-servicemanager": "^3.0.3", +# "laminas/laminas-coding-standard": "~2.3.0", +# "laminas/laminas-servicemanager": "^3.15.1", # "phpunit/phpunit": "^9.5.0", -# "psalm/plugin-phpunit": "^0.15.1", -# "vimeo/psalm": "^4.7" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +# "psalm/plugin-phpunit": "^0.17.0", +# "vimeo/psalm": "^4.24.0" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.15.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) # remirepo:4 %else BuildRequires: php-laminas-zendframework-bridge @@ -59,8 +59,8 @@ BuildRequires: phpunit9 >= 9.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0" -Requires: php(language) >= 7.3 +# "php": "^7.4 || ~8.0.0 || ~8.1.0" +Requires: php(language) >= 7.4 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -149,7 +149,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\Acl") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -174,6 +174,10 @@ exit $ret %changelog +* Fri Jul 22 2022 Remi Collet <remi@remirepo.net> - 2.10.0-1 +- update to 2.10.0 +- raise dependency on PHP 7.4 + * Fri Dec 3 2021 Remi Collet <remi@remirepo.net> - 2.9.0-1 - update to 2.9.0 - keep compatibility using laminas-zendframework-bridge |