update to 3.0.2

rename to php-laminas-hydrator3
install in /usr/share/php/Zend/Hydrator3
raise dependency on PHP 7.2
raise dependency on laminas-stdlib 3.2.1

2 files changed, 67 insertions, 58 deletions

diff --git a/composer.json b/composer.json
index 4d7dfe9..271951f 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-release-2.4": "2.4.x-dev"
+            "dev-release-2.4": "2.4.x-dev",
+            "dev-master": "3.0.x-dev",
+            "dev-develop": "3.1.x-dev"
         },
         "laminas": {
             "component": "Laminas\\Hydrator",
@@ -28,24 +30,24 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "laminas/laminas-stdlib": "^3.0",
+        "php": "^7.2",
+        "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-        "laminas/laminas-filter": "^2.6",
-        "laminas/laminas-inputfilter": "^2.6",
-        "laminas/laminas-serializer": "^2.6.1",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+        "laminas/laminas-eventmanager": "^3.2.1",
+        "laminas/laminas-modulemanager": "^2.8",
+        "laminas/laminas-serializer": "^2.9",
+        "laminas/laminas-servicemanager": "^3.3.2",
+        "phpspec/prophecy": "^1.7.5",
+        "phpstan/phpstan": "^0.10.5",
+        "phpunit/phpunit": "^7.5"
     },
     "suggest": {
-        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-        "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
-        "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+        "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"
     },
     "autoload": {
         "psr-4": {
@@ -58,6 +60,7 @@
         }
     },
     "scripts": {
+        "analyse": "phpstan analyse --no-progress",
         "check": [
             "@cs-check",
             "@test"
diff --git a/php-laminas-hydrator3.spec b/php-laminas-hydrator3.spec
index 0c9bb9e..b4203aa 100644
--- a/php-laminas-hydrator3.spec
+++ b/php-laminas-hydrator3.spec
@@ -1,4 +1,4 @@
-# remirepo/Fedora spec file for php-laminas-hydrator
+# remirepo/Fedora spec file for php-laminas-hydrator3
 #
 # Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
@@ -6,8 +6,11 @@
 #
 # Please, preserve the changelog entries
 #
+
+# TODO: v2 pulled by php-ocramius-generated-hydrator
+#          pulled by php-ocramius-proxy-manager
 %global bootstrap    0
-%global gh_commit    4a0e81cf05f32edcace817f1f48cb4055f689d85
+%global gh_commit    5c418d6e37ad363bef5ce1c8a72388243d6c7950
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-hydrator
@@ -15,16 +18,17 @@
 %global php_home     %{_datadir}/php
 %global namespace    Laminas
 %global library      Hydrator
+%global major        3
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
 %global with_tests   0%{!?_without_tests:1}
 %endif
 
-Name:           php-%{gh_project}
-Version:        2.4.2
+Name:           php-%{gh_project}%{major}
+Version:        3.0.2
 Release:        1%{?dist}
-Summary:        %{namespace} Framework %{library} component
+Summary:        %{namespace} Framework %{library} component v%{major}
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -34,60 +38,56 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-date
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0   with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.2.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": "~1.0.0",
-#        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-#        "laminas/laminas-filter": "^2.6",
-#        "laminas/laminas-inputfilter": "^2.6",
-#        "laminas/laminas-serializer": "^2.6.1",
-#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.0   with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.6   with php-autoloader(%{gh_owner}/laminas-filter)               < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter)          >= 2.6   with php-autoloader(%{gh_owner}/laminas-inputfilter)          < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer)           >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer)           < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-# remirepo:9
+#        "laminas/laminas-eventmanager": "^3.2.1",
+#        "laminas/laminas-modulemanager": "^2.8",
+#        "laminas/laminas-serializer": "^2.9",
+#        "laminas/laminas-servicemanager": "^3.3.2",
+#        "phpspec/prophecy": "^1.7.5",
+#        "phpstan/phpstan": "^0.10.5",
+#        "phpunit/phpunit": "^7.5"
+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)
+# remirepo:8
 %else
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
 BuildRequires:  php-laminas-eventmanager
-BuildRequires:  php-laminas-filter
-BuildRequires:  php-laminas-inputfilter
+BuildRequires:  php-laminas-modulemanager
 BuildRequires:  php-laminas-serializer
 BuildRequires:  php-laminas-servicemanager
 %endif
 %global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.1.4
+BuildRequires:  phpunit7 >= 7.5
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "laminas/laminas-stdlib": "^3.0",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
-Requires:       php(language) >= 5.6
+#        "php": "^7.2",
+#        "laminas/laminas-stdlib": "^3.2.1",
+Requires:       php(language) >= 7.2
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0    with php-autoloader(%{gh_owner}/laminas-stdlib)         < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.2.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": {
-#        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-#        "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
-#        "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
-#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-Suggests:       php-autoloader(%{gh_owner}/laminas-eventmanager)   >= 3.0
-Suggests:       php-autoloader(%{gh_owner}/laminas-filter)         >= 2.6
-Suggests:       php-autoloader(%{gh_owner}/laminas-serializer)     >= 2.6.1
-Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3
+#        "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"
+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
 # remirepo:4
 %else
 Requires:       php-laminas-stdlib
@@ -134,7 +134,6 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{namespace}/EventManager/autoload.php',
     '%{php_home}/%{namespace}/Serializer/autoload.php',
     '%{php_home}/%{namespace}/ServiceManager/autoload.php',
-    '%{php_home}/%{namespace}/Filter/autoload.php',
 ]);
 EOF
 
@@ -143,7 +142,7 @@ cat << 'EOF' | tee zf.php
 require_once '%{php_home}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
     '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php',
-    dirname(dirname(__DIR__)) . '/%{namespace}/%{library}/autoload.php',
+    dirname(dirname(__DIR__)) . '/%{namespace}/%{library}%{major}/autoload.php',
 ]);
 EOF
 
@@ -151,11 +150,11 @@ EOF
 %install
 : Laminas library
 mkdir -p   %{buildroot}%{php_home}/%{namespace}/
-cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}%{major}
 
 : Zend equiv
-mkdir -p      %{buildroot}%{php_home}/Zend/%{library}
-cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
+mkdir -p      %{buildroot}%{php_home}/Zend/%{library}%{major}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php
 
 
 %check
@@ -163,16 +162,16 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
-require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
+require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/%{namespace}/InputFilter/autoload.php',
+    '%{php_home}/%{namespace}/ModuleManager/autoload.php',
 ]);
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 EOF
 
 : check compat autoloader
 php -r '
-require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
+require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php";
 exit (class_exists("\\Zend\\%{library}\\Reflection") ? 0 : 1);
 '
 
@@ -196,11 +195,18 @@ exit $ret
 %license LICENSE
 %doc *.md
 %doc composer.json
-%{php_home}/Zend/%{library}
-%{php_home}/%{namespace}/%{library}
+%{php_home}/Zend/%{library}%{major}
+%{php_home}/%{namespace}/%{library}%{major}
 
 
 %changelog
+* Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 3.0.2-1
+- update to 3.0.2
+- rename to php-laminas-hydrator3
+- install in /usr/share/php/Zend/Hydrator3
+- raise dependency on PHP 7.2
+- raise dependency on laminas-stdlib 3.2.1
+
 * Fri Jan 10 2020 Remi Collet <remi@remirepo.net> - 2.4.2-1
 - switch to Laminas