- update to 1.6.0HEADmaster

- allow sensiolabs/security-checker 6
- allow symfony 5

2 files changed, 20 insertions, 14 deletions

diff --git a/composer.json b/composer.json
index 72c5a01..2db3c29 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,8 @@
         "php-amqplib/php-amqplib": "^2.0",
         "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
         "predis/predis": "^1.0",
-        "sensiolabs/security-checker": "^5.0",
-        "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
+        "sensiolabs/security-checker": "^5.0 || ^6.0.3",
+        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-loader": "^2.0"
     },
@@ -62,8 +62,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev",
-            "dev-develop": "1.6.x-dev"
+            "dev-master": "1.6.x-dev",
+            "dev-develop": "1.7.x-dev"
         }
     },
     "scripts": {
diff --git a/php-zendframework-zenddiagnostics.spec b/php-zendframework-zenddiagnostics.spec
index 4f1b749..e4207a7 100644
--- a/php-zendframework-zenddiagnostics.spec
+++ b/php-zendframework-zenddiagnostics.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    2e60c61935ecc70c9d3b4ce5a8903ea9986ae314
+%global gh_commit    9ad04e7a911c3895071cfb7ec22c5f354a0099fe
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-diagnostics
@@ -19,7 +19,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.5.0
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A set of components for performing diagnostic tests
 
@@ -45,8 +45,8 @@ BuildRequires:  php-xmlreader
 #        "php-amqplib/php-amqplib": "^2.0",
 #        "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
 #        "predis/predis": "^1.0",
-#        "sensiolabs/security-checker": "^5.0",
-#        "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
+#        "sensiolabs/security-checker": "^5.0 || ^6.0.3",
+#        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 #        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-loader": "^2.0"
 # remirepo:1
@@ -56,8 +56,8 @@ BuildRequires: (php-composer(guzzlehttp/guzzle)           >= 5.3.3 with php-comp
 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(predis/predis)               >= 1.0   with php-composer(predis/predis)               < 2)
-BuildRequires: (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 6)
-BuildRequires: (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 5)
+BuildRequires: (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 7)
+BuildRequires: (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 6)
 %global phpunit %{_bindir}/phpunit7
 # remirepo:16
 %else
@@ -71,7 +71,7 @@ BuildRequires:  php-composer(php-amqplib/php-amqplib)     <  3
 BuildRequires:  php-composer(php-amqplib/php-amqplib)     >= 2.0
 BuildRequires:  php-composer(predis/predis)               <  2
 BuildRequires:  php-composer(predis/predis)               >= 1.0
-BuildRequires:  php-composer(sensiolabs/security-checker) <  6
+BuildRequires:  php-composer(sensiolabs/security-checker) <  7
 BuildRequires:  php-composer(sensiolabs/security-checker) >= 5.0
 BuildRequires:  php-symfony3-yaml
 %global phpunit %{_bindir}/phpunit
@@ -96,8 +96,8 @@ Requires:       php(language) >= 5.6
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Recommends:     php-bcmath
-Recommends:    (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 6)
-Recommends:    (php-composer(symfony/yaml)                >= 2.7   with php-composer(symfony/yaml)                < 5)
+Recommends:    (php-composer(sensiolabs/security-checker) >= 5.0   with php-composer(sensiolabs/security-checker) < 7)
+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)
@@ -138,6 +138,7 @@ cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::optional([
     '%{php_home}/SensioLabs/Security/autoload.php',
     [
+        '%{php_home}/Symfony5/Component/Yaml/autoload.php',
         '%{php_home}/Symfony4/Component/Yaml/autoload.php',
         '%{php_home}/Symfony3/Component/Yaml/autoload.php',
         '%{php_home}/Symfony/Component/Yaml/autoload.php',
@@ -182,7 +183,7 @@ EOF
 # test in GuzzleHttpServiceTest.php sometime fail in local build, ok in mock
 
 ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73; do
+for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} \
@@ -206,6 +207,11 @@ exit $ret
 
 
 %changelog
+* Mon Nov 25 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+- allow sensiolabs/security-checker 6
+- allow symfony 5
+
 * Wed Mar 27 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - update to 1.5.0
 - allow doctrine/migrations 2.0