diff options
| -rw-r--r-- | composer.json | 16 | ||||
| -rw-r--r-- | php-laminas-paginator.spec | 32 |
2 files changed, 29 insertions, 19 deletions
diff --git a/composer.json b/composer.json index ef05667..ab2d368 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": { @@ -27,7 +33,7 @@ "require": { "php": "^7.4 || ~8.0.0 || ~8.1.0", "ext-json": "*", - "laminas/laminas-stdlib": "^3.6.2" + "laminas/laminas-stdlib": "^3.10.1" }, "require-dev": { "laminas/laminas-cache": "^3.1.2", @@ -35,11 +41,11 @@ "laminas/laminas-coding-standard": "^2.3.0", "laminas/laminas-config": "^3.7.0", "laminas/laminas-filter": "^2.13.0", - "laminas/laminas-servicemanager": "^3.10.0", + "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-view": "^2.15.0", - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^9.5.21", "psalm/plugin-phpunit": "^0.16.1", - "vimeo/psalm": "^4.15.0" + "vimeo/psalm": "^4.24.0" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component to support cache features", diff --git a/php-laminas-paginator.spec b/php-laminas-paginator.spec index 2975eba..7977c94 100644 --- a/php-laminas-paginator.spec +++ b/php-laminas-paginator.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit e2e5a17e2b6ca750e4a75b8f34763c63cc6bf8fa +%global gh_commit 2d6a9d21f5d67963347d497cd53873e3e693b0b5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-paginator @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -39,7 +39,7 @@ BuildRequires: php-json 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.10.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0.4 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { # "laminas/laminas-cache": "^3.1.2", @@ -47,29 +47,29 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0. # "laminas/laminas-coding-standard": "^2.3.0", # "laminas/laminas-config": "^3.7.0", # "laminas/laminas-filter": "^2.13.0", -# "laminas/laminas-servicemanager": "^3.10.0", +# "laminas/laminas-servicemanager": "^3.14.0", # "laminas/laminas-view": "^2.15.0", -# "phpunit/phpunit": "^9.5.5", +# "phpunit/phpunit": "^9.5.21", # "psalm/plugin-phpunit": "^0.16.1", -# "vimeo/psalm": "^4.15.0" +# "vimeo/psalm": "^4.24.0" # ignore cache min version for now BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-cache) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7.0 with php-autoloader(%{gh_owner}/laminas-config) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.13.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.15.0 with php-autoloader(%{gh_owner}/laminas-view) < 3) # remirepo:11 %else -BuildRequires: php-laminas-stdlib >= 3.6 +BuildRequires: php-laminas-stdlib >= 3.10.1 BuildRequires: php-laminas-zendframework-bridge >= 1.0.4 BuildRequires: php-laminas-cache >= 2.9.0 BuildRequires: php-laminas-config3 >= 3.7.0 BuildRequires: php-laminas-filter >= 2.13 -BuildRequires: php-laminas-servicemanager >= 3.10.0 +BuildRequires: php-laminas-servicemanager >= 3.14.0 BuildRequires: php-laminas-view >= 2.15.0 %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.5 +BuildRequires: phpunit9 >= 9.5.21 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -77,14 +77,14 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^7.4 || ~8.0.0 || ~8.1.0", # "ext-json": "*", -# "laminas/laminas-stdlib": "^3.6.0", +# "laminas/laminas-stdlib": "^3.10.1", # "laminas/laminas-zendframework-bridge": "^1.0.4" Requires: php(language) >= 7.4 Requires: php-json %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.10.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0.4 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-cache": "Laminas\\Cache component to support cache features", @@ -191,10 +191,10 @@ exit (class_exists("\\Zend\\%{library}\\Factory") ? 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 + $1 ${2:-%{_bindir}/phpunit9} --bootstrap vendor/autoload.php --verbose || ret=1 fi done exit $ret @@ -214,6 +214,10 @@ exit $ret %changelog +* Tue Jul 12 2022 Remi Collet <remi@remirepo.net> - 2.13.0-1 +- update to 2.13.0 +- raise dependency to laminas-stdlib 3.10.1 + * Wed Jan 12 2022 Remi Collet <remi@remirepo.net> - 2.12.2-1 - update to 2.12.2 |