From 93439ea1cf4f2282b8ffc247c87bca1e92868e05 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Oct 2022 15:00:41 +0200 Subject: update to 2.10.0 raise dependency on PHP 8.0 --- composer.json | 11 +++++++---- php-laminas-uri.spec | 24 ++++++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 34e1325..0af0121 100644 --- a/composer.json +++ b/composer.json @@ -16,18 +16,21 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "extra": { }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0", "laminas/laminas-escaper": "^2.9", "laminas/laminas-validator": "^2.15" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", - "phpunit/phpunit": "^9.5.5" + "laminas/laminas-coding-standard": "~2.4.0", + "phpunit/phpunit": "^9.5.25" }, "autoload": { "psr-4": { diff --git a/php-laminas-uri.spec b/php-laminas-uri.spec index 418dee5..8d8b4c3 100644 --- a/php-laminas-uri.spec +++ b/php-laminas-uri.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-uri # -# 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 7e837dc15c8fd3949df7d1213246fd7c8640032b +%global gh_commit 663b050294945c7345cc3a61f3ca661d5f9e1f80 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-uri @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project} -Version: 2.9.1 +Version: 2.10.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -35,12 +35,12 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.0 BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "^2.2.1", -# "phpunit/phpunit": "^9.5.5" +# "laminas/laminas-coding-standard": "^2.4.0", +# "phpunit/phpunit": "^9.5.25" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) @@ -53,16 +53,16 @@ BuildRequires: php-laminas-validator BuildRequires: php-laminas-zendframework-bridge %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.5 +BuildRequires: phpunit9 >= 9.5.25 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "~8.0.0 || ~8.1.0 || ~8.2.0", # "laminas/laminas-escaper": "^2.9", # "laminas/laminas-validator": "^2.15" -Requires: php(language) >= 7.3 +Requires: php(language) >= 8.0 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) @@ -153,7 +153,7 @@ exit (class_exists("\\Zend\\%{library}\\File") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -176,6 +176,10 @@ exit $ret %changelog +* Mon Oct 17 2022 Remi Collet - 2.10.0-1 +- update to 2.10.0 +- raise dependency on PHP 8.0 + * Fri Sep 10 2021 Remi Collet - 2.9.1-1 - update to 2.9.1 - keep compatibility using laminas-zendframework-bridge -- cgit