update to 1.5.0

allow doctrine/migrations 2.0

2 files changed, 34 insertions, 17 deletions

diff --git a/composer.json b/composer.json
index 0fad504..72c5a01 100644
--- a/composer.json
+++ b/composer.json
@@ -21,9 +21,9 @@
         "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "doctrine/migrations": "^1.0",
-        "guzzlehttp/guzzle": "^5.3.2 || ^6.3.3",
-        "mikey179/vfsStream": "^1.6",
+        "doctrine/migrations": "^1.0 || ^2.0",
+        "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
+        "mikey179/vfsstream": "^1.6",
         "php-amqplib/php-amqplib": "^2.0",
         "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
         "predis/predis": "^1.0",
@@ -42,6 +42,9 @@
         "doctrine/migrations": "Required by Check\\DoctrineMigration"
     },
     "autoload": {
+        "files": [
+            "src/autoload.php"
+        ],
         "psr-4": {
             "ZendDiagnostics\\": "src/"
         }
@@ -54,10 +57,13 @@
     "config": {
         "sort-packages": true
     },
+    "conflict": {
+        "guzzlehttp/ringphp": "<1.1.1"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4.x-dev",
-            "dev-develop": "1.5.x-dev"
+            "dev-master": "1.5.x-dev",
+            "dev-develop": "1.6.x-dev"
         }
     },
     "scripts": {
diff --git a/php-zendframework-zenddiagnostics.spec b/php-zendframework-zenddiagnostics.spec
index 37afb93..4f1b749 100644
--- a/php-zendframework-zenddiagnostics.spec
+++ b/php-zendframework-zenddiagnostics.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    79d0b7d0a1cab8f18e73d76ff1c2ec028f113840
+%global gh_commit    2e60c61935ecc70c9d3b4ce5a8903ea9986ae314
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-diagnostics
@@ -19,8 +19,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        A set of components for performing diagnostic tests
 
 License:        BSD
@@ -39,8 +39,8 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-xmlreader
 # From composer, "require-dev": {
-#        "doctrine/migrations": "^1.0",
-#        "guzzlehttp/guzzle": "^5.3.2 || ^6.3.3",
+#        "doctrine/migrations": "^1.0 || ^2.0",
+#        "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
 #        "mikey179/vfsStream": "^1.6",
 #        "php-amqplib/php-amqplib": "^2.0",
 #        "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
@@ -51,8 +51,8 @@ BuildRequires:  php-xmlreader
 #        "zendframework/zend-loader": "^2.0"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 2)
-BuildRequires: (php-composer(guzzlehttp/guzzle)           >= 5.3.2 with php-composer(guzzlehttp/guzzle)           < 7)
+BuildRequires: (php-composer(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 3)
+BuildRequires: (php-composer(guzzlehttp/guzzle)           >= 5.3.3 with php-composer(guzzlehttp/guzzle)           < 7)
 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)
@@ -61,10 +61,10 @@ BuildRequires: (php-composer(symfony/yaml)                >= 2.7   with php-comp
 %global phpunit %{_bindir}/phpunit7
 # remirepo:16
 %else
-BuildRequires:  php-composer(doctrine/migrations)         <  2
+BuildRequires:  php-composer(doctrine/migrations)         <  3
 BuildRequires:  php-composer(doctrine/migrations)         >= 1.0
 BuildRequires:  php-composer(guzzlehttp/guzzle)           <  7
-BuildRequires:  php-composer(guzzlehttp/guzzle)           >= 5.3.2
+BuildRequires:  php-composer(guzzlehttp/guzzle)           >= 5.3.3
 BuildRequires:  php-composer(mikey179/vfsStream)          <  2
 BuildRequires:  php-composer(mikey179/vfsStream)          >= 1.6
 BuildRequires:  php-composer(php-amqplib/php-amqplib)     <  3
@@ -98,10 +98,10 @@ Requires:       php(language) >= 5.6
 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(guzzlehttp/guzzle)           >= 5.3.2 with php-composer(guzzlehttp/guzzle)           < 7)
+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(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 2)
+Recommends:    (php-composer(doctrine/migrations)         >= 1.0   with php-composer(doctrine/migrations)         < 3)
 # remirepo:1
 %endif
 # Autoloader
@@ -129,8 +129,12 @@ mv LICENSE.md LICENSE
 
 %build
 : Create autoloader
+mv src/autoload.php src/_autoload.php
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+   __DIR__ . '/_autoload.php',
+]);
 \Fedora\Autoloader\Dependencies::optional([
     '%{php_home}/SensioLabs/Security/autoload.php',
     [
@@ -143,7 +147,10 @@ cat << 'EOF' | tee -a src/autoload.php
         '%{php_home}/Guzzle/autoload.php',
     ],
     '%{php_home}/PhpAmqpLib/autoload.php',
-    '%{php_home}/Doctrine/DBAL/Migrations/autoload.php',
+    [
+        '%{php_home}/Doctrine/Migrations/autoload.php',
+        '%{php_home}/Doctrine/DBAL/Migrations/autoload.php',
+    ],
 ]);
 if  (file_exists('/usr/share/pear/Predis/Autoloader.php')) {
     require_once '/usr/share/pear/Predis/Autoloader.php';
@@ -199,6 +206,10 @@ exit $ret
 
 
 %changelog
+* Wed Mar 27 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+- allow doctrine/migrations 2.0
+
 * Thu Jan 10 2019 Remi Collet <remi@remirepo.net> - 1.4.0-2
 - ignore tests with erratic results