Rename namespace from Imitation to Packages

m3m0r7 · m3m0r7 · commit 7a9ffe59afa6 · 2019-04-24T14:35:40.000+09:00
diff --git a/src/Core/JVM/Field/FieldGettable.php b/src/Core/JVM/Field/FieldGettable.php
@@ -2,8 +2,8 @@
 namespace PHPJava\Core\JVM\Field;
 
 use PHPJava\Core\JavaClassInvoker;
-use PHPJava\Imitation\java\lang\_String;
-use PHPJava\Imitation\java\lang\NoSuchFieldException;
+use PHPJava\Packages\java\lang\_String;
+use PHPJava\Packages\java\lang\NoSuchFieldException;
 
 trait FieldGettable
 {
diff --git a/src/Core/JVM/Field/StaticField.php b/src/Core/JVM/Field/StaticField.php
@@ -2,7 +2,7 @@
 namespace PHPJava\Core\JVM\Field;
 
 use PHPJava\Core\JavaClassInvoker;
-use PHPJava\Imitation\java\lang\_String;
+use PHPJava\Packages\java\lang\_String;
 
 class StaticField implements FieldInterface
 {
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -12,7 +12,7 @@
 use PHPJava\Exceptions\RuntimeException;
 use PHPJava\Exceptions\UndefinedMethodException;
 use PHPJava\Exceptions\UndefinedOpCodeException;
-use PHPJava\Imitation\java\lang\NoSuchMethodException;
+use PHPJava\Packages\java\lang\NoSuchMethodException;
 use PHPJava\Kernel\Attributes\AttributeInfo;
 use PHPJava\Kernel\Attributes\AttributeInterface;
 use PHPJava\Kernel\Attributes\CodeAttribute;
diff --git a/src/Core/JVM/Parameters/Runtime.php b/src/Core/JVM/Parameters/Runtime.php
@@ -21,12 +21,12 @@ final class Runtime
     const LOG_PATH = 'php://stderr';
     const LOG_LEVEL = Logger::EMERGENCY;
 
-    const PHP_IMITATION_MAPS = [
+    const PHP_Packages_MAPS = [
         'String' => '_String',
         'Object' => '_Object',
     ];
 
-    const PHP_IMITATION_DIRECTORY = '\\PHPJava\\Imitation';
+    const PHP_Packages_DIRECTORY = '\\PHPJava\\Packages';
 
     const PREFIX_STATIC = 'static_';
 }
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -5,9 +5,9 @@
 use PHPJava\Core\JVM\Parameters\Runtime;
 use PHPJava\Core\Stream\Reader\InlineReader;
 use PHPJava\Exceptions\UndefinedEntrypointException;
-use PHPJava\Imitation\java\io\FileNotFoundException;
-use PHPJava\Imitation\java\lang\_Object;
-use PHPJava\Imitation\java\lang\ClassNotFoundException;
+use PHPJava\Packages\java\io\FileNotFoundException;
+use PHPJava\Packages\java\lang\_Object;
+use PHPJava\Packages\java\lang\ClassNotFoundException;
 use PHPJava\Utilities\ClassResolver;
 use PHPJava\Utilities\DebugTool;
 use PHPJava\Utilities\FileTypeResolver;
@@ -35,7 +35,7 @@ class JavaArchive
      * @throws FileNotFoundException
      * @throws \PHPJava\Exceptions\ReadEntryException
      * @throws \PHPJava\Exceptions\ValidatorException
-     * @throws \PHPJava\Imitation\java\lang\ClassNotFoundException
+     * @throws \PHPJava\Packages\java\lang\ClassNotFoundException
      */
     public function __construct(string $jarFile, array $options = [])
     {
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -86,7 +86,7 @@ class JavaClass implements JavaClassInterface
      * @param array $options
      * @throws ValidatorException
      * @throws \PHPJava\Exceptions\ReadEntryException
-     * @throws \PHPJava\Imitation\java\lang\ClassNotFoundException
+     * @throws \PHPJava\Packages\java\lang\ClassNotFoundException
      */
     public function __construct(ReaderInterface $reader, array $options = [])
     {
@@ -159,7 +159,7 @@ public function __construct(ReaderInterface $reader, array $options = [])
         );
 
         switch ($resolvedType) {
-            case ClassResolver::RESOLVED_TYPE_IMITATION:
+            case ClassResolver::RESOLVED_TYPE_Packages:
                 $this->superClass = new $superClass();
                 break;
             default:
diff --git a/src/Kernel/Mnemonics/_aload_0.php b/src/Kernel/Mnemonics/_aload_0.php
@@ -2,7 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Imitation\java\lang\_Object;
+use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
 
 final class _aload_0 implements OperationInterface
diff --git a/src/Kernel/Mnemonics/_aload_1.php b/src/Kernel/Mnemonics/_aload_1.php
@@ -2,7 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Imitation\java\lang\_Object;
+use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
 
 final class _aload_1 implements OperationInterface
diff --git a/src/Kernel/Mnemonics/_aload_2.php b/src/Kernel/Mnemonics/_aload_2.php
@@ -2,7 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Imitation\java\lang\_Object;
+use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
 
 final class _aload_2 implements OperationInterface
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -51,7 +51,7 @@ public function execute(): void
                             ...$arguments
                         );
                     break;
-                case ClassResolver::RESOLVED_TYPE_IMITATION:
+                case ClassResolver::RESOLVED_TYPE_Packages:
                     $return = forward_static_call_array(
                         [
                             $classObject,
diff --git a/src/Kernel/Mnemonics/_ldc.php b/src/Kernel/Mnemonics/_ldc.php
@@ -25,7 +25,7 @@ public function execute(): void
             $value = $cpInfo[$data->getStringIndex()];
 
             if ($value instanceof _Utf8) {
-                $value = new \PHPJava\Imitation\java\lang\_String($value);
+                $value = new \PHPJava\Packages\java\lang\_String($value);
             }
         } elseif (($data instanceof _Integer) || ($data instanceof _Float)) {
             $value = $data->getBytes();
diff --git a/src/Packages/PHPJava/Extended/_Object.php b/src/Packages/PHPJava/Extended/_Object.php
@@ -1,7 +1,7 @@
 <?php
-namespace PHPJava\Imitation\PHPJava\Extended;
+namespace PHPJava\Packages\PHPJava\Extended;
 
-use PHPJava\Imitation\java\lang\NoSuchMethodException;
+use PHPJava\Packages\java\lang\NoSuchMethodException;
 
 trait _Object
 {
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -6,11 +6,11 @@
 use PHPJava\Core\Stream\Reader\FileReader;
 use PHPJava\Core\Stream\Reader\ReaderInterface;
 use PHPJava\Core\JVM\Parameters\Runtime;
-use PHPJava\Imitation\java\lang\ClassNotFoundException;
+use PHPJava\Packages\java\lang\ClassNotFoundException;
 
 class ClassResolver
 {
-    const MAPS = Runtime::PHP_IMITATION_MAPS;
+    const MAPS = Runtime::PHP_Packages_MAPS;
 
     // resource types
     const RESOURCE_TYPE_FILE = 'RESOURCE_TYPE_FILE';
@@ -19,7 +19,7 @@ class ClassResolver
 
     // resolved types
     const RESOLVED_TYPE_CLASS = 'RESOLVED_TYPE_CLASS';
-    const RESOLVED_TYPE_IMITATION = 'RESOLVED_TYPE_IMITATION';
+    const RESOLVED_TYPE_Packages = 'RESOLVED_TYPE_Packages';
 
     private $resolves = [];
     private $resolvedPaths = [];
@@ -91,20 +91,20 @@ public function resolve(string $javaPath, JavaClass $class = null): array
             }
         }
 
-        $className = Runtime::PHP_IMITATION_DIRECTORY . '\\' . implode('\\', $buildClassPath);
+        $className = Runtime::PHP_Packages_DIRECTORY . '\\' . implode('\\', $buildClassPath);
 
         if (!class_exists($className)) {
             throw new ClassNotFoundException(
                 str_replace(
-                    [Runtime::PHP_IMITATION_DIRECTORY . '\\', '\\'],
+                    [Runtime::PHP_Packages_DIRECTORY . '\\', '\\'],
                     ['', '.'],
                     $className
                 ) . ' class does not exist.'
             );
         }
 
         return [
-            static::RESOLVED_TYPE_IMITATION,
+            static::RESOLVED_TYPE_Packages,
             $className,
         ];
     }
@@ -128,7 +128,7 @@ public static function resolveNameByPath($path)
         $names = explode(
             '.',
             str_replace(
-                [Runtime::PHP_IMITATION_DIRECTORY . '\\', '\\'],
+                [Runtime::PHP_Packages_DIRECTORY . '\\', '\\'],
                 ['', '.'],
                 get_class($path)
             )
diff --git a/src/Utilities/Formatter.php b/src/Utilities/Formatter.php
@@ -121,13 +121,13 @@ public static function convertPHPNamespacesToJava($className)
         $newClassName = explode(
             '.',
             str_replace(
-                [ltrim(Runtime::PHP_IMITATION_DIRECTORY, '\\') . '\\', '\\'],
+                [ltrim(Runtime::PHP_Packages_DIRECTORY, '\\') . '\\', '\\'],
                 ['', '.'],
                 ltrim($className, '\\')
             )
         );
         foreach ($newClassName as $key => $value) {
-            $newClassName[$key] = array_flip(Runtime::PHP_IMITATION_MAPS)[$value] ?? $value;
+            $newClassName[$key] = array_flip(Runtime::PHP_Packages_MAPS)[$value] ?? $value;
         }
 
         return implode('.', $newClassName);
diff --git a/src/Utilities/SuperClassResolver.php b/src/Utilities/SuperClassResolver.php
@@ -4,7 +4,7 @@
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JVM\ConstantPool;
 use PHPJava\Core\JVM\FlexibleMethod;
-use PHPJava\Imitation\java\lang\_Object;
+use PHPJava\Packages\java\lang\_Object;
 
 class SuperClassResolver
 {
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -5,8 +5,8 @@
 use PHPJava\Core\JVM\Parameters\GlobalOptions;
 use PHPJava\Core\JVM\Parameters\Runtime;
 use PHPJava\Exceptions\TypeException;
-use PHPJava\Imitation\java\lang\_Object;
-use PHPJava\Imitation\java\lang\_String;
+use PHPJava\Packages\java\lang\_Object;
+use PHPJava\Packages\java\lang\_String;
 use PHPJava\Kernel\Types\_Array\Collection;
 use PHPJava\Kernel\Types\_Boolean;
 use PHPJava\Kernel\Types\_Double;
@@ -234,14 +234,14 @@ public static function getExtendedClasses($class): array
             }
             $path = [];
             foreach (explode('.', $signature['class_name']) as $name) {
-                $path[] = Runtime::PHP_IMITATION_MAPS[$name] ?? $name;
+                $path[] = Runtime::PHP_Packages_MAPS[$name] ?? $name;
             }
-            $classPath = Runtime::PHP_IMITATION_DIRECTORY . '\\' . implode('\\', $path);
+            $classPath = Runtime::PHP_Packages_DIRECTORY . '\\' . implode('\\', $path);
 
             // Remove duplicated prefix
             $classPath = preg_replace(
-                '/^(?:' . preg_quote(Runtime::PHP_IMITATION_DIRECTORY, '/') . ')+/',
-                Runtime::PHP_IMITATION_DIRECTORY,
+                '/^(?:' . preg_quote(Runtime::PHP_Packages_DIRECTORY, '/') . ')+/',
+                Runtime::PHP_Packages_DIRECTORY,
                 $classPath
             );
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`namespace PHPJava\Core\JVM\Field;`
`3`	`3`
`4`	`4`	`use PHPJava\Core\JavaClassInvoker;`
`5`		`-use PHPJava\Imitation\java\lang\_String;`
`6`		`-use PHPJava\Imitation\java\lang\NoSuchFieldException;`
	`5`	`+use PHPJava\Packages\java\lang\_String;`
	`6`	`+use PHPJava\Packages\java\lang\NoSuchFieldException;`
`7`	`7`
`8`	`8`	`trait FieldGettable`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`namespace PHPJava\Core\JVM\Field;`
`3`	`3`
`4`	`4`	`use PHPJava\Core\JavaClassInvoker;`
`5`		`-use PHPJava\Imitation\java\lang\_String;`
	`5`	`+use PHPJava\Packages\java\lang\_String;`
`6`	`6`
`7`	`7`	`class StaticField implements FieldInterface`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function execute(): void`
`51`	`51`	`...$arguments`
`52`	`52`	`);`
`53`	`53`	`break;`
`54`		`- case ClassResolver::RESOLVED_TYPE_IMITATION:`
	`54`	`+ case ClassResolver::RESOLVED_TYPE_Packages:`
`55`	`55`	`$return = forward_static_call_array(`
`56`	`56`	`[`
`57`	`57`	`$classObject,`