From f2aa0982eeeeca65890884666ce1413046eb0483 Mon Sep 17 00:00:00 2001 From: sikofitt Date: Wed, 20 Jul 2016 13:20:16 -0700 Subject: [PATCH] Remove php 5.2 from travis and check for HHVM --- .travis.yml | 2 -- tests/Sikofitt/Tests/ArrayObjectArrayTest.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb305a6..c791578 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: php php: - - '5.2' - '5.3' - '5.4' - '5.5' @@ -10,7 +9,6 @@ php: - nightly matrix: allow_failures: - - php: 5.2 - php: hhvm - php: nightly diff --git a/tests/Sikofitt/Tests/ArrayObjectArrayTest.php b/tests/Sikofitt/Tests/ArrayObjectArrayTest.php index c70b5e8..6ee06fb 100644 --- a/tests/Sikofitt/Tests/ArrayObjectArrayTest.php +++ b/tests/Sikofitt/Tests/ArrayObjectArrayTest.php @@ -276,7 +276,7 @@ class ArrayObjectArrayTest extends \PHPUnit_Framework_TestCase define('ARRAY_FILTER_USE_KEY', 2); } - if (PHP_VERSION_ID >= 50600) { + if (PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')) { $this->assertSame(array_filter($this->workingMultiArray, $array_filter, ARRAY_FILTER_USE_BOTH), $this->arrayObjectArrayMulti->array_filter($array_filter, ARRAY_FILTER_USE_BOTH)); $this->assertSame(array_filter($this->workingMultiArray, $array_filter, ARRAY_FILTER_USE_KEY), $this->arrayObjectArrayMulti->array_filter($array_filter, ARRAY_FILTER_USE_KEY)); }