Merge branch 'cs/remove-underscores' of https://github.com/arse/zf2 i…

…nto feature/protected-underscores

Conflicts:
	library/Zend/Console/Getopt.php

src/NodeList.php

@@ -29,40 +29,40 @@ class NodeList implements Iterator, Countable
      * Number of results
      * @var int
      */
-    protected $_count;
+    protected $count;
 
     /**
      * CSS Selector query
      * @var string
      */
-    protected $_cssQuery;
+    protected $cssQuery;
 
     /**
      * @var DOMDocument
      */
-    protected $_document;
+    protected $document;
 
     /**
      * @var DOMNodeList
      */
-    protected $_nodeList;
+    protected $nodeList;
 
     /**
      * Current iterator position
      * @var int
      */
-    protected $_position = 0;
+    protected $position = 0;
 
     /**
      * @var DOMXPath
      */
-    protected $_xpath;
+    protected $xpath;
 
     /**
      * XPath query
      * @var string
      */
-    protected $_xpathQuery;
+    protected $xpathQuery;
 
     /**
      * Constructor
@@ -75,10 +75,10 @@ class NodeList implements Iterator, Countable
      */
     public function  __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
     {
-        $this->_cssQuery   = $cssQuery;
-        $this->_xpathQuery = $xpathQuery;
-        $this->_document   = $document;
-        $this->_nodeList   = $nodeList;
+        $this->cssQuery   = $cssQuery;
+        $this->xpathQuery = $xpathQuery;
+        $this->document   = $document;
+        $this->nodeList   = $nodeList;
     }
 
     /**
@@ -88,7 +88,7 @@ public function  __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMN
      */
     public function getCssQuery()
     {
-        return $this->_cssQuery;
+        return $this->cssQuery;
     }
 
     /**
@@ -98,7 +98,7 @@ public function getCssQuery()
      */
     public function getXpathQuery()
     {
-        return $this->_xpathQuery;
+        return $this->xpathQuery;
     }
 
     /**
@@ -108,7 +108,7 @@ public function getXpathQuery()
      */
     public function getDocument()
     {
-        return $this->_document;
+        return $this->document;
     }
 
     /**
@@ -118,8 +118,8 @@ public function getDocument()
      */
     public function rewind()
     {
-        $this->_position = 0;
-        return $this->_nodeList->item(0);
+        $this->position = 0;
+        return $this->nodeList->item(0);
     }
 
     /**
@@ -129,7 +129,7 @@ public function rewind()
      */
     public function valid()
     {
-        if (in_array($this->_position, range(0, $this->_nodeList->length - 1)) && $this->_nodeList->length > 0) {
+        if (in_array($this->position, range(0, $this->nodeList->length - 1)) && $this->nodeList->length > 0) {
             return true;
         }
         return false;
@@ -142,7 +142,7 @@ public function valid()
      */
     public function current()
     {
-        return $this->_nodeList->item($this->_position);
+        return $this->nodeList->item($this->position);
     }
 
     /**
@@ -152,7 +152,7 @@ public function current()
      */
     public function key()
     {
-        return $this->_position;
+        return $this->position;
     }
 
     /**
@@ -162,8 +162,8 @@ public function key()
      */
     public function next()
     {
-        ++$this->_position;
-        return $this->_nodeList->item($this->_position);
+        ++$this->position;
+        return $this->nodeList->item($this->position);
     }
 
     /**
@@ -173,6 +173,6 @@ public function next()
      */
     public function count()
     {
-        return $this->_nodeList->length;
+        return $this->nodeList->length;
     }
 }