diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #10579 HHVM fixes (fabpot)

Browse Source 
This PR was merged into the 2.3 branch.

Discussion
----------

HHVM fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Fixes support for HHVM in the Process component and upgraded PHPUnit to version 4 for the same reason.

Commits
-------

9e6af95 fixed float comparison in unit tests for HHVM
73189b1 upgraded PHPUnit to version 4 for better HHVM support
8fbea0f [Process] fixed HHVM usage on the CLI
This commit is contained in:
Fabien Potencier 2014-03-30 09:33:31 +02:00
commit 78e52ae517
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -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

2
src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
View File

@ -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()

4
src/Symfony/Component/Process/PhpExecutableFinder.php
View File

@ -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