update to 3.3.0

raise dependency on laminas-stdlib 3.6
raise dependency on psr/container 1.1.1
drop dependency on laminas-zendframework-bridge

2 files changed, 43 insertions, 44 deletions

diff --git a/composer.json b/composer.json
index 64e9734..e6781e7 100644
--- a/composer.json
+++ b/composer.json
@@ -26,22 +26,22 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
-        "psr/container": "^1.0",
-        "psr/log": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-stdlib": "^3.6",
+        "psr/container": "^1.1.1",
+        "psr/log": "^1.1.4"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.2.0",
-        "laminas/laminas-coding-standard": "^2",
-        "laminas/laminas-servicemanager": "^3.4",
-        "mikey179/vfsstream": "^1.6.7",
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "laminas/laminas-servicemanager": "^3.7",
+        "mikey179/vfsstream": "^1.6.10@alpha",
         "phpstan/phpstan": "^0.12.64",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.5.5"
     },
     "conflict": {
+        "zendframework/zend-di": "*",
         "laminas/laminas-servicemanager-di": "*",
         "phpspec/prophecy": "<1.9.0"
     },
@@ -69,8 +69,5 @@
         "analyse": "phpstan analyse --no-progress -c phpstan.neon",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-di": "^3.1.2"
     }
 }
diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec
index fcd8d3a..b321268 100644
--- a/php-laminas-di3.spec
+++ b/php-laminas-di3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    ed38ab3b066c0a1f1b087e0a664caadf1d4f8f04
+%global gh_commit    83330af17fc2511231e805a3586d51883a452094
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-di
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}%{major}
-Version:        3.2.2
+Version:        3.3.0
 Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component v%{major}
 
@@ -40,61 +40,56 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3   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)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6   with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-composer(psr/container)                              >= 1.1.1 with php-composer(psr/container)                              < 2)
+BuildRequires: (php-composer(psr/log)                                    >= 1.1.4 with php-composer(psr/log)                                    < 2)
 # From composer, "require-dev": {
 #        "container-interop/container-interop": "^1.2.0",
-#        "laminas/laminas-coding-standard": "^2",
-#        "laminas/laminas-servicemanager": "^3.4",
-#        "mikey179/vfsstream": "^1.6.7",
+#        "laminas/laminas-coding-standard": "^2.3.0",
+#        "laminas/laminas-servicemanager": "^3.7",
+#        "mikey179/vfsstream": "^1.6.10@alpha",
 #        "phpstan/phpstan": "^0.12",
 #        "phpspec/prophecy-phpunit": "^2.0",
-#        "phpunit/phpunit": "^9.3"
+#        "phpunit/phpunit": "^9.5.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.4   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.6.7 with php-composer(mikey179/vfsstream)                         < 2)
 BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0   with php-composer(phpspec/prophecy-phpunit)                   < 3)
-# remirepo:10
+# remirepo:9
 %else
-BuildRequires:  php-laminas-stdlib                                       >= 3.3
-BuildRequires:  php-laminas-zendframework-bridge                         >= 1.0
-BuildRequires:  php-psr-container                                        >= 1.0
-BuildRequires:  php-PsrLog                                               >= 1.0
+BuildRequires:  php-laminas-stdlib                                       >= 3.6
+BuildRequires:  php-psr-container                                        >= 1.1.1
+BuildRequires:  php-PsrLog                                               >= 1.1.4
 BuildRequires:  php-container-interop                                    >= 1.2
-BuildRequires:  php-laminas-servicemanager                               >= 3.4
+BuildRequires:  php-laminas-servicemanager                               >= 3.7
 BuildRequires:  php-mikey179-vfsstream                                   >= 1.6.7
 BuildRequires:  php-phpspec-prophecy-phpunit                             >= 2.0
 %endif
-BuildRequires:  phpunit9 >= 9.3
+BuildRequires:  phpunit9 >= 9.5.5
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0",
-#        "laminas/laminas-stdlib": "^3.3",
-#        "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
-#        "psr/container": "^1.0",
-#        "psr/log": "^1.0"
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-stdlib": "^3.6",
+#        "psr/container": "^1.1.1",
+#        "psr/log": "^1.1.4"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # 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)
-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)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6   with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-composer(psr/container)                              >= 1.1.1 with php-composer(psr/container)                              < 2)
+Requires:      (php-composer(psr/log)                                    >= 1.1.4 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
+# remirepo:5
 %else
-Requires:       php-laminas-stdlib                                       >= 3.3
-Requires:       php-laminas-zendframework-bridge                         >= 1.0
-Requires:       php-psr-container                                        >= 1.0
-Requires:       php-PsrLog                                               >= 1.0
+Requires:       php-laminas-stdlib                                       >= 3.6
+Requires:       php-psr-container                                        >= 1.1.1
+Requires:       php-PsrLog                                               >= 1.1.4
 %endif
 %endif
 # Autoloader
@@ -163,6 +158,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p
 EOF
 
 ret=0
+# TODO PHP 8.1 waiting for mikey179/vfsstream 1.6.10
 for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit9 \
@@ -187,6 +183,12 @@ exit $ret
 
 
 %changelog
+* Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 3.3.0-1
+- update to 3.3.0
+- raise dependency on laminas-stdlib 3.6
+- raise dependency on psr/container 1.1.1
+- drop dependency on laminas-zendframework-bridge
+
 * Wed Apr 14 2021 Remi Collet <remi@remirepo.net> - 3.2.2-1
 - update to 3.2.2
 - drop ZF compatibility