update to 3.2.0

raise dependency on PHP 7.3
raise dependency on zend-stdlib >= 3.3
switch to phpunit9

2 files changed, 48 insertions, 33 deletions

diff --git a/composer.json b/composer.json
index 4f6692e..d6d54d1 100644
--- a/composer.json
+++ b/composer.json
@@ -26,18 +26,20 @@
         }
     },
     "require": {
-        "php": "^7.1",
-        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+        "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"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.2.0",
-        "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-servicemanager": "^3.0",
+        "laminas/laminas-coding-standard": "^2",
+        "laminas/laminas-servicemanager": "^3.4",
         "mikey179/vfsstream": "^1.6.7",
-        "phpunit/phpunit": "^7.5.18 || ^8.5"
+        "phpstan/phpstan": "^0.12",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "conflict": {
         "laminas/laminas-servicemanager-di": "*",
@@ -59,14 +61,16 @@
     "scripts": {
         "check": [
             "@cs-check",
+            "@analyse",
             "@test"
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "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"
     }
-}
+}
\ No newline at end of file
diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec
index c5affbe..d30cf83 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    2bf302eafa283e65d7fbd083c24ad53be4bbcfce
+%global gh_commit    9a9917cd3848c33ff638bc1a9462d0eafc759105
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-di
@@ -23,7 +23,7 @@
 %endif
 
 Name:           php-%{gh_project}%{major}
-Version:        3.1.3
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component v%{major}
 
@@ -35,51 +35,55 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-reflection
 BuildRequires:  php-pcre
 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.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)
 # From composer, "require-dev": {
 #        "container-interop/container-interop": "^1.2.0",
-#        "laminas/laminas-coding-standard": "~1.0.0",
-#        "laminas/laminas-servicemanager": "^3.0",
+#        "laminas/laminas-coding-standard": "^2",
+#        "laminas/laminas-servicemanager": "^3.4",
 #        "mikey179/vfsstream": "^1.6.7",
-#        "phpunit/phpunit": "^7.5.18 || ^8.5"
+#        "phpstan/phpstan": "^0.12",
+#        "phpspec/prophecy-phpunit": "^2.0",
+#        "phpunit/phpunit": "^9.3"
 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-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.4   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.6.7 with php-composer(mikey179/vfsstream)                         < 2)
-# remirepo:7
+BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0   with php-composer(phpspec/prophecy-phpunit)                   < 3)
+# remirepo:10
 %else
-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
+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-container-interop                                    >= 1.2
+BuildRequires:  php-laminas-servicemanager                               >= 3.4
+BuildRequires:  php-mikey179-vfsstream                                   >= 1.6.7
+BuildRequires:  php-phpspec-prophecy-phpunit                             >= 2.0
 %endif
-BuildRequires:  phpunit8 >= 8.5
+BuildRequires:  phpunit9 >= 9.3
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.1",
-#        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+#        "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"
-Requires:       php(language) >= 5.7
+Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # 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.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)
@@ -88,10 +92,10 @@ Requires:      (php-composer(psr/log)                                    >= 1.0
 Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
 # remirepo:6
 %else
-Requires:       php-laminas-stdlib
-Requires:       php-laminas-zendframework-bridge
-Requires:       php-psr-container
-Requires:       php-PsrLog
+Requires:       php-laminas-stdlib                                       >= 3.3
+Requires:       php-laminas-zendframework-bridge                         >= 1.0
+Requires:       php-psr-container                                        >= 1.0
+Requires:       php-PsrLog                                               >= 1.0
 %endif
 %endif
 # Autoloader
@@ -171,13 +175,14 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p
 \Fedora\Autoloader\Dependencies::required([
     '%{php_home}/Interop/Container/autoload.php',
     '%{php_home}/org/bovigo/vfs/autoload.php',
+    '%{php_home}/Prophecy/PhpUnit/autoload.php',
 ]);
 EOF
 
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit8 \
+    $cmd %{_bindir}/phpunit9 \
       --verbose || ret=1
   fi
 done
@@ -205,6 +210,12 @@ exit $ret
 
 
 %changelog
+* Wed Oct 21 2020 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- raise dependency on PHP 7.3
+- raise dependency on zend-stdlib >= 3.3
+- switch to phpunit9
+
 * Wed Sep 16 2020 Remi Collet <remi@remirepo.net> - 3.1.3-1
 - update to 3.1.3