Advertisement
Guest User

Untitled

a guest
Sep 20th, 2013
63
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.41 KB | None | 0 0
  1. diff --git a/core/Object.php b/core/Object.php
  2. index 3c5480a..035ffae 100755
  3. --- a/core/Object.php
  4. +++ b/core/Object.php
  5. @@ -356,6 +356,15 @@ abstract class Object {
  6.             if (isset($static_properties[$class][$name])) {
  7.                 $value = $static_properties[$class][$name];
  8.  
  9. +               if($value instanceof ReflectionProperty) {
  10. +                   // HHVM?
  11. +                   if(function_exists('hphp_get_static_property')) {
  12. +                       $value = hphp_get_static_property($class, $name, true);
  13. +                   } else {
  14. +                       $value = $value->getValue();
  15. +                   }
  16. +               }
  17. +
  18.                 $parent = get_parent_class($class);
  19.                 if (!$parent) return $value;
  20.  
  21. diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
  22. index 0e5af4a..efa5a66 100644
  23. --- a/tests/i18n/i18nTest.php
  24. +++ b/tests/i18n/i18nTest.php
  25. @@ -470,6 +470,7 @@ class i18nTest extends SapphireTest {
  26.     }
  27.  
  28.     public function testRegisterTranslator() {
  29. +       $this->fail('No RecursiveRegexIterator');
  30.         $translator = new Zend_Translate(array(
  31.             'adapter' => 'i18nTest_CustomTranslatorAdapter',
  32.             'disableNotices' => true,
  33. @@ -487,6 +488,7 @@ class i18nTest extends SapphireTest {
  34.     }
  35.  
  36.     public function testMultipleTranslators() {
  37. +       $this->fail('No RecursiveRegexIterator');
  38.         // Looping through modules, so we can test the translation autoloading
  39.         // Load non-exclusive to retain core class autoloading
  40.         $classManifest = new SS_ClassManifest($this->alternateBasePath, true, true, false);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement