Fix Error.$trace property.

Author: dim-s

jphp-runtime/src/php/runtime/common/HintType.java

@@ -1,7 +1,5 @@
 package php.runtime.common;
 
-import php.runtime.common.collections.map.HashedMap;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,7 +33,7 @@ public String toString(){
         }
     }
 
-    public static HintType of(String code){
+    public static HintType of(String code) {
         return values.get(code);
     }
 }

jphp-runtime/src/php/runtime/ext/core/classes/stream/FileStream.java

@@ -45,50 +45,53 @@ public Memory __construct(Environment env, Memory... args) throws IOException {
         super.__construct(env, args);
 
         try {
-            if (getMode().equals("r")) {
-                accessFile = new RandomAccessFile(getPath(), "r");
+            String mode = getMode();
+            String path = getPath();
+
+            if (mode.equals("r") || mode.equals("rb")) {
+                accessFile = new RandomAccessFile(path, "r");
                 position = 0;
-            } else if (getMode().equals("r+")){
-                if (!new File(getPath()).getAbsoluteFile().exists())
+            } else if (mode.equals("r+") || mode.equals("rb+")){
+                if (!new File(path).getAbsoluteFile().exists())
                     throwFileNotFound(env);
-                accessFile = new RandomAccessFile(getPath(), "rw");
-            } else if (getMode().equals("w")){
-                accessFile = new RandomAccessFile(getPath(), "rw");
+                accessFile = new RandomAccessFile(path, "rw");
+            } else if (mode.equals("w") || mode.equals("wb")){
+                accessFile = new RandomAccessFile(path, "rw");
                 accessFile.setLength(0);
                 canRead = false;
-            } else if (getMode().equals("w+")){
-                accessFile = new RandomAccessFile(getPath(), "rw");
+            } else if (mode.equals("w+") || mode.equals("wb+")){
+                accessFile = new RandomAccessFile(path, "rw");
                 accessFile.setLength(0);
-            } else if (getMode().equals("a")){
-                accessFile = new RandomAccessFile(getPath(), "rw");
-                File file = new File(getPath());
+            } else if (mode.equals("a")){
+                accessFile = new RandomAccessFile(path, "rw");
+                File file = new File(path);
                 if (file.getAbsoluteFile().exists()) {
                     accessFile.seek(file.length());
                     position = file.length();
                 }
 
                 canRead = false;
-            } else if (getMode().equals("a+")){
-                accessFile = new RandomAccessFile(getPath(), "rw");
-                File file = new File(getPath());
+            } else if (mode.equals("a+")){
+                accessFile = new RandomAccessFile(path, "rw");
+                File file = new File(path);
                 if (file.getAbsoluteFile().exists()){
                     accessFile.seek(file.length());
                     position = file.length();
                 }
-            } else if (getMode().equals("x") || getMode().equals("x+")){
-                File file = new File(getPath());
+            } else if (mode.equals("x") || mode.equals("x+")){
+                File file = new File(path);
                 if (file.getAbsoluteFile().exists())
-                    env.exception(WrapIOException.class, "File '%s' already exists (mode: %s)", getMode());
+                    env.exception(WrapIOException.class, "File '%s' already exists (mode: %s)", mode);
 
-                accessFile = new RandomAccessFile(getPath(), "rw");
-                if (getMode().equals("x"))
+                accessFile = new RandomAccessFile(path, "rw");
+                if (mode.equals("x"))
                     canRead = false;
-            } else if (getMode().equals("c") || getMode().equals("c+")){
-                accessFile = new RandomAccessFile(getPath(), "rw");
-                if (getMode().equals("c"))
+            } else if (mode.equals("c") || mode.equals("c+")){
+                accessFile = new RandomAccessFile(path, "rw");
+                if (mode.equals("c"))
                     canRead = false;
             } else
-                env.exception(WrapIOException.class, "Unsupported mode - '%s'", getMode());
+                env.exception(WrapIOException.class, "Unsupported mode - '%s'", mode);
         } catch (FileNotFoundException e){
             throwFileNotFound(env);
         } catch (IOException e) {

jphp-runtime/src/php/runtime/lang/exception/BaseError.java

@@ -21,7 +21,7 @@
                 @Reflection.Arg(value = "message", modifier = Modifier.PROTECTED, type = HintType.STRING),
                 @Reflection.Arg(value = "code", modifier = Modifier.PROTECTED, type = HintType.INT),
                 @Reflection.Arg(value = "previous", modifier = Modifier.PROTECTED, type = HintType.OBJECT),
-                @Reflection.Arg(value = "trace", modifier = Modifier.PROTECTED, type = HintType.ARRAY),
+                @Reflection.Arg(value = "trace", modifier = Modifier.PRIVATE, type = HintType.ARRAY),
                 @Reflection.Arg(value = "file", modifier = Modifier.PROTECTED, type = HintType.STRING),
                 @Reflection.Arg(value = "line", modifier = Modifier.PROTECTED, type = HintType.INT),
                 @Reflection.Arg(value = "position", modifier = Modifier.PROTECTED, type = HintType.INT)