Merge pull request #1998 from fauvel/issue-1998

Test on php56
cargomedia · Dec 3, 2015 · 7dc84ad · 7dc84ad
2 parents 5d0e006 + e86bf44
commit 7dc84ad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
 
 services:
   - mysql

diff --git 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);

diff --git 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

diff --git a/tests/travis/php-5.6.ini b/tests/travis/php-5.6.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ language: php @@
     php:
       - 5.4
       - 5.5
+      - 5.6
     services:
       - mysql
@@ Expand Down @@