Merge pull request #141 from Ocramius/hotfix/hhvm-compat

Applying workarounds for HHVM compatibility
Ocramius · Feb 6, 2014 · 40a89a7 · 40a89a7
2 parents a8e3e5b + e95b8c6
commit 40a89a7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/...oxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/Constructor.php b/...oxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/Constructor.php
@@ -59,7 +59,7 @@ public function __construct(
         $localizedProperties = array();
 
         foreach ($originalClass->getProperties() as $originalProperty) {
-            if (PHP_VERSION_ID < 50400 && $originalProperty->isPrivate()) {
+            if ((PHP_VERSION_ID < 50400 || (defined('HHVM_VERSION'))) && $originalProperty->isPrivate()) {
                 // @codeCoverageIgnoreStart
                 throw UnsupportedProxiedClassException::unsupportedLocalizedReflectionProperty($originalProperty);
                 // @codeCoverageIgnoreEnd

diff --git a/src/ProxyManager/ProxyGenerator/Util/PublicScopeSimulator.php b/src/ProxyManager/ProxyGenerator/Util/PublicScopeSimulator.php
@@ -176,7 +176,7 @@ private static function getOperation($operationType, $nameParameter, $valueParam
      */
     private static function getScopeReBind()
     {
-        if (PHP_VERSION_ID < 50400) {
+        if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
             // @codeCoverageIgnoreStart
             return '';
             // @codeCoverageIgnoreEnd

diff --git a/tests/ProxyManagerTest/Functional/AccessInterceptorScopeLocalizerFunctionalTest.php b/tests/ProxyManagerTest/Functional/AccessInterceptorScopeLocalizerFunctionalTest.php
@@ -47,7 +47,7 @@ class AccessInterceptorScopeLocalizerFunctionalTest extends PHPUnit_Framework_Te
      */
     public static function setUpBeforeClass()
     {
-        if (PHP_VERSION_ID < 50400) {
+        if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
             throw new PHPUnit_Framework_SkippedTestError(
                 'PHP 5.3 doesn\'t support scope localization of private properties'
             );

diff --git a/tests/ProxyManagerTest/Functional/BasePerformanceTest.php b/tests/ProxyManagerTest/Functional/BasePerformanceTest.php
@@ -92,8 +92,9 @@ protected function endCapturing($messageTemplate)
      */
     protected function compareProfile(array $baseProfile, array $proxyProfile)
     {
+        $baseMemory     = max(1, $baseProfile['memory']);
         $timeOverhead   = (($proxyProfile['time'] / $baseProfile['time']) - 1) * 100;
-        $memoryOverhead = (($proxyProfile['memory'] / $baseProfile['memory']) - 1) * 100;
+        $memoryOverhead = (($proxyProfile['memory'] / $baseMemory) - 1) * 100;
 
         echo sprintf('Comparison time / memory: %.2f%% / %.2f%%', $timeOverhead, $memoryOverhead) . "\n\n";
     }

diff --git a/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php b/tests/ProxyManagerTest/Functional/MultipleProxyGenerationTest.php
@@ -58,7 +58,9 @@ public function testCanGenerateMultipleDifferentProxiesForSameClass($className)
 
         $reflectionClass = new ReflectionClass($className);
 
-        if (PHP_VERSION_ID < 50400 && $reflectionClass->getProperties(ReflectionProperty::IS_PRIVATE)) {
+        if ((defined('HHVM_VERSION') || PHP_VERSION_ID < 50400)
+            && $reflectionClass->getProperties(ReflectionProperty::IS_PRIVATE)
+        ) {
             $skipScopeLocalizerTests = true;
         }
 

diff --git a/...erTest/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/ConstructorTest.php b/...erTest/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/ConstructorTest.php
@@ -146,7 +146,7 @@ public function testBodyStructureWithProtectedProperties()
      */
     public function testBodyStructureWithPrivateProperties()
     {
-        if (PHP_VERSION_ID < 50400) {
+        if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
             $this->setExpectedException('ProxyManager\Exception\UnsupportedProxiedClassException');
         }
 

diff --git a/tests/ProxyManagerTest/ProxyGenerator/AccessInterceptorScopeLocalizerTest.php b/tests/ProxyManagerTest/ProxyGenerator/AccessInterceptorScopeLocalizerTest.php
@@ -48,7 +48,9 @@ public function testGeneratesValidCode($className)
             return parent::testGeneratesValidCode($className);
         }
 
-        if (PHP_VERSION_ID < 50400 && $reflectionClass->getProperties(ReflectionProperty::IS_PRIVATE)) {
+        if ((PHP_VERSION_ID < 50400 || defined('HHVM_VERSION'))
+            && $reflectionClass->getProperties(ReflectionProperty::IS_PRIVATE)
+        ) {
             $this->setExpectedException('ProxyManager\Exception\UnsupportedProxiedClassException');
         }