update to 3.1.2

rename to php-laminas-di3
move to /usr/share/php/Laminas/Di3
raise dependency on PHP 7.1
add dependency on psr/container
add dependency on psr/log

2 files changed, 113 insertions, 58 deletions

diff --git a/composer.json b/composer.json
index 559de5c..1cab55b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,11 @@
 {
     "name": "laminas/laminas-di",
-    "description": " ",
+    "description": "Automated dependency injection for PSR-11 containers",
     "license": "BSD-3-Clause",
     "keywords": [
         "laminas",
-        "di"
+        "di",
+        "psr-11"
     ],
     "homepage": "https://laminas.dev",
     "support": {
@@ -20,20 +21,34 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
+        },
+        "laminas": {
+            "component": "Laminas\\Di",
+            "config-provider": "Laminas\\Di\\ConfigProvider"
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
-        "container-interop/container-interop": "^1.1",
-        "laminas/laminas-code": "^2.6 || ^3.0",
+        "php": "^7.1",
         "laminas/laminas-stdlib": "^2.7 || ^3.0",
-        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0"
+        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
+        "psr/container": "^1.0",
+        "psr/log": "^1.0"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/phpunit": "~4.0"
+        "container-interop/container-interop": "^1.2.0",
+        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-servicemanager": "^3.0",
+        "mikey179/vfsstream": "^1.6.7",
+        "phpunit/phpunit": "^7.5.18 || ^8.5"
+    },
+    "conflict": {
+        "laminas/laminas-servicemanager-di": "*",
+        "phpspec/prophecy": "<1.9.0"
+    },
+    "suggest": {
+        "laminas/laminas-servicemanager": "An IoC container without auto wiring capabilities"
     },
     "autoload": {
         "psr-4": {
@@ -45,6 +60,16 @@
             "LaminasTest\\Di\\": "test/"
         }
     },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
     "replace": {
         "zendframework/zend-di": "self.version"
     }
diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec
index dfc6f1e..a24bd96 100644
--- a/php-laminas-di3.spec
+++ b/php-laminas-di3.spec
@@ -1,4 +1,4 @@
-# remirepo/Fedora spec file for php-laminas-di
+# remirepo/Fedora spec file for php-laminas-di3
 #
 # Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    239b22408a1f8eacda6fc2b838b5065c4cf1d88e
+%global gh_commit    ee4d80f1756cf8c249e6816513f6f1f9ed89a262
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-di
@@ -15,16 +15,17 @@
 %global php_home     %{_datadir}/php
 %global namespace    Laminas
 %global library      Di
+%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.6.1
-Release:        2%{?dist}
-Summary:        Laminas Framework %{library} component
+Name:           php-%{gh_project}%{major}
+Version:        3.1.2
+Release:        1%{?dist}
+Summary:        Laminas Framework %{library} component v%{major}
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -40,62 +41,69 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(container-interop/container-interop)      >= 1.1   with php-composer(container-interop/container-interop)      < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-code)               >= 3.0   with php-autoloader(%{gh_owner}/laminas-code)               < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)             >= 3.0   with php-autoloader(%{gh_owner}/laminas-stdlib)             < 4)
-BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0   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)
+BuildRequires: (php-composer(psr/container)                              >= 1.0   with php-composer(psr/container)                              < 2)
+BuildRequires: (php-composer(psr/log)                                    >= 1.0   with php-composer(psr/log)                                    < 2)
+# From composer, "require-dev": {
+#        "container-interop/container-interop": "^1.2.0",
+#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-servicemanager": "^3.0",
+#        "mikey179/vfsstream": "^1.6.7",
+#        "phpunit/phpunit": "^7.5.18 || ^8.5"
+BuildRequires: (php-composer(container-interop/container-interop)        >= 1.2   with php-composer(container-interop/container-interop)        < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.6.7 with php-composer(mikey179/vfsstream)                         < 2)
 # remirepo:7
 %else
-BuildRequires:  php-composer(container-interop/container-interop) <  2
-BuildRequires:  php-composer(container-interop/container-interop) >= 1.1
-BuildRequires:  php-laminas-code
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
+BuildRequires:  php-psr-container
+BuildRequires:  php-PsrLog
+BuildRequires:  php-container-interop
+BuildRequires:  php-laminas-servicemanager
+BuildRequires:  php-mikey179-vfsstream
 %endif
-# From composer, "require-dev": {
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/phpunit": "~4.0"
-BuildRequires:  php-composer(phpunit/phpunit)                     >= 4.0
+BuildRequires:  phpunit8 >= 8.5
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0",
-#        "container-interop/container-interop": "^1.1",
-#        "laminas/laminas-code": "^2.6 || ^3.0",
+#        "php": "^7.1",
 #        "laminas/laminas-stdlib": "^2.7 || ^3.0",
-#        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0"
+#        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
+#        "psr/container": "^1.0",
+#        "psr/log": "^1.0"
 Requires:       php(language) >= 5.7
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(container-interop/container-interop)      >= 1.1   with php-composer(container-interop/container-interop)      < 2)
-Requires:      (php-autoloader(%{gh_owner}/laminas-code)               >= 3.0   with php-autoloader(%{gh_owner}/laminas-code)               < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)             >= 3.0   with php-autoloader(%{gh_owner}/laminas-stdlib)             < 4)
-Requires:      (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
-# remirepo:7
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0   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)
+Requires:      (php-composer(psr/container)                              >= 1.0   with php-composer(psr/container)                              < 2)
+Requires:      (php-composer(psr/log)                                    >= 1.0   with php-composer(psr/log)                                    < 2)
+# From composer, "require": {
+#        "laminas/laminas-servicemanager": "An IoC container without auto wiring capabilities"
+Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
+# remirepo:6
 %else
-Requires:       php-composer(container-interop/container-interop) >= 1.1
-Requires:       php-composer(container-interop/container-interop) <  2
-Requires:       php-laminas-code
 Requires:       php-laminas-stdlib
 Requires:       php-laminas-zendframework-bridge
+Requires:       php-psr-container
+Requires:       php-PsrLog
 %endif
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 2.6.1
+# From phpcompatinfo report for version 3.1.2
 Requires:       php-reflection
 Requires:       php-pcre
 Requires:       php-spl
 
-# remirepo:2
-Obsoletes:      php-ZendFramework2-%{library}             < 2.5
-Provides:       php-ZendFramework2-%{library}             = %{version}
 # Compatibily ensure by the bridge
-Obsoletes:      php-zendframework-%{zf_name}              < 2.6.1-99
-Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Obsoletes:      php-zendframework-%{zf_name}%{major}      < 3.1.2-99
+Provides:       php-zendframework-%{zf_name}%{major}      = %{version}-99
 Provides:       php-composer(%{gh_owner}/%{gh_project})   = %{version}
 Provides:       php-composer(zendframework/%{zf_name})    = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -116,15 +124,22 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 
 mv LICENSE.md LICENSE
 
+: Fix installation layout
+mv templates src/
+sed -e 's:/../../templates:/../templates:' -i src/CodeGenerator/*php
+
 
 %build
 : Create autoloader
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Interop/Container/autoload.php',
-    '%{php_home}/%{namespace}/Code/autoload.php',
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
+    '%{php_home}/Psr/Container/autoload.php',
+    '%{php_home}/Psr/Log/autoload.php',
+]);
+\Fedora\Autoloader\Dependencies::optional([
+    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
 ]);
 EOF
 
@@ -133,7 +148,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
 
@@ -141,11 +156,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
@@ -153,21 +168,28 @@ 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\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/Interop/Container/autoload.php',
+    '%{php_home}/org/bovigo/vfs/autoload.php',
+]);
 EOF
 
+: ignore test failing, only related to output order
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose || ret=1
+    $cmd %{_bindir}/phpunit8 \
+      --filter '^((?!(testGenerateForClassWithoutParams|testGenerateForClassWithParams)).)*$' \
+      --verbose || ret=1
   fi
 done
 
 : check compat autoloader
 php -r '
-require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
-exit (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1);
+require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php";
+exit (class_exists("\\Zend\\%{library}\\Config") ? 0 : 1);
 '
 
 exit $ret
@@ -182,11 +204,19 @@ 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
+* Thu Jan 23 2020 Remi Collet <remi@remirepo.net> - 3.1.2-1
+- update to 3.1.2
+- rename to php-laminas-di3
+- move to /usr/share/php/Laminas/Di3
+- raise dependency on PHP 7.1
+- add dependency on psr/container
+- add dependency on psr/log
+
 * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.6.1-2
 - cleanup