update to 2.13.4

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
raise dependency on laminas-stdlib 3.6

2 files changed, 32 insertions, 34 deletions

diff --git a/composer.json b/composer.json
index 02a0de6..f00f335 100644
--- a/composer.json
+++ b/composer.json
@@ -25,21 +25,19 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-stdlib": "^3.6"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-eventmanager": "^3.3",
-        "laminas/laminas-hydrator": "^3.2 || ^4.0",
-        "laminas/laminas-servicemanager": "^3.3",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.3"
+        "laminas/laminas-coding-standard": "~2.2.1",
+        "laminas/laminas-eventmanager": "^3.4",
+        "laminas/laminas-hydrator": "^3.2 || ^4.3",
+        "laminas/laminas-servicemanager": "^3.7",
+        "phpunit/phpunit": "^9.5.5"
     },
     "suggest": {
         "laminas/laminas-eventmanager": "Laminas\\EventManager component",
-        "laminas/laminas-hydrator": "(^3.2 || ^4.0) Laminas\\Hydrator component for using HydratingResultSets",
+        "laminas/laminas-hydrator": "(^3.2 || ^4.3) Laminas\\Hydrator component for using HydratingResultSets",
         "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
     },
     "autoload": {
@@ -65,7 +63,7 @@
         "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
         "upload-coverage": "coveralls -v"
     },
-    "replace": {
-        "zendframework/zend-db": "^2.11.0"
+    "conflict": {
+        "zendframework/zend-db": "*"
     }
 }
diff --git a/php-laminas-db.spec b/php-laminas-db.spec
index 3747a0d..e97746b 100644
--- a/php-laminas-db.spec
+++ b/php-laminas-db.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    80cbba4e749f9eb7d8036172acb9ad41e8b6923f
+%global gh_commit    cdabb4bfa669c2c0edb0cb4e014c15b41afd3fb1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-db
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.12.0
+Version:        2.13.4
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -41,43 +41,40 @@ BuildRequires:  php-pdo
 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-stdlib)               >= 3.6   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": "^3.3",
-#        "laminas/laminas-hydrator": "^3.2 || ^4.0",
-#        "laminas/laminas-servicemanager": "^3.3",
-#        "phpspec/prophecy-phpunit": "^2.0",
-#        "phpunit/phpunit": "^9.3"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.3   with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+#        "laminas/laminas-coding-standard": "~2.2.1",
+#        "laminas/laminas-eventmanager": "^3.4",
+#        "laminas/laminas-hydrator": "^3.2 || ^4.3",
+#        "laminas/laminas-servicemanager": "^3.7",
+#        "phpunit/phpunit": "^9.5.5"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.4   with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator)             >= 3.2   with php-autoloader(%{gh_owner}/laminas-hydrator)             < 5)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.3   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(phpspec/prophecy-phpunit)                   >= 2.0    with php-composer(phpspec/prophecy-phpunit)                  < 3)
-# remirepo:8
+# remirepo:7
 %else
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
 BuildRequires:  php-laminas-eventmanager
 BuildRequires:  php-laminas-hydrator3
 BuildRequires:  php-laminas-servicemanager
-BuildRequires:  php-phpspec-prophecy-phpunit
 %endif
 %global phpunit %{_bindir}/phpunit9
-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": "^1.0"
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-stdlib": "^3.6",
 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-stdlib)               >= 3.6   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": "Laminas\\EventManager component",
@@ -172,9 +169,6 @@ cat << 'EOF' | tee vendor/autoload.php
 require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test/unit');
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}IntegrationTest\\%{library}\\', dirname(__DIR__) . '/test/integration');
-\Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Prophecy/PhpUnit/autoload.php',
-]);
 EOF
 
 : check compat autoloader
@@ -185,7 +179,7 @@ exit (class_exists("\\Zend\\%{library}\\ConfigProvider") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -208,6 +202,12 @@ exit $ret
 
 
 %changelog
+* Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 2.13.4-1
+- update to 2.13.4
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+- raise dependency on laminas-stdlib 3.6
+
 * Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1
 - update to 2.12.0
 - raise dependency on PHP 7.3