Merge pull request #27 from memory-agape/0.0.4.4

m3m0r7 · web-flow · commit 1271f2127e1d · 2019-03-03T12:01:28.000+09:00
Fix missed refactoring
diff --git a/src/Core/JavaClassFileReader.php b/src/Core/JavaClassFileReader.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Utilities\ClassResolver;
 
-class JavaClassFileReaderInterface implements JavaClassReaderInterface
+class JavaClassFileReader implements JavaClassReaderInterface
 {
     private $handle;
     private $binaryReader;
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\JavaClassFileReaderInterface;
+use PHPJava\Core\JavaClassFileReader;
 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 JavaClassFileReaderInterface($path));
+                        $initiatedClass = new JavaClass(new JavaClassFileReader($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\JavaClassFileReaderInterface(
+                new \PHPJava\Core\JavaClassFileReader(
                     $this->getClassName($fixture)
                 )
             );

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 JavaClassFileReaderInterface implements JavaClassReaderInterface`
	`6`	`+class JavaClassFileReader implements JavaClassReaderInterface`
`7`	`7`	`{`
`8`	`8`	`private $handle;`
`9`	`9`	`private $binaryReader;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function setUp(): void`
`18`	`18`	`foreach ($this->fixtures as $fixture) {`
`19`	`19`	`exec('javac -classpath ' . $pathRoot . ':' . $pathRoot . 'caches -encoding UTF8 ' . $pathRoot . str_replace(['../', './'], '', $fixture) . '.java -d ' . __DIR__ . '/caches');`
`20`	`20`	`$this->initiatedJavaClasses[$fixture] = new \PHPJava\Core\JavaClass(`
`21`		`- new \PHPJava\Core\JavaClassFileReaderInterface(`
	`21`	`+ new \PHPJava\Core\JavaClassFileReader(`
`22`	`22`	`$this->getClassName($fixture)`
`23`	`23`	`)`
`24`	`24`	`);`