Merging develop to master in preparation for 1.5.0 release.

Author: weierophinney

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -84,6 +82,18 @@ matrix:
       env:
         - DEPS=latest
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
+    - php: 7.3
+      env:
+        - DEPS=lowest
+        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
+    - php: 7.3
+      env:
+        - DEPS=locked
+        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
+    - php: 7.3
+      env:
+        - DEPS=latest
+        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -4,11 +4,13 @@ All notable changes to this project will be documented in this file, in reverse
 
 Releases prior to 1.2.0 did not have entries.
 
-## 1.4.1 - TBD
+## 1.5.0 - 2019-03-26
 
 ### Added
 
-- Nothing.
+- [#97](https://github.com/zendframework/zenddiagnostics/pull/97) adds support for doctrine/migrations v2 releases.
+
+- [#96](https://github.com/zendframework/zenddiagnostics/pull/96) adds support for PHP 7.3.
 
 ### Changed
 

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": {

composer.lock

@@ -451,7 +451,7 @@ Make sure all migrations are applied:
 
 ```php
 <?php
-use Doctrine\DBAL\Migrations\Configuration\Configuration;
+use Doctrine\Migrations\Configuration\Configuration;
 use Doctrine\ORM\EntityManager;
 use ZendDiagnostics\Check\DoctrineMigration;
 

docs/book/diagnostics.md

@@ -7,7 +7,7 @@
 
 namespace ZendDiagnostics\Check;
 
-use Doctrine\DBAL\Migrations\Configuration\Configuration;
+use Doctrine\Migrations\Configuration\Configuration;
 use ZendDiagnostics\Result\Failure;
 use ZendDiagnostics\Result\ResultInterface;
 use ZendDiagnostics\Result\Success;

src/Check/DoctrineMigration.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diagnostics for the canonical source repository
+ * @copyright Copyright (c) 2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diagnostics/blob/master/LICENSE.md New BSD License
+ */
+
+if (class_exists(Doctrine\DBAL\Migrations\Configuration\Configuration::class)
+    && ! class_exists(Doctrine\Migrations\Configuration\Configuration::class)
+) {
+    class_alias(
+        Doctrine\DBAL\Migrations\Configuration\Configuration::class,
+        Doctrine\Migrations\Configuration\Configuration::class
+    );
+}

src/autoload.php

@@ -7,7 +7,7 @@
 
 namespace ZendDiagnosticsTest;
 
-use Doctrine\DBAL\Migrations\Configuration\Configuration;
+use Doctrine\Migrations\Configuration\Configuration;
 use PHPUnit\Framework\TestCase;
 use ZendDiagnostics\Check\DoctrineMigration;
 use ZendDiagnostics\Result\FailureInterface;