merged 2.0

fabpot · fabpot · commit 6978e34cbf17 · 2012-05-18T19:04:58.000+02:00
diff --git a/CssSelector.php b/CssSelector.php
@@ -84,11 +84,11 @@ static public function toXPath($cssExpr, $prefix = 'descendant-or-self::')
      * Parses an expression and returns the Node object that represents
      * the parsed expression.
      *
-     * @throws \Exception When tokenizer throws it while parsing
-     *
      * @param string $string The expression to parse
      *
      * @return Node\NodeInterface
+     *
+     * @throws \Exception When tokenizer throws it while parsing
      */
     public function parse($string)
     {
@@ -136,11 +136,11 @@ private function parseSelectorGroup($stream)
      * Parses a selector contained in $stream and returns the Node
      * object that represents it.
      *
-     * @throws ParseException When expected selector but got something else
-     *
      * @param TokenStream $stream The stream containing the selector.
      *
      * @return Node\NodeInterface
+     *
+     * @throws ParseException When expected selector but got something else
      */
     private function parseSelector($stream)
     {
@@ -177,11 +177,11 @@ private function parseSelector($stream)
      * Parses a simple selector (the current token) from $stream and returns
      * the resulting Node object.
      *
-     * @throws ParseException When expected symbol but got something else
-     *
      * @param TokenStream $stream The stream containing the selector.
      *
      * @return Node\NodeInterface
+     *
+     * @throws ParseException When expected symbol but got something else
      */
     private function parseSimpleSelector($stream)
     {
@@ -284,13 +284,13 @@ private function parseSimpleSelector($stream)
      * Parses an attribute from a selector contained in $stream and returns
      * the resulting AttribNode object.
      *
-     * @throws ParseException When encountered unexpected selector
-     *
      * @param Node\NodeInterface $selector The selector object whose attribute
      *                                      is to be parsed.
      * @param TokenStream $stream The container token stream.
      *
      * @return Node\AttribNode
+     *
+     * @throws ParseException When encountered unexpected selector
      */
     private function parseAttrib($selector, $stream)
     {
diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -79,6 +79,8 @@ public function toXpath()
      *
      * @param XPathExpr     $xpath The XPath expression for this object
      * @param NodeInterface $sub   The NodeInterface object to add
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_descendant($xpath, $sub)
     {
@@ -93,6 +95,8 @@ protected function _xpath_descendant($xpath, $sub)
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The NodeInterface object to add
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_child($xpath, $sub)
     {
@@ -107,6 +111,8 @@ protected function _xpath_child($xpath, $sub)
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The adjacent XPath expression
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_direct_adjacent($xpath, $sub)
     {
@@ -123,6 +129,8 @@ protected function _xpath_direct_adjacent($xpath, $sub)
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The indirect adjacent NodeInterface object
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_indirect_adjacent($xpath, $sub)
     {
diff --git a/Tokenizer.php b/Tokenizer.php
@@ -109,12 +109,12 @@ public function tokenize($s)
      * and returns an array holding the unquoted string contained by $s and
      * the new position from which tokenizing should take over.
      *
-     * @throws ParseException When expected closing is not found
-     *
      * @param string  $s   The selector string containing the quoted string.
      * @param integer $pos The starting position for the quoted string.
      *
      * @return array
+     *
+     * @throws ParseException When expected closing is not found
      */
     private function tokenizeEscapedString($s, $pos)
     {
@@ -146,11 +146,11 @@ private function tokenizeEscapedString($s, $pos)
     /**
      * Unescapes a string literal and returns the unescaped string.
      *
-     * @throws ParseException When invalid escape sequence is found
-     *
      * @param string $literal The string literal to unescape.
      *
      * @return string
+     *
+     * @throws ParseException When invalid escape sequence is found
      */
     private function unescapeStringLiteral($literal)
     {
@@ -172,12 +172,12 @@ private function unescapeStringLiteral($literal)
      * contained in it and the new position from which tokenizing should take
      * over.
      *
-     * @throws ParseException When Unexpected symbol is found
-     *
      * @param string  $s   The selector string.
      * @param integer $pos The position in $s at which the symbol starts.
      *
      * @return array
+     *
+     * @throws ParseException When Unexpected symbol is found
      */
     private function tokenizeSymbol($s, $pos)
     {

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,11 @@ static public function toXPath($cssExpr, $prefix = 'descendant-or-self::')`
`84`	`84`	`* Parses an expression and returns the Node object that represents`
`85`	`85`	`* the parsed expression.`
`86`	`86`	`*`
`87`		`- * @throws \Exception When tokenizer throws it while parsing`
`88`		`- *`
`89`	`87`	`* @param string $string The expression to parse`
`90`	`88`	`*`
`91`	`89`	`* @return Node\NodeInterface`
	`90`	`+ *`
	`91`	`+ * @throws \Exception When tokenizer throws it while parsing`
`92`	`92`	`*/`
`93`	`93`	`public function parse($string)`
`94`	`94`	`{`
`@@ -136,11 +136,11 @@ private function parseSelectorGroup($stream)`
`136`	`136`	`* Parses a selector contained in $stream and returns the Node`
`137`	`137`	`* object that represents it.`
`138`	`138`	`*`
`139`		`- * @throws ParseException When expected selector but got something else`
`140`		`- *`
`141`	`139`	`* @param TokenStream $stream The stream containing the selector.`
`142`	`140`	`*`
`143`	`141`	`* @return Node\NodeInterface`
	`142`	`+ *`
	`143`	`+ * @throws ParseException When expected selector but got something else`
`144`	`144`	`*/`
`145`	`145`	`private function parseSelector($stream)`
`146`	`146`	`{`
`@@ -177,11 +177,11 @@ private function parseSelector($stream)`
`177`	`177`	`* Parses a simple selector (the current token) from $stream and returns`
`178`	`178`	`* the resulting Node object.`
`179`	`179`	`*`
`180`		`- * @throws ParseException When expected symbol but got something else`
`181`		`- *`
`182`	`180`	`* @param TokenStream $stream The stream containing the selector.`
`183`	`181`	`*`
`184`	`182`	`* @return Node\NodeInterface`
	`183`	`+ *`
	`184`	`+ * @throws ParseException When expected symbol but got something else`
`185`	`185`	`*/`
`186`	`186`	`private function parseSimpleSelector($stream)`
`187`	`187`	`{`
`@@ -284,13 +284,13 @@ private function parseSimpleSelector($stream)`
`284`	`284`	`* Parses an attribute from a selector contained in $stream and returns`
`285`	`285`	`* the resulting AttribNode object.`
`286`	`286`	`*`
`287`		`- * @throws ParseException When encountered unexpected selector`
`288`		`- *`
`289`	`287`	`* @param Node\NodeInterface $selector The selector object whose attribute`
`290`	`288`	`* is to be parsed.`
`291`	`289`	`* @param TokenStream $stream The container token stream.`
`292`	`290`	`*`
`293`	`291`	`* @return Node\AttribNode`
	`292`	`+ *`
	`293`	`+ * @throws ParseException When encountered unexpected selector`
`294`	`294`	`*/`
`295`	`295`	`private function parseAttrib($selector, $stream)`
`296`	`296`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ public function toXpath()`
`79`	`79`	`*`
`80`	`80`	`* @param XPathExpr $xpath The XPath expression for this object`
`81`	`81`	`* @param NodeInterface $sub The NodeInterface object to add`
	`82`	`+ *`
	`83`	`+ * @return XPathExpr An XPath instance`
`82`	`84`	`*/`
`83`	`85`	`protected function _xpath_descendant($xpath, $sub)`
`84`	`86`	`{`
`@@ -93,6 +95,8 @@ protected function _xpath_descendant($xpath, $sub)`
`93`	`95`	`*`
`94`	`96`	`* @param XPathExpr $xpath The parent XPath expression`
`95`	`97`	`* @param NodeInterface $sub The NodeInterface object to add`
	`98`	`+ *`
	`99`	`+ * @return XPathExpr An XPath instance`
`96`	`100`	`*/`
`97`	`101`	`protected function _xpath_child($xpath, $sub)`
`98`	`102`	`{`
`@@ -107,6 +111,8 @@ protected function _xpath_child($xpath, $sub)`
`107`	`111`	`*`
`108`	`112`	`* @param XPathExpr $xpath The parent XPath expression`
`109`	`113`	`* @param NodeInterface $sub The adjacent XPath expression`
	`114`	`+ *`
	`115`	`+ * @return XPathExpr An XPath instance`
`110`	`116`	`*/`
`111`	`117`	`protected function _xpath_direct_adjacent($xpath, $sub)`
`112`	`118`	`{`
`@@ -123,6 +129,8 @@ protected function _xpath_direct_adjacent($xpath, $sub)`
`123`	`129`	`*`
`124`	`130`	`* @param XPathExpr $xpath The parent XPath expression`
`125`	`131`	`* @param NodeInterface $sub The indirect adjacent NodeInterface object`
	`132`	`+ *`
	`133`	`+ * @return XPathExpr An XPath instance`
`126`	`134`	`*/`
`127`	`135`	`protected function _xpath_indirect_adjacent($xpath, $sub)`
`128`	`136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,12 @@ public function tokenize($s)`
`109`	`109`	`* and returns an array holding the unquoted string contained by $s and`
`110`	`110`	`* the new position from which tokenizing should take over.`
`111`	`111`	`*`
`112`		`- * @throws ParseException When expected closing is not found`
`113`		`- *`
`114`	`112`	`* @param string $s The selector string containing the quoted string.`
`115`	`113`	`* @param integer $pos The starting position for the quoted string.`
`116`	`114`	`*`
`117`	`115`	`* @return array`
	`116`	`+ *`
	`117`	`+ * @throws ParseException When expected closing is not found`
`118`	`118`	`*/`
`119`	`119`	`private function tokenizeEscapedString($s, $pos)`
`120`	`120`	`{`
`@@ -146,11 +146,11 @@ private function tokenizeEscapedString($s, $pos)`
`146`	`146`	`/**`
`147`	`147`	`* Unescapes a string literal and returns the unescaped string.`
`148`	`148`	`*`
`149`		`- * @throws ParseException When invalid escape sequence is found`
`150`		`- *`
`151`	`149`	`* @param string $literal The string literal to unescape.`
`152`	`150`	`*`
`153`	`151`	`* @return string`
	`152`	`+ *`
	`153`	`+ * @throws ParseException When invalid escape sequence is found`
`154`	`154`	`*/`
`155`	`155`	`private function unescapeStringLiteral($literal)`
`156`	`156`	`{`
`@@ -172,12 +172,12 @@ private function unescapeStringLiteral($literal)`
`172`	`172`	`* contained in it and the new position from which tokenizing should take`
`173`	`173`	`* over.`
`174`	`174`	`*`
`175`		`- * @throws ParseException When Unexpected symbol is found`
`176`		`- *`
`177`	`175`	`* @param string $s The selector string.`
`178`	`176`	`* @param integer $pos The position in $s at which the symbol starts.`
`179`	`177`	`*`
`180`	`178`	`* @return array`
	`179`	`+ *`
	`180`	`+ * @throws ParseException When Unexpected symbol is found`
`181`	`181`	`*/`
`182`	`182`	`private function tokenizeSymbol($s, $pos)`
`183`	`183`	`{`