summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json23
-rw-r--r--php-laminas-router.spec43
2 files changed, 38 insertions, 28 deletions
diff --git a/composer.json b/composer.json
index b558eeb..201ec45 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": {
@@ -25,21 +31,20 @@
}
},
"require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0",
- "container-interop/container-interop": "^1.2",
+ "php": "^7.4 || ~8.0.0 || ~8.1.0",
"laminas/laminas-http": "^2.15",
- "laminas/laminas-servicemanager": "^3.7",
- "laminas/laminas-stdlib": "^3.6"
+ "laminas/laminas-servicemanager": "^3.14.0",
+ "laminas/laminas-stdlib": "^3.10.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.2.1",
- "laminas/laminas-i18n": "^2.7.4",
+ "laminas/laminas-i18n": "^2.15.0",
"phpunit/phpunit": "^9.5.5",
- "psalm/plugin-phpunit": "^0.15.1",
- "vimeo/psalm": "^4.7"
+ "psalm/plugin-phpunit": "^0.17.0",
+ "vimeo/psalm": "^4.24.0"
},
"suggest": {
- "laminas/laminas-i18n": "^2.7.4, if defining translatable HTTP path segments"
+ "laminas/laminas-i18n": "^2.15.0 if defining translatable HTTP path segments"
},
"autoload": {
"psr-4": {
diff --git a/php-laminas-router.spec b/php-laminas-router.spec
index c574073..ecea187 100644
--- a/php-laminas-router.spec
+++ b/php-laminas-router.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 44759e71620030c93d99e40b394fe9fff8f0beda
+%global gh_commit 39f9bdfdb875a7229ba6a8b93fb7ad0f9811d080
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-router
@@ -22,8 +22,8 @@
%endif
Name: php-%{gh_project}
-Version: 3.5.0
-Release: 3%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
License: BSD
@@ -34,22 +34,22 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 7.4
BuildRequires: php-pcre
BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-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.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14 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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
# "laminas/laminas-coding-standard": "~2.2.1",
-# "laminas/laminas-i18n": "^2.7.4",
+# "laminas/laminas-i18n": "^2.15.0",
# "phpunit/phpunit": "^9.5.5",
-# "psalm/plugin-phpunit": "^0.15.1",
-# "vimeo/psalm": "^4.7"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
+# "psalm/plugin-phpunit": "^0.17.0",
+# "vimeo/psalm": "^4.24"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.15.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
# remirepo:7
%else
BuildRequires: php-laminas-http
@@ -65,21 +65,20 @@ BuildRequires: phpunit9 >= 9.5.5
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0 || ~8.1.0",
-# "container-interop/container-interop": "^1.2",
+# "php": "^7.4 || ~8.0.0 || ~8.1.0",
# "laminas/laminas-http": "^2.15",
-# "laminas/laminas-servicemanager": "^3.7",
-# "laminas/laminas-stdlib": "^3.6"
-Requires: php(language) >= 7.3
+# "laminas/laminas-servicemanager": "^3.14.0",
+# "laminas/laminas-stdlib": "^3.10.1"
+Requires: php(language) >= 7.4
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-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.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14 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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
-# "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
+# "zendframework/zend-i18n": "^2.15.0, if defining translatable HTTP path segments"
Suggests: php-autoloader(%{gh_owner}/laminas-i18n)
# remirepo:6
%else
@@ -184,7 +183,7 @@ exit (class_exists("\\Zend\\%{library}\\RouterFactory") ? 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 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -207,6 +206,12 @@ exit $ret
%changelog
+* Wed Jul 13 2022 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+- raise dependency on PHP 7.4
+- raise dependency on laminas-servicemanager 3.14
+- raise dependency on laminas-stdlib 3.10.1
+
* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 3.5.0-3
- drop dependency on container-interop/container-interop
replaced by servicemanager >= 3.12