update to 3.5.0

raise dependency on PHP 8.0

2 files changed, 56 insertions, 57 deletions

diff --git a/composer.json b/composer.json
index deadb8b..47792af 100644
--- a/composer.json
+++ b/composer.json
@@ -8,41 +8,40 @@
     "homepage": "https://laminas.dev",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "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"
     },
     "conflict": {
         "doctrine/annotations": "<1.12.0",
-        "laminas/laminas-captcha": "<2.11.0",
-        "laminas/laminas-eventmanager": "<3.4.0",
-        "laminas/laminas-i18n": "<2.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.10.0",
-        "laminas/laminas-view": "<2.14.0"
+        "laminas/laminas-servicemanager": "<3.19.0",
+        "laminas/laminas-view": "<2.24.0"
     },
     "require-dev": {
         "ext-intl": "*",
         "doctrine/annotations": "^1.13.3",
-        "laminas/laminas-captcha": "^2.11.0",
-        "laminas/laminas-coding-standard": "^2.3.0",
-        "laminas/laminas-db": "^2.13.4",
-        "laminas/laminas-escaper": "^2.9.0",
-        "laminas/laminas-eventmanager": "^3.4.0",
-        "laminas/laminas-filter": "^2.14.0",
-        "laminas/laminas-i18n": "^2.14.0",
-        "laminas/laminas-modulemanager": "^2.11.0",
+        "laminas/laminas-captcha": "^2.13",
+        "laminas/laminas-coding-standard": "^2.4",
+        "laminas/laminas-db": "^2.15",
+        "laminas/laminas-escaper": "^2.12",
+        "laminas/laminas-eventmanager": "^3.6",
+        "laminas/laminas-filter": "^2.23",
+        "laminas/laminas-i18n": "^2.19",
+        "laminas/laminas-modulemanager": "^2.12",
         "laminas/laminas-recaptcha": "^3.4.0",
-        "laminas/laminas-servicemanager": "^3.15.1",
-        "laminas/laminas-session": "^2.12.1",
+        "laminas/laminas-servicemanager": "^3.19",
+        "laminas/laminas-session": "^2.13",
         "laminas/laminas-text": "^2.9.0",
-        "laminas/laminas-validator": "^2.16.0",
-        "laminas/laminas-view": "^2.19.1",
-        "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpunit/phpunit": "^9.5.14",
+        "laminas/laminas-validator": "^2.26",
+        "laminas/laminas-view": "^2.24",
+        "phpunit/phpunit": "^9.5.25",
         "psalm/plugin-phpunit": "^0.17.0",
-        "vimeo/psalm": "^4.21.0"
+        "vimeo/psalm": "^4.29"
     },
     "suggest": {
         "doctrine/annotations": "^1.12, required to use laminas-form annotations support",
@@ -60,7 +59,7 @@
             "dealerdirect/phpcodesniffer-composer-installer": true
         },
         "platform": {
-            "php": "7.4.99"
+            "php": "8.0.99"
         }
     },
     "extra": {
diff --git a/php-laminas-form3.spec b/php-laminas-form3.spec
index afac746..decae6d 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    cd3f9d3e345b075d34793e46b0759a4dfd12f674
+%global gh_commit    477695ffff0bc468f73cb695d4268538e90036b5
 %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.4.1
+Version:        3.5.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component version %{major}
 
@@ -47,39 +47,37 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.7.
 # From composer, "require-dev": {
 #        "ext-intl": "*",
 #        "doctrine/annotations": "^1.13.3",
-#        "laminas/laminas-captcha": "^2.11.0",
-#        "laminas/laminas-coding-standard": "^2.3.0",
-#        "laminas/laminas-db": "^2.13.4",
-#        "laminas/laminas-escaper": "^2.9.0",
-#        "laminas/laminas-eventmanager": "^3.4.0",
-#        "laminas/laminas-filter": "^2.14.0",
-#        "laminas/laminas-i18n": "^2.14.0",
-#        "laminas/laminas-modulemanager": "^2.11.0",
+#        "laminas/laminas-captcha": "^2.13",
+#        "laminas/laminas-coding-standard": "^2.4",
+#        "laminas/laminas-db": "^2.15",
+#        "laminas/laminas-escaper": "^2.12",
+#        "laminas/laminas-eventmanager": "^3.6",
+#        "laminas/laminas-filter": "^2.23",
+#        "laminas/laminas-i18n": "^2.19",
+#        "laminas/laminas-modulemanager": "^2.12",
 #        "laminas/laminas-recaptcha": "^3.4.0",
-#        "laminas/laminas-servicemanager": "^3.15.1",
-#        "laminas/laminas-session": "^2.12.1",
+#        "laminas/laminas-servicemanager": "^3.19",
+#        "laminas/laminas-session": "^2.13",
 #        "laminas/laminas-text": "^2.9.0",
-#        "laminas/laminas-validator": "^2.16.0",
-#        "laminas/laminas-view": "^2.19.1",
-#        "phpspec/prophecy-phpunit": "^2.0.1",
-#        "phpunit/phpunit": "^9.5.14",
+#        "laminas/laminas-validator": "^2.26",
+#        "laminas/laminas-view": "^2.24",
+#        "phpunit/phpunit": "^9.5.25",
 #        "psalm/plugin-phpunit": "^0.16.1",
-#        "vimeo/psalm": "^4.21.0"
+#        "vimeo/psalm": "^4.29"
 BuildRequires: (php-composer(doctrine/annotations)                       >= 1.13.3  with php-composer(doctrine/annotations)                       < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha)              >= 2.11.0  with php-autoloader(%{gh_owner}/laminas-captcha)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)                   >= 2.13.4  with php-autoloader(%{gh_owner}/laminas-db)                   < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper)              >= 2.9.0   with php-autoloader(%{gh_owner}/laminas-escaper)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.4.0   with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.14.0  with php-autoloader(%{gh_owner}/laminas-filter)               < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n)                 >= 2.14.0  with php-autoloader(%{gh_owner}/laminas-i18n)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager)        >= 2.11.0  with php-autoloader(%{gh_owner}/laminas-modulemanager)        < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha)              >= 2.13    with php-autoloader(%{gh_owner}/laminas-captcha)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)                   >= 2.15    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.6     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.23    with php-autoloader(%{gh_owner}/laminas-filter)               < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n)                 >= 2.19    with php-autoloader(%{gh_owner}/laminas-i18n)                 < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager)        >= 2.12    with php-autoloader(%{gh_owner}/laminas-modulemanager)        < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha)            >= 3.4.0   with php-autoloader(%{gh_owner}/laminas-recaptcha)            < 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-session)              >= 2.12.1  with php-autoloader(%{gh_owner}/laminas-session)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.19    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.13    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.16.0  with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.19.1  with php-autoloader(%{gh_owner}/laminas-view)                 < 3)
-BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0     with php-composer(phpspec/prophecy-phpunit)                   < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.26    with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.24  with php-autoloader(%{gh_owner}/laminas-view)                 < 3)
 # remirepo:20
 %else
 BuildRequires:  php-laminas-inputfilter
@@ -99,16 +97,15 @@ BuildRequires:  php-laminas-session
 BuildRequires:  php-laminas-text
 BuildRequires:  php-laminas-validator
 BuildRequires:  php-laminas-view
-BuildRequires:  php-phpspec-prophecy-phpunit
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.5.14
+BuildRequires:  phpunit9 >= 9.5.25
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+#        "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"
@@ -209,7 +206,6 @@ cat << 'EOF' | tee vendor/autoload.php
 require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Prophecy/PhpUnit/autoload.php',
     '%{php_home}/%{namespace}/Db/autoload.php',
     '%{php_home}/%{namespace}/Escaper/autoload.php',
     '%{php_home}/%{namespace}/Filter/autoload.php',
@@ -225,11 +221,11 @@ EOF
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php80 php81 php82; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} \
-      --filter '^((?!(testHtmlEscapingOfMessages|setValidationGroup|testFormCanBeCreatedViaInteractionOfAllManagers)).)*$' \
+      --filter '^((?!(testHtmlEscapingOfMessages|setValidationGroup|testFormCanBeCreatedViaInteractionOfAllManagers|testRendersDatesWithEsCLLocaleDatePattern)).)*$' \
       -d memory_limit=1G || ret=1
   fi
 done
@@ -249,6 +245,10 @@ exit $ret
 
 
 %changelog
+* Fri Oct 14 2022 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+- raise dependency on PHP 8.0
+
 * Mon Aug  1 2022 Remi Collet <remi@remirepo.net> - 3.4.1-1
 - update to 3.4.1