update to 4.4.0

raise dependency on PHP 7.4

2 files changed, 43 insertions, 35 deletions

diff --git a/composer.json b/composer.json
index 508f417..97dcef8 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,13 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        },
+        "platform": {
+            "php": "7.4.99"
+        }
     },
     "extra": {
         "laminas": {
@@ -25,26 +31,26 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-stdlib": "^3.3",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
-        "laminas/laminas-eventmanager": "^3.2.1",
-        "laminas/laminas-modulemanager": "^2.8",
-        "laminas/laminas-serializer": "^2.9",
-        "laminas/laminas-servicemanager": "^3.3.2",
-        "phpbench/phpbench": "^1.0",
-        "phpunit/phpunit": "~9.5.5",
-        "psalm/plugin-phpunit": "^0.16.1",
+        "laminas/laminas-eventmanager": "^3.5.0",
+        "laminas/laminas-modulemanager": "^2.11.0",
+        "laminas/laminas-serializer": "^2.13.0",
+        "laminas/laminas-servicemanager": "^3.14.0",
+        "phpbench/phpbench": "^1.2.5",
+        "phpunit/phpunit": "~9.5.21",
+        "psalm/plugin-phpunit": "^0.17.0",
         "psr/cache": "1.0.1",
-        "vimeo/psalm": "^4.8.1"
+        "vimeo/psalm": "^4.24.0"
     },
     "suggest": {
         "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage",
         "laminas/laminas-serializer": "^2.9, to use the SerializableStrategy",
-        "laminas/laminas-servicemanager": "^3.3, to support hydrator plugin manager usage"
+        "laminas/laminas-servicemanager": "^3.14, to support hydrator plugin manager usage"
     },
     "autoload": {
         "psr-4": {
@@ -70,6 +76,7 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "conflict": {
-        "zendframework/zend-hydrator": "*"
+        "zendframework/zend-hydrator": "*",
+        "laminas/laminas-servicemanager": "<3.14.0"
     }
 }
diff --git a/php-laminas-hydrator4.spec b/php-laminas-hydrator4.spec
index fa4d48f..872c438 100644
--- a/php-laminas-hydrator4.spec
+++ b/php-laminas-hydrator4.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    cc5ea6b42d318dbac872d94e8dca2d3013a37ab5
+%global gh_commit    a264e31f3c8af89b88451ae06ba7661acbd586d6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-hydrator
@@ -22,7 +22,7 @@
 %global major        4
 
 Name:           php-%{gh_project}%{major}
-Version:        4.3.1
+Version:        4.4.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component version %{major}
 
@@ -34,7 +34,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with tests}
-BuildRequires:  php(language) >= 7.3
+BuildRequires:  php(language) >= 7.4
 BuildRequires:  php-date
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
@@ -44,19 +44,19 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3
 BuildRequires: (php-composer(webmozart/assert)                           >= 1.10   with php-composer(webmozart/assert)                     < 2)
 # From composer, "require-dev": {
 #        "laminas/laminas-coding-standard": "~2.3.0",
-#        "laminas/laminas-eventmanager": "^3.2.1",
-#        "laminas/laminas-modulemanager": "^2.8",
-#        "laminas/laminas-serializer": "^2.9",
-#        "laminas/laminas-servicemanager": "^3.3.2",
-#        "phpbench/phpbench": "^1.0",
-#        "phpunit/phpunit": "~9.5.5",
-#        "psalm/plugin-phpunit": "^0.16.1",
+#        "laminas/laminas-eventmanager": "^3.5.0",
+#        "laminas/laminas-modulemanager": "^2.11.0",
+#        "laminas/laminas-serializer": "^2.13.0",
+#        "laminas/laminas-servicemanager": "^3.14.0",
+#        "phpbench/phpbench": "^1.2.5",
+#        "phpunit/phpunit": "~9.5.21",
+#        "psalm/plugin-phpunit": "^0.17.0",
 #        "psr/cache": "1.0.1",
-#        "vimeo/psalm": "^4.8.1"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager)        >= 2.8   with php-autoloader(%{gh_owner}/laminas-modulemanager)        < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer)           >= 2.9   with php-autoloader(%{gh_owner}/laminas-serializer)           < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.3.2 with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+#        "vimeo/psalm": "^4.24.0"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.5   with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager)        >= 2.11  with php-autoloader(%{gh_owner}/laminas-modulemanager)        < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer)           >= 2.13  with php-autoloader(%{gh_owner}/laminas-serializer)           < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.14  with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 BuildRequires: (php-composer(psr/cache)                                  >= 1.0.1 with php-composer(psr/cache)                                  < 2)
 # remirepo:9
 %else
@@ -69,16 +69,16 @@ BuildRequires:  php-laminas-servicemanager
 BuildRequires:  php-psr-cache
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.5.5
+BuildRequires:  phpunit9 >= 9.5.21
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "php": "^7.4 || ~8.0.0 || ~8.1.0",
 #        "laminas/laminas-stdlib": "^3.3",
 #        "webmozart/assert": "^1.10"
-Requires:       php(language) >= 7.3
+Requires:       php(language) >= 7.4
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)         < 4)
@@ -86,7 +86,7 @@ Requires:      (php-composer(webmozart/assert)                           >= 1.10
 # From composer, "suggest": {
 #        "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage",
 #        "laminas/laminas-serializer": "^2.9, to use the SerializableStrategy",
-#        "laminas/laminas-servicemanager": "^3.3, to support hydrator plugin manager usage"
+#        "laminas/laminas-servicemanager": "^3.14, to support hydrator plugin manager usage"
 Suggests:       php-autoloader(%{gh_owner}/laminas-eventmanager)   >= 3.2
 Suggests:       php-autoloader(%{gh_owner}/laminas-serializer)     >= 2.9
 Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3
@@ -128,9 +128,9 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
+    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
     '%{php_home}/%{namespace}/EventManager/autoload.php',
     '%{php_home}/%{namespace}/Serializer/autoload.php',
-    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
 ]);
 EOF
 
@@ -160,9 +160,6 @@ ret=0
 for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
-    if [ $($1 -r 'echo PHP_VERSION_ID;') -ge 80100 ]; then
-      sed -e "/'Implicit conversion'/d" -i test/NamingStrategy/MapNamingStrategyTest.php
-    fi
     $1 ${2:-%{_bindir}/phpunit9} -d memory_limit=1G || ret=1
   fi
 done
@@ -182,6 +179,10 @@ exit $ret
 
 
 %changelog
+* Wed Jul 13 2022 Remi Collet <remi@remirepo.net> - 4.4.0-1
+- update to 4.4.0
+- raise dependency on PHP 7.4
+
 * Thu Jan  6 2022 Remi Collet <remi@remirepo.net> - 4.3.1-1
 - update to 4.3.1
 - rename to php-laminas-hydrator4