From ceaf85e8b720ab8c3d8b74cd5429a40dfef09294 Mon Sep 17 00:00:00 2001
From: mwguy <yousan4ik@gmail.com>
Date: Fri, 17 May 2019 00:29:11 +0300
Subject: [PATCH] Add class loading for Jar files and API for arrays

---
 package.php.yml                               |  2 +-
 sdk/java/reflection/JarClassLoader.php        | 15 +++++++
 sdk/java/reflection/ReflectionArray.php       | 35 +++++++++++++++
 sdk/java/reflection/ReflectionClass.php       |  3 +-
 .../JavaReflectionExtension.java              |  8 ++--
 .../classes/JarClassLoader.java               | 43 +++++++++++++++++++
 .../classes/ReflectionArray.java              | 41 ++++++++++++++++++
 .../classes/ReflectionClass.java              |  5 +++
 8 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 sdk/java/reflection/JarClassLoader.php
 create mode 100644 sdk/java/reflection/ReflectionArray.php
 create mode 100644 src-jvm/main/java/org/venity/javareflection/classes/JarClassLoader.java
 create mode 100644 src-jvm/main/java/org/venity/javareflection/classes/ReflectionArray.java

diff --git a/package.php.yml b/package.php.yml
index 721b0b9..e2ead48 100644
--- a/package.php.yml
+++ b/package.php.yml
@@ -1,5 +1,5 @@
 name: java-reflection-ext
-version: 1.1.1
+version: 1.2.0
 description: Java Reflection API
 
 plugins: 
diff --git a/sdk/java/reflection/JarClassLoader.php b/sdk/java/reflection/JarClassLoader.php
new file mode 100644
index 0000000..483e731
--- /dev/null
+++ b/sdk/java/reflection/JarClassLoader.php
@@ -0,0 +1,15 @@
+<?php
+
+
+namespace java\reflection;
+
+
+use php\io\File;
+
+class JarClassLoader
+{
+    /**
+     * @param File $jarFile
+     */
+    public function __construct(File $jarFile) {}
+}
\ No newline at end of file
diff --git a/sdk/java/reflection/ReflectionArray.php b/sdk/java/reflection/ReflectionArray.php
new file mode 100644
index 0000000..26802cc
--- /dev/null
+++ b/sdk/java/reflection/ReflectionArray.php
@@ -0,0 +1,35 @@
+<?php
+
+
+namespace java\reflection;
+
+
+class ReflectionArray
+{
+    /**
+     * @param ReflectionClass $class
+     * @param int $length
+     * @return ReflectionObject
+     */
+    public static function newInstance(ReflectionClass $class, int $length): ReflectionObject {}
+
+    /**
+     * @param ReflectionObject $object
+     * @return int
+     */
+    public static function getLength(ReflectionObject $object): int {}
+
+    /**
+     * @param ReflectionObject $object
+     * @param int $id
+     * @return ReflectionObject
+     */
+    public static function get(ReflectionObject $object, int $id): ReflectionObject {}
+
+    /**
+     * @param ReflectionObject $object
+     * @param int $id
+     * @param ReflectionObject $data
+     */
+    public static function set(ReflectionObject $object, int $id, ReflectionObject $data) {}
+}
\ No newline at end of file
diff --git a/sdk/java/reflection/ReflectionClass.php b/sdk/java/reflection/ReflectionClass.php
index 207c115..74b8488 100644
--- a/sdk/java/reflection/ReflectionClass.php
+++ b/sdk/java/reflection/ReflectionClass.php
@@ -8,9 +8,10 @@ private function __construct() {}
 
     /**
      * @param string $javaClassName
+     * @param JarClassLoader $cl
      * @return ReflectionClass
      */
-    public static function forName(string $javaClassName): ReflectionClass {}
+    public static function forName(string $javaClassName, JarClassLoader $cl = null): ReflectionClass {}
 
     public function newInstance(): ReflectionObject {}
 
diff --git a/src-jvm/main/java/org/venity/javareflection/JavaReflectionExtension.java b/src-jvm/main/java/org/venity/javareflection/JavaReflectionExtension.java
index b0b929a..58ab0b6 100644
--- a/src-jvm/main/java/org/venity/javareflection/JavaReflectionExtension.java
+++ b/src-jvm/main/java/org/venity/javareflection/JavaReflectionExtension.java
@@ -6,10 +6,7 @@
 import php.runtime.env.Environment;
 import php.runtime.ext.support.Extension;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.lang.reflect.*;
 
 public class JavaReflectionExtension extends Extension {
     public static final String NS = "java\\reflection";
@@ -26,12 +23,15 @@ public String getName() {
 
     @Override
     public void onRegister(CompileScope scope) {
+        registerClass(scope, JarClassLoader.class);
+
         registerWrapperClass(scope, Class.class, ReflectionClass.class);
         registerWrapperClass(scope, Object.class, ReflectionObject.class);
         registerWrapperClass(scope, Executable.class, ReflectionExecutable.class);
         registerWrapperClass(scope, Constructor.class, ReflectionConstructor.class);
         registerWrapperClass(scope, Method.class, ReflectionMethod.class);
         registerWrapperClass(scope, Field.class, ReflectionField.class);
+        registerWrapperClass(scope, Array.class, ReflectionArray.class);
 
         registerClass(scope, ReflectionTypes.class);
     }
diff --git a/src-jvm/main/java/org/venity/javareflection/classes/JarClassLoader.java b/src-jvm/main/java/org/venity/javareflection/classes/JarClassLoader.java
new file mode 100644
index 0000000..b8680ec
--- /dev/null
+++ b/src-jvm/main/java/org/venity/javareflection/classes/JarClassLoader.java
@@ -0,0 +1,43 @@
+package org.venity.javareflection.classes;
+
+import org.venity.javareflection.JavaReflectionExtension;
+import php.runtime.annotation.Reflection;
+import php.runtime.env.Environment;
+import php.runtime.lang.BaseObject;
+import php.runtime.reflection.ClassEntity;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+@Reflection.Name("JarClassLoader")
+@Reflection.Namespace(JavaReflectionExtension.NS)
+public class JarClassLoader extends BaseObject {
+
+    public JarClassLoader(Environment env) {
+        super(env);
+    }
+
+    protected JarClassLoader(ClassEntity entity) {
+        super(entity);
+    }
+
+    public JarClassLoader(Environment env, ClassEntity clazz) {
+        super(env, clazz);
+    }
+
+    private URLClassLoader classLoader;
+
+    @Reflection.Signature
+    public void __construct(File jar) throws MalformedURLException {
+        classLoader = new URLClassLoader(
+                new URL[] {jar.toURI().toURL()},
+                this.getClass().getClassLoader()
+        );
+    }
+
+    public URLClassLoader getClassLoader() {
+        return classLoader;
+    }
+}
diff --git a/src-jvm/main/java/org/venity/javareflection/classes/ReflectionArray.java b/src-jvm/main/java/org/venity/javareflection/classes/ReflectionArray.java
new file mode 100644
index 0000000..415e383
--- /dev/null
+++ b/src-jvm/main/java/org/venity/javareflection/classes/ReflectionArray.java
@@ -0,0 +1,41 @@
+package org.venity.javareflection.classes;
+
+import org.venity.javareflection.JavaReflectionExtension;
+import php.runtime.annotation.Reflection;
+import php.runtime.env.Environment;
+import php.runtime.lang.BaseWrapper;
+import php.runtime.reflection.ClassEntity;
+
+import java.lang.reflect.Array;
+
+@Reflection.Name("ReflectionArray")
+@Reflection.Namespace(JavaReflectionExtension.NS)
+public class ReflectionArray extends BaseWrapper<Array> {
+    public ReflectionArray(Environment env, Array wrappedObject) {
+        super(env, wrappedObject);
+    }
+
+    public ReflectionArray(Environment env, ClassEntity clazz) {
+        super(env, clazz);
+    }
+
+    @Reflection.Signature
+    public static ReflectionObject newInstance(Environment environment, Class<?> componentType, int length) {
+        return new ReflectionObject(environment, Array.newInstance(componentType, length));
+    }
+
+    @Reflection.Signature
+    public static int getLength(ReflectionObject object) {
+        return Array.getLength(object.getWrappedObject());
+    }
+
+    @Reflection.Signature
+    public static ReflectionObject get(Environment environment, ReflectionObject object, int id) {
+        return new ReflectionObject(environment, Array.get(object.getWrappedObject(), id));
+    }
+
+    @Reflection.Signature
+    public static void set(Environment environment, ReflectionObject object, int id, ReflectionObject reflectionObject) {
+        Array.set(object.getWrappedObject(), id, reflectionObject.getWrappedObject());
+    }
+}
diff --git a/src-jvm/main/java/org/venity/javareflection/classes/ReflectionClass.java b/src-jvm/main/java/org/venity/javareflection/classes/ReflectionClass.java
index 262d4fd..bb7f061 100644
--- a/src-jvm/main/java/org/venity/javareflection/classes/ReflectionClass.java
+++ b/src-jvm/main/java/org/venity/javareflection/classes/ReflectionClass.java
@@ -32,6 +32,11 @@ public static ReflectionClass forName(Environment env, String className) throws
         return new ReflectionClass(env, Class.forName(className));
     }
 
+    @Reflection.Signature
+    public static ReflectionClass forName(Environment env, String className, JarClassLoader classLoader) throws ClassNotFoundException {
+        return new ReflectionClass(env, Class.forName(className, false, classLoader.getClassLoader()));
+    }
+
     @Reflection.Signature
     public ReflectionObject newInstance() throws IllegalAccessException, InstantiationException {
         return new ReflectionObject(__env__, __wrappedObject.newInstance());