From 856d56cc63068d9c7410829e1d6589ea9fc1c794 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 7 Dec 2021 12:12:33 +0100
Subject: update to 1.11.0

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
---
 composer.json                |  9 +++------
 php-laminas-diagnostics.spec | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 9c76c8a..9390598 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,7 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0"
     },
     "require-dev": {
         "doctrine/migrations": "^2.0 || ^3.0",
@@ -46,7 +45,8 @@
         "vimeo/psalm": "^4.7"
     },
     "conflict": {
-        "guzzlehttp/ringphp": "<1.1.1"
+        "guzzlehttp/ringphp": "<1.1.1",
+        "zendframework/zenddiagnostics": "*"
     },
     "suggest": {
         "ext-bcmath": "Required by Check\\CpuPerformance",
@@ -80,8 +80,5 @@
         "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zenddiagnostics": "^1.6.0"
     }
 }
diff --git a/php-laminas-diagnostics.spec b/php-laminas-diagnostics.spec
index 1846319..c98842e 100644
--- a/php-laminas-diagnostics.spec
+++ b/php-laminas-diagnostics.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cda82d226bcc9e2008b0ddf0199c24c465bc36c7
+%global gh_commit    cf9f497fe04adb4a813503f34bc2dc6586b05d25
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-diagnostics
@@ -17,7 +17,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_project}
-Version:        1.10.0
+Version:        1.11.0
 Release:        1%{?dist}
 Summary:        A set of components for performing diagnostic tests
 
@@ -58,7 +58,7 @@ BuildRequires: (php-composer(doctrine/migrations)                        >= 2.0
 BuildRequires: (php-composer(guzzlehttp/guzzle)                          >= 5.3.3 with php-composer(guzzlehttp/guzzle)                          < 7)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.0   with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
 BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.6   with php-composer(mikey179/vfsstream)                         < 2)
-BuildRequires: (php-composer(php-amqplib/php-amqplib)                    >= 2.0   with php-composer(php-amqplib/php-amqplib)                    < 3)
+BuildRequires: (php-composer(php-amqplib/php-amqplib)                    >= 2.0   with php-composer(php-amqplib/php-amqplib)                    < 4)
 BuildRequires: (php-composer(predis/predis)                              >= 1.0   with php-composer(predis/predis)                              < 2)
 BuildRequires: (php-composer(symfony/yaml)                               >= 2.7   with php-composer(symfony/yaml)                               < 6)
 BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0   with php-composer(phpspec/prophecy-phpunit)                   < 3)
@@ -82,8 +82,7 @@ BuildRequires:  /bin/ps
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "php": "^7.3 || ~8.0.0"
 Requires:       php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -100,7 +99,7 @@ Recommends:     php-bcmath
 Recommends:    (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 6)
 Recommends:    (php-composer(guzzlehttp/guzzle)           >= 5.3.3 with php-composer(guzzlehttp/guzzle)           < 7)
 Recommends:    (php-composer(predis/predis)               >= 1.0   with php-composer(predis/predis)               < 2)
-Recommends:    (php-composer(php-amqplib/php-amqplib)     >= 2.0   with php-composer(php-amqplib/php-amqplib)     < 3)
+Recommends:    (php-composer(php-amqplib/php-amqplib)     >= 2.0   with php-composer(php-amqplib/php-amqplib)     < 4)
 Recommends:    (php-composer(doctrine/migrations)         >= 2.0   with php-composer(doctrine/migrations)         < 4)
 # remirepo:3
 %else
@@ -212,7 +211,7 @@ exit (class_exists("\\Zend%{library}\\Check\\IniFile") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} \
@@ -237,6 +236,11 @@ exit $ret
 
 
 %changelog
+* Tue Dec  7 2021 Remi Collet <remi@remirepo.net> - 1.11.0-1
+- update to 1.11.0
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+
 * Mon Jul 12 2021 Remi Collet <remi@remirepo.net> - 1.10.0-1
 - update to 1.10.0
 
-- 
cgit