diff --git a/.travis.yml b/.travis.yml index 25df8d790c..32b5856310 100755 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: before_script: - curl -sSL https://dl.bintray.com/xp-runners/generic/xp-run-master.sh > xp-run - echo "test.xar" > composer.pth - - if [ -f /etc/hhvm/php.ini ] ; then echo "hhvm.php7.all = 1" | sudo tee -a /etc/hhvm/php.ini ; fi + - if [ -f /etc/hhvm/php.ini ] ; then (echo "hhvm.php7.all = 1"; echo "hhvm.hack.lang.look_for_typechecker = 0") | sudo tee -a /etc/hhvm/php.ini ; fi script: - (EXCD=0; for i in `ls -1 src/test/config/unittest/*.ini`; do echo "---> $i"; sh xp-run xp.unittest.Runner $i; RES=$?; if [ $RES -ne 0 ]; then EXCD=$RES; fi; done; exit $EXCD;) diff --git a/ChangeLog.md b/ChangeLog.md index 878e1a5189..dc8202f35b 100755 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,7 +5,7 @@ XP Framework Core ChangeLog ### Heads up! -* Minimum HHVM version required is now **3.20.2**, see issue #176. +* Minimum HHVM version required is now **3.20**, see issue #176. (@thekid) * Deprecated `package-info.xp` files previously used for documentation purposes. Packages have been split into libraries with their own repos, diff --git a/README.md b/README.md index a4994cf929..608a4bbfac 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ XP Framework Core [![Build status on AppVeyor](https://ci.appveyor.com/api/projects/status/bb9gkkq1o7f6m2ns?svg=true)](https://ci.appveyor.com/project/thekid/core) [![BSD Licence](https://raw.githubusercontent.com/xp-framework/web/master/static/licence-bsd.png)](https://github.com/xp-framework/core/blob/master/LICENCE.md) [![Requires PHP 7.0+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-7_0plus.png)](http://php.net/) -[![Supports HHVM 3.20.2+](https://raw.githubusercontent.com/xp-framework/web/master/static/hhvm-3_20_2plus.png)](http://hhvm.com/) +[![Supports HHVM 3.20+](https://raw.githubusercontent.com/xp-framework/web/master/static/hhvm-3_20plus.png)](http://hhvm.com/) [![Latest Stable Version](https://poser.pugx.org/xp-framework/core/version.png)](https://packagist.org/packages/xp-framework/core) This is the XP Framework's development checkout. diff --git a/src/main/php/__xp.php b/src/main/php/__xp.php index 70e19a2542..3ef136185a 100755 --- a/src/main/php/__xp.php +++ b/src/main/php/__xp.php @@ -4,8 +4,8 @@ throw new \Exception('This version of the XP Framework requires PHP 7.0.0+, have PHP '.PHP_VERSION); } if (defined('HHVM_VERSION_ID')) { - if (HHVM_VERSION_ID < 32002) { - throw new \Exception('This version of the XP Framework requires HHVM 3.20.2+, have HHVM '.HHVM_VERSION); + if (HHVM_VERSION_ID < 32000) { + throw new \Exception('This version of the XP Framework requires HHVM 3.20+, have HHVM '.HHVM_VERSION); } else if (!ini_get('hhvm.php7.all')) { throw new \Exception('This version of the XP Framework requires hhvm.php7.all to be set to 1'); }