remove HHVM from allowed failures and enable travis for PHP 5.6

tchwork · May 22, 2014 · c1edbc8 · c1edbc8
1 parent 0238b1a
commit c1edbc8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,12 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm-nightly
 
 script:
   - phpunit --coverage-text
   - phpunit --group unicode --coverage-text
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.1.23 (2014-05-22)
+
+- enable tests for PHP 5.6
+- remove HHVM from allowed failures
+
 ## v1.1.22 (2014-04-06)
 
 - fix #19: don't call ini_set() when not required and gain compat with PHP5.6

diff --git a/tests/Patchwork/Tests/PHP/Shim/IntlTest.php b/tests/Patchwork/Tests/PHP/Shim/IntlTest.php
@@ -53,7 +53,12 @@ function testGrapheme_extract()
         $this->assertSame( 'dé', p::grapheme_extract('déjà', 2, GRAPHEME_EXTR_MAXCHARS) );
 
         $this->assertFalse( @p::grapheme_extract(array(), 0) );
-        $this->assertFalse( @grapheme_extract(array(), 0) );
+
+        if (defined('HHVM_VERSION')) {
+            $this->assertNull( @grapheme_extract(array(), 0) );
+        } else {
+            $this->assertFalse( @grapheme_extract(array(), 0) );
+        }
     }
 
     /**

diff --git a/tests/Patchwork/Tests/Utf8/HhvmTest.php b/tests/Patchwork/Tests/Utf8/HhvmTest.php
@@ -6,7 +6,11 @@ class HhvmTest extends \PHPUnit_Framework_TestCase
 {
     function test1()
     {
-        $this->assertFalse( @grapheme_extract(array(), 0) );
+        if (defined('HHVM_VERSION')) {
+            $this->assertNull( @grapheme_extract(array(), 0) );
+        } else {
+            $this->assertFalse( @grapheme_extract(array(), 0) );
+        }
     }
 
     function test2()
@@ -56,6 +60,10 @@ function dummy9($arg)
     {
         $arg = 456;
 
-        $this->assertSame( 123, func_get_arg(0) );
+        if (defined('HHVM_VERSION')) {
+            $this->assertSame( 456, func_get_arg(0) );
+        } else {
+            $this->assertSame( 123, func_get_arg(0) );
+        }
     }
 }