summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json17
-rw-r--r--php-laminas-tag-escaper.patch22
-rw-r--r--php-laminas-tag.spec50
3 files changed, 34 insertions, 55 deletions
diff --git a/composer.json b/composer.json
index c7496c2..c5bcf9b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,15 +19,14 @@
"sort-packages": true
},
"require": {
- "php": "^7.3 || ~8.0.0",
- "laminas/laminas-escaper": "^2.7",
- "laminas/laminas-stdlib": "^3.3",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0",
+ "laminas/laminas-escaper": "^2.9",
+ "laminas/laminas-stdlib": "^3.6"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-servicemanager": "^3.4.1",
- "phpunit/phpunit": "^9.3"
+ "laminas/laminas-coding-standard": "~2.3",
+ "laminas/laminas-servicemanager": "^3.8",
+ "phpunit/phpunit": "^9.5.5"
},
"suggest": {
"laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
@@ -52,7 +51,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
- "replace": {
- "zendframework/zend-tag": "^2.7.1"
+ "conflict": {
+ "zendframework/zend-tag": "*"
}
}
diff --git a/php-laminas-tag-escaper.patch b/php-laminas-tag-escaper.patch
deleted file mode 100644
index fed770c..0000000
--- a/php-laminas-tag-escaper.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d864af14cf8645f5ab09df9cd406b4eafd113a57 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 3 Aug 2021 10:36:00 +0200
-Subject: [PATCH] fix for laminas/escaper 2.8
-
----
- src/Cloud/Decorator/HtmlTag.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Cloud/Decorator/HtmlTag.php b/src/Cloud/Decorator/HtmlTag.php
-index 6e50578..89ab75b 100644
---- a/src/Cloud/Decorator/HtmlTag.php
-+++ b/src/Cloud/Decorator/HtmlTag.php
-@@ -241,7 +241,7 @@ public function render($tags)
-
- $tagHTML = sprintf(
- '<a href="%s" %s>%s</a>',
-- $escaper->escapeHtml($tag->getParam('url')),
-+ $escaper->escapeHtml($tag->getParam('url') ?? ''),
- $attribute,
- $escaper->escapeHtml($tag->getTitle())
- );
diff --git a/php-laminas-tag.spec b/php-laminas-tag.spec
index d5888bc..490e8ad 100644
--- a/php-laminas-tag.spec
+++ b/php-laminas-tag.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit f8d754c800196375869b7a4fae870ca89ab91bfb
+%global gh_commit 570b206c9a5126a97fdd5f0bf9de6cec08402658
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-tag
@@ -22,8 +22,8 @@
%endif
Name: php-%{gh_project}
-Version: 2.8.0
-Release: 2%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
License: BSD
@@ -31,24 +31,21 @@ URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
-# https://github.com/laminas/laminas-tag/pull/6
-Patch0: %{name}-escaper.patch
-
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 7.4
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer, "require-dev": {
-# "laminas/laminas-coding-standard": "~1.0.0",
-# "laminas/laminas-servicemanager": "^3.4.1",
-# "phpunit/phpunit": "^9.3"
+# "laminas/laminas-coding-standard": "~2.3",
+# "laminas/laminas-servicemanager": "^3.8",
+# "phpunit/phpunit": "^9.5.5"
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.7 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
+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.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# remirepo:6
%else
@@ -58,21 +55,20 @@ BuildRequires: php-laminas-servicemanager
BuildRequires: php-laminas-zendframework-bridge
%endif
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.5
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
-# "laminas/laminas-escaper": "^2.7",
-# "laminas/laminas-stdlib": "^3.3",
-# "laminas/laminas-zendframework-bridge": "^1.0"
-Requires: php(language) >= 7.3
+# "php": "^7.4 || ~8.0.0 || ~8.1.0",
+# "laminas/laminas-escaper": "^2.9",
+# "laminas/laminas-stdlib": "^3.6"
+Requires: php(language) >= 7.4
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.7 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 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": {
# "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
@@ -113,8 +109,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
-
mv LICENSE.md LICENSE
@@ -161,7 +155,7 @@ EOF
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -191,6 +185,14 @@ exit $ret
%changelog
+* Fri Dec 3 2021 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+- raise dependency on PHP 7.4
+- raise dependency on laminas-escaper 2.9
+- raise dependency on laminas-stdlib 3.6
+
* Tue Aug 3 2021 Remi Collet <remi@remirepo.net> - 2.8.0-2
- add fix for laminas-escaper 2.8.0
https://github.com/laminas/laminas-tag/pull/6
generated by cgit (git 2.34.1) at 2024-11-16 19:06:48 +0000