Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/core/Object.php b/core/Object.php
- index 3c5480a..035ffae 100755
- --- a/core/Object.php
- +++ b/core/Object.php
- @@ -356,6 +356,15 @@ abstract class Object {
- if (isset($static_properties[$class][$name])) {
- $value = $static_properties[$class][$name];
- + if($value instanceof ReflectionProperty) {
- + // HHVM?
- + if(function_exists('hphp_get_static_property')) {
- + $value = hphp_get_static_property($class, $name, true);
- + } else {
- + $value = $value->getValue();
- + }
- + }
- +
- $parent = get_parent_class($class);
- if (!$parent) return $value;
- diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
- index 0e5af4a..efa5a66 100644
- --- a/tests/i18n/i18nTest.php
- +++ b/tests/i18n/i18nTest.php
- @@ -470,6 +470,7 @@ class i18nTest extends SapphireTest {
- }
- public function testRegisterTranslator() {
- + $this->fail('No RecursiveRegexIterator');
- $translator = new Zend_Translate(array(
- 'adapter' => 'i18nTest_CustomTranslatorAdapter',
- 'disableNotices' => true,
- @@ -487,6 +488,7 @@ class i18nTest extends SapphireTest {
- }
- public function testMultipleTranslators() {
- + $this->fail('No RecursiveRegexIterator');
- // Looping through modules, so we can test the translation autoloading
- // Load non-exclusive to retain core class autoloading
- $classManifest = new SS_ClassManifest($this->alternateBasePath, true, true, false);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement