From 8fbea0fe4d93bc58ec554bfeef3d873136f8a5b0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Mar 2014 09:34:36 +0100 Subject: [PATCH 1/3] [Process] fixed HHVM usage on the CLI --- src/Symfony/Component/Process/PhpExecutableFinder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php index 9001f41095..cda86995a4 100644 --- a/src/Symfony/Component/Process/PhpExecutableFinder.php +++ b/src/Symfony/Component/Process/PhpExecutableFinder.php @@ -34,8 +34,8 @@ class PhpExecutableFinder public function find() { // HHVM support - if (defined('HHVM_VERSION') && false !== $hhvm = getenv('PHP_BINARY')) { - return $hhvm; + if (defined('HHVM_VERSION')) { + return (false !== ($hhvm = getenv('PHP_BINARY')) ? $hhvm : PHP_BINARY).' --php'; } // PHP_BINARY return the current sapi executable From 73189b1774dfca1b96f78d9166af6f233a86d168 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Mar 2014 09:34:56 +0100 Subject: [PATCH 2/3] upgraded PHPUnit to version 4 for better HHVM support --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85a1f7a074..275ef31519 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,9 @@ before_script: - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' + - wget https://phar.phpunit.de/phpunit.phar && chmod +x phpunit.phar && sudo mv phpunit.phar /usr/local/bin/phpunit - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install script: - - ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};' || exit 1 - - echo "Running tests requiring tty"; phpunit --group tty + - ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; /usr/local/bin/phpunit --exclude-group tty,benchmark {};' || exit 1 + - echo "Running tests requiring tty"; /usr/local/bin/phpunit --group tty From 9e6af955f5f4cdd460fd58dbbc86ed1b49c877f6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Mar 2014 09:56:31 +0100 Subject: [PATCH 3/3] fixed float comparison in unit tests for HHVM --- .../Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php index e41252c497..c7801f4300 100644 --- a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php @@ -684,7 +684,7 @@ abstract class AbstractNumberFormatterTest extends \PHPUnit_Framework_TestCase { $formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL); $parsedValue = $formatter->parse($value, NumberFormatter::TYPE_DOUBLE); - $this->assertSame($expectedValue, $parsedValue); + $this->assertEquals($expectedValue, $parsedValue, '', 0.001); } public function parseTypeDoubleProvider()