From f42b777f9afa84f924ff3ec6853e3c9cd736bd89 Mon Sep 17 00:00:00 2001
From: David de Boer <david@ddeboer.nl>
Date: Wed, 30 Aug 2017 10:13:01 +0200
Subject: [PATCH] Bump version and start from PHP 5.6

---
 .travis.yml   | 6 +++---
 composer.json | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4cc693c..357ab7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
+dist: trusty
+
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - hhvm
@@ -12,7 +12,7 @@ matrix:
     - php: 7.0
     - php: hhvm
   include:
-    - php: 5.4
+    - php: 5.6
       env:
         - COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
         - COVERAGE=true
diff --git a/composer.json b/composer.json
index 452a43f..a2e3927 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,8 @@
         "docs": "https://portphp.readthedocs.org"
     },
     "require": {
-        "php": ">=5.4.0",
-        "portphp/portphp": "1.0.x-dev",
+        "php": ">=5.6.0",
+        "portphp/portphp": "^1.0.0",
         "doctrine/common": "^2.2"
     },
     "require-dev": {
@@ -46,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }