Author: codemasher

src/Document.php

@@ -69,7 +69,7 @@ public function getElementsBySelector(string $selector, DOMNode $contextNode = n
 	 * @param string        $axis
 	 * @param int           $nodeType
 	 *
-	 * @return array
+	 * @return \DOMNode[]
 	 */
 	public function select($selectors = null, DOMNode $contextNode = null, string $axis = 'descendant-or-self::', int $nodeType = XML_ELEMENT_NODE):array{
 
@@ -166,7 +166,7 @@ public function _toDOMNodeList($content):DOMNodeList{
 	 * @param int      $maxLength
 	 * @param int      $nodeType
 	 *
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \DOMNode[]
 	 */
 	public function recursivelyCollect(DOMNode $element, string $property, int $maxLength = -1, int $nodeType = XML_ELEMENT_NODE):array{
 		$nodes = [];
@@ -197,16 +197,16 @@ public function recursivelyCollect(DOMNode $element, string $property, int $maxL
 	 * @param int         $index
 	 * @param int         $nodeType
 	 *
-	 * @return \chillerlan\PrototypeDOM\Element|\DOMNode|null
+	 * @return \DOMNode|null
 	 */
 	public function _recursivelyFind(DOMNode $element, string $property, string $selector = null, int $index = 0, int $nodeType = XML_ELEMENT_NODE){
 
 		if(in_array($property, ['parentNode', 'previousSibling', 'nextSibling'])){
 
+			/** @var \chillerlan\PrototypeDOM\Element $element */
 			while($element = $element->{$property}){
 
-				/** @var \chillerlan\PrototypeDOM\Element $element */
-				if($element->nodeType !== $nodeType || $selector && !$element->match($selector) || --$index >= 0){
+				if($element->nodeType !== $nodeType || !is_null($selector) && !$element->match($selector) || --$index >= 0){
 					continue;
 				}
 

src/Element.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\PrototypeDOM;
 
-use DOMElement, DOMNode, DOMNodeList;
+use DOMElement;
 
 class Element extends DOMElement{
 	use NodeTraversalTrait, NodeManipulationTrait;
@@ -25,7 +25,7 @@ class Element extends DOMElement{
 	public function id(string $newID = null):string {
 		$oldID = $this->getAttribute('id');
 
-		if($newID){
+		if(!is_null($newID)){
 			$this->setAttribute('id', $newID);
 		}
 
@@ -146,7 +146,7 @@ public function toggleClassName(string $classname):Element{
 	}
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function getStyle():array{
 		$currentStyle = [];
@@ -210,7 +210,7 @@ public function setStyle(array $style, bool $replace = false):Element{
 	}
 
 	/**
-	 * @return array
+	 * @return  string[]
 	 */
 	public function getAttributes():array{
 		$attributes = [];

src/NodeTraversalTrait.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\PrototypeDOM;
 
-use DOMNode, DOMNodeList;
+use DOMNode;
 
 /**
  * @extends \DOMNode
@@ -31,7 +31,7 @@ trait NodeTraversalTrait{
 	 * @param int    $maxLength
 	 * @param int    $nodeType
 	 *
-	 * @return array [\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function recursivelyCollect(string $property, int $maxLength = -1, int $nodeType = XML_ELEMENT_NODE):array{
 		/** @var \DOMNode $this */
@@ -138,7 +138,7 @@ public function next($expression = null, int $index = null){
 	/**
 	 * @param int $nodeType
 	 *
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function childElements(int $nodeType = XML_ELEMENT_NODE):array{
 		$children = [];
@@ -177,21 +177,21 @@ public function descendantOf(DOMNode $ancestor):bool{
 	}
 
 	/**
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function ancestors():array{
 		return $this->recursivelyCollect('parentNode');
 	}
 
 	/**
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function siblings():array{
 		return array_merge(array_reverse($this->previousSiblings()), $this->nextSiblings());
 	}
 
 	/**
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function descendants():array{
 		return $this->select();
@@ -205,14 +205,14 @@ public function firstDescendant(){
 	}
 
 	/**
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function previousSiblings():array{
 		return $this->recursivelyCollect('previousSibling');
 	}
 
 	/**
-	 * @return array[\chillerlan\PrototypeDOM\Element]
+	 * @return \chillerlan\PrototypeDOM\Element[]
 	 */
 	public function nextSiblings():array{
 		return $this->recursivelyCollect('nextSibling');