summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-03-21 09:31:11 +0100
committerRemi Collet <remi@php.net>2023-03-21 09:31:11 +0100
commite6565eadb9a72f22fedfece5fbac2bbefc6207f2 (patch)
tree85ee66869b99766b60e5d0dc9af5b999b06633f7
parentebed6a44cbea200cf5978f3cc7d440653bed6f30 (diff)
update to 3.10.0
raise dependency on PHP 8.1 raise dependency on laminas-hydrator 4.13 raise dependency on laminas-inputfilter 2.24 raise dependency on laminas-stdlib 3.16.1 switch to phpunit10
-rw-r--r--composer.json108
-rw-r--r--php-laminas-form3.spec102
2 files changed, 111 insertions, 99 deletions
diff --git a/composer.json b/composer.json
index 101341f..ad3fdd5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,66 +1,84 @@
{
"name": "laminas/laminas-form",
"description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+ "license": "BSD-3-Clause",
"keywords": [
"laminas",
"form"
],
"homepage": "https://laminas.dev",
- "license": "BSD-3-Clause",
- "require": {
- "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
- "laminas/laminas-hydrator": "^4.3.1",
- "laminas/laminas-inputfilter": "^2.19.1",
- "laminas/laminas-stdlib": "^3.7.1"
+ "support": {
+ "issues": "https://github.com/laminas/laminas-form/issues",
+ "forum": "https://discourse.laminas.dev",
+ "chat": "https://laminas.dev/chat",
+ "source": "https://github.com/laminas/laminas-form",
+ "docs": "https://docs.laminas.dev/laminas-form/",
+ "rss": "https://github.com/laminas/laminas-form/releases.atom"
},
- "conflict": {
- "doctrine/annotations": "<1.12.0",
- "laminas/laminas-captcha": "<2.13.0",
- "laminas/laminas-eventmanager": "<3.6.0",
- "laminas/laminas-i18n": "<2.19.0",
- "laminas/laminas-recaptcha": "<3.4.0",
- "laminas/laminas-servicemanager": "<3.19.0",
- "laminas/laminas-view": "<2.24.0"
+ "require": {
+ "php": "~8.1.0 || ~8.2.0",
+ "laminas/laminas-hydrator": "^4.13.0",
+ "laminas/laminas-inputfilter": "^2.24.0",
+ "laminas/laminas-stdlib": "^3.16.1"
},
"require-dev": {
"ext-intl": "*",
- "doctrine/annotations": "^1.13.3",
- "laminas/laminas-captcha": "^2.15",
- "laminas/laminas-coding-standard": "^2.4",
- "laminas/laminas-db": "^2.16",
+ "doctrine/annotations": "^1.14.3 || ^2.0.1",
+ "laminas/laminas-captcha": "^2.16",
+ "laminas/laminas-coding-standard": "^2.5",
+ "laminas/laminas-db": "^2.17",
"laminas/laminas-escaper": "^2.12",
- "laminas/laminas-eventmanager": "^3.8",
- "laminas/laminas-filter": "^2.29",
+ "laminas/laminas-eventmanager": "^3.10",
+ "laminas/laminas-filter": "^2.31",
"laminas/laminas-i18n": "^2.21",
"laminas/laminas-modulemanager": "^2.14.0",
- "laminas/laminas-recaptcha": "^3.5",
+ "laminas/laminas-recaptcha": "^3.6",
"laminas/laminas-servicemanager": "^3.20",
"laminas/laminas-session": "^2.16",
- "laminas/laminas-text": "^2.9.0",
- "laminas/laminas-validator": "^2.28",
- "laminas/laminas-view": "^2.25",
- "phpunit/phpunit": "^9.5.26",
+ "laminas/laminas-text": "^2.10.0",
+ "laminas/laminas-validator": "^2.30.1",
+ "laminas/laminas-view": "^2.27",
+ "phpunit/phpunit": "^10.0.16",
"psalm/plugin-phpunit": "^0.18.4",
- "vimeo/psalm": "^5.1"
+ "vimeo/psalm": "^5.8"
+ },
+ "conflict": {
+ "doctrine/annotations": "<1.14.0",
+ "laminas/laminas-captcha": "<2.16.0",
+ "laminas/laminas-eventmanager": "<3.10.0",
+ "laminas/laminas-i18n": "<2.21.0",
+ "laminas/laminas-recaptcha": "<3.6.0",
+ "laminas/laminas-servicemanager": "<3.20.0",
+ "laminas/laminas-view": "<2.27.0"
},
"suggest": {
- "doctrine/annotations": "^1.12, required to use laminas-form annotations support",
- "laminas/laminas-captcha": "^2.11, required for using CAPTCHA form elements",
- "laminas/laminas-eventmanager": "^3.4, reuired for laminas-form annotations support",
- "laminas/laminas-i18n": "^2.12, required when using laminas-form view helpers",
- "laminas/laminas-recaptcha": "^3.4, in order to use the ReCaptcha form element",
- "laminas/laminas-servicemanager": "^3.10, required to use the form factories or provide services",
- "laminas/laminas-view": "^2.14, required for using the laminas-form view helpers"
+ "doctrine/annotations": "^1.14, required to use laminas-form annotations support",
+ "laminas/laminas-captcha": "^2.16, required for using CAPTCHA form elements",
+ "laminas/laminas-eventmanager": "^3.10, reuired for laminas-form annotations support",
+ "laminas/laminas-i18n": "^2.21, required when using laminas-form view helpers",
+ "laminas/laminas-recaptcha": "^3.6, in order to use the ReCaptcha form element",
+ "laminas/laminas-servicemanager": "^3.20, required to use the form factories or provide services",
+ "laminas/laminas-view": "^2.27, required for using the laminas-form view helpers"
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Form\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "LaminasTest\\Form\\": "test/"
+ }
},
"config": {
- "sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
- "php": "8.0.99"
- }
+ "php": "8.1.99"
+ },
+ "sort-packages": true
},
"extra": {
"laminas": {
@@ -68,16 +86,6 @@
"config-provider": "Laminas\\Form\\ConfigProvider"
}
},
- "autoload": {
- "psr-4": {
- "Laminas\\Form\\": "src/"
- }
- },
- "autoload-dev": {
- "psr-4": {
- "LaminasTest\\Form\\": "test/"
- }
- },
"scripts": {
"check": [
"@cs-check",
@@ -89,13 +97,5 @@
"static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- },
- "support": {
- "issues": "https://github.com/laminas/laminas-form/issues",
- "forum": "https://discourse.laminas.dev",
- "chat": "https://laminas.dev/chat",
- "source": "https://github.com/laminas/laminas-form",
- "docs": "https://docs.laminas.dev/laminas-form/",
- "rss": "https://github.com/laminas/laminas-form/releases.atom"
}
}
diff --git a/php-laminas-form3.spec b/php-laminas-form3.spec
index 37cb988..7c7ec52 100644
--- a/php-laminas-form3.spec
+++ b/php-laminas-form3.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 843056ab671477be0204ceb7f13feaab41193b52
+%global gh_commit 91dd0e884c0dacb28922166b3ec9a400bd6e8b47
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-form
@@ -20,7 +20,7 @@
%bcond_without tests
Name: php-%{gh_project}%{major}
-Version: 3.9.0
+Version: 3.10.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component version %{major}
@@ -32,7 +32,7 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with tests}
-BuildRequires: php(language) >= 8.0
+BuildRequires: php(language) >= 8.1
BuildRequires: php-date
BuildRequires: php-intl
BuildRequires: php-mbstring
@@ -41,43 +41,43 @@ BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
# Only v3 for build
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.3.1 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.19.1 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.13 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.24 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.16.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
# From composer, "require-dev": {
# "ext-intl": "*",
-# "doctrine/annotations": "^1.13.3",
-# "laminas/laminas-captcha": "^2.15",
-# "laminas/laminas-coding-standard": "^2.4",
-# "laminas/laminas-db": "^2.16",
+# "doctrine/annotations": "^1.14.3 || ^2.0.1",
+# "laminas/laminas-captcha": "^2.16",
+# "laminas/laminas-coding-standard": "^2.5",
+# "laminas/laminas-db": "^2.17",
# "laminas/laminas-escaper": "^2.12",
-# "laminas/laminas-eventmanager": "^3.8",
-# "laminas/laminas-filter": "^2.29",
+# "laminas/laminas-eventmanager": "^3.10",
+# "laminas/laminas-filter": "^2.31",
# "laminas/laminas-i18n": "^2.21",
# "laminas/laminas-modulemanager": "^2.14",
# "laminas/laminas-recaptcha": "^3.5",
# "laminas/laminas-servicemanager": "^3.20",
# "laminas/laminas-session": "^2.16",
-# "laminas/laminas-text": "^2.9.0",
-# "laminas/laminas-validator": "^2.28",
-# "laminas/laminas-view": "^2.25",
-# "phpunit/phpunit": "^9.5.26",
+# "laminas/laminas-text": "^2.10.0",
+# "laminas/laminas-validator": "^2.30.1",
+# "laminas/laminas-view": "^2.27",
+# "phpunit/phpunit": "^10.0.16",
# "psalm/plugin-phpunit": "^0.18.4",
-# "vimeo/psalm": "^5.1"
-BuildRequires: (php-composer(doctrine/annotations) >= 1.13.3 with php-composer(doctrine/annotations) < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha) >= 2.15 with php-autoloader(%{gh_owner}/laminas-captcha) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.16 with php-autoloader(%{gh_owner}/laminas-db) < 3)
+# "vimeo/psalm": "^5.8"
+BuildRequires: (php-composer(doctrine/annotations) >= 1.14.3 with php-composer(doctrine/annotations) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha) >= 2.16 with php-autoloader(%{gh_owner}/laminas-captcha) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.17 with php-autoloader(%{gh_owner}/laminas-db) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.12 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.8 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.29 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.10 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.31 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.21 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.14 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.5 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.20 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.16 with php-autoloader(%{gh_owner}/laminas-session) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-text) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.28 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.25 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.10 with php-autoloader(%{gh_owner}/laminas-text) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.30.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.27 with php-autoloader(%{gh_owner}/laminas-view) < 3)
# remirepo:20
%else
BuildRequires: php-laminas-inputfilter
@@ -98,34 +98,34 @@ BuildRequires: php-laminas-text
BuildRequires: php-laminas-validator
BuildRequires: php-laminas-view
%endif
-%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.5.26
+%global phpunit %{_bindir}/phpunit10
+BuildRequires: phpunit10 >= 10.0.16
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
-# "laminas/laminas-hydrator": "^4.3.1",
-# "laminas/laminas-inputfilter": "^2.19.1",
-# "laminas/laminas-stdlib": "^3.7.1"
-Requires: php(language) >= 8.0
+# "php": "~8.1.0 || ~8.2.0",
+# "laminas/laminas-hydrator": "^4.13.0",
+# "laminas/laminas-inputfilter": "^2.24.0",
+# "laminas/laminas-stdlib": "^3.16.1"
+Requires: php(language) >= 8.1
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.3.1 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5)
-Requires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.19.1 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.7.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.13 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5)
+Requires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.24 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.16.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
# Mandory because of Polyfill
Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.15.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
# From composer, "suggest": {
-# "doctrine/annotations": "^1.12, required to use laminas-form annotations support",
-# "laminas/laminas-captcha": "^2.11, required for using CAPTCHA form elements",
-# "laminas/laminas-eventmanager": "^3.4, reuired for laminas-form annotations support",
-# "laminas/laminas-i18n": "^2.12, required when using laminas-form view helpers",
-# "laminas/laminas-recaptcha": "^3.4, in order to use the ReCaptcha form element",
-# "laminas/laminas-servicemanager": "^3.10, required to use the form factories or provide services",
-# "laminas/laminas-view": "^2.14, required for using the laminas-form view helpers"
+# "doctrine/annotations": "^1.14, required to use laminas-form annotations support",
+# "laminas/laminas-captcha": "^2.16, required for using CAPTCHA form elements",
+# "laminas/laminas-eventmanager": "^3.10, reuired for laminas-form annotations support",
+# "laminas/laminas-i18n": "^2.21, required when using laminas-form view helpers",
+# "laminas/laminas-recaptcha": "^3.6, in order to use the ReCaptcha form element",
+# "laminas/laminas-servicemanager": "^3.20, required to use the form factories or provide services",
+# "laminas/laminas-view": "^2.27, required for using the laminas-form view helpers"
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
Suggests: php-composer(doctrine/annotations)
Suggests: php-autoloader(%{gh_owner}/laminas-captcha)
@@ -181,7 +181,10 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/%{namespace}/Hydrator4/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
- '%{php_home}/Doctrine/Common/Annotations/autoload.php',
+ [
+ '%{php_home}/Doctrine/Common/Annotations2/autoload.php',
+ '%{php_home}/Doctrine/Common/Annotations/autoload.php',
+ ],
'%{php_home}/%{namespace}/Captcha/autoload.php',
'%{php_home}/%{namespace}/EventManager/autoload.php',
'%{php_home}/%{namespace}/I18n/autoload.php',
@@ -221,11 +224,12 @@ EOF
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php80 php81 php82; do
+for cmdarg in "php %{phpunit}" php81 php82; do
if which $cmdarg; then
set $cmdarg
- $1 ${2:-%{_bindir}/phpunit9} \
+ $1 ${2:-%{_bindir}/phpunit10} \
--filter '^((?!(testHtmlEscapingOfMessages|setValidationGroup|testFormCanBeCreatedViaInteractionOfAllManagers|testRendersDatesWithEsCLLocaleDatePattern)).)*$' \
+ --bootstrap vendor/autoload.php \
-d memory_limit=1G || ret=1
fi
done
@@ -245,6 +249,14 @@ exit $ret
%changelog
+* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 3.10.0-1
+- update to 3.10.0
+- raise dependency on PHP 8.1
+- raise dependency on laminas-hydrator 4.13
+- raise dependency on laminas-inputfilter 2.24
+- raise dependency on laminas-stdlib 3.16.1
+- switch to phpunit10
+
* Thu Mar 16 2023 Remi Collet <remi@remirepo.net> - 3.9.0-1
- update to 3.9.0