From 6b2d18a3eb09aa3cee05531d8735e656553f2ecc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 26 Jul 2021 08:43:50 +0200
Subject: update to 3.7.0

---
 composer.json                   | 14 +++++++++-----
 php-laminas-servicemanager.spec | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 26ca4da..6c367cf 100644
--- a/composer.json
+++ b/composer.json
@@ -32,14 +32,16 @@
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.0",
-        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-coding-standard": "~2.2.0",
         "laminas/laminas-container-config-test": "^0.3",
-        "laminas/laminas-dependency-plugin": "^2.1",
+        "laminas/laminas-dependency-plugin": "^2.1.2",
         "mikey179/vfsstream": "^1.6.8",
         "ocramius/proxy-manager": "^2.2.3",
-        "phpbench/phpbench": "^1.0.0-alpha3",
+        "phpbench/phpbench": "^1.0.4",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.4"
+        "phpunit/phpunit": "^9.4",
+        "psalm/plugin-phpunit": "^0.16.1",
+        "vimeo/psalm": "^4.8"
     },
     "provide": {
         "container-interop/container-interop-implementation": "^1.2",
@@ -68,6 +70,7 @@
         "bin/generate-factory-for-class"
     ],
     "scripts": {
+        "benchmark": "phpbench run --revs=2 --iterations=2 --report=aggregate",
         "check": [
             "@cs-check",
             "@test"
@@ -75,7 +78,8 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "static-analysis" : "psalm --shepherd --stats"
     },
     "replace": {
         "zendframework/zend-servicemanager": "^3.4.0"
diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec
index 6fe4432..910ba5b 100644
--- a/php-laminas-servicemanager.spec
+++ b/php-laminas-servicemanager.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b1445e1a7077c21b0fad0974a1b7a11b9dbe0828
+%global gh_commit    2b0aee477fdbd3191af7c302b93dbc5fda0626f4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-servicemanager
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        3.6.4
+Version:        3.7.0
 Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component
 
@@ -56,14 +56,16 @@ BuildRequires:  php-json
 BuildRequires:  php-spl
 # From composer, "require-dev": {
 #        "composer/package-versions-deprecated": "^1.0",
-#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-coding-standard": "~2.2.0",
 #        "laminas/laminas-container-config-test": "^0.3",
-#        "laminas/laminas-dependency-plugin": "^2.1",
+#        "laminas/laminas-dependency-plugin": "^2.1.2",
 #        "mikey179/vfsstream": "^1.6.8",
 #        "ocramius/proxy-manager": "^2.2.3",
-#        "phpbench/phpbench": "^1.0.0-alpha3",
+#        "phpbench/phpbench": "^1.0.4",
 #        "phpspec/prophecy-phpunit": "^2.0",
-#        "phpunit/phpunit": "^9.4"
+#        "phpunit/phpunit": "^9.4",
+#        "psalm/plugin-phpunit": "^0.16.1",
+#        "vimeo/psalm": "^4.8"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(mikey179/vfsstream)                >= 1.6.5 with php-composer(mikey179/vfsstream)                < 2)
@@ -200,7 +202,7 @@ EOF
 rm test/ContainerTest.php
 
 ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php73 php74 php80 php81; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit9 --verbose || ret=1
   fi
@@ -229,6 +231,9 @@ exit $ret
 
 
 %changelog
+* Mon Jul 26 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1
+- update to 3.7.0
+
 * Wed Feb  3 2021 Remi Collet <remi@remirepo.net> - 3.6.4-1
 - update to 3.6.4
 
-- 
cgit