Work around bug with anonymous classes and static methods in HHVM

See facebook/hhvm#7878
xp-framework · Jun 10, 2017 · eeb3fa5 · eeb3fa5
1 parent 1d06387
commit eeb3fa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/php/io/streams/Streams.class.php b/src/main/php/io/streams/Streams.class.php
@@ -61,7 +61,7 @@ public function stream_read($count) {
       }
 
       public function stream_flush() {
-        return self::$streams[$this->id]->flush();
+        return parent::$streams[$this->id]->flush();
       }
 
       public function stream_eof() {

diff --git a/src/main/php/lang/CommandLine.class.php b/src/main/php/lang/CommandLine.class.php
@@ -65,16 +65,16 @@ public function parse($cmd) {
         return $parts;
       }
 
-      protected static function quote($arg) {
+      protected function quote($arg) {
         $l= strlen($arg);
         if ($l && strcspn($arg, '" ') >= $l) return $arg;
         return '"'.str_replace('"', '"""', $arg).'"';
       }
 
       public function compose($command, $arguments= []) {
-        $cmd= self::quote($command);
+        $cmd= $this->quote($command);
         foreach ($arguments as $arg) {
-          $cmd.= " ".self::quote($arg);
+          $cmd.= ' '.$this->quote($arg);
         }
         return $cmd;
       }
@@ -107,16 +107,16 @@ public function parse($cmd) {
         return $parts;
       }
 
-      protected static function quote($arg) {
+      protected function quote($arg) {
         $l= strlen($arg);
         if ($l && strcspn($arg, "&;`\'\"|*?~<>^()[]{}\$ ") >= $l) return $arg;
         return "'".str_replace("'", "'\\''", $arg)."'";
       }
 
       public function compose($command, $arguments= []) {
-        $cmd= self::quote($command);
+        $cmd= $this->quote($command);
         foreach ($arguments as $arg) {
-          $cmd.= ' '.self::quote($arg);
+          $cmd.= ' '.$this->quote($arg);
         }
         return $cmd;
       }