Add IteratorAggregate to *Pool and add getPackageName method into JavaClass

m3m0r7 · m3m0r7 · commit dff9abf15db0 · 2019-05-03T11:46:59.000+09:00
diff --git a/src/Core/JVM/AttributePool.php b/src/Core/JVM/AttributePool.php
@@ -6,7 +6,7 @@
 use PHPJava\Kernel\Attributes\AttributeInfo;
 use PHPJava\Utilities\DebugTool;
 
-class AttributePool implements \ArrayAccess, \Countable
+class AttributePool implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $entries = [];
     private $reader;
@@ -58,4 +58,9 @@ public function offsetUnset($offset)
     {
         throw new ReadOnlyException('You cannot rewrite datum. The Attribute Pool is read-only.');
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->entries);
+    }
 }
diff --git a/src/Core/JVM/ConstantPool.php b/src/Core/JVM/ConstantPool.php
@@ -20,7 +20,7 @@
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Kernel\Structures\StructureInterface;
 
-class ConstantPool implements \ArrayAccess, \Countable
+class ConstantPool implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $entries = [];
     private $reader;
@@ -116,4 +116,9 @@ public function offsetUnset($offset)
     {
         throw new ReadOnlyException('You cannot rewrite datum. The Constant Pool is read-only.');
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->entries);
+    }
 }
diff --git a/src/Core/JVM/FieldPool.php b/src/Core/JVM/FieldPool.php
@@ -7,7 +7,7 @@
 use PHPJava\Kernel\Structures\_FieldInfo;
 use PHPJava\Utilities\DebugTool;
 
-class FieldPool implements \ArrayAccess, \Countable
+class FieldPool implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $entries = [];
     private $reader;
@@ -56,4 +56,9 @@ public function offsetUnset($offset)
     {
         throw new ReadOnlyException('You cannot rewrite datum. The Field Pool is read-only.');
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->entries);
+    }
 }
diff --git a/src/Core/JVM/InterfacePool.php b/src/Core/JVM/InterfacePool.php
@@ -6,7 +6,7 @@
 use PHPJava\Exceptions\ReadOnlyException;
 use PHPJava\Utilities\DebugTool;
 
-class InterfacePool implements \ArrayAccess, \Countable
+class InterfacePool implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $entries = [];
     private $reader;
@@ -52,4 +52,9 @@ public function offsetUnset($offset)
     {
         throw new ReadOnlyException('You cannot rewrite datum. The Interface Pool is read-only.');
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->entries);
+    }
 }
diff --git a/src/Core/JVM/MethodPool.php b/src/Core/JVM/MethodPool.php
@@ -6,7 +6,7 @@
 use PHPJava\Kernel\Structures\_MethodInfo;
 use PHPJava\Utilities\DebugTool;
 
-class MethodPool implements \ArrayAccess, \Countable
+class MethodPool implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $entries = [];
     private $reader;
@@ -55,4 +55,9 @@ public function offsetUnset($offset)
     {
         throw new ReadOnlyException('You cannot rewrite datum. The Interface Pool is read-only.');
     }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->entries);
+    }
 }
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -14,6 +14,7 @@
 use PHPJava\Exceptions\ValidatorException;
 use PHPJava\Kernel\Attributes\AttributeInterface;
 use PHPJava\Kernel\Attributes\InnerClassesAttribute;
+use PHPJava\Kernel\Attributes\SourceFileAttribute;
 use PHPJava\Kernel\Maps\FieldAccessFlag;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Utilities\ClassResolver;
@@ -248,11 +249,22 @@ public function __destruct()
 
     public function getClassName(bool $shortName = false): string
     {
+        $className = $this->className->getString();
         if ($shortName === true) {
-            $split = explode('$', $this->className->getString());
+            $split = explode('$', $className);
             return $split[count($split) - 1];
         }
-        return $this->className->getString();
+        return $className;
+    }
+
+
+    public function getPackageName(): ?string
+    {
+        $className = dirname($this->className->getString());
+        if ($className === '') {
+            return null;
+        }
+        return str_replace('/', '.', $className);
     }
 
     public function getInnerClasses(): array

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use PHPJava\Kernel\Attributes\AttributeInfo;`
`7`	`7`	`use PHPJava\Utilities\DebugTool;`
`8`	`8`
`9`		`-class AttributePool implements \ArrayAccess, \Countable`
	`9`	`+class AttributePool implements \ArrayAccess, \Countable, \IteratorAggregate`
`10`	`10`	`{`
`11`	`11`	`private $entries = [];`
`12`	`12`	`private $reader;`
`@@ -58,4 +58,9 @@ public function offsetUnset($offset)`
`58`	`58`	`{`
`59`	`59`	`throw new ReadOnlyException('You cannot rewrite datum. The Attribute Pool is read-only.');`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ public function getIterator()`
	`63`	`+ {`
	`64`	`+ return new \ArrayIterator($this->entries);`
	`65`	`+ }`
`61`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use PHPJava\Kernel\Structures\_Utf8;`
`21`	`21`	`use PHPJava\Kernel\Structures\StructureInterface;`
`22`	`22`
`23`		`-class ConstantPool implements \ArrayAccess, \Countable`
	`23`	`+class ConstantPool implements \ArrayAccess, \Countable, \IteratorAggregate`
`24`	`24`	`{`
`25`	`25`	`private $entries = [];`
`26`	`26`	`private $reader;`
`@@ -116,4 +116,9 @@ public function offsetUnset($offset)`
`116`	`116`	`{`
`117`	`117`	`throw new ReadOnlyException('You cannot rewrite datum. The Constant Pool is read-only.');`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+ public function getIterator()`
	`121`	`+ {`
	`122`	`+ return new \ArrayIterator($this->entries);`
	`123`	`+ }`
`119`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use PHPJava\Kernel\Structures\_FieldInfo;`
`8`	`8`	`use PHPJava\Utilities\DebugTool;`
`9`	`9`
`10`		`-class FieldPool implements \ArrayAccess, \Countable`
	`10`	`+class FieldPool implements \ArrayAccess, \Countable, \IteratorAggregate`
`11`	`11`	`{`
`12`	`12`	`private $entries = [];`
`13`	`13`	`private $reader;`
`@@ -56,4 +56,9 @@ public function offsetUnset($offset)`
`56`	`56`	`{`
`57`	`57`	`throw new ReadOnlyException('You cannot rewrite datum. The Field Pool is read-only.');`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ public function getIterator()`
	`61`	`+ {`
	`62`	`+ return new \ArrayIterator($this->entries);`
	`63`	`+ }`
`59`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use PHPJava\Exceptions\ReadOnlyException;`
`7`	`7`	`use PHPJava\Utilities\DebugTool;`
`8`	`8`
`9`		`-class InterfacePool implements \ArrayAccess, \Countable`
	`9`	`+class InterfacePool implements \ArrayAccess, \Countable, \IteratorAggregate`
`10`	`10`	`{`
`11`	`11`	`private $entries = [];`
`12`	`12`	`private $reader;`
`@@ -52,4 +52,9 @@ public function offsetUnset($offset)`
`52`	`52`	`{`
`53`	`53`	`throw new ReadOnlyException('You cannot rewrite datum. The Interface Pool is read-only.');`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ public function getIterator()`
	`57`	`+ {`
	`58`	`+ return new \ArrayIterator($this->entries);`
	`59`	`+ }`
`55`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use PHPJava\Kernel\Structures\_MethodInfo;`
`7`	`7`	`use PHPJava\Utilities\DebugTool;`
`8`	`8`
`9`		`-class MethodPool implements \ArrayAccess, \Countable`
	`9`	`+class MethodPool implements \ArrayAccess, \Countable, \IteratorAggregate`
`10`	`10`	`{`
`11`	`11`	`private $entries = [];`
`12`	`12`	`private $reader;`
`@@ -55,4 +55,9 @@ public function offsetUnset($offset)`
`55`	`55`	`{`
`56`	`56`	`throw new ReadOnlyException('You cannot rewrite datum. The Interface Pool is read-only.');`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ public function getIterator()`
	`60`	`+ {`
	`61`	`+ return new \ArrayIterator($this->entries);`
	`62`	`+ }`
`58`	`63`	`}`