From d78dc6dc5ec33ad136e49615515b834f28f10e0b Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Sun, 30 Dec 2018 14:09:53 +0100
Subject: [PATCH 1/5] Test on PHP 7.2 and 7.3

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3507c5a..f86ffbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
+    - 7.3
 
 env:
     global:

From 50dff1640835f62e58d5ecc306734dd7b5944e51 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Sun, 30 Dec 2018 14:13:22 +0100
Subject: [PATCH 2/5] Added changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7566aea..68d4965 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,13 @@ Do not use 1.5.1.
 
 - Removed PHP 7 code
 
+## 1.6.0 - UNRELEASED
+
+### Added
+
+- Support for PSR-17 factories
+- Support for PSR-18 clients
+
 ## 1.5.1 - 2018-12-30
 
 ### Fixed

From d0e2d6f4bca7f5f4d5ff5198818e61b7f0779fde Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Sun, 30 Dec 2018 14:31:40 +0100
Subject: [PATCH 3/5] added fix for puli and php 7.3

---
 spec/autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/autoload.php b/spec/autoload.php
index 1f0ffd1..0893022 100644
--- a/spec/autoload.php
+++ b/spec/autoload.php
@@ -2,7 +2,7 @@
 $loader = require __DIR__.'/../vendor/autoload.php';
 
 // Temporary fix for Puli
-if (PHP_VERSION_ID >= 50600) {
+if (PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 70300) {
     $loader->addClassMap([
         'Puli\\GeneratedPuliFactory' => __DIR__.'/../.puli/GeneratedPuliFactory.php',
     ]);

From fa075b8c073d5a6081d8861b8d59251f6dfea0eb Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 31 Dec 2018 08:37:50 +0100
Subject: [PATCH 4/5] fixes

---
 .travis.yml       | 6 ++----
 spec/autoload.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f86ffbd..a764af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,14 +25,12 @@ branches:
 
 matrix:
     allow_failures:
-        - php: hhvm
-          dist: trusty
+        - php: 7.3
     fast_finish: true
     include:
         - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" PULI_VERSION=1.0.0-beta9 
-        - php: hhvm
-          dist: trusty
+
 
 before_install:
     - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
diff --git a/spec/autoload.php b/spec/autoload.php
index 0893022..1f0ffd1 100644
--- a/spec/autoload.php
+++ b/spec/autoload.php
@@ -2,7 +2,7 @@
 $loader = require __DIR__.'/../vendor/autoload.php';
 
 // Temporary fix for Puli
-if (PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 70300) {
+if (PHP_VERSION_ID >= 50600) {
     $loader->addClassMap([
         'Puli\\GeneratedPuliFactory' => __DIR__.'/../.puli/GeneratedPuliFactory.php',
     ]);

From 6385e5f83875d08715afb81c7db7e8d06d164b8e Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 31 Dec 2018 08:41:37 +0100
Subject: [PATCH 5/5] Minorsw

---
 CHANGELOG.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d4965..298f099 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,19 @@
 # Change Log
 
+## 1.6.0 - UNRELEASED
+
+### Added
+
+- Support for PSR-17 factories
+- Support for PSR-18 clients
+
 ## 1.5.2 - 2018-12-31
 
 Corrected mistakes in 1.5.1. The different between 1.5.2 and 1.5.0 is that
 we removed some PHP 7 code. 
 
+https://github.com/php-http/discovery/compare/1.5.0...1.5.2
+
 ## 1.5.1 - 2018-12-31
 
 This version added new features by mistake. These are reverted in 1.5.2. 
@@ -15,19 +24,6 @@ Do not use 1.5.1.
 
 - Removed PHP 7 code
 
-## 1.6.0 - UNRELEASED
-
-### Added
-
-- Support for PSR-17 factories
-- Support for PSR-18 clients
-
-## 1.5.1 - 2018-12-30
-
-### Fixed
-
-- Removed PHP 7 code
-
 ## 1.5.0 - 2018-12-30
 
 ### Added