Fixed missing interface name

m3m0r7 · m3m0r7 · commit e7c98a62b314 · 2019-03-03T11:40:28.000+09:00
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "JVM emulator by PHP",
     "type": "library",
     "license": "MIT",
-    "version": "0.0.4.1-dev",
+    "version": "0.0.4.2-dev",
     "authors": [
         {
             "name": "memory"
diff --git a/src/Core/JVM/ActiveAttributes.php b/src/Core/JVM/ActiveAttributes.php
@@ -1,15 +1,15 @@
 <?php
 namespace PHPJava\Core\JVM;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 use PHPJava\Kernel\Attributes\AttributeInfo;
 
 class ActiveAttributes
 {
     private $entries = [];
     private $reader;
 
-    public function __construct(JavaClassReader $reader, int $entries, ConstantPool $constantPool)
+    public function __construct(JavaClassReaderInterface $reader, int $entries, ConstantPool $constantPool)
     {
         $this->reader = $reader;
         for ($i = 0; $i < $entries; $i++) {
diff --git a/src/Core/JVM/ActiveFields.php b/src/Core/JVM/ActiveFields.php
@@ -1,15 +1,15 @@
 <?php
 namespace PHPJava\Core\JVM;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 use PHPJava\Kernel\Structures\_FieldInfo;
 
 class ActiveFields
 {
     private $entries = [];
     private $reader;
 
-    public function __construct(JavaClassReader $reader, int $entries, ConstantPool $constantPool)
+    public function __construct(JavaClassReaderInterface $reader, int $entries, ConstantPool $constantPool)
     {
         $this->reader = $reader;
         for ($i = 0; $i < $entries; $i++) {
diff --git a/src/Core/JVM/ActiveInterface.php b/src/Core/JVM/ActiveInterface.php
@@ -1,14 +1,14 @@
 <?php
 namespace PHPJava\Core\JVM;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 
 class ActiveInterface
 {
     private $entries = [];
     private $reader;
 
-    public function __construct(JavaClassReader $reader, int $entries, ConstantPool $constantPool)
+    public function __construct(JavaClassReaderInterface $reader, int $entries, ConstantPool $constantPool)
     {
         $this->reader = $reader;
         for ($i = 0; $i < $entries; $i++) {
diff --git a/src/Core/JVM/ActiveMethods.php b/src/Core/JVM/ActiveMethods.php
@@ -1,15 +1,15 @@
 <?php
 namespace PHPJava\Core\JVM;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 use PHPJava\Kernel\Structures\_MethodInfo;
 
 class ActiveMethods
 {
     private $entries = [];
     private $reader;
 
-    public function __construct(JavaClassReader $reader, int $entries, ConstantPool $constantPool)
+    public function __construct(JavaClassReaderInterface $reader, int $entries, ConstantPool $constantPool)
     {
         $this->reader = $reader;
         for ($i = 0; $i < $entries; $i++) {
diff --git a/src/Core/JVM/ConstantPool.php b/src/Core/JVM/ConstantPool.php
@@ -1,7 +1,7 @@
 <?php
 namespace PHPJava\Core\JVM;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 use PHPJava\Exceptions\ReadEntryException;
 use PHPJava\Kernel\Maps\ConstantPoolTag;
 use PHPJava\Kernel\Structures\_Class;
@@ -22,11 +22,11 @@ class ConstantPool
     private $reader;
 
     /**
-     * @param JavaClassReader $reader
+     * @param JavaClassReaderInterface $reader
      * @param int $entries
      * @throws ReadEntryException
      */
-    public function __construct(JavaClassReader $reader, int $entries)
+    public function __construct(JavaClassReaderInterface $reader, int $entries)
     {
         $this->reader = $reader;
 
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -71,7 +71,7 @@ function ($fileName) {
         );
 
         foreach ($this->files as $className => $code) {
-            $this->classes[str_replace('/', '.', $className)] = new JavaClass(new JavaClassInlineReader(
+            $this->classes[str_replace('/', '.', $className)] = new JavaClass(new JavaClassInlineReaderInterface(
                 $className,
                 $code
             ));
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -73,12 +73,12 @@ class JavaClass
 
     /**
      * JavaClass constructor.
-     * @param JavaClassReader $reader
+     * @param JavaClassReaderInterface $reader
      * @throws ValidatorException
      * @throws \PHPJava\Exceptions\ReadEntryException
      * @throws \PHPJava\Imitation\java\lang\ClassNotFoundException
      */
-    public function __construct(JavaClassReader $reader)
+    public function __construct(JavaClassReaderInterface $reader)
     {
         // Validate Java file
         if (!(new MagicByte($reader->getBinaryReader()->readUnsignedInt()))->isValid()) {
diff --git a/src/Core/JavaClassFileReaderInterface.php b/src/Core/JavaClassFileReaderInterface.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Utilities\ClassResolver;
 
-class JavaClassFileReader implements JavaClassReader
+class JavaClassFileReaderInterface implements JavaClassReaderInterface
 {
     private $handle;
     private $binaryReader;
diff --git a/src/Core/JavaClassInlineReaderInterface.php b/src/Core/JavaClassInlineReaderInterface.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Utilities\ClassResolver;
 
-class JavaClassInlineReader implements JavaClassReader
+class JavaClassInlineReaderInterface implements JavaClassReaderInterface
 {
     private $fileName;
     private $handle;
diff --git a/src/Core/JavaClassReaderInterface.php b/src/Core/JavaClassReaderInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace PHPJava\Core;
 
-interface JavaClassReader
+interface JavaClassReaderInterface
 {
 
 }
diff --git a/src/Kernel/Core/BinaryReader.php b/src/Kernel/Core/BinaryReader.php
@@ -1,13 +1,13 @@
 <?php
 namespace PHPJava\Kernel\Core;
 
-use PHPJava\Core\JavaClassReader;
+use PHPJava\Core\JavaClassReaderInterface;
 
 trait BinaryReader
 {
     private $reader;
 
-    public function __construct(JavaClassReader $reader)
+    public function __construct(JavaClassReaderInterface $reader)
     {
         $this->reader = $reader;
     }
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Core\JavaArchive;
 use PHPJava\Core\JavaClass;
-use PHPJava\Core\JavaClassFileReader;
+use PHPJava\Core\JavaClassFileReaderInterface;
 use PHPJava\Imitation\java\lang\ClassNotFoundException;
 
 class ClassResolver
@@ -42,7 +42,7 @@ public static function resolve(string $javaPath, JavaClass $class = null): array
                         return static::$resolvedPaths[$key];
                     }
                     if (is_file($path)) {
-                        $initiatedClass = new JavaClass(new JavaClassFileReader($path));
+                        $initiatedClass = new JavaClass(new JavaClassFileReaderInterface($path));
                         if (strpos($relativePath, '$') !== false && $class !== null) {
                             $initiatedClass->setParentClass($class);
                         }
diff --git a/tests/Base.php b/tests/Base.php
@@ -18,7 +18,7 @@ public function setUp(): void
         foreach ($this->fixtures as $fixture) {
             exec('javac -classpath ' . $pathRoot . ':' . $pathRoot . 'caches -encoding UTF8 ' . $pathRoot . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');
             $this->initiatedJavaClasses[$fixture] = new \PHPJava\Core\JavaClass(
-                new \PHPJava\Core\JavaClassFileReader(
+                new \PHPJava\Core\JavaClassFileReaderInterface(
                     $this->getClassName($fixture)
                 )
             );

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"description": "JVM emulator by PHP",`
`4`	`4`	`"type": "library",`
`5`	`5`	`"license": "MIT",`
`6`		`- "version": "0.0.4.1-dev",`
	`6`	`+ "version": "0.0.4.2-dev",`
`7`	`7`	`"authors": [`
`8`	`8`	`{`
`9`	`9`	`"name": "memory"`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Core\JVM;`
`3`	`3`
`4`		`-use PHPJava\Core\JavaClassReader;`
	`4`	`+use PHPJava\Core\JavaClassReaderInterface;`
`5`	`5`
`6`	`6`	`class ActiveInterface`
`7`	`7`	`{`
`8`	`8`	`private $entries = [];`
`9`	`9`	`private $reader;`
`10`	`10`
`11`		`- public function __construct(JavaClassReader $reader, int $entries, ConstantPool $constantPool)`
	`11`	`+ public function __construct(JavaClassReaderInterface $reader, int $entries, ConstantPool $constantPool)`
`12`	`12`	`{`
`13`	`13`	`$this->reader = $reader;`
`14`	`14`	`for ($i = 0; $i < $entries; $i++) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Utilities\ClassResolver;`
`5`	`5`
`6`		`-class JavaClassFileReader implements JavaClassReader`
	`6`	`+class JavaClassFileReaderInterface implements JavaClassReaderInterface`
`7`	`7`	`{`
`8`	`8`	`private $handle;`
`9`	`9`	`private $binaryReader;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Utilities\ClassResolver;`
`5`	`5`
`6`		`-class JavaClassInlineReader implements JavaClassReader`
	`6`	`+class JavaClassInlineReaderInterface implements JavaClassReaderInterface`
`7`	`7`	`{`
`8`	`8`	`private $fileName;`
`9`	`9`	`private $handle;`