From 14838fc2d01dd872f3389f1e6f2081bcf5602a2d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Jul 2022 11:12:33 +0200 Subject: update to 1.4.0 raise dependency on laminas-i18n 2.13.0 raise dependency on laminas-router 3.5.0 raise dependency on laminas-servicemanager 3.15.1 raise dependency on laminas-stdlib 3.10.1 raise dependency on laminas-validator 2.19.0 --- composer.json | 24 ++++++++++++--------- php-laminas-mvc-i18n.spec | 55 +++++++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 61f8dfc..18dced0 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,10 @@ "config": { "sort-packages": true, "platform": { - "php": "7.3.99" + "php": "7.4.99" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true } }, "extra": { @@ -29,20 +32,21 @@ } }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "ext-intl": "*", "container-interop/container-interop": "^1.1", - "laminas/laminas-i18n": "^2.11", - "laminas/laminas-router": "^3.0", - "laminas/laminas-servicemanager": "^3.6", - "laminas/laminas-stdlib": "^3.3", - "laminas/laminas-validator": "^2.14" + "laminas/laminas-i18n": "^2.13.0", + "laminas/laminas-router": "^3.5.0", + "laminas/laminas-servicemanager": "^3.15.1", + "laminas/laminas-stdlib": "^3.10.1", + "laminas/laminas-validator": "^2.19.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.3.0", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.7" + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "conflict": { "laminas/laminas-mvc": "<3.0.0", diff --git a/php-laminas-mvc-i18n.spec b/php-laminas-mvc-i18n.spec index 5b681fa..5f088e7 100644 --- a/php-laminas-mvc-i18n.spec +++ b/php-laminas-mvc-i18n.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 3f6c81d839507dee8bbf74a09a9bfc65ecd3bb88 +%global gh_commit 6dc949c045d7a2c27652a3bb891d46ef5e1814e4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mvc-i18n @@ -23,8 +23,8 @@ %endif Name: php-%{gh_project} -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj} component License: BSD @@ -35,22 +35,23 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-intl BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0 with php-autoloader(%{gh_owner}/laminas-router) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.13.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.5.0 with php-autoloader(%{gh_owner}/laminas-router) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.15.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 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-validator) >= 2.19.0 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { +# "laminas/laminas-coding-standard": "~2.3.0", # "phpspec/prophecy-phpunit": "^2.0", # "phpunit/phpunit": "^9.5", -# "psalm/plugin-phpunit": "^0.15.1", -# "vimeo/psalm": "^4.7" +# "psalm/plugin-phpunit": "^0.17.0", +# "vimeo/psalm": "^4.24.0" BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) # remirepo:9 %else @@ -69,21 +70,21 @@ BuildRequires: phpunit9 >= 9.5 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", # "container-interop/container-interop": "^1.1", -# "laminas/laminas-i18n": "^2.11", -# "laminas/laminas-router": "^3.0", -# "laminas/laminas-servicemanager": "^3.6", -# "laminas/laminas-stdlib": "^3.3", -# "laminas/laminas-validator": "^2.14" +# "laminas/laminas-i18n": "^2.13.0", +# "laminas/laminas-router": "^3.5.0", +# "laminas/laminas-servicemanager": "^3.15.1", +# "laminas/laminas-stdlib": "^3.10.1", +# "laminas/laminas-validator": "^2.19.0" Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.11 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0 with php-autoloader(%{gh_owner}/laminas-router) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.13 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.5.0 with php-autoloader(%{gh_owner}/laminas-router) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.15.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 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-validator) >= 2.19 with php-autoloader(%{gh_owner}/laminas-validator) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-cache": "To enable caching of translation strings" @@ -188,7 +189,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\Translator") ? 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 @@ -213,6 +214,14 @@ exit $ret %changelog +* Fri Jul 22 2022 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- raise dependency on laminas-i18n 2.13.0 +- raise dependency on laminas-router 3.5.0 +- raise dependency on laminas-servicemanager 3.15.1 +- raise dependency on laminas-stdlib 3.10.1 +- raise dependency on laminas-validator 2.19.0 + * Thu Jun 23 2022 Remi Collet - 1.3.1-2 - drop dependency on container-interop/container-interop replaced by servicemanager >= 3.12 -- cgit