From 8d6c36b7474c09c2f33ac879edc7612595bbe9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Fauvel?= <sebastien.fauvel@cargomedia.ch>
Date: Thu, 3 Dec 2015 12:42:41 +0100
Subject: [PATCH 1/4] Test on php56

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

diff --git a/.travis.yml b/.travis.yml
index 428490910..70d379a48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
 
 services:
   - mysql

From 7ae44b9157bd6cb5b782e017c556b444a2572c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Fauvel?= <sebastien.fauvel@cargomedia.ch>
Date: Thu, 3 Dec 2015 12:49:04 +0100
Subject: [PATCH 2/4] Updated runkit for php56

---
 tests/travis/install-php-runkit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/travis/install-php-runkit.sh b/tests/travis/install-php-runkit.sh
index b8a603479..751c82f1c 100755
--- a/tests/travis/install-php-runkit.sh
+++ b/tests/travis/install-php-runkit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-VERSION="5e179e978af79444d3c877d5681ea91d15134a01"
+VERSION="1.0.4"
 
 git clone http://github.com/zenovich/runkit.git runkit
 cd runkit

From e5c6f74a26eb9c068fa97c701354f0801605fcf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Fauvel?= <sebastien.fauvel@cargomedia.ch>
Date: Thu, 3 Dec 2015 12:52:14 +0100
Subject: [PATCH 3/4] Added ini file

---
 tests/travis/php-5.6.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/travis/php-5.6.ini

diff --git a/tests/travis/php-5.6.ini b/tests/travis/php-5.6.ini
new file mode 100644
index 000000000..e69de29bb

From e86bf4459e8ec938ad05d190ce16b53985049a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Fauvel?= <sebastien.fauvel@cargomedia.ch>
Date: Thu, 3 Dec 2015 13:03:29 +0100
Subject: [PATCH 4/4] Adjusted key size

---
 tests/library/CM/Model/StreamChannel/AbstractTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/library/CM/Model/StreamChannel/AbstractTest.php b/tests/library/CM/Model/StreamChannel/AbstractTest.php
index 111fb2f0b..668a23d0a 100644
--- a/tests/library/CM/Model/StreamChannel/AbstractTest.php
+++ b/tests/library/CM/Model/StreamChannel/AbstractTest.php
@@ -194,7 +194,7 @@ public function testCreate() {
 
     public function testEncryptAndDecryptKey() {
         $data = 'foo ';
-        $encryptionKey = 'qwertyuiopasdfghjk';
+        $encryptionKey = 'qwertyuiopasdfgh';
         $encryptMethod = new ReflectionMethod('CM_Model_StreamChannel_Abstract', '_encryptKey');
         $encryptMethod->setAccessible(true);
         $encryptedData = $encryptMethod->invoke(null, $data, $encryptionKey);