c-harris / phpquery

src/bootstrap.php

Doc Comments +13 added lines

@@ -44,6 +44,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_strpos')) {
+
+    /**
+     * @param string $needle
+     */
     function mb_strpos($haystack, $needle, $offset = 0)
     {
         return strpos($haystack, $needle, $offset);
@@ -55,6 +59,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_stripos')) {
+
+    /**
+     * @param string $needle
+     */
     function mb_stripos($haystack, $needle, $offset = 0)
     {
         return stripos($haystack, $needle, $offset);
@@ -67,6 +75,11 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_substr')) {
+
+    /**
+     * @param string $str
+     * @param integer $start
+     */
     function mb_substr($str, $start, $length = 0)
     {
         return substr($str, $start, $length);

Indentation +28 added lines, -28 removed lines

@@ -8,10 +8,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_internal_encoding')) {
-    function mb_internal_encoding($enc)
-    {
-        return true;
-    }
+	function mb_internal_encoding($enc)
+	{
+		return true;
+	}
 }
 
 /**
@@ -20,10 +20,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_regex_encoding')) {
-    function mb_regex_encoding($enc)
-    {
-        return true;
-    }
+	function mb_regex_encoding($enc)
+	{
+		return true;
+	}
 }
 
 /**
@@ -32,10 +32,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_strlen')) {
-    function mb_strlen($str)
-    {
-        return strlen($str);
-    }
+	function mb_strlen($str)
+	{
+		return strlen($str);
+	}
 }
 
 /**
@@ -44,10 +44,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_strpos')) {
-    function mb_strpos($haystack, $needle, $offset = 0)
-    {
-        return strpos($haystack, $needle, $offset);
-    }
+	function mb_strpos($haystack, $needle, $offset = 0)
+	{
+		return strpos($haystack, $needle, $offset);
+	}
 }
 /**
  *  mb_stripos()
@@ -55,10 +55,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_stripos')) {
-    function mb_stripos($haystack, $needle, $offset = 0)
-    {
-        return stripos($haystack, $needle, $offset);
-    }
+	function mb_stripos($haystack, $needle, $offset = 0)
+	{
+		return stripos($haystack, $needle, $offset);
+	}
 }
 
 /**
@@ -67,10 +67,10 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_substr')) {
-    function mb_substr($str, $start, $length = 0)
-    {
-        return substr($str, $start, $length);
-    }
+	function mb_substr($str, $start, $length = 0)
+	{
+		return substr($str, $start, $length);
+	}
 }
 
 /**
@@ -79,8 +79,8 @@ 
  *  Included for mbstring pseudo-compatability.
  */
 if (!function_exists('mb_substr_count')) {
-    function mb_substr_count($haystack, $needle)
-    {
-        return substr_count($haystack, $needle);
-    }
+	function mb_substr_count($haystack, $needle)
+	{
+		return substr_count($haystack, $needle);
+	}
 }

src/Callback/Callback.php

Doc Comments +8 added lines

@@ -1,6 +1,14 @@
 <?php
 interface ICallbackNamed {
+
+	/**
+	 * @return boolean
+	 */
 	function hasName();
+
+	/**
+	 * @return string
+	 */
 	function getName();
 }
 /**

Spacing +6 added lines, -6 removed lines

@@ -80,8 +80,8 @@ 
 class CallbackReturnReference extends Callback
 	implements ICallbackNamed {
 	protected $reference;
-	public function __construct(&$reference, $name = null){
-		$this->reference =& $reference;
+	public function __construct(&$reference, $name = null) {
+		$this->reference = & $reference;
 		$this->callback = array($this, 'callback');
 	}
 	public function callback() {
@@ -103,8 +103,8 @@ 
 	implements ICallbackNamed {
 	protected $value;
 	protected $name;
-	public function __construct($value, $name = null){
-		$this->value =& $value;
+	public function __construct($value, $name = null) {
+		$this->value = & $value;
 		$this->name = $name;
 		$this->callback = array($this, 'callback');
 	}
@@ -134,8 +134,8 @@ 
 	 * @TODO implement $paramIndex; 
 	 * param index choose which callback param will be passed to reference
 	 */
-	public function __construct(&$reference){
-		$this->callback =& $reference;
+	public function __construct(&$reference) {
+		$this->callback = & $reference;
 	}
 }
 //class CallbackReference extends Callback {

src/Dom/DOMDocumentWrapper.php

Doc Comments +8 added lines, -1 removed lines

@@ -592,6 +592,7 @@ 
      *
      * @param $document DOMDocumentWrapper
      * @param $markup
+     * @param DOMDocumentWrapper $fragment
      * @return $document
      */
     private function documentFragmentLoadMarkup($fragment, $charset, $markup = null)
@@ -643,6 +644,9 @@ 
         return true;
     }
 
+    /**
+     * @param DOMDocumentWrapper $fragment
+     */
     protected function documentFragmentToMarkup($fragment)
     {
         PhpQuery::debug('documentFragmentToMarkup');
@@ -760,6 +764,9 @@ 
         }
     }
 
+    /**
+     * @param string $markup
+     */
     protected static function markupFixXHTML($markup)
     {
         $markup = self::expandEmptyTag('script', $markup);
@@ -776,7 +783,7 @@ 
     /**
      * expandEmptyTag
      *
-     * @param $tag
+     * @param string $tag
      * @param $xml
      * @return string
      * @author mjaque at ilkebenson dot com

Indentation +755 added lines, -755 removed lines

@@ -15,788 +15,788 @@
  */
 class DOMDocumentWrapper
 {
-    /**
-     * @var \DOMDocument
-     */
-    public $document;
-    public $id;
-    /**
-     * @todo Rewrite as method and quess if null.
-     * @var unknown_type
-     */
-    public $contentType = '';
-    public $xpath;
-    public $uuid = 0;
-    public $data = array();
-    public $dataNodes = array();
-    public $events = array();
-    public $eventsNodes = array();
-    public $eventsGlobal = array();
-    /**
-     * @TODO iframes support http://code.google.com/p/phpquery/issues/detail?id=28
-     * @var unknown_type
-     */
-    public $frames = array();
-    /**
-     * Document root, by default equals to document itself.
-     * Used by documentFragments.
-     *
-     * @var \DOMNode
-     */
-    public $root;
-    public $isDocumentFragment;
-    public $isXML = false;
-    public $isXHTML = false;
-    public $isHTML = false;
-    public $charset;
+	/**
+	 * @var \DOMDocument
+	 */
+	public $document;
+	public $id;
+	/**
+	 * @todo Rewrite as method and quess if null.
+	 * @var unknown_type
+	 */
+	public $contentType = '';
+	public $xpath;
+	public $uuid = 0;
+	public $data = array();
+	public $dataNodes = array();
+	public $events = array();
+	public $eventsNodes = array();
+	public $eventsGlobal = array();
+	/**
+	 * @TODO iframes support http://code.google.com/p/phpquery/issues/detail?id=28
+	 * @var unknown_type
+	 */
+	public $frames = array();
+	/**
+	 * Document root, by default equals to document itself.
+	 * Used by documentFragments.
+	 *
+	 * @var \DOMNode
+	 */
+	public $root;
+	public $isDocumentFragment;
+	public $isXML = false;
+	public $isXHTML = false;
+	public $isHTML = false;
+	public $charset;
 
-    public function __construct($markup = null, $contentType = null, $newDocumentID = null)
-    {
-        if (isset($markup)) {
-            $this->load($markup, $contentType, $newDocumentID);
-        }
-        $this->id = $newDocumentID ? $newDocumentID : md5(microtime());
-    }
+	public function __construct($markup = null, $contentType = null, $newDocumentID = null)
+	{
+		if (isset($markup)) {
+			$this->load($markup, $contentType, $newDocumentID);
+		}
+		$this->id = $newDocumentID ? $newDocumentID : md5(microtime());
+	}
 
-    public function load($markup, $contentType = null, $newDocumentID = null)
-    {
-        //		PhpQuery::$documents[$id] = $this;
-        $this->contentType = strtolower($contentType);
-        if ($markup instanceof \DOMDocument) {
-            $this->document = $markup;
-            $this->root     = $this->document;
-            $this->charset  = $this->document->encoding;
-            // TODO isDocumentFragment
-            $loaded = true;
-        } else {
-            $loaded = $this->loadMarkup($markup);
-        }
-        if ($loaded) {
-            //			$this->document->formatOutput = true;
-            $this->document->preserveWhiteSpace = true;
-            $this->xpath                        = new \DOMXPath($this->document);
-            $this->afterMarkupLoad();
-            return true;
-            // remember last loaded document
-            //			return PhpQuery::selectDocument($id);
-        }
-        return false;
-    }
+	public function load($markup, $contentType = null, $newDocumentID = null)
+	{
+		//		PhpQuery::$documents[$id] = $this;
+		$this->contentType = strtolower($contentType);
+		if ($markup instanceof \DOMDocument) {
+			$this->document = $markup;
+			$this->root     = $this->document;
+			$this->charset  = $this->document->encoding;
+			// TODO isDocumentFragment
+			$loaded = true;
+		} else {
+			$loaded = $this->loadMarkup($markup);
+		}
+		if ($loaded) {
+			//			$this->document->formatOutput = true;
+			$this->document->preserveWhiteSpace = true;
+			$this->xpath                        = new \DOMXPath($this->document);
+			$this->afterMarkupLoad();
+			return true;
+			// remember last loaded document
+			//			return PhpQuery::selectDocument($id);
+		}
+		return false;
+	}
 
-    protected function afterMarkupLoad()
-    {
-        if ($this->isXHTML) {
-            $this->xpath->registerNamespace("html", "http://www.w3.org/1999/xhtml");
-        }
-    }
+	protected function afterMarkupLoad()
+	{
+		if ($this->isXHTML) {
+			$this->xpath->registerNamespace("html", "http://www.w3.org/1999/xhtml");
+		}
+	}
 
-    protected function loadMarkup($markup)
-    {
-        $loaded = false;
-        if ($this->contentType) {
-            self::debug("Load markup for content type {$this->contentType}");
-            // content determined by contentType
-            list($contentType, $charset) = $this->contentTypeToArray($this->contentType);
-            switch ($contentType) {
-                case 'text/html':
-                    PhpQuery::debug("Loading HTML, content type '{$this->contentType}'");
-                    $loaded = $this->loadMarkupHTML($markup, $charset);
-                    break;
-                case 'text/xml':
-                case 'application/xhtml+xml':
-                    PhpQuery::debug("Loading XML, content type '{$this->contentType}'");
-                    $loaded = $this->loadMarkupXML($markup, $charset);
-                    break;
-                default:
-                    // for feeds or anything that sometimes doesn't use text/xml
-                    if (strpos('xml', $this->contentType) !== false) {
-                        PhpQuery::debug("Loading XML, content type '{$this->contentType}'");
-                        $loaded = $this->loadMarkupXML($markup, $charset);
-                    } else {
-                        PhpQuery::debug("Could not determine document type from content type '{$this->contentType}'");
-                    }
-            }
-        } else {
-            // content type autodetection
-            if ($this->isXML($markup)) {
-                PhpQuery::debug("Loading XML, isXML() == true");
-                $loaded = $this->loadMarkupXML($markup);
-                if (!$loaded && $this->isXHTML) {
-                    PhpQuery::debug('Loading as XML failed, trying to load as HTML, isXHTML == true');
-                    $loaded = $this->loadMarkupHTML($markup);
-                }
-            } else {
-                PhpQuery::debug("Loading HTML, isXML() == false");
-                $loaded = $this->loadMarkupHTML($markup);
-            }
-        }
-        return $loaded;
-    }
+	protected function loadMarkup($markup)
+	{
+		$loaded = false;
+		if ($this->contentType) {
+			self::debug("Load markup for content type {$this->contentType}");
+			// content determined by contentType
+			list($contentType, $charset) = $this->contentTypeToArray($this->contentType);
+			switch ($contentType) {
+				case 'text/html':
+					PhpQuery::debug("Loading HTML, content type '{$this->contentType}'");
+					$loaded = $this->loadMarkupHTML($markup, $charset);
+					break;
+				case 'text/xml':
+				case 'application/xhtml+xml':
+					PhpQuery::debug("Loading XML, content type '{$this->contentType}'");
+					$loaded = $this->loadMarkupXML($markup, $charset);
+					break;
+				default:
+					// for feeds or anything that sometimes doesn't use text/xml
+					if (strpos('xml', $this->contentType) !== false) {
+						PhpQuery::debug("Loading XML, content type '{$this->contentType}'");
+						$loaded = $this->loadMarkupXML($markup, $charset);
+					} else {
+						PhpQuery::debug("Could not determine document type from content type '{$this->contentType}'");
+					}
+			}
+		} else {
+			// content type autodetection
+			if ($this->isXML($markup)) {
+				PhpQuery::debug("Loading XML, isXML() == true");
+				$loaded = $this->loadMarkupXML($markup);
+				if (!$loaded && $this->isXHTML) {
+					PhpQuery::debug('Loading as XML failed, trying to load as HTML, isXHTML == true');
+					$loaded = $this->loadMarkupHTML($markup);
+				}
+			} else {
+				PhpQuery::debug("Loading HTML, isXML() == false");
+				$loaded = $this->loadMarkupHTML($markup);
+			}
+		}
+		return $loaded;
+	}
 
-    protected function loadMarkupReset()
-    {
-        $this->isXML = $this->isXHTML = $this->isHTML = false;
-    }
+	protected function loadMarkupReset()
+	{
+		$this->isXML = $this->isXHTML = $this->isHTML = false;
+	}
 
-    protected function documentCreate($charset, $version = '1.0')
-    {
-        if (!$version) {
-            $version = '1.0';
-        }
-        $this->document = new \DOMDocument($version, $charset);
-        $this->charset  = $this->document->encoding;
-        //		$this->document->encoding = $charset;
-        $this->document->formatOutput       = true;
-        $this->document->preserveWhiteSpace = true;
-    }
+	protected function documentCreate($charset, $version = '1.0')
+	{
+		if (!$version) {
+			$version = '1.0';
+		}
+		$this->document = new \DOMDocument($version, $charset);
+		$this->charset  = $this->document->encoding;
+		//		$this->document->encoding = $charset;
+		$this->document->formatOutput       = true;
+		$this->document->preserveWhiteSpace = true;
+	}
 
-    protected function loadMarkupHTML($markup, $requestedCharset = null)
-    {
-        if (PhpQuery::$debug) {
-            PhpQuery::debug('Full markup load (HTML): ' . substr($markup, 0, 250));
-        }
-        $this->loadMarkupReset();
-        $this->isHTML = true;
-        if (!isset($this->isDocumentFragment)) {
-            $this->isDocumentFragment = self::isDocumentFragmentHTML($markup);
-        }
-        $charset            = null;
-        $documentCharset    = $this->charsetFromHTML($markup);
-        $addDocumentCharset = false;
-        if ($documentCharset) {
-            $charset = $documentCharset;
-            $markup  = $this->charsetFixHTML($markup);
-        } else {
-            if ($requestedCharset) {
-                $charset = $requestedCharset;
-            }
-        }
-        if (!$charset) {
-            $charset = PhpQuery::$defaultCharset;
-        }
-        // HTTP 1.1 says that the default charset is ISO-8859-1
-        // @see http://www.w3.org/International/O-HTTP-charset
-        if (!$documentCharset) {
-            $documentCharset    = 'ISO-8859-1';
-            $addDocumentCharset = true;
-        }
-        // Should be careful here, still need 'magic encoding detection' since lots of pages have other 'default encoding'
-        // Worse, some pages can have mixed encodings... we'll try not to worry about that
-        $requestedCharset = strtoupper($requestedCharset);
-        $documentCharset  = strtoupper($documentCharset);
-        PhpQuery::debug("DOC: $documentCharset REQ: $requestedCharset");
-        if ($requestedCharset && $documentCharset
-            && $requestedCharset !== $documentCharset
-        ) {
-            PhpQuery::debug("CHARSET CONVERT");
-            // Document Encoding Conversion
-            // http://code.google.com/p/phpquery/issues/detail?id=86
-            if (function_exists('mb_detect_encoding')) {
-                $possibleCharsets = array(
-                    $documentCharset,
-                    $requestedCharset,
-                    'AUTO'
-                );
-                $docEncoding      = mb_detect_encoding($markup, implode(', ', $possibleCharsets));
-                if (!$docEncoding) {
-                    $docEncoding = $documentCharset;
-                }
-                // ok trust the document
-                PhpQuery::debug("DETECTED '$docEncoding'");
-                // Detected does not match what document says...
-                if ($docEncoding !== $documentCharset) {
-                    // Tricky..
-                }
-                if ($docEncoding !== $requestedCharset) {
-                    PhpQuery::debug("CONVERT $docEncoding => $requestedCharset");
-                    $markup  = mb_convert_encoding($markup, $requestedCharset, $docEncoding);
-                    $markup  = $this->charsetAppendToHTML($markup, $requestedCharset);
-                    $charset = $requestedCharset;
-                }
-            } else {
-                PhpQuery::debug("TODO: charset conversion without mbstring...");
-            }
-        }
-        $return = false;
-        if ($this->isDocumentFragment) {
-            PhpQuery::debug("Full markup load (HTML), DocumentFragment detected, using charset '$charset'");
-            $return = $this->documentFragmentLoadMarkup($this, $charset, $markup);
-        } else {
-            if ($addDocumentCharset) {
-                PhpQuery::debug("Full markup load (HTML), appending charset: '$charset'");
-                $markup = $this->charsetAppendToHTML($markup, $charset);
-            }
-            PhpQuery::debug("Full markup load (HTML), documentCreate('$charset')");
-            $this->documentCreate($charset);
-            $return = PhpQuery::$debug === 2 ? $this->document->loadHTML($markup)
-                : @$this->document->loadHTML($markup);
-            if ($return) {
-                $this->root = $this->document;
-            }
-        }
-        if ($return && !$this->contentType) {
-            $this->contentType = 'text/html';
-        }
-        return $return;
-    }
+	protected function loadMarkupHTML($markup, $requestedCharset = null)
+	{
+		if (PhpQuery::$debug) {
+			PhpQuery::debug('Full markup load (HTML): ' . substr($markup, 0, 250));
+		}
+		$this->loadMarkupReset();
+		$this->isHTML = true;
+		if (!isset($this->isDocumentFragment)) {
+			$this->isDocumentFragment = self::isDocumentFragmentHTML($markup);
+		}
+		$charset            = null;
+		$documentCharset    = $this->charsetFromHTML($markup);
+		$addDocumentCharset = false;
+		if ($documentCharset) {
+			$charset = $documentCharset;
+			$markup  = $this->charsetFixHTML($markup);
+		} else {
+			if ($requestedCharset) {
+				$charset = $requestedCharset;
+			}
+		}
+		if (!$charset) {
+			$charset = PhpQuery::$defaultCharset;
+		}
+		// HTTP 1.1 says that the default charset is ISO-8859-1
+		// @see http://www.w3.org/International/O-HTTP-charset
+		if (!$documentCharset) {
+			$documentCharset    = 'ISO-8859-1';
+			$addDocumentCharset = true;
+		}
+		// Should be careful here, still need 'magic encoding detection' since lots of pages have other 'default encoding'
+		// Worse, some pages can have mixed encodings... we'll try not to worry about that
+		$requestedCharset = strtoupper($requestedCharset);
+		$documentCharset  = strtoupper($documentCharset);
+		PhpQuery::debug("DOC: $documentCharset REQ: $requestedCharset");
+		if ($requestedCharset && $documentCharset
+			&& $requestedCharset !== $documentCharset
+		) {
+			PhpQuery::debug("CHARSET CONVERT");
+			// Document Encoding Conversion
+			// http://code.google.com/p/phpquery/issues/detail?id=86
+			if (function_exists('mb_detect_encoding')) {
+				$possibleCharsets = array(
+					$documentCharset,
+					$requestedCharset,
+					'AUTO'
+				);
+				$docEncoding      = mb_detect_encoding($markup, implode(', ', $possibleCharsets));
+				if (!$docEncoding) {
+					$docEncoding = $documentCharset;
+				}
+				// ok trust the document
+				PhpQuery::debug("DETECTED '$docEncoding'");
+				// Detected does not match what document says...
+				if ($docEncoding !== $documentCharset) {
+					// Tricky..
+				}
+				if ($docEncoding !== $requestedCharset) {
+					PhpQuery::debug("CONVERT $docEncoding => $requestedCharset");
+					$markup  = mb_convert_encoding($markup, $requestedCharset, $docEncoding);
+					$markup  = $this->charsetAppendToHTML($markup, $requestedCharset);
+					$charset = $requestedCharset;
+				}
+			} else {
+				PhpQuery::debug("TODO: charset conversion without mbstring...");
+			}
+		}
+		$return = false;
+		if ($this->isDocumentFragment) {
+			PhpQuery::debug("Full markup load (HTML), DocumentFragment detected, using charset '$charset'");
+			$return = $this->documentFragmentLoadMarkup($this, $charset, $markup);
+		} else {
+			if ($addDocumentCharset) {
+				PhpQuery::debug("Full markup load (HTML), appending charset: '$charset'");
+				$markup = $this->charsetAppendToHTML($markup, $charset);
+			}
+			PhpQuery::debug("Full markup load (HTML), documentCreate('$charset')");
+			$this->documentCreate($charset);
+			$return = PhpQuery::$debug === 2 ? $this->document->loadHTML($markup)
+				: @$this->document->loadHTML($markup);
+			if ($return) {
+				$this->root = $this->document;
+			}
+		}
+		if ($return && !$this->contentType) {
+			$this->contentType = 'text/html';
+		}
+		return $return;
+	}
 
-    protected function loadMarkupXML($markup, $requestedCharset = null)
-    {
-        if (PhpQuery::$debug) {
-            PhpQuery::debug('Full markup load (XML): ' . substr($markup, 0, 250));
-        }
-        $this->loadMarkupReset();
-        $this->isXML = true;
-        // check agains XHTML in contentType or markup
-        $isContentTypeXHTML = $this->isXHTML();
-        $isMarkupXHTML      = $this->isXHTML($markup);
-        if ($isContentTypeXHTML || $isMarkupXHTML) {
-            self::debug('Full markup load (XML), XHTML detected');
-            $this->isXHTML = true;
-        }
-        // determine document fragment
-        if (!isset($this->isDocumentFragment)) {
-            $this->isDocumentFragment = $this->isXHTML ? self::isDocumentFragmentXHTML($markup)
-                : self::isDocumentFragmentXML($markup);
-        }
-        // this charset will be used
-        $charset = null;
-        // charset from XML declaration @var string
-        $documentCharset = $this->charsetFromXML($markup);
-        if (!$documentCharset) {
-            if ($this->isXHTML) {
-                // this is XHTML, try to get charset from content-type meta header
-                $documentCharset = $this->charsetFromHTML($markup);
-                if ($documentCharset) {
-                    PhpQuery::debug("Full markup load (XML), appending XHTML charset '$documentCharset'");
-                    $this->charsetAppendToXML($markup, $documentCharset);
-                    $charset = $documentCharset;
-                }
-            }
-            if (!$documentCharset) {
-                // if still no document charset...
-                $charset = $requestedCharset;
-            }
-        } else {
-            if ($requestedCharset) {
-                $charset = $requestedCharset;
-            }
-        }
-        if (!$charset) {
-            $charset = PhpQuery::$defaultCharset;
-        }
-        if ($requestedCharset && $documentCharset
-            && $requestedCharset != $documentCharset
-        ) {
-            // TODO place for charset conversion
-            //			$charset = $requestedCharset;
-        }
-        $return = false;
-        if ($this->isDocumentFragment) {
-            PhpQuery::debug("Full markup load (XML), DocumentFragment detected, using charset '$charset'");
-            $return = $this->documentFragmentLoadMarkup($this, $charset, $markup);
-        } else {
-            // FIXME ???
-            if ($isContentTypeXHTML && !$isMarkupXHTML) {
-                if (!$documentCharset) {
-                    PhpQuery::debug("Full markup load (XML), appending charset '$charset'");
-                    $markup = $this->charsetAppendToXML($markup, $charset);
-                }
-            }
-            // see http://pl2.php.net/manual/en/book.dom.php#78929
-            // LIBXML_DTDLOAD (>= PHP 5.1)
-            // does XML ctalogues works with LIBXML_NONET
-            //		$this->document->resolveExternals = true;
-            // TODO test LIBXML_COMPACT for performance improvement
-            // create document
-            $this->documentCreate($charset);
-            if (phpversion() < 5.1) {
-                $this->document->resolveExternals = true;
-                $return                           = PhpQuery::$debug === 2 ? $this->document->loadXML($markup)
-                    : @$this->document->loadXML($markup);
-            } else {
-                /** @link http://pl2.php.net/manual/en/libxml.constants.php */
-                $libxmlStatic = PhpQuery::$debug === 2 ? LIBXML_DTDLOAD
-                    | LIBXML_DTDATTR | LIBXML_NONET
-                    : LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_NONET | LIBXML_NOWARNING
-                    | LIBXML_NOERROR;
-                $return       = $this->document->loadXML($markup, $libxmlStatic);
-                // 				if (! $return)
-                // 					$return = $this->document->loadHTML($markup);
-            }
-            if ($return) {
-                $this->root = $this->document;
-            }
-        }
-        if ($return) {
-            if (!$this->contentType) {
-                if ($this->isXHTML) {
-                    $this->contentType = 'application/xhtml+xml';
-                } else {
-                    $this->contentType = 'text/xml';
-                }
-            }
-            return $return;
-        } else {
-            throw new \Exception("Error loading XML markup");
-        }
-    }
+	protected function loadMarkupXML($markup, $requestedCharset = null)
+	{
+		if (PhpQuery::$debug) {
+			PhpQuery::debug('Full markup load (XML): ' . substr($markup, 0, 250));
+		}
+		$this->loadMarkupReset();
+		$this->isXML = true;
+		// check agains XHTML in contentType or markup
+		$isContentTypeXHTML = $this->isXHTML();
+		$isMarkupXHTML      = $this->isXHTML($markup);
+		if ($isContentTypeXHTML || $isMarkupXHTML) {
+			self::debug('Full markup load (XML), XHTML detected');
+			$this->isXHTML = true;
+		}
+		// determine document fragment
+		if (!isset($this->isDocumentFragment)) {
+			$this->isDocumentFragment = $this->isXHTML ? self::isDocumentFragmentXHTML($markup)
+				: self::isDocumentFragmentXML($markup);
+		}
+		// this charset will be used
+		$charset = null;
+		// charset from XML declaration @var string
+		$documentCharset = $this->charsetFromXML($markup);
+		if (!$documentCharset) {
+			if ($this->isXHTML) {
+				// this is XHTML, try to get charset from content-type meta header
+				$documentCharset = $this->charsetFromHTML($markup);
+				if ($documentCharset) {
+					PhpQuery::debug("Full markup load (XML), appending XHTML charset '$documentCharset'");
+					$this->charsetAppendToXML($markup, $documentCharset);
+					$charset = $documentCharset;
+				}
+			}
+			if (!$documentCharset) {
+				// if still no document charset...
+				$charset = $requestedCharset;
+			}
+		} else {
+			if ($requestedCharset) {
+				$charset = $requestedCharset;
+			}
+		}
+		if (!$charset) {
+			$charset = PhpQuery::$defaultCharset;
+		}
+		if ($requestedCharset && $documentCharset
+			&& $requestedCharset != $documentCharset
+		) {
+			// TODO place for charset conversion
+			//			$charset = $requestedCharset;
+		}
+		$return = false;
+		if ($this->isDocumentFragment) {
+			PhpQuery::debug("Full markup load (XML), DocumentFragment detected, using charset '$charset'");
+			$return = $this->documentFragmentLoadMarkup($this, $charset, $markup);
+		} else {
+			// FIXME ???
+			if ($isContentTypeXHTML && !$isMarkupXHTML) {
+				if (!$documentCharset) {
+					PhpQuery::debug("Full markup load (XML), appending charset '$charset'");
+					$markup = $this->charsetAppendToXML($markup, $charset);
+				}
+			}
+			// see http://pl2.php.net/manual/en/book.dom.php#78929
+			// LIBXML_DTDLOAD (>= PHP 5.1)
+			// does XML ctalogues works with LIBXML_NONET
+			//		$this->document->resolveExternals = true;
+			// TODO test LIBXML_COMPACT for performance improvement
+			// create document
+			$this->documentCreate($charset);
+			if (phpversion() < 5.1) {
+				$this->document->resolveExternals = true;
+				$return                           = PhpQuery::$debug === 2 ? $this->document->loadXML($markup)
+					: @$this->document->loadXML($markup);
+			} else {
+				/** @link http://pl2.php.net/manual/en/libxml.constants.php */
+				$libxmlStatic = PhpQuery::$debug === 2 ? LIBXML_DTDLOAD
+					| LIBXML_DTDATTR | LIBXML_NONET
+					: LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_NONET | LIBXML_NOWARNING
+					| LIBXML_NOERROR;
+				$return       = $this->document->loadXML($markup, $libxmlStatic);
+				// 				if (! $return)
+				// 					$return = $this->document->loadHTML($markup);
+			}
+			if ($return) {
+				$this->root = $this->document;
+			}
+		}
+		if ($return) {
+			if (!$this->contentType) {
+				if ($this->isXHTML) {
+					$this->contentType = 'application/xhtml+xml';
+				} else {
+					$this->contentType = 'text/xml';
+				}
+			}
+			return $return;
+		} else {
+			throw new \Exception("Error loading XML markup");
+		}
+	}
 
-    protected function isXHTML($markup = null)
-    {
-        if (!isset($markup)) {
-            return strpos($this->contentType, 'xhtml') !== false;
-        }
-        // XXX ok ?
-        return strpos($markup, "<!DOCTYPE html") !== false;
-        //		return stripos($doctype, 'xhtml') !== false;
-        //		$doctype = isset($dom->doctype) && is_object($dom->doctype)
-        //			? $dom->doctype->publicId
-        //			: self::$defaultDoctype;
-    }
+	protected function isXHTML($markup = null)
+	{
+		if (!isset($markup)) {
+			return strpos($this->contentType, 'xhtml') !== false;
+		}
+		// XXX ok ?
+		return strpos($markup, "<!DOCTYPE html") !== false;
+		//		return stripos($doctype, 'xhtml') !== false;
+		//		$doctype = isset($dom->doctype) && is_object($dom->doctype)
+		//			? $dom->doctype->publicId
+		//			: self::$defaultDoctype;
+	}
 
-    protected function isXML($markup)
-    {
-        //		return strpos($markup, '<?xml') !== false && stripos($markup, 'xhtml') === false;
-        return strpos(substr($markup, 0, 100), '<' . '?xml') !== false;
-    }
+	protected function isXML($markup)
+	{
+		//		return strpos($markup, '<?xml') !== false && stripos($markup, 'xhtml') === false;
+		return strpos(substr($markup, 0, 100), '<' . '?xml') !== false;
+	}
 
-    protected function contentTypeToArray($contentType)
-    {
-        $test = null;
-        $test = $matches = explode(';', trim(strtolower($contentType)));
-        if (isset($matches[1])) {
-            $matches[1] = explode('=', $matches[1]);
-            // strip 'charset='
-            $matches[1] = isset($matches[1][1]) && trim($matches[1][1]) ? $matches[1][1]
-                : $matches[1][0];
-        } else {
-            $matches[1] = null;
-        }
-        return $matches;
-    }
+	protected function contentTypeToArray($contentType)
+	{
+		$test = null;
+		$test = $matches = explode(';', trim(strtolower($contentType)));
+		if (isset($matches[1])) {
+			$matches[1] = explode('=', $matches[1]);
+			// strip 'charset='
+			$matches[1] = isset($matches[1][1]) && trim($matches[1][1]) ? $matches[1][1]
+				: $matches[1][0];
+		} else {
+			$matches[1] = null;
+		}
+		return $matches;
+	}
 
-    /**
-     *
-     * @param $markup
-     * @return array contentType, charset
-     */
-    protected function contentTypeFromHTML($markup)
-    {
-        $matches = array();
-        // find meta tag
-        preg_match('@<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i', $markup, $matches);
-        if (!isset($matches[0])) {
-            return array(
-                null,
-                null
-            );
-        }
-        // get attr 'content'
-        preg_match('@content\\s*=\\s*(["|\'])(.+?)\\1@', $matches[0], $matches);
-        if (!isset($matches[0])) {
-            return array(
-                null,
-                null
-            );
-        }
-        return $this->contentTypeToArray($matches[2]);
-    }
+	/**
+	 *
+	 * @param $markup
+	 * @return array contentType, charset
+	 */
+	protected function contentTypeFromHTML($markup)
+	{
+		$matches = array();
+		// find meta tag
+		preg_match('@<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i', $markup, $matches);
+		if (!isset($matches[0])) {
+			return array(
+				null,
+				null
+			);
+		}
+		// get attr 'content'
+		preg_match('@content\\s*=\\s*(["|\'])(.+?)\\1@', $matches[0], $matches);
+		if (!isset($matches[0])) {
+			return array(
+				null,
+				null
+			);
+		}
+		return $this->contentTypeToArray($matches[2]);
+	}
 
-    protected function charsetFromHTML($markup)
-    {
-        $contentType = $this->contentTypeFromHTML($markup);
-        return $contentType[1];
-    }
+	protected function charsetFromHTML($markup)
+	{
+		$contentType = $this->contentTypeFromHTML($markup);
+		return $contentType[1];
+	}
 
-    protected function charsetFromXML($markup)
-    {
-        $matches;
-        // find declaration
-        preg_match('@<' . '?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i', $markup, $matches);
-        return isset($matches[2]) ? strtolower($matches[2]) : null;
-    }
+	protected function charsetFromXML($markup)
+	{
+		$matches;
+		// find declaration
+		preg_match('@<' . '?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i', $markup, $matches);
+		return isset($matches[2]) ? strtolower($matches[2]) : null;
+	}
 
-    /**
-     * Repositions meta[type=charset] at the start of head. Bypasses \DOMDocument bug.
-     *
-     * @link http://code.google.com/p/phpquery/issues/detail?id=80
-     * @param $html
-     */
-    protected function charsetFixHTML($markup)
-    {
-        $matches = array();
-        // find meta tag
-        preg_match(
-            '@\s*<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i',
-            $markup,
-            $matches,
-            PREG_OFFSET_CAPTURE
-        );
-        if (!isset($matches[0])) {
-            return;
-        }
-        $metaContentType = $matches[0][0];
-        $markup          = substr($markup, 0, $matches[0][1])
-            . substr($markup, $matches[0][1] + strlen($metaContentType));
-        $headStart       = stripos($markup, '<head>');
-        $markup          = substr($markup, 0, $headStart + 6) . $metaContentType
-            . substr($markup, $headStart + 6);
-        return $markup;
-    }
+	/**
+	 * Repositions meta[type=charset] at the start of head. Bypasses \DOMDocument bug.
+	 *
+	 * @link http://code.google.com/p/phpquery/issues/detail?id=80
+	 * @param $html
+	 */
+	protected function charsetFixHTML($markup)
+	{
+		$matches = array();
+		// find meta tag
+		preg_match(
+			'@\s*<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i',
+			$markup,
+			$matches,
+			PREG_OFFSET_CAPTURE
+		);
+		if (!isset($matches[0])) {
+			return;
+		}
+		$metaContentType = $matches[0][0];
+		$markup          = substr($markup, 0, $matches[0][1])
+			. substr($markup, $matches[0][1] + strlen($metaContentType));
+		$headStart       = stripos($markup, '<head>');
+		$markup          = substr($markup, 0, $headStart + 6) . $metaContentType
+			. substr($markup, $headStart + 6);
+		return $markup;
+	}
 
-    protected function charsetAppendToHTML($html, $charset, $xhtml = false)
-    {
-        // remove existing meta[type=content-type]
-        $html = preg_replace('@\s*<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i', '', $html);
-        $meta = '<meta http-equiv="Content-Type" content="text/html;charset='
-            . $charset . '" ' . ($xhtml ? '/' : '') . '>';
-        if (strpos($html, '<head') === false) {
-            if (strpos($html, '<html') === false) {
-                return $meta . $html;
-            } else {
-                return preg_replace('@<html(.*?)(?(?<!\?)>)@s', "<html\\1><head>{$meta}</head>", $html);
-            }
-        } else {
-            return preg_replace('@<head(.*?)(?(?<!\?)>)@s', '<head\\1>' . $meta, $html);
-        }
-    }
+	protected function charsetAppendToHTML($html, $charset, $xhtml = false)
+	{
+		// remove existing meta[type=content-type]
+		$html = preg_replace('@\s*<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i', '', $html);
+		$meta = '<meta http-equiv="Content-Type" content="text/html;charset='
+			. $charset . '" ' . ($xhtml ? '/' : '') . '>';
+		if (strpos($html, '<head') === false) {
+			if (strpos($html, '<html') === false) {
+				return $meta . $html;
+			} else {
+				return preg_replace('@<html(.*?)(?(?<!\?)>)@s', "<html\\1><head>{$meta}</head>", $html);
+			}
+		} else {
+			return preg_replace('@<head(.*?)(?(?<!\?)>)@s', '<head\\1>' . $meta, $html);
+		}
+	}
 
-    protected function charsetAppendToXML($markup, $charset)
-    {
-        $declaration = '<' . '?xml version="1.0" encoding="' . $charset . '"?'
-            . '>';
-        return $declaration . $markup;
-    }
+	protected function charsetAppendToXML($markup, $charset)
+	{
+		$declaration = '<' . '?xml version="1.0" encoding="' . $charset . '"?'
+			. '>';
+		return $declaration . $markup;
+	}
 
-    public static function isDocumentFragmentHTML($markup)
-    {
-        return stripos($markup, '<html') === false
-        && stripos($markup, '<!doctype') === false;
-    }
+	public static function isDocumentFragmentHTML($markup)
+	{
+		return stripos($markup, '<html') === false
+		&& stripos($markup, '<!doctype') === false;
+	}
 
-    public static function isDocumentFragmentXML($markup)
-    {
-        return stripos($markup, '<' . '?xml') === false;
-    }
+	public static function isDocumentFragmentXML($markup)
+	{
+		return stripos($markup, '<' . '?xml') === false;
+	}
 
-    public static function isDocumentFragmentXHTML($markup)
-    {
-        return self::isDocumentFragmentHTML($markup);
-    }
+	public static function isDocumentFragmentXHTML($markup)
+	{
+		return self::isDocumentFragmentHTML($markup);
+	}
 
-    public function importAttr($value)
-    {
-        // TODO
-    }
+	public function importAttr($value)
+	{
+		// TODO
+	}
 
-    /**
-     *
-     * @param $source
-     * @param $target
-     * @param $sourceCharset
-     * @return array Array of imported nodes.
-     */
-    public function import($source, $sourceCharset = null)
-    {
-        // TODO charset conversions
-        $return = array();
-        if ($source instanceof \DOMNode && !($source instanceof \DOMNodeList)) {
-            $source = array(
-                $source
-            );
-        }
-        //		if (is_array($source)) {
-        //			foreach($source as $node) {
-        //				if (is_string($node)) {
-        //					// string markup
-        //					$fake = $this->documentFragmentCreate($node, $sourceCharset);
-        //					if ($fake === false)
-        //						throw new \Exception("Error loading documentFragment markup");
-        //					else
-        //						$return = array_merge($return,
-        //							$this->import($fake->root->childNodes)
-        //						);
-        //				} else {
-        //					$return[] = $this->document->importNode($node, true);
-        //				}
-        //			}
-        //			return $return;
-        //		} else {
-        //			// string markup
-        //			$fake = $this->documentFragmentCreate($source, $sourceCharset);
-        //			if ($fake === false)
-        //				throw new \Exception("Error loading documentFragment markup");
-        //			else
-        //				return $this->import($fake->root->childNodes);
-        //		}
-        if (is_array($source) || $source instanceof \DOMNodeList) {
-            // dom nodes
-            self::debug('Importing nodes to document');
-            foreach ($source as $node) {
-                $return[] = $this->document->importNode($node, true);
-            }
-        } else {
-            // string markup
-            $fake = $this->documentFragmentCreate($source, $sourceCharset);
-            if ($fake === false) {
-                throw new \Exception("Error loading documentFragment markup");
-            } else {
-                return $this->import($fake->root->childNodes);
-            }
-        }
-        return $return;
-    }
+	/**
+	 *
+	 * @param $source
+	 * @param $target
+	 * @param $sourceCharset
+	 * @return array Array of imported nodes.
+	 */
+	public function import($source, $sourceCharset = null)
+	{
+		// TODO charset conversions
+		$return = array();
+		if ($source instanceof \DOMNode && !($source instanceof \DOMNodeList)) {
+			$source = array(
+				$source
+			);
+		}
+		//		if (is_array($source)) {
+		//			foreach($source as $node) {
+		//				if (is_string($node)) {
+		//					// string markup
+		//					$fake = $this->documentFragmentCreate($node, $sourceCharset);
+		//					if ($fake === false)
+		//						throw new \Exception("Error loading documentFragment markup");
+		//					else
+		//						$return = array_merge($return,
+		//							$this->import($fake->root->childNodes)
+		//						);
+		//				} else {
+		//					$return[] = $this->document->importNode($node, true);
+		//				}
+		//			}
+		//			return $return;
+		//		} else {
+		//			// string markup
+		//			$fake = $this->documentFragmentCreate($source, $sourceCharset);
+		//			if ($fake === false)
+		//				throw new \Exception("Error loading documentFragment markup");
+		//			else
+		//				return $this->import($fake->root->childNodes);
+		//		}
+		if (is_array($source) || $source instanceof \DOMNodeList) {
+			// dom nodes
+			self::debug('Importing nodes to document');
+			foreach ($source as $node) {
+				$return[] = $this->document->importNode($node, true);
+			}
+		} else {
+			// string markup
+			$fake = $this->documentFragmentCreate($source, $sourceCharset);
+			if ($fake === false) {
+				throw new \Exception("Error loading documentFragment markup");
+			} else {
+				return $this->import($fake->root->childNodes);
+			}
+		}
+		return $return;
+	}
 
-    /**
-     * Creates new document fragment.
-     *
-     * @param $source
-     * @return DOMDocumentWrapper
-     */
-    protected function documentFragmentCreate($source, $charset = null)
-    {
-        $fake              = new DOMDocumentWrapper();
-        $fake->contentType = $this->contentType;
-        $fake->isXML       = $this->isXML;
-        $fake->isHTML      = $this->isHTML;
-        $fake->isXHTML     = $this->isXHTML;
-        $fake->root        = $fake->document;
-        if (!$charset) {
-            $charset = $this->charset;
-        }
-        //	$fake->documentCreate($this->charset);
-        if ($source instanceof \DOMNode && !($source instanceof \DOMNodeList)) {
-            $source = array(
-                $source
-            );
-        }
-        if (is_array($source) || $source instanceof \DOMNodeList) {
-            // dom nodes
-            // load fake document
-            if (!$this->documentFragmentLoadMarkup($fake, $charset)) {
-                return false;
-            }
-            $nodes = $fake->import($source);
-            foreach ($nodes as $node) {
-                $fake->root->appendChild($node);
-            }
-        } else {
-            // string markup
-            $this->documentFragmentLoadMarkup($fake, $charset, $source);
-        }
-        return $fake;
-    }
+	/**
+	 * Creates new document fragment.
+	 *
+	 * @param $source
+	 * @return DOMDocumentWrapper
+	 */
+	protected function documentFragmentCreate($source, $charset = null)
+	{
+		$fake              = new DOMDocumentWrapper();
+		$fake->contentType = $this->contentType;
+		$fake->isXML       = $this->isXML;
+		$fake->isHTML      = $this->isHTML;
+		$fake->isXHTML     = $this->isXHTML;
+		$fake->root        = $fake->document;
+		if (!$charset) {
+			$charset = $this->charset;
+		}
+		//	$fake->documentCreate($this->charset);
+		if ($source instanceof \DOMNode && !($source instanceof \DOMNodeList)) {
+			$source = array(
+				$source
+			);
+		}
+		if (is_array($source) || $source instanceof \DOMNodeList) {
+			// dom nodes
+			// load fake document
+			if (!$this->documentFragmentLoadMarkup($fake, $charset)) {
+				return false;
+			}
+			$nodes = $fake->import($source);
+			foreach ($nodes as $node) {
+				$fake->root->appendChild($node);
+			}
+		} else {
+			// string markup
+			$this->documentFragmentLoadMarkup($fake, $charset, $source);
+		}
+		return $fake;
+	}
 
-    /**
-     *
-     * @param $document DOMDocumentWrapper
-     * @param $markup
-     * @return $document
-     */
-    private function documentFragmentLoadMarkup($fragment, $charset, $markup = null)
-    {
-        // TODO error handling
-        // TODO copy doctype
-        // tempolary turn off
-        $fragment->isDocumentFragment = false;
-        if ($fragment->isXML) {
-            if ($fragment->isXHTML) {
-                // add FAKE element to set default namespace
-                $fragment->loadMarkupXML(
-                    '<?xml version="1.0" encoding="' . $charset
-                    . '"?>'
-                    . '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" '
-                    . '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
-                    . '<fake xmlns="http://www.w3.org/1999/xhtml">' . $markup . '</fake>'
-                );
-                $fragment->root = $fragment->document->firstChild->nextSibling;
-            } else {
-                $fragment->loadMarkupXML(
-                    '<?xml version="1.0" encoding="' . $charset
-                    . '"?><fake>' . $markup . '</fake>'
-                );
-                $fragment->root = $fragment->document->firstChild;
-            }
-        } else {
-            $markup2 = PhpQuery::$defaultDoctype
-                . '<html><head><meta http-equiv="Content-Type" content="text/html;charset='
-                . $charset . '"></head>';
-            $noBody  = strpos($markup, '<body') === false;
-            if ($noBody) {
-                $markup2 .= '<body>';
-            }
-            $markup2 .= $markup;
-            if ($noBody) {
-                $markup2 .= '</body>';
-            }
-            $markup2 .= '</html>';
-            $fragment->loadMarkupHTML($markup2);
-            // TODO resolv body tag merging issue
-            $fragment->root = $noBody ? $fragment->document->firstChild->nextSibling->firstChild->nextSibling
-                : $fragment->document->firstChild->nextSibling->firstChild->nextSibling;
-        }
-        if (!$fragment->root) {
-            return false;
-        }
-        $fragment->isDocumentFragment = true;
-        return true;
-    }
+	/**
+	 *
+	 * @param $document DOMDocumentWrapper
+	 * @param $markup
+	 * @return $document
+	 */
+	private function documentFragmentLoadMarkup($fragment, $charset, $markup = null)
+	{
+		// TODO error handling
+		// TODO copy doctype
+		// tempolary turn off
+		$fragment->isDocumentFragment = false;
+		if ($fragment->isXML) {
+			if ($fragment->isXHTML) {
+				// add FAKE element to set default namespace
+				$fragment->loadMarkupXML(
+					'<?xml version="1.0" encoding="' . $charset
+					. '"?>'
+					. '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" '
+					. '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+					. '<fake xmlns="http://www.w3.org/1999/xhtml">' . $markup . '</fake>'
+				);
+				$fragment->root = $fragment->document->firstChild->nextSibling;
+			} else {
+				$fragment->loadMarkupXML(
+					'<?xml version="1.0" encoding="' . $charset
+					. '"?><fake>' . $markup . '</fake>'
+				);
+				$fragment->root = $fragment->document->firstChild;
+			}
+		} else {
+			$markup2 = PhpQuery::$defaultDoctype
+				. '<html><head><meta http-equiv="Content-Type" content="text/html;charset='
+				. $charset . '"></head>';
+			$noBody  = strpos($markup, '<body') === false;
+			if ($noBody) {
+				$markup2 .= '<body>';
+			}
+			$markup2 .= $markup;
+			if ($noBody) {
+				$markup2 .= '</body>';
+			}
+			$markup2 .= '</html>';
+			$fragment->loadMarkupHTML($markup2);
+			// TODO resolv body tag merging issue
+			$fragment->root = $noBody ? $fragment->document->firstChild->nextSibling->firstChild->nextSibling
+				: $fragment->document->firstChild->nextSibling->firstChild->nextSibling;
+		}
+		if (!$fragment->root) {
+			return false;
+		}
+		$fragment->isDocumentFragment = true;
+		return true;
+	}
 
-    protected function documentFragmentToMarkup($fragment)
-    {
-        PhpQuery::debug('documentFragmentToMarkup');
-        $tmp                          = $fragment->isDocumentFragment;
-        $fragment->isDocumentFragment = false;
-        $markup                       = $fragment->markup();
-        if ($fragment->isXML) {
-            $markup = substr($markup, 0, strrpos($markup, '</fake>'));
-            if ($fragment->isXHTML) {
-                $markup = substr($markup, strpos($markup, '<fake') + 43);
-            } else {
-                $markup = substr($markup, strpos($markup, '<fake>') + 6);
-            }
-        } else {
-            $markup = substr($markup, strpos($markup, '<body>') + 6);
-            $markup = substr($markup, 0, strrpos($markup, '</body>'));
-        }
-        $fragment->isDocumentFragment = $tmp;
-        if (PhpQuery::$debug) {
-            PhpQuery::debug('documentFragmentToMarkup: ' . substr($markup, 0, 150));
-        }
-        return $markup;
-    }
+	protected function documentFragmentToMarkup($fragment)
+	{
+		PhpQuery::debug('documentFragmentToMarkup');
+		$tmp                          = $fragment->isDocumentFragment;
+		$fragment->isDocumentFragment = false;
+		$markup                       = $fragment->markup();
+		if ($fragment->isXML) {
+			$markup = substr($markup, 0, strrpos($markup, '</fake>'));
+			if ($fragment->isXHTML) {
+				$markup = substr($markup, strpos($markup, '<fake') + 43);
+			} else {
+				$markup = substr($markup, strpos($markup, '<fake>') + 6);
+			}
+		} else {
+			$markup = substr($markup, strpos($markup, '<body>') + 6);
+			$markup = substr($markup, 0, strrpos($markup, '</body>'));
+		}
+		$fragment->isDocumentFragment = $tmp;
+		if (PhpQuery::$debug) {
+			PhpQuery::debug('documentFragmentToMarkup: ' . substr($markup, 0, 150));
+		}
+		return $markup;
+	}
 
-    /**
-     * Return document markup, starting with optional $nodes as root.
-     *
-     * @param $nodes    \DOMNode|\DOMNodeList
-     * @return string
-     */
-    public function markup($nodes = null, $innerMarkup = false)
-    {
-        if (isset($nodes) && count($nodes) == 1
-            && $nodes[0] instanceof \DOMDocument
-        ) {
-            $nodes = null;
-        }
-        if (isset($nodes)) {
-            $markup = '';
-            if (!is_array($nodes) && !($nodes instanceof \DOMNodeList)) {
-                $nodes = array(
-                    $nodes
-                );
-            }
-            if ($this->isDocumentFragment && !$innerMarkup) {
-                foreach ($nodes as $i => $node) {
-                    if ($node->isSameNode($this->root)) {
-                        //	var_dump($node);
-                        $nodes = array_slice($nodes, 0, $i)
-                            + PhpQuery::DOMNodeListToArray($node->childNodes)
-                            + array_slice($nodes, $i + 1);
-                    }
-                }
-            }
-            if ($this->isXML && !$innerMarkup) {
-                self::debug("Getting outerXML with charset '{$this->charset}'");
-                // we need outerXML, so we can benefit from
-                // $node param support in saveXML()
-                foreach ($nodes as $node) {
-                    $markup .= $this->document->saveXML($node);
-                }
-            } else {
-                $loop = array();
-                if ($innerMarkup) {
-                    foreach ($nodes as $node) {
-                        if ($node->childNodes) {
-                            foreach ($node->childNodes as $child) {
-                                $loop[] = $child;
-                            }
-                        } else {
-                            $loop[] = $node;
-                        }
-                    }
-                } else {
-                    $loop = $nodes;
-                }
-                self::debug(
-                    "Getting markup, moving selected nodes (" . count($loop)
-                    . ") to new DocumentFragment"
-                );
-                $fake   = $this->documentFragmentCreate($loop);
-                $markup = $this->documentFragmentToMarkup($fake);
-            }
-            if ($this->isXHTML) {
-                self::debug("Fixing XHTML");
-                $markup = self::markupFixXHTML($markup);
-            }
-            self::debug("Markup: " . substr($markup, 0, 250));
-            return $markup;
-        } else {
-            if ($this->isDocumentFragment) {
-                // documentFragment, html only...
-                self::debug("Getting markup, DocumentFragment detected");
-                //				return $this->markup(
-                ////					$this->document->getElementsByTagName('body')->item(0)
-                //					$this->document->root, true
-                //				);
-                $markup = $this->documentFragmentToMarkup($this);
-                // no need for markupFixXHTML, as it's done thought markup($nodes) method
-                return $markup;
-            } else {
-                self::debug(
-                    "Getting markup (" . ($this->isXML ? 'XML' : 'HTML')
-                    . "), final with charset '{$this->charset}'"
-                );
-                $markup = $this->isXML ? $this->document->saveXML()
-                    : $this->document->saveHTML();
-                if ($this->isXHTML) {
-                    self::debug("Fixing XHTML");
-                    $markup = self::markupFixXHTML($markup);
-                }
-                self::debug("Markup: " . substr($markup, 0, 250));
-                return $markup;
-            }
-        }
-    }
+	/**
+	 * Return document markup, starting with optional $nodes as root.
+	 *
+	 * @param $nodes    \DOMNode|\DOMNodeList
+	 * @return string
+	 */
+	public function markup($nodes = null, $innerMarkup = false)
+	{
+		if (isset($nodes) && count($nodes) == 1
+			&& $nodes[0] instanceof \DOMDocument
+		) {
+			$nodes = null;
+		}
+		if (isset($nodes)) {
+			$markup = '';
+			if (!is_array($nodes) && !($nodes instanceof \DOMNodeList)) {
+				$nodes = array(
+					$nodes
+				);
+			}
+			if ($this->isDocumentFragment && !$innerMarkup) {
+				foreach ($nodes as $i => $node) {
+					if ($node->isSameNode($this->root)) {
+						//	var_dump($node);
+						$nodes = array_slice($nodes, 0, $i)
+							+ PhpQuery::DOMNodeListToArray($node->childNodes)
+							+ array_slice($nodes, $i + 1);
+					}
+				}
+			}
+			if ($this->isXML && !$innerMarkup) {
+				self::debug("Getting outerXML with charset '{$this->charset}'");
+				// we need outerXML, so we can benefit from
+				// $node param support in saveXML()
+				foreach ($nodes as $node) {
+					$markup .= $this->document->saveXML($node);
+				}
+			} else {
+				$loop = array();
+				if ($innerMarkup) {
+					foreach ($nodes as $node) {
+						if ($node->childNodes) {
+							foreach ($node->childNodes as $child) {
+								$loop[] = $child;
+							}
+						} else {
+							$loop[] = $node;
+						}
+					}
+				} else {
+					$loop = $nodes;
+				}
+				self::debug(
+					"Getting markup, moving selected nodes (" . count($loop)
+					. ") to new DocumentFragment"
+				);
+				$fake   = $this->documentFragmentCreate($loop);
+				$markup = $this->documentFragmentToMarkup($fake);
+			}
+			if ($this->isXHTML) {
+				self::debug("Fixing XHTML");
+				$markup = self::markupFixXHTML($markup);
+			}
+			self::debug("Markup: " . substr($markup, 0, 250));
+			return $markup;
+		} else {
+			if ($this->isDocumentFragment) {
+				// documentFragment, html only...
+				self::debug("Getting markup, DocumentFragment detected");
+				//				return $this->markup(
+				////					$this->document->getElementsByTagName('body')->item(0)
+				//					$this->document->root, true
+				//				);
+				$markup = $this->documentFragmentToMarkup($this);
+				// no need for markupFixXHTML, as it's done thought markup($nodes) method
+				return $markup;
+			} else {
+				self::debug(
+					"Getting markup (" . ($this->isXML ? 'XML' : 'HTML')
+					. "), final with charset '{$this->charset}'"
+				);
+				$markup = $this->isXML ? $this->document->saveXML()
+					: $this->document->saveHTML();
+				if ($this->isXHTML) {
+					self::debug("Fixing XHTML");
+					$markup = self::markupFixXHTML($markup);
+				}
+				self::debug("Markup: " . substr($markup, 0, 250));
+				return $markup;
+			}
+		}
+	}
 
-    protected static function markupFixXHTML($markup)
-    {
-        $markup = self::expandEmptyTag('script', $markup);
-        $markup = self::expandEmptyTag('select', $markup);
-        $markup = self::expandEmptyTag('textarea', $markup);
-        return $markup;
-    }
+	protected static function markupFixXHTML($markup)
+	{
+		$markup = self::expandEmptyTag('script', $markup);
+		$markup = self::expandEmptyTag('select', $markup);
+		$markup = self::expandEmptyTag('textarea', $markup);
+		return $markup;
+	}
 
-    public static function debug($text)
-    {
-        PhpQuery::debug($text);
-    }
+	public static function debug($text)
+	{
+		PhpQuery::debug($text);
+	}
 
-    /**
-     * expandEmptyTag
-     *
-     * @param $tag
-     * @param $xml
-     * @return string
-     * @author mjaque at ilkebenson dot com
-     * @link   http://php.net/manual/en/domdocument.savehtml.php#81256
-     */
-    public static function expandEmptyTag($tag, $xml)
-    {
-        $indice = 0;
-        while ($indice < strlen($xml)) {
-            $pos = strpos($xml, "<$tag ", $indice);
-            if ($pos) {
-                $posCierre = strpos($xml, ">", $pos);
-                if ($xml[$posCierre - 1] == "/") {
-                    $xml = substr_replace($xml, "></$tag>", $posCierre - 1, 2);
-                }
-                $indice = $posCierre;
-            } else {
-                break;
-            }
-        }
-        return $xml;
-    }
+	/**
+	 * expandEmptyTag
+	 *
+	 * @param $tag
+	 * @param $xml
+	 * @return string
+	 * @author mjaque at ilkebenson dot com
+	 * @link   http://php.net/manual/en/domdocument.savehtml.php#81256
+	 */
+	public static function expandEmptyTag($tag, $xml)
+	{
+		$indice = 0;
+		while ($indice < strlen($xml)) {
+			$pos = strpos($xml, "<$tag ", $indice);
+			if ($pos) {
+				$posCierre = strpos($xml, ">", $pos);
+				if ($xml[$posCierre - 1] == "/") {
+					$xml = substr_replace($xml, "></$tag>", $posCierre - 1, 2);
+				}
+				$indice = $posCierre;
+			} else {
+				break;
+			}
+		}
+		return $xml;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -153,7 +153,7 @@ 
     protected function loadMarkupHTML($markup, $requestedCharset = null)
     {
         if (PhpQuery::$debug) {
-            PhpQuery::debug('Full markup load (HTML): ' . substr($markup, 0, 250));
+            PhpQuery::debug('Full markup load (HTML): '.substr($markup, 0, 250));
         }
         $this->loadMarkupReset();
         $this->isHTML = true;
@@ -197,7 +197,7 @@ 
                     $requestedCharset,
                     'AUTO'
                 );
-                $docEncoding      = mb_detect_encoding($markup, implode(', ', $possibleCharsets));
+                $docEncoding = mb_detect_encoding($markup, implode(', ', $possibleCharsets));
                 if (!$docEncoding) {
                     $docEncoding = $documentCharset;
                 }
@@ -243,7 +243,7 @@ 
     protected function loadMarkupXML($markup, $requestedCharset = null)
     {
         if (PhpQuery::$debug) {
-            PhpQuery::debug('Full markup load (XML): ' . substr($markup, 0, 250));
+            PhpQuery::debug('Full markup load (XML): '.substr($markup, 0, 250));
         }
         $this->loadMarkupReset();
         $this->isXML = true;
@@ -320,7 +320,7 @@ 
                     | LIBXML_DTDATTR | LIBXML_NONET
                     : LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_NONET | LIBXML_NOWARNING
                     | LIBXML_NOERROR;
-                $return       = $this->document->loadXML($markup, $libxmlStatic);
+                $return = $this->document->loadXML($markup, $libxmlStatic);
                 // 				if (! $return)
                 // 					$return = $this->document->loadHTML($markup);
             }
@@ -358,7 +358,7 @@ 
     protected function isXML($markup)
     {
         //		return strpos($markup, '<?xml') !== false && stripos($markup, 'xhtml') === false;
-        return strpos(substr($markup, 0, 100), '<' . '?xml') !== false;
+        return strpos(substr($markup, 0, 100), '<'.'?xml') !== false;
     }
 
     protected function contentTypeToArray($contentType)
@@ -413,7 +413,7 @@ 
     {
         $matches;
         // find declaration
-        preg_match('@<' . '?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i', $markup, $matches);
+        preg_match('@<'.'?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i', $markup, $matches);
         return isset($matches[2]) ? strtolower($matches[2]) : null;
     }
 
@@ -440,7 +440,7 @@ 
         $markup          = substr($markup, 0, $matches[0][1])
             . substr($markup, $matches[0][1] + strlen($metaContentType));
         $headStart       = stripos($markup, '<head>');
-        $markup          = substr($markup, 0, $headStart + 6) . $metaContentType
+        $markup          = substr($markup, 0, $headStart + 6).$metaContentType
             . substr($markup, $headStart + 6);
         return $markup;
     }
@@ -450,23 +450,23 @@ 
         // remove existing meta[type=content-type]
         $html = preg_replace('@\s*<meta[^>]+http-equiv\\s*=\\s*(["|\'])Content-Type\\1([^>]+?)>@i', '', $html);
         $meta = '<meta http-equiv="Content-Type" content="text/html;charset='
-            . $charset . '" ' . ($xhtml ? '/' : '') . '>';
+            . $charset.'" '.($xhtml ? '/' : '').'>';
         if (strpos($html, '<head') === false) {
             if (strpos($html, '<html') === false) {
-                return $meta . $html;
+                return $meta.$html;
             } else {
                 return preg_replace('@<html(.*?)(?(?<!\?)>)@s', "<html\\1><head>{$meta}</head>", $html);
             }
         } else {
-            return preg_replace('@<head(.*?)(?(?<!\?)>)@s', '<head\\1>' . $meta, $html);
+            return preg_replace('@<head(.*?)(?(?<!\?)>)@s', '<head\\1>'.$meta, $html);
         }
     }
 
     protected function charsetAppendToXML($markup, $charset)
     {
-        $declaration = '<' . '?xml version="1.0" encoding="' . $charset . '"?'
+        $declaration = '<'.'?xml version="1.0" encoding="'.$charset.'"?'
             . '>';
-        return $declaration . $markup;
+        return $declaration.$markup;
     }
 
     public static function isDocumentFragmentHTML($markup)
@@ -477,7 +477,7 @@ 
 
     public static function isDocumentFragmentXML($markup)
     {
-        return stripos($markup, '<' . '?xml') === false;
+        return stripos($markup, '<'.'?xml') === false;
     }
 
     public static function isDocumentFragmentXHTML($markup)
@@ -604,24 +604,24 @@ 
             if ($fragment->isXHTML) {
                 // add FAKE element to set default namespace
                 $fragment->loadMarkupXML(
-                    '<?xml version="1.0" encoding="' . $charset
+                    '<?xml version="1.0" encoding="'.$charset
                     . '"?>'
                     . '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" '
                     . '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
-                    . '<fake xmlns="http://www.w3.org/1999/xhtml">' . $markup . '</fake>'
+                    . '<fake xmlns="http://www.w3.org/1999/xhtml">'.$markup.'</fake>'
                 );
                 $fragment->root = $fragment->document->firstChild->nextSibling;
             } else {
                 $fragment->loadMarkupXML(
-                    '<?xml version="1.0" encoding="' . $charset
-                    . '"?><fake>' . $markup . '</fake>'
+                    '<?xml version="1.0" encoding="'.$charset
+                    . '"?><fake>'.$markup.'</fake>'
                 );
                 $fragment->root = $fragment->document->firstChild;
             }
         } else {
             $markup2 = PhpQuery::$defaultDoctype
                 . '<html><head><meta http-equiv="Content-Type" content="text/html;charset='
-                . $charset . '"></head>';
+                . $charset.'"></head>';
             $noBody  = strpos($markup, '<body') === false;
             if ($noBody) {
                 $markup2 .= '<body>';
@@ -662,7 +662,7 @@ 
         }
         $fragment->isDocumentFragment = $tmp;
         if (PhpQuery::$debug) {
-            PhpQuery::debug('documentFragmentToMarkup: ' . substr($markup, 0, 150));
+            PhpQuery::debug('documentFragmentToMarkup: '.substr($markup, 0, 150));
         }
         return $markup;
     }
@@ -720,7 +720,7 @@ 
                     $loop = $nodes;
                 }
                 self::debug(
-                    "Getting markup, moving selected nodes (" . count($loop)
+                    "Getting markup, moving selected nodes (".count($loop)
                     . ") to new DocumentFragment"
                 );
                 $fake   = $this->documentFragmentCreate($loop);
@@ -730,7 +730,7 @@ 
                 self::debug("Fixing XHTML");
                 $markup = self::markupFixXHTML($markup);
             }
-            self::debug("Markup: " . substr($markup, 0, 250));
+            self::debug("Markup: ".substr($markup, 0, 250));
             return $markup;
         } else {
             if ($this->isDocumentFragment) {
@@ -745,7 +745,7 @@ 
                 return $markup;
             } else {
                 self::debug(
-                    "Getting markup (" . ($this->isXML ? 'XML' : 'HTML')
+                    "Getting markup (".($this->isXML ? 'XML' : 'HTML')
                     . "), final with charset '{$this->charset}'"
                 );
                 $markup = $this->isXML ? $this->document->saveXML()
@@ -754,7 +754,7 @@ 
                     self::debug("Fixing XHTML");
                     $markup = self::markupFixXHTML($markup);
                 }
-                self::debug("Markup: " . substr($markup, 0, 250));
+                self::debug("Markup: ".substr($markup, 0, 250));
                 return $markup;
             }
         }

src/PhpQuery.php

Doc Comments +17 added lines, -5 removed lines

@@ -338,7 +338,7 @@ 
      * Creates new document from markup.
      * Chainable.
      *
-     * @param null $markup
+     * @param string $markup
      * @param null $charset
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
@@ -380,7 +380,7 @@ 
      * Creates new document from markup.
      * Chainable.
      *
-     * @param null   $markup
+     * @param string   $markup
      * @param string $contentType
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
@@ -571,7 +571,7 @@ 
     /**
      * Enter description here...
      *
-     * @param      $html
+     * @param      string $html
      * @param null $contentType
      * @param null $documentID
      * @return null|string
@@ -737,7 +737,7 @@ 
     /**
      * Unloades all or specified document from memory.
      *
-     * @param null $id
+     * @param string $id
      * @internal param mixed $documentID @see PhpQuery::getDocumentID() for supported types.
      */
     public static function unloadDocuments($id = null)
@@ -1128,6 +1128,9 @@ 
         self::$ajaxSettings = array_merge(self::$ajaxSettings, $options);
     }
 
+    /**
+     * @param string|false $host1
+     */
     public static function ajaxAllowHost($host1, $host2 = null, $host3 = null)
     {
         $loop = is_array($host1) ? $host1 : func_get_args();
@@ -1138,6 +1141,9 @@ 
         }
     }
 
+    /**
+     * @param string $url1
+     */
     public static function ajaxAllowURL($url1, $url2 = null, $url3 = null)
     {
         $loop = is_array($url1) ? $url1 : func_get_args();
@@ -1515,7 +1521,7 @@ 
 
     /**
      *
-     * @param $type
+     * @param string $type
      * @param $code
      * @return string
      */
@@ -1558,6 +1564,9 @@ 
         }
     }
 
+    /**
+     * @param string $documentID
+     */
     public static function data($node, $name, $data, $documentID = null)
     {
         if (!$documentID)
@@ -1579,6 +1588,9 @@ 
             return $id;
     }
 
+    /**
+     * @param string $documentID
+     */
     public static function removeData($node, $name, $documentID)
     {
         if (!$documentID)

Indentation +1568 added lines, -1568 removed lines

@@ -29,7 +29,7 @@ 
  */
 function pq($arg1, $context = null)
 {
-    return PhpQuery::pq($arg1, $context);
+	return PhpQuery::pq($arg1, $context);
 }
 
 /**
@@ -40,1565 +40,1565 @@ 
  */
 abstract class PhpQuery
 {
-    /**
-     * XXX: Workaround for mbstring problems
-     *
-     * @var bool
-     */
-    public static $mbstringSupport = true;
-    public static $debug = false;
-    public static $documents = array();
-    public static $defaultDocumentID = null;
-    //	public static $defaultDoctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"';
-    /**
-     * Applies only to HTML.
-     *
-     * @var string
-     */
-    public static $defaultDoctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	/**
+	 * XXX: Workaround for mbstring problems
+	 *
+	 * @var bool
+	 */
+	public static $mbstringSupport = true;
+	public static $debug = false;
+	public static $documents = array();
+	public static $defaultDocumentID = null;
+	//	public static $defaultDoctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"';
+	/**
+	 * Applies only to HTML.
+	 *
+	 * @var string
+	 */
+	public static $defaultDoctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">';
-    public static $defaultCharset = 'UTF-8';
-    /**
-     * Static namespace for plugins.
-     *
-     * @var object
-     */
-    public static $plugins = array();
-    /**
-     * List of loaded plugins.
-     *
-     * @var array
-     */
-    public static $pluginsLoaded = array();
-    public static $pluginsMethods = array();
-    public static $pluginsStaticMethods = array();
-    public static $extendMethods = array();
-    /**
-     * @TODO implement
-     */
-    public static $extendStaticMethods = array();
-    /**
-     * Hosts allowed for AJAX connections.
-     * Dot '.' means $_SERVER['HTTP_HOST'] (if any).
-     *
-     * @var array
-     */
-    public static $ajaxAllowedHosts = array(
-        '.'
-    );
-    /**
-     * AJAX settings.
-     *
-     * @var array
-     * XXX should it be static or not ?
-     */
-    public static $ajaxSettings = array(
-        'url'         => '',
-        //TODO
-        'global'      => true,
-        'type'        => "GET",
-        'timeout'     => null,
-        'contentType' => "application/x-www-form-urlencoded",
-        'processData' => true,
-        //		'async' => true,
-        'data'        => null,
-        'username'    => null,
-        'password'    => null,
-        'dataType'    => null,
-        'ifModified'  => null,
-        'accepts'     => array(
-            'xml'      => "application/xml, text/xml",
-            'html'     => "text/html",
-            'script'   => "text/javascript, application/javascript",
-            'json'     => "application/json, text/javascript",
-            'text'     => "text/plain",
-            '_default' => "*/*"
-        )
-    );
-    public static $lastModified = null;
-    public static $active = 0;
-    public static $dumpCount = 0;
-    public static $enableCssShorthand = false;
-
-    public static function use_function($ns = '\\', $func = 'pq')
-    {
-        if ($ns{0} !== '\\') {
-            $ns = '\\' . $ns;
-        }
-        if (!function_exists($ns . '\\' . $func)) {
-            if ($ns === '\\') {
-                eval("function $func(\$a, \$b = '') { return \\PhpQuery\\PhpQuery::pq(\$a, \$b); }");
-            } else {
-                $ns = substr($ns, 1);
-                eval("namespace $ns { function $func(\$a, \$b = '') { return \\PhpQuery\\PhpQuery::pq(\$a, \$b); } }");
-            }
-        }
-    }
-
-
-    /**
-     * Multi-purpose function.
-     * Use pq() as shortcut.
-     *
-     * In below examples, $pq is any result of pq(); function.
-     *
-     * 1. Import markup into existing document (without any attaching):
-     * - Import into selected document:
-     *   pq('<div/>')                // DOESNT accept text nodes at beginning of input string !
-     * - Import into document with ID from $pq->getDocumentID():
-     *   pq('<div/>', $pq->getDocumentID())
-     * - Import into same document as \DOMNode belongs to:
-     *   pq('<div/>', \DOMNode)
-     * - Import into document from PhpQuery object:
-     *   pq('<div/>', $pq)
-     *
-     * 2. Run query:
-     * - Run query on last selected document:
-     *   pq('div.myClass')
-     * - Run query on document with ID from $pq->getDocumentID():
-     *   pq('div.myClass', $pq->getDocumentID())
-     * - Run query on same document as \DOMNode belongs to and use node(s)as root for query:
-     *   pq('div.myClass', \DOMNode)
-     * - Run query on document from PhpQuery object
-     *   and use object's stack as root node(s) for query:
-     *   pq('div.myClass', $pq)
-     *
-     * @param string|\DOMNode|\DOMNodeList|array $arg1    HTML markup, CSS Selector, \DOMNode or array of \DOMNodes
-     * @param string|PhpQueryObject|\DOMNode     $context DOM ID from $pq->getDocumentID(), PhpQuery object (determines also query root) or \DOMNode (determines also query root)
-     *
-     * @throws \Exception
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery|QueryTemplatesPhpQuery|false
-     * PhpQuery object or false in case of error.
-     */
-    public static function pq($arg1, $context = null)
-    {
-        if ($arg1 instanceof \DOMNode && !isset($context)) {
-            foreach (PhpQuery::$documents as $documentWrapper) {
-                $compare = $arg1 instanceof \DOMDocument ? $arg1 : $arg1->ownerDocument;
-                if ($documentWrapper->document->isSameNode($compare)) {
-                    $context = $documentWrapper->id;
-                }
-            }
-        }
-        if (!$context) {
-            $domId = self::$defaultDocumentID;
-            if (!$domId) {
-                throw new \Exception("Can't use last created DOM, because there isn't any. Use PhpQuery::newDocument() first.");
-            }
-            //		} else if (is_object($context) && ($context instanceof PHPQUERY || is_subclass_of($context, 'PhpQueryObject')))
-        } else {
-            if (is_object($context) && $context instanceof PhpQueryObject) {
-                $domId = $context->getDocumentID();
-            } else {
-                if ($context instanceof \DOMDocument) {
-                    $domId = self::getDocumentID($context);
-                    if (!$domId) {
-                        //throw new \Exception('Orphaned \DOMDocument');
-                        $domId = self::newDocument($context)->getDocumentID();
-                    }
-                } else {
-                    if ($context instanceof \DOMNode) {
-                        $domId = self::getDocumentID($context);
-                        if (!$domId) {
-                            throw new \Exception('Orphaned DOMNode');
-                            //				$domId = self::newDocument($context->ownerDocument);
-                        }
-                    } else {
-                        $domId = $context;
-                    }
-                }
-            }
-        }
-        if ($arg1 instanceof PhpQueryObject) {
-            //		if (is_object($arg1) && (get_class($arg1) == 'PhpQueryObject' || $arg1 instanceof PHPQUERY || is_subclass_of($arg1, 'PhpQueryObject'))) {
-            /**
-             * Return $arg1 or import $arg1 stack if document differs:
-             * pq(pq('<div/>'))
-             */
-            if ($arg1->getDocumentID() == $domId) {
-                return $arg1;
-            }
-            $class = get_class($arg1);
-            // support inheritance by passing old object to overloaded constructor
-            $PhpQuery           = $class != 'PhpQuery' ? new $class($arg1, $domId)
-                : new PhpQueryObject($domId);
-            $PhpQuery->elements = array();
-            foreach ($arg1->elements as $node) {
-                $PhpQuery->elements[] = $PhpQuery->document->importNode($node, true);
-            }
-            return $PhpQuery;
-        } else {
-            if ($arg1 instanceof \DOMNode
-                || (is_array($arg1) && isset($arg1[0]) && $arg1[0] instanceof \DOMNode)
-            ) {
-                /*
+	public static $defaultCharset = 'UTF-8';
+	/**
+	 * Static namespace for plugins.
+	 *
+	 * @var object
+	 */
+	public static $plugins = array();
+	/**
+	 * List of loaded plugins.
+	 *
+	 * @var array
+	 */
+	public static $pluginsLoaded = array();
+	public static $pluginsMethods = array();
+	public static $pluginsStaticMethods = array();
+	public static $extendMethods = array();
+	/**
+	 * @TODO implement
+	 */
+	public static $extendStaticMethods = array();
+	/**
+	 * Hosts allowed for AJAX connections.
+	 * Dot '.' means $_SERVER['HTTP_HOST'] (if any).
+	 *
+	 * @var array
+	 */
+	public static $ajaxAllowedHosts = array(
+		'.'
+	);
+	/**
+	 * AJAX settings.
+	 *
+	 * @var array
+	 * XXX should it be static or not ?
+	 */
+	public static $ajaxSettings = array(
+		'url'         => '',
+		//TODO
+		'global'      => true,
+		'type'        => "GET",
+		'timeout'     => null,
+		'contentType' => "application/x-www-form-urlencoded",
+		'processData' => true,
+		//		'async' => true,
+		'data'        => null,
+		'username'    => null,
+		'password'    => null,
+		'dataType'    => null,
+		'ifModified'  => null,
+		'accepts'     => array(
+			'xml'      => "application/xml, text/xml",
+			'html'     => "text/html",
+			'script'   => "text/javascript, application/javascript",
+			'json'     => "application/json, text/javascript",
+			'text'     => "text/plain",
+			'_default' => "*/*"
+		)
+	);
+	public static $lastModified = null;
+	public static $active = 0;
+	public static $dumpCount = 0;
+	public static $enableCssShorthand = false;
+
+	public static function use_function($ns = '\\', $func = 'pq')
+	{
+		if ($ns{0} !== '\\') {
+			$ns = '\\' . $ns;
+		}
+		if (!function_exists($ns . '\\' . $func)) {
+			if ($ns === '\\') {
+				eval("function $func(\$a, \$b = '') { return \\PhpQuery\\PhpQuery::pq(\$a, \$b); }");
+			} else {
+				$ns = substr($ns, 1);
+				eval("namespace $ns { function $func(\$a, \$b = '') { return \\PhpQuery\\PhpQuery::pq(\$a, \$b); } }");
+			}
+		}
+	}
+
+
+	/**
+	 * Multi-purpose function.
+	 * Use pq() as shortcut.
+	 *
+	 * In below examples, $pq is any result of pq(); function.
+	 *
+	 * 1. Import markup into existing document (without any attaching):
+	 * - Import into selected document:
+	 *   pq('<div/>')                // DOESNT accept text nodes at beginning of input string !
+	 * - Import into document with ID from $pq->getDocumentID():
+	 *   pq('<div/>', $pq->getDocumentID())
+	 * - Import into same document as \DOMNode belongs to:
+	 *   pq('<div/>', \DOMNode)
+	 * - Import into document from PhpQuery object:
+	 *   pq('<div/>', $pq)
+	 *
+	 * 2. Run query:
+	 * - Run query on last selected document:
+	 *   pq('div.myClass')
+	 * - Run query on document with ID from $pq->getDocumentID():
+	 *   pq('div.myClass', $pq->getDocumentID())
+	 * - Run query on same document as \DOMNode belongs to and use node(s)as root for query:
+	 *   pq('div.myClass', \DOMNode)
+	 * - Run query on document from PhpQuery object
+	 *   and use object's stack as root node(s) for query:
+	 *   pq('div.myClass', $pq)
+	 *
+	 * @param string|\DOMNode|\DOMNodeList|array $arg1    HTML markup, CSS Selector, \DOMNode or array of \DOMNodes
+	 * @param string|PhpQueryObject|\DOMNode     $context DOM ID from $pq->getDocumentID(), PhpQuery object (determines also query root) or \DOMNode (determines also query root)
+	 *
+	 * @throws \Exception
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery|QueryTemplatesPhpQuery|false
+	 * PhpQuery object or false in case of error.
+	 */
+	public static function pq($arg1, $context = null)
+	{
+		if ($arg1 instanceof \DOMNode && !isset($context)) {
+			foreach (PhpQuery::$documents as $documentWrapper) {
+				$compare = $arg1 instanceof \DOMDocument ? $arg1 : $arg1->ownerDocument;
+				if ($documentWrapper->document->isSameNode($compare)) {
+					$context = $documentWrapper->id;
+				}
+			}
+		}
+		if (!$context) {
+			$domId = self::$defaultDocumentID;
+			if (!$domId) {
+				throw new \Exception("Can't use last created DOM, because there isn't any. Use PhpQuery::newDocument() first.");
+			}
+			//		} else if (is_object($context) && ($context instanceof PHPQUERY || is_subclass_of($context, 'PhpQueryObject')))
+		} else {
+			if (is_object($context) && $context instanceof PhpQueryObject) {
+				$domId = $context->getDocumentID();
+			} else {
+				if ($context instanceof \DOMDocument) {
+					$domId = self::getDocumentID($context);
+					if (!$domId) {
+						//throw new \Exception('Orphaned \DOMDocument');
+						$domId = self::newDocument($context)->getDocumentID();
+					}
+				} else {
+					if ($context instanceof \DOMNode) {
+						$domId = self::getDocumentID($context);
+						if (!$domId) {
+							throw new \Exception('Orphaned DOMNode');
+							//				$domId = self::newDocument($context->ownerDocument);
+						}
+					} else {
+						$domId = $context;
+					}
+				}
+			}
+		}
+		if ($arg1 instanceof PhpQueryObject) {
+			//		if (is_object($arg1) && (get_class($arg1) == 'PhpQueryObject' || $arg1 instanceof PHPQUERY || is_subclass_of($arg1, 'PhpQueryObject'))) {
+			/**
+			 * Return $arg1 or import $arg1 stack if document differs:
+			 * pq(pq('<div/>'))
+			 */
+			if ($arg1->getDocumentID() == $domId) {
+				return $arg1;
+			}
+			$class = get_class($arg1);
+			// support inheritance by passing old object to overloaded constructor
+			$PhpQuery           = $class != 'PhpQuery' ? new $class($arg1, $domId)
+				: new PhpQueryObject($domId);
+			$PhpQuery->elements = array();
+			foreach ($arg1->elements as $node) {
+				$PhpQuery->elements[] = $PhpQuery->document->importNode($node, true);
+			}
+			return $PhpQuery;
+		} else {
+			if ($arg1 instanceof \DOMNode
+				|| (is_array($arg1) && isset($arg1[0]) && $arg1[0] instanceof \DOMNode)
+			) {
+				/*
                  * Wrap DOM nodes with PhpQuery object, import into document when needed:
                  * pq(array($domNode1, $domNode2))
                  */
-                $PhpQuery = new PhpQueryObject($domId);
-                if (!($arg1 instanceof \DOMNodeList) && !is_array($arg1)) {
-                    $arg1 = array(
-                        $arg1
-                    );
-                }
-                $PhpQuery->elements = array();
-                foreach ($arg1 as $node) {
-                    $sameDocument         = $node->ownerDocument instanceof \DOMDocument
-                        && !$node->ownerDocument->isSameNode($PhpQuery->document);
-                    $PhpQuery->elements[] = $sameDocument ? $PhpQuery->document->importNode($node, true)
-                        : $node;
-                }
-                return $PhpQuery;
-            } else {
-                if (self::isMarkup($arg1)) {
-                    /**
-                     * Import HTML:
-                     * pq('<div/>')
-                     */
-                    $PhpQuery = new PhpQueryObject($domId);
-                    return $PhpQuery->newInstance($PhpQuery->documentWrapper->import($arg1));
-                } else {
-                    /**
-                     * Run CSS query:
-                     * pq('div.myClass')
-                     */
-                    $PhpQuery = new PhpQueryObject($domId);
-                    //			if ($context && ($context instanceof PHPQUERY || is_subclass_of($context, 'PhpQueryObject')))
-                    if ($context && $context instanceof PhpQueryObject) {
-                        $PhpQuery->elements = $context->elements;
-                    } else {
-                        if ($context && $context instanceof \DOMNodeList) {
-                            $PhpQuery->elements = array();
-                            foreach ($context as $node) {
-                                $PhpQuery->elements[] = $node;
-                            }
-                        } else {
-                            if ($context && $context instanceof \DOMNode) {
-                                $PhpQuery->elements = array(
-                                    $context
-                                );
-                            }
-                        }
-                    }
-                    return $PhpQuery->find($arg1);
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets default document to $id. Document has to be loaded prior
-     * to using this method.
-     * $id can be retrived via getDocumentID() or getDocumentIDRef().
-     *
-     * @param string $id
-     */
-    public static function selectDocument($id)
-    {
-        $id = self::getDocumentID($id);
-        self::debug("Selecting document '$id' as default one");
-        self::$defaultDocumentID = self::getDocumentID($id);
-    }
-
-    /**
-     * Returns document with id $id or last used as PhpQueryObject.
-     * $id can be retrived via getDocumentID() or getDocumentIDRef().
-     * Chainable.
-     *
-     * @see PhpQuery::selectDocument()
-     * @param null $id
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function getDocument($id = null)
-    {
-        if ($id)
-            PhpQuery::selectDocument($id);
-        else
-            $id = PhpQuery::$defaultDocumentID;
-        return new PhpQueryObject($id);
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param null $markup
-     * @param null $contentType
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocument($markup = null, $contentType = null)
-    {
-        if (!$markup)
-            $markup = '';
-        $documentID = PhpQuery::createDocumentWrapper($markup, $contentType);
-        return new PhpQueryObject($documentID);
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param null $markup
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentHTML($markup = null, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocument($markup, "text/html{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param null $markup
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentXML($markup = null, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocument($markup, "text/xml{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param null $markup
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentXHTML($markup = null, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocument($markup, "application/xhtml+xml{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param null   $markup
-     * @param string $contentType
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentPHP($markup = null, $contentType = "text/html")
-    {
-        // TODO pass charset to phpToMarkup if possible (use DOMDocumentWrapper function)
-        $markup = PhpQuery::phpToMarkup($markup, self::$defaultCharset);
-        return self::newDocument($markup, $contentType);
-    }
-
-    public static function phpToMarkup($php, $charset = 'utf-8')
-    {
-        $regexes = array(
-            '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)<'
-            . '?php?(.*?)(?:\\?>)([^\']*)\'@s',
-            '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)<'
-            . '?php?(.*?)(?:\\?>)([^"]*)"@s',
-        );
-        foreach ($regexes as $regex)
-            while (preg_match($regex, $php, $matches)) {
-                $php = preg_replace_callback(
-                    $regex,
-                    //					create_function('$m, $charset = "'.$charset.'"',
-                    //						'return $m[1].$m[2]
-                    //							.htmlspecialchars("<"."?php".$m[4]."?".">", ENT_QUOTES|ENT_NOQUOTES, $charset)
-                    //							.$m[5].$m[2];'
-                    //					),
-                    array(
-                        'PhpQuery',
-                        '_phpToMarkupCallback'
-                    ),
-                    $php
-                );
-            }
-        $regex = '@(^|>[^<]*)+?(<\?php(.*?)(\?>))@s';
-        //preg_match_all($regex, $php, $matches);
-        //var_dump($matches);
-        $php = preg_replace($regex, '\\1<php><!-- \\3 --></php>', $php);
-        return $php;
-    }
-
-    public static function _phpToMarkupCallback($m, $charset = 'utf-8')
-    {
-        return $m[1] . $m[2]
-        . htmlspecialchars(
-            "<" . "?php" . $m[4] . "?" . ">",
-            ENT_QUOTES
-            | ENT_NOQUOTES,
-            $charset
-        ) . $m[5] . $m[2];
-    }
-
-    public static function _markupToPHPCallback($m)
-    {
-        return "<" . "?php " . htmlspecialchars_decode($m[1]) . " ?" . ">";
-    }
-
-    /**
-     * Converts document markup containing PHP code generated by PhpQuery::php()
-     * into valid (executable) PHP code syntax.
-     *
-     * @param string|PhpQueryObject $content
-     * @return string PHP code.
-     */
-    public static function markupToPHP($content)
-    {
-        if ($content instanceof PhpQueryObject)
-            $content = $content->markupOuter();
-        /* <php>...</php> to <?php...? > */
-        $content = preg_replace_callback(
-            '@<php>\s*<!--(.*?)-->\s*</php>@s',
-            //			create_function('$m',
-            //				'return "<'.'?php ".htmlspecialchars_decode($m[1])." ?'.'>";'
-            //			),
-            array(
-                'PhpQuery',
-                '_markupToPHPCallback'
-            ),
-            $content
-        );
-        /* <node attr='< ?php ? >'> extra space added to save highlighters */
-        $regexes = array(
-            '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^\']*)\'@s',
-            '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^"]*)"@s',
-        );
-        foreach ($regexes as $regex)
-            while (preg_match($regex, $content))
-                $content = preg_replace_callback(
-                    $regex,
-                    create_function(
-                        '$m',
-                        'return $m[1].$m[2].$m[3]."<?php "
+				$PhpQuery = new PhpQueryObject($domId);
+				if (!($arg1 instanceof \DOMNodeList) && !is_array($arg1)) {
+					$arg1 = array(
+						$arg1
+					);
+				}
+				$PhpQuery->elements = array();
+				foreach ($arg1 as $node) {
+					$sameDocument         = $node->ownerDocument instanceof \DOMDocument
+						&& !$node->ownerDocument->isSameNode($PhpQuery->document);
+					$PhpQuery->elements[] = $sameDocument ? $PhpQuery->document->importNode($node, true)
+						: $node;
+				}
+				return $PhpQuery;
+			} else {
+				if (self::isMarkup($arg1)) {
+					/**
+					 * Import HTML:
+					 * pq('<div/>')
+					 */
+					$PhpQuery = new PhpQueryObject($domId);
+					return $PhpQuery->newInstance($PhpQuery->documentWrapper->import($arg1));
+				} else {
+					/**
+					 * Run CSS query:
+					 * pq('div.myClass')
+					 */
+					$PhpQuery = new PhpQueryObject($domId);
+					//			if ($context && ($context instanceof PHPQUERY || is_subclass_of($context, 'PhpQueryObject')))
+					if ($context && $context instanceof PhpQueryObject) {
+						$PhpQuery->elements = $context->elements;
+					} else {
+						if ($context && $context instanceof \DOMNodeList) {
+							$PhpQuery->elements = array();
+							foreach ($context as $node) {
+								$PhpQuery->elements[] = $node;
+							}
+						} else {
+							if ($context && $context instanceof \DOMNode) {
+								$PhpQuery->elements = array(
+									$context
+								);
+							}
+						}
+					}
+					return $PhpQuery->find($arg1);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Sets default document to $id. Document has to be loaded prior
+	 * to using this method.
+	 * $id can be retrived via getDocumentID() or getDocumentIDRef().
+	 *
+	 * @param string $id
+	 */
+	public static function selectDocument($id)
+	{
+		$id = self::getDocumentID($id);
+		self::debug("Selecting document '$id' as default one");
+		self::$defaultDocumentID = self::getDocumentID($id);
+	}
+
+	/**
+	 * Returns document with id $id or last used as PhpQueryObject.
+	 * $id can be retrived via getDocumentID() or getDocumentIDRef().
+	 * Chainable.
+	 *
+	 * @see PhpQuery::selectDocument()
+	 * @param null $id
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function getDocument($id = null)
+	{
+		if ($id)
+			PhpQuery::selectDocument($id);
+		else
+			$id = PhpQuery::$defaultDocumentID;
+		return new PhpQueryObject($id);
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param null $markup
+	 * @param null $contentType
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocument($markup = null, $contentType = null)
+	{
+		if (!$markup)
+			$markup = '';
+		$documentID = PhpQuery::createDocumentWrapper($markup, $contentType);
+		return new PhpQueryObject($documentID);
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param null $markup
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentHTML($markup = null, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocument($markup, "text/html{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param null $markup
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentXML($markup = null, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocument($markup, "text/xml{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param null $markup
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentXHTML($markup = null, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocument($markup, "application/xhtml+xml{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param null   $markup
+	 * @param string $contentType
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentPHP($markup = null, $contentType = "text/html")
+	{
+		// TODO pass charset to phpToMarkup if possible (use DOMDocumentWrapper function)
+		$markup = PhpQuery::phpToMarkup($markup, self::$defaultCharset);
+		return self::newDocument($markup, $contentType);
+	}
+
+	public static function phpToMarkup($php, $charset = 'utf-8')
+	{
+		$regexes = array(
+			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)<'
+			. '?php?(.*?)(?:\\?>)([^\']*)\'@s',
+			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)<'
+			. '?php?(.*?)(?:\\?>)([^"]*)"@s',
+		);
+		foreach ($regexes as $regex)
+			while (preg_match($regex, $php, $matches)) {
+				$php = preg_replace_callback(
+					$regex,
+					//					create_function('$m, $charset = "'.$charset.'"',
+					//						'return $m[1].$m[2]
+					//							.htmlspecialchars("<"."?php".$m[4]."?".">", ENT_QUOTES|ENT_NOQUOTES, $charset)
+					//							.$m[5].$m[2];'
+					//					),
+					array(
+						'PhpQuery',
+						'_phpToMarkupCallback'
+					),
+					$php
+				);
+			}
+		$regex = '@(^|>[^<]*)+?(<\?php(.*?)(\?>))@s';
+		//preg_match_all($regex, $php, $matches);
+		//var_dump($matches);
+		$php = preg_replace($regex, '\\1<php><!-- \\3 --></php>', $php);
+		return $php;
+	}
+
+	public static function _phpToMarkupCallback($m, $charset = 'utf-8')
+	{
+		return $m[1] . $m[2]
+		. htmlspecialchars(
+			"<" . "?php" . $m[4] . "?" . ">",
+			ENT_QUOTES
+			| ENT_NOQUOTES,
+			$charset
+		) . $m[5] . $m[2];
+	}
+
+	public static function _markupToPHPCallback($m)
+	{
+		return "<" . "?php " . htmlspecialchars_decode($m[1]) . " ?" . ">";
+	}
+
+	/**
+	 * Converts document markup containing PHP code generated by PhpQuery::php()
+	 * into valid (executable) PHP code syntax.
+	 *
+	 * @param string|PhpQueryObject $content
+	 * @return string PHP code.
+	 */
+	public static function markupToPHP($content)
+	{
+		if ($content instanceof PhpQueryObject)
+			$content = $content->markupOuter();
+		/* <php>...</php> to <?php...? > */
+		$content = preg_replace_callback(
+			'@<php>\s*<!--(.*?)-->\s*</php>@s',
+			//			create_function('$m',
+			//				'return "<'.'?php ".htmlspecialchars_decode($m[1])." ?'.'>";'
+			//			),
+			array(
+				'PhpQuery',
+				'_markupToPHPCallback'
+			),
+			$content
+		);
+		/* <node attr='< ?php ? >'> extra space added to save highlighters */
+		$regexes = array(
+			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^\']*)\'@s',
+			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^"]*)"@s',
+		);
+		foreach ($regexes as $regex)
+			while (preg_match($regex, $content))
+				$content = preg_replace_callback(
+					$regex,
+					create_function(
+						'$m',
+						'return $m[1].$m[2].$m[3]."<?php "
                                                    .str_replace(
                                                        array("%20", "%3E", "%09", "&#10;", "&#9;", "%7B", "%24", "%7D", "%22", "%5B", "%5D"),
                                                        array(" ", ">", "	", "\n", "	", "{", "$", "}", \'"\', "[", "]"),
                                                        htmlspecialchars_decode($m[4])
                                                    )
                                                    ." ?>".$m[5].$m[2];'
-                    ),
-                    $content
-                );
-        return $content;
-    }
-
-    /**
-     * Creates new document from file $file.
-     * Chainable.
-     *
-     * @param string $file URLs allowed. See File wrapper page at php.net for more supported sources.
-     * @param null   $contentType
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentFile($file, $contentType = null)
-    {
-        $documentID = self::createDocumentWrapper(file_get_contents($file), $contentType);
-        return new PhpQueryObject($documentID);
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param      $file
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentFileHTML($file, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocumentFile($file, "text/html{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param      $file
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentFileXML($file, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocumentFile($file, "text/xml{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param      $file
-     * @param null $charset
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentFileXHTML($file, $charset = null)
-    {
-        $contentType = $charset ? ";charset=$charset" : '';
-        return self::newDocumentFile($file, "application/xhtml+xml{$contentType}");
-    }
-
-    /**
-     * Creates new document from markup.
-     * Chainable.
-     *
-     * @param      $file
-     * @param null $contentType
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public static function newDocumentFilePHP($file, $contentType = null)
-    {
-        return self::newDocumentPHP(file_get_contents($file), $contentType);
-    }
-
-    /**
-     * Reuses existing \DOMDocument object.
-     * Chainable.
-     *
-     * @param $document \DOMDocument
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @TODO support \DOMDocument
-     */
-    public static function loadDocument($document)
-    {
-        // TODO
-        die('TODO loadDocument');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $html
-     * @param null $contentType
-     * @param null $documentID
-     * @return null|string
-     * @throws \Exception
-     * @todo support PHP tags in input
-     * @todo support passing \DOMDocument object from self::loadDocument
-     */
-    protected static function createDocumentWrapper($html, $contentType = null, $documentID = null)
-    {
-        if (function_exists('domxml_open_mem'))
-            throw new \Exception("Old PHP4 DOM XML extension detected. PhpQuery won't work until this extension is enabled.");
-        //		$id = $documentID
-        //			? $documentID
-        //			: md5(microtime());
-        $document = null;
-        if ($html instanceof \DOMDocument) {
-            if (self::getDocumentID($html)) {
-                // document already exists in PhpQuery::$documents, make a copy
-                $document = clone $html;
-            } else {
-                // new document, add it to PhpQuery::$documents
-                $wrapper = new Dom\DOMDocumentWrapper($html, $contentType, $documentID);
-            }
-        } else {
-            $wrapper = new Dom\DOMDocumentWrapper($html, $contentType, $documentID);
-        }
-        //		$wrapper->id = $id;
-        // bind document
-        PhpQuery::$documents[$wrapper->id] = $wrapper;
-        // remember last loaded document
-        PhpQuery::selectDocument($wrapper->id);
-        return $wrapper->id;
-    }
-
-    /**
-     * Extend class namespace.
-     *
-     * @param string|array $target
-     * @param array        $source
-     * @throws \Exception
-     * @return bool
-     * @TODO support string $source
-     */
-    public static function extend($target, $source)
-    {
-        switch ($target) {
-            case 'PhpQueryObject':
-                $targetRef  = & self::$extendMethods;
-                $targetRef2 = & self::$pluginsMethods;
-                break;
-            case 'PhpQuery':
-                $targetRef  = & self::$extendStaticMethods;
-                $targetRef2 = & self::$pluginsStaticMethods;
-                break;
-            default:
-                throw new \Exception("Unsupported \$target type");
-        }
-        if (is_string($source))
-            $source = array(
-                $source => $source
-            );
-        foreach ($source as $method => $callback) {
-            if (isset($targetRef[$method])) {
-                //				throw new \Exception
-                self::debug("Duplicate method '{$method}', can\'t extend '{$target}'");
-                continue;
-            }
-            if (isset($targetRef2[$method])) {
-                //				throw new \Exception
-                self::debug(
-                    "Duplicate method '{$method}' from plugin '{$targetRef2[$method]}',"
-                    . " can\'t extend '{$target}'"
-                );
-                continue;
-            }
-            $targetRef[$method] = $callback;
-        }
-        return true;
-    }
-
-    /**
-     * Extend PhpQuery with $class from $file.
-     *
-     * @param string $class Extending class name. Real class name can be prepended PhpQuery_.
-     * @param string $file  Filename to include. Defaults to "{$class}.php".
-     * @throws \Exception
-     * @return bool
-     */
-    public static function plugin($class, $file = null)
-    {
-        // TODO $class checked agains PhpQuery_$class
-        //		if (strpos($class, 'PhpQuery') === 0)
-        //			$class = substr($class, 8);
-        if (in_array($class, self::$pluginsLoaded))
-            return true;
-        if (!$file)
-            $file = $class . '.php';
-        $objectClassExists = class_exists('\\PhpQuery\\Plugin\\' . $class);
-        $staticClassExists = class_exists('\PhpQuery\Plugin\Util' . $class);
-        if (!$objectClassExists && !$staticClassExists)
-            require_once($file);
-        self::$pluginsLoaded[] = $class;
-        // static methods
-        if (class_exists('\PhpQuery\Plugin\Util' . $class)) {
-            $realClass = '\PhpQuery\Plugin\Util' . $class;
-            $vars      = get_class_vars($realClass);
-            $loop      = isset($vars['PhpQueryMethods'])
-            && !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
-                : get_class_methods($realClass);
-            foreach ($loop as $method) {
-                if ($method == '__initialize')
-                    continue;
-                if (!is_callable(
-                    array(
-                        $realClass,
-                        $method
-                    )
-                )
-                )
-                    continue;
-                if (isset(self::$pluginsStaticMethods[$method])) {
-                    throw new \Exception("Duplicate method '{$method}' from plugin '{$c}' conflicts with same method from plugin '"
-                                         . self::$pluginsStaticMethods[$method] . "'");
-                }
-                self::$pluginsStaticMethods[$method] = $class;
-            }
-            if (method_exists($realClass, '__initialize'))
-                call_user_func_array(
-                    array(
-                        $realClass,
-                        '__initialize'
-                    ),
-                    array()
-                );
-        }
-        // object methods
-        if (class_exists('\\PhpQuery\\Plugin\\' . $class)) {
-            $realClass = '\\PhpQuery\\Plugin\\' . $class;
-            $vars      = get_class_vars($realClass);
-            $loop      = isset($vars['PhpQueryMethods'])
-            && !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
-                : get_class_methods($realClass);
-            foreach ($loop as $method) {
-                if (!is_callable(
-                    array(
-                        $realClass,
-                        $method
-                    )
-                )
-                )
-                    continue;
-                if (isset(self::$pluginsMethods[$method])) {
-                    throw new \Exception("Duplicate method '{$method}' from plugin '{$class}' conflicts with same method from plugin '"
-                                         . self::$pluginsMethods[$method] . "'");
-                    continue;
-                }
-                self::$pluginsMethods[$method] = $class;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Unloades all or specified document from memory.
-     *
-     * @param null $id
-     * @internal param mixed $documentID @see PhpQuery::getDocumentID() for supported types.
-     */
-    public static function unloadDocuments($id = null)
-    {
-        if (isset($id)) {
-            if ($id = self::getDocumentID($id))
-                unset(PhpQuery::$documents[$id]);
-        } else {
-            foreach (PhpQuery::$documents as $k => $v) {
-                unset(PhpQuery::$documents[$k]);
-            }
-        }
-    }
-
-    /**
-     * Parses PhpQuery object or HTML result against PHP tags and makes them active.
-     *
-     * @param PhpQuery|string $content
-     * @deprecated
-     * @return string
-     */
-    public static function unsafePHPTags($content)
-    {
-        return self::markupToPHP($content);
-    }
-
-    public static function DOMNodeListToArray($DOMNodeList)
-    {
-        $array = array();
-        if (!$DOMNodeList)
-            return $array;
-        foreach ($DOMNodeList as $node)
-            $array[] = $node;
-        return $array;
-    }
-
-    /**
-     * Checks if $input is HTML string, which has to start with '<'.
-     *
-     * @deprecated
-     * @param String $input
-     * @return Bool
-     * @todo still used ?
-     */
-    public static function isMarkup($input)
-    {
-        return is_string($input) && substr(trim($input), 0, 1) == '<';
-    }
-
-    public static function debug($text)
-    {
-        if (self::$debug)
-            print var_dump($text);
-    }
-
-    /**
-     * Make an AJAX request.
-     *
-     * @param array $options
-     * @param null  $xhr
-     * @throws \Exception
-     * @internal param \PhpQuery\See $array $options http://docs.jquery.com/Ajax/jQuery.ajax#toptions
-     * Additional options are:
-     * 'document' - document for global events, @see PhpQuery::getDocumentID()
-     * 'referer' - implemented
-     * 'requested_with' - TODO; not implemented (X-Requested-With)
-     * @return \Zend_Http_Client
-     * @link     http://docs.jquery.com/Ajax/jQuery.ajax
-     *
-     * @TODO $options['cache']
-     * @TODO $options['processData']
-     * @TODO $options['xhr']
-     * @TODO $options['data'] as string
-     * @TODO     XHR interface
-     */
-    public static function ajax($options = array(), $xhr = null)
-    {
-        $options    = array_merge(self::$ajaxSettings, $options);
-        $documentID = isset($options['document']) ? self::getDocumentID($options['document'])
-            : null;
-        if ($xhr) {
-            // reuse existing XHR object, but clean it up
-            $client = $xhr;
-            //			$client->setParameterPost(null);
-            //			$client->setParameterGet(null);
-            $client->setAuth(false);
-            $client->setHeaders("If-Modified-Since", null);
-            $client->setHeaders("Referer", null);
-            $client->resetParameters();
-        } else {
-            // create new XHR object
-            $client = new \Zend_Http_Client();
-            $client->setCookieJar();
-        }
-        if (isset($options['timeout']))
-            $client->setConfig(
-                array(
-                    'timeout' => $options['timeout'],
-                )
-            );
-        //			'maxredirects' => 0,
-        foreach (self::$ajaxAllowedHosts as $k => $host)
-            if ($host == '.' && isset($_SERVER['HTTP_HOST']))
-                self::$ajaxAllowedHosts[$k] = $_SERVER['HTTP_HOST'];
-        $host = parse_url($options['url'], PHP_URL_HOST);
-        if (!in_array($host, self::$ajaxAllowedHosts)) {
-            throw new \Exception("Request not permitted, host '$host' not present in "
-                                 . "PhpQuery::\$ajaxAllowedHosts");
-        }
-        // JSONP
-        $jsre = "/=\\?(&|$)/";
-        if (isset($options['dataType']) && $options['dataType'] == 'jsonp') {
-            $jsonpCallbackParam = $options['jsonp'] ? $options['jsonp'] : 'callback';
-            if (strtolower($options['type']) == 'get') {
-                if (!preg_match($jsre, $options['url'])) {
-                    $sep = strpos($options['url'], '?') ? '&' : '?';
-                    $options['url'] .= "$sep$jsonpCallbackParam=?";
-                }
-            } else if ($options['data']) {
-                $jsonp = false;
-                foreach ($options['data'] as $n => $v) {
-                    if ($v == '?')
-                        $jsonp = true;
-                }
-                if (!$jsonp) {
-                    $options['data'][$jsonpCallbackParam] = '?';
-                }
-            }
-            $options['dataType'] = 'json';
-        }
-        if (isset($options['dataType']) && $options['dataType'] == 'json') {
-            $jsonpCallback = 'json_' . md5(microtime());
-            $jsonpData     = $jsonpUrl = false;
-            if ($options['data']) {
-                foreach ($options['data'] as $n => $v) {
-                    if ($v == '?')
-                        $jsonpData = $n;
-                }
-            }
-            if (preg_match($jsre, $options['url']))
-                $jsonpUrl = true;
-            if ($jsonpData !== false || $jsonpUrl) {
-                // remember callback name for httpData()
-                $options['_jsonp'] = $jsonpCallback;
-                if ($jsonpData !== false)
-                    $options['data'][$jsonpData] = $jsonpCallback;
-                if ($jsonpUrl)
-                    $options['url'] = preg_replace($jsre, "=$jsonpCallback\\1", $options['url']);
-            }
-        }
-        $client->setUri($options['url']);
-        $client->setMethod(strtoupper($options['type']));
-        if (isset($options['referer']) && $options['referer'])
-            $client->setHeaders('Referer', $options['referer']);
-        $client->setHeaders(
-            array(
-                //			'content-type' => $options['contentType'],
-                'User-Agent'      => 'Mozilla/5.0 (X11; U; Linux x86; en-US; rv:1.9.0.5) Gecko'
-                    . '/2008122010 Firefox/3.0.5',
-                // TODO custom charset
-                'Accept-Charset'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-                // 	 		'Connection' => 'keep-alive',
-                // 			'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                'Accept-Language' => 'en-us,en;q=0.5',
-            )
-        );
-        if ($options['username'])
-            $client->setAuth($options['username'], $options['password']);
-        if (isset($options['ifModified']) && $options['ifModified'])
-            $client->setHeaders(
-                "If-Modified-Since",
-                self::$lastModified ? self::$lastModified
-                    : "Thu, 01 Jan 1970 00:00:00 GMT"
-            );
-        $client->setHeaders(
-            "Accept",
-            isset($options['dataType'])
-            && isset(self::$ajaxSettings['accepts'][$options['dataType']]) ? self::$ajaxSettings['accepts'][$options['dataType']]
-                . ", */*" : self::$ajaxSettings['accepts']['_default']
-        );
-        // TODO $options['processData']
-        if ($options['data'] instanceof PhpQueryObject) {
-            $serialized      = $options['data']->serializeArray($options['data']);
-            $options['data'] = array();
-            foreach ($serialized as $r)
-                $options['data'][$r['name']] = $r['value'];
-        }
-        if (strtolower($options['type']) == 'get') {
-            $client->setParameterGet($options['data']);
-        } else if (strtolower($options['type']) == 'post') {
-            $client->setEncType($options['contentType']);
-            $client->setParameterPost($options['data']);
-        }
-        if (self::$active == 0 && $options['global'])
-            PhpQueryEvents::trigger($documentID, 'ajaxStart');
-        self::$active++;
-        // beforeSend callback
-        if (isset($options['beforeSend']) && $options['beforeSend'])
-            PhpQuery::callbackRun(
-                $options['beforeSend'],
-                array(
-                    $client
-                )
-            );
-        // ajaxSend event
-        if ($options['global'])
-            PhpQueryEvents::trigger(
-                $documentID,
-                'ajaxSend',
-                array(
-                    $client,
-                    $options
-                )
-            );
-        if (PhpQuery::$debug) {
-            self::debug("{$options['type']}: {$options['url']}\n");
-            self::debug("Options: <pre>" . var_export($options, true) . "</pre>\n");
-            //			if ($client->getCookieJar())
-            //				self::debug("Cookies: <pre>".var_export($client->getCookieJar()->getMatchingCookies($options['url']), true)."</pre>\n");
-        }
-        // request
-        $response = $client->request();
-        if (PhpQuery::$debug) {
-            self::debug(
-                'Status: ' . $response->getStatus() . ' / '
-                . $response->getMessage()
-            );
-            self::debug($client->getLastRequest());
-            self::debug($response->getHeaders());
-        }
-        if ($response->isSuccessful()) {
-            // XXX tempolary
-            self::$lastModified = $response->getHeader('Last-Modified');
-            $data               = self::httpData($response->getBody(), $options['dataType'], $options);
-            if (isset($options['success']) && $options['success'])
-                PhpQuery::callbackRun(
-                    $options['success'],
-                    array(
-                        $data,
-                        $response->getStatus(),
-                        $options
-                    )
-                );
-            if ($options['global'])
-                PhpQueryEvents::trigger(
-                    $documentID,
-                    'ajaxSuccess',
-                    array(
-                        $client,
-                        $options
-                    )
-                );
-        } else {
-            if (isset($options['error']) && $options['error'])
-                PhpQuery::callbackRun(
-                    $options['error'],
-                    array(
-                        $client,
-                        $response->getStatus(),
-                        $response->getMessage()
-                    )
-                );
-            if ($options['global'])
-                PhpQueryEvents::trigger(
-                    $documentID,
-                    'ajaxError',
-                    array(
-                        $client,
-                        /*$response->getStatus(),*/
-                        $response->getMessage(),
-                        $options
-                    )
-                );
-        }
-        if (isset($options['complete']) && $options['complete'])
-            PhpQuery::callbackRun(
-                $options['complete'],
-                array(
-                    $client,
-                    $response->getStatus()
-                )
-            );
-        if ($options['global'])
-            PhpQueryEvents::trigger(
-                $documentID,
-                'ajaxComplete',
-                array(
-                    $client,
-                    $options
-                )
-            );
-        if ($options['global'] && !--self::$active)
-            PhpQueryEvents::trigger($documentID, 'ajaxStop');
-        return $client;
-        //		if (is_null($domId))
-        //			$domId = self::$defaultDocumentID ? self::$defaultDocumentID : false;
-        //		return new PhpQueryAjaxResponse($response, $domId);
-    }
-
-    protected static function httpData($data, $type, $options)
-    {
-        if (isset($options['dataFilter']) && $options['dataFilter'])
-            $data = self::callbackRun(
-                $options['dataFilter'],
-                array(
-                    $data,
-                    $type
-                )
-            );
-        if (is_string($data)) {
-            if ($type == "json") {
-                if (isset($options['_jsonp']) && $options['_jsonp']) {
-                    $data = preg_replace('/^\s*\w+\((.*)\)\s*$/s', '$1', $data);
-                }
-                $data = self::parseJSON($data);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param array|PhpQuery $data
-     *
-     * @return string
-     */
-    public static function param($data)
-    {
-        return http_build_query($data, null, '&');
-    }
-
-    public static function get($url, $data = null, $callback = null, $type = null)
-    {
-        if (!is_array($data)) {
-            $callback = $data;
-            $data     = null;
-        }
-        // TODO some array_values on this shit
-        return PhpQuery::ajax(
-            array(
-                'type'     => 'GET',
-                'url'      => $url,
-                'data'     => $data,
-                'success'  => $callback,
-                'dataType' => $type,
-            )
-        );
-    }
-
-    public static function post($url, $data = null, $callback = null, $type = null)
-    {
-        if (!is_array($data)) {
-            $callback = $data;
-            $data     = null;
-        }
-        return PhpQuery::ajax(
-            array(
-                'type'     => 'POST',
-                'url'      => $url,
-                'data'     => $data,
-                'success'  => $callback,
-                'dataType' => $type,
-            )
-        );
-    }
-
-    public static function getJSON($url, $data = null, $callback = null)
-    {
-        if (!is_array($data)) {
-            $callback = $data;
-            $data     = null;
-        }
-        // TODO some array_values on this shit
-        return PhpQuery::ajax(
-            array(
-                'type'     => 'GET',
-                'url'      => $url,
-                'data'     => $data,
-                'success'  => $callback,
-                'dataType' => 'json',
-            )
-        );
-    }
-
-    public static function ajaxSetup($options)
-    {
-        self::$ajaxSettings = array_merge(self::$ajaxSettings, $options);
-    }
-
-    public static function ajaxAllowHost($host1, $host2 = null, $host3 = null)
-    {
-        $loop = is_array($host1) ? $host1 : func_get_args();
-        foreach ($loop as $host) {
-            if ($host && !in_array($host, PhpQuery::$ajaxAllowedHosts)) {
-                PhpQuery::$ajaxAllowedHosts[] = $host;
-            }
-        }
-    }
-
-    public static function ajaxAllowURL($url1, $url2 = null, $url3 = null)
-    {
-        $loop = is_array($url1) ? $url1 : func_get_args();
-        foreach ($loop as $url)
-            PhpQuery::ajaxAllowHost(parse_url($url, PHP_URL_HOST));
-    }
-
-    /**
-     * Returns JSON representation of $data.
-     *
-     * @static
-     * @param mixed $data
-     * @return string
-     */
-    public static function toJSON($data)
-    {
-        if (function_exists('json_encode'))
-            return json_encode($data);
-        require_once('Zend/Json/Encoder.php');
-        return \Zend_Json_Encoder::encode($data);
-    }
-
-    /**
-     * Parses JSON into proper PHP type.
-     *
-     * @static
-     * @param string $json
-     * @return mixed
-     */
-    public static function parseJSON($json)
-    {
-        if (function_exists('json_decode')) {
-            $return = json_decode(trim($json), true);
-            // json_decode and UTF8 issues
-            if (isset($return))
-                return $return;
-        }
-        require_once('Zend/Json/Decoder.php');
-        return \Zend_Json_Decoder::decode($json);
-    }
-
-    /**
-     * Returns source's document ID.
-     *
-     * @param $source \DOMNode|PhpQueryObject
-     * @return string
-     */
-    public static function getDocumentID($source)
-    {
-        if ($source instanceof \DOMDocument) {
-            foreach (PhpQuery::$documents as $id => $document) {
-                if ($source->isSameNode($document->document))
-                    return $id;
-            }
-        } else if ($source instanceof \DOMNode) {
-            foreach (PhpQuery::$documents as $id => $document) {
-                if ($source->ownerDocument->isSameNode($document->document))
-                    return $id;
-            }
-        } else if ($source instanceof PhpQueryObject)
-            return $source->getDocumentID();
-        else if (is_string($source) && isset(PhpQuery::$documents[$source]))
-            return $source;
-    }
-
-    /**
-     * Get \DOMDocument object related to $source.
-     * Returns null if such document doesn't exist.
-     *
-     * @param $source \DOMNode|PhpQueryObject|string
-     * @return string
-     */
-    public static function getDOMDocument($source)
-    {
-        if ($source instanceof \DOMDocument)
-            return $source;
-        $source = self::getDocumentID($source);
-        return $source ? self::$documents[$id]['document'] : null;
-    }
-
-    // UTILITIES
-    // http://docs.jquery.com/Utilities
-
-    /**
-     *
-     * @link     http://docs.jquery.com/Utilities/jQuery.makeArray
-     * @param $object
-     * @return array
-     */
-    public static function makeArray($object)
-    {
-        $array = array();
-        if (is_object($object) && $object instanceof \DOMNodeList) {
-            foreach ($object as $value)
-                $array[] = $value;
-        } else if (is_object($object) && !($object instanceof \Iterator)) {
-            foreach (get_object_vars($object) as $name => $value)
-                $array[0][$name] = $value;
-        } else {
-            foreach ($object as $name => $value)
-                $array[0][$name] = $value;
-        }
-        return $array;
-    }
-
-    public static function inArray($value, $array)
-    {
-        return in_array($value, $array);
-    }
-
-    /**
-     *
-     * @param      $object
-     * @param      $callback
-     * @param null $param1
-     * @param null $param2
-     * @param null $param3
-     * @link http://docs.jquery.com/Utilities/jQuery.each
-     */
-    public static function each($object, $callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        $paramStructure = null;
-        if (func_num_args() > 2) {
-            $paramStructure = func_get_args();
-            $paramStructure = array_slice($paramStructure, 2);
-        }
-        if (is_object($object) && !($object instanceof \Iterator)) {
-            foreach (get_object_vars($object) as $name => $value)
-                PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $name,
-                        $value
-                    ),
-                    $paramStructure
-                );
-        } else {
-            foreach ($object as $name => $value)
-                PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $name,
-                        $value
-                    ),
-                    $paramStructure
-                );
-        }
-    }
-
-    /**
-     *
-     * @link http://docs.jquery.com/Utilities/jQuery.map
-     */
-    public static function map($array, $callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        $result         = array();
-        $paramStructure = null;
-        if (func_num_args() > 2) {
-            $paramStructure = func_get_args();
-            $paramStructure = array_slice($paramStructure, 2);
-        }
-        foreach ($array as $v) {
-            $vv = PhpQuery::callbackRun(
-                $callback,
-                array(
-                    $v
-                ),
-                $paramStructure
-            );
-            //			$callbackArgs = $args;
-            //			foreach($args as $i => $arg) {
-            //				$callbackArgs[$i] = $arg instanceof CallbackParam
-            //					? $v
-            //					: $arg;
-            //			}
-            //			$vv = call_user_func_array($callback, $callbackArgs);
-            if (is_array($vv)) {
-                foreach ($vv as $vvv)
-                    $result[] = $vvv;
-            } else if ($vv !== null) {
-                $result[] = $vv;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     *
-     * @param $callback Callback
-     * @param $params
-     * @param $paramStructure
-     * @return bool|mixed
-     */
-    public static function callbackRun($callback, $params = array(), $paramStructure = null)
-    {
-        if (!$callback)
-            return;
-        if ($callback instanceof \CallbackParameterToReference) {
-            // TODO support ParamStructure to select which $param push to reference
-            if (isset($params[0]))
-                $callback->callback = $params[0];
-            return true;
-        }
-        if ($callback instanceof \Callback) {
-            $paramStructure = $callback->params;
-            $callback       = $callback->callback;
-        }
-        if (!$paramStructure)
-            return call_user_func_array($callback, $params);
-        $p = 0;
-        foreach ($paramStructure as $i => $v) {
-            $paramStructure[$i] = $v instanceof \CallbackParam ? $params[$p++] : $v;
-        }
-        return call_user_func_array($callback, $paramStructure);
-    }
-
-    /**
-     * Merge 2 PhpQuery objects.
-     * @param array $one
-     * @param array $two
-     * @return array
-     * @protected
-     * @todo node lists, PhpQueryObject
-     */
-    public static function merge($one, $two)
-    {
-        $elements = $one->elements;
-        foreach ($two->elements as $node) {
-            $exists = false;
-            foreach ($elements as $node2) {
-                if ($node2->isSameNode($node))
-                    $exists = true;
-            }
-            if (!$exists)
-                $elements[] = $node;
-        }
-        return $elements;
-        //		$one = $one->newInstance();
-        //		$one->elements = $elements;
-        //		return $one;
-    }
-
-    /**
-     *
-     * @param $array
-     * @param $callback
-     * @param $invert
-     * @return array
-     * @link http://docs.jquery.com/Utilities/jQuery.grep
-     */
-    public static function grep($array, $callback, $invert = false)
-    {
-        $result = array();
-        foreach ($array as $k => $v) {
-            $r = call_user_func_array(
-                $callback,
-                array(
-                    $v,
-                    $k
-                )
-            );
-            if ($r === !(bool) $invert)
-                $result[] = $v;
-        }
-        return $result;
-    }
-
-    public static function unique($array)
-    {
-        return array_unique($array);
-    }
-
-    /**
-     *
-     * @param $function
-     * @return bool
-     * @TODO there are problems with non-static methods, second parameter pass it
-     *    but doesnt verify is method is really callable
-     */
-    public static function isFunction($function)
-    {
-        return is_callable($function);
-    }
-
-    public static function trim($str)
-    {
-        return trim($str);
-    }
-    /* PLUGINS NAMESPACE */
-    /**
-     *
-     * @param $url
-     * @param $callback
-     * @param $param1
-     * @param $param2
-     * @param $param3
-     * @return PhpQueryObject
-     */
-    public static function browserGet($url, $callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        if (self::plugin('WebBrowser')) {
-            $params = func_get_args();
-            return self::callbackRun(
-                array(
-                    self::$plugins,
-                    'browserGet'
-                ),
-                $params
-            );
-        } else {
-            self::debug('WebBrowser plugin not available...');
-        }
-    }
-
-    /**
-     *
-     * @param $url
-     * @param $data
-     * @param $callback
-     * @param $param1
-     * @param $param2
-     * @param $param3
-     * @return PhpQueryObject
-     */
-    public static function browserPost($url, $data, $callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        if (self::plugin('WebBrowser')) {
-            $params = func_get_args();
-            return self::callbackRun(
-                array(
-                    self::$plugins,
-                    'browserPost'
-                ),
-                $params
-            );
-        } else {
-            self::debug('WebBrowser plugin not available...');
-        }
-    }
-
-    /**
-     *
-     * @param $ajaxSettings
-     * @param $callback
-     * @param $param1
-     * @param $param2
-     * @param $param3
-     * @return PhpQueryObject
-     */
-    public static function browser($ajaxSettings, $callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        if (self::plugin('WebBrowser')) {
-            $params = func_get_args();
-            return self::callbackRun(
-                array(
-                    self::$plugins,
-                    'browser'
-                ),
-                $params
-            );
-        } else {
-            self::debug('WebBrowser plugin not available...');
-        }
-    }
-
-    /**
-     *
-     * @param $code
-     * @return string
-     */
-    public static function php($code)
-    {
-        return self::code('php', $code);
-    }
-
-    /**
-     *
-     * @param $type
-     * @param $code
-     * @return string
-     */
-    public static function code($type, $code)
-    {
-        return "<$type><!-- " . trim($code) . " --></$type>";
-    }
-
-    public static function __callStatic($method, $params)
-    {
-        return call_user_func_array(
-            array(
-                PhpQuery::$plugins,
-                $method
-            ),
-            $params
-        );
-    }
-
-    protected static function dataSetupNode($node, $documentID)
-    {
-        // search are return if alredy exists
-        foreach (PhpQuery::$documents[$documentID]->dataNodes as $dataNode) {
-            if ($node->isSameNode($dataNode))
-                return $dataNode;
-        }
-        // if doesn't, add it
-        PhpQuery::$documents[$documentID]->dataNodes[] = $node;
-        return $node;
-    }
-
-    protected static function dataRemoveNode($node, $documentID)
-    {
-        // search are return if alredy exists
-        foreach (PhpQuery::$documents[$documentID]->dataNodes as $k => $dataNode) {
-            if ($node->isSameNode($dataNode)) {
-                unset(self::$documents[$documentID]->dataNodes[$k]);
-                unset(self::$documents[$documentID]->data[$dataNode->dataID]);
-            }
-        }
-    }
-
-    public static function data($node, $name, $data, $documentID = null)
-    {
-        if (!$documentID)
-            // TODO check if this works
-            $documentID = self::getDocumentID($node);
-        $document = PhpQuery::$documents[$documentID];
-        $node     = self::dataSetupNode($node, $documentID);
-        if (!isset($node->dataID))
-            $node->dataID = ++PhpQuery::$documents[$documentID]->uuid;
-        $id = $node->dataID;
-        if (!isset($document->data[$id]))
-            $document->data[$id] = array();
-        if (!is_null($data))
-            $document->data[$id][$name] = $data;
-        if ($name) {
-            if (isset($document->data[$id][$name]))
-                return $document->data[$id][$name];
-        } else
-            return $id;
-    }
-
-    public static function removeData($node, $name, $documentID)
-    {
-        if (!$documentID)
-            // TODO check if this works
-            $documentID = self::getDocumentID($node);
-        $document = PhpQuery::$documents[$documentID];
-        $node     = self::dataSetupNode($node, $documentID);
-        $id       = $node->dataID;
-        if ($name) {
-            if (isset($document->data[$id][$name]))
-                unset($document->data[$id][$name]);
-            $name = null;
-            foreach ($document->data[$id] as $name)
-                break;
-            if (!$name)
-                self::removeData($node, $name, $documentID);
-        } else {
-            self::dataRemoveNode($node, $documentID);
-        }
-    }
+					),
+					$content
+				);
+		return $content;
+	}
+
+	/**
+	 * Creates new document from file $file.
+	 * Chainable.
+	 *
+	 * @param string $file URLs allowed. See File wrapper page at php.net for more supported sources.
+	 * @param null   $contentType
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentFile($file, $contentType = null)
+	{
+		$documentID = self::createDocumentWrapper(file_get_contents($file), $contentType);
+		return new PhpQueryObject($documentID);
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param      $file
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentFileHTML($file, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocumentFile($file, "text/html{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param      $file
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentFileXML($file, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocumentFile($file, "text/xml{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param      $file
+	 * @param null $charset
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentFileXHTML($file, $charset = null)
+	{
+		$contentType = $charset ? ";charset=$charset" : '';
+		return self::newDocumentFile($file, "application/xhtml+xml{$contentType}");
+	}
+
+	/**
+	 * Creates new document from markup.
+	 * Chainable.
+	 *
+	 * @param      $file
+	 * @param null $contentType
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public static function newDocumentFilePHP($file, $contentType = null)
+	{
+		return self::newDocumentPHP(file_get_contents($file), $contentType);
+	}
+
+	/**
+	 * Reuses existing \DOMDocument object.
+	 * Chainable.
+	 *
+	 * @param $document \DOMDocument
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @TODO support \DOMDocument
+	 */
+	public static function loadDocument($document)
+	{
+		// TODO
+		die('TODO loadDocument');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $html
+	 * @param null $contentType
+	 * @param null $documentID
+	 * @return null|string
+	 * @throws \Exception
+	 * @todo support PHP tags in input
+	 * @todo support passing \DOMDocument object from self::loadDocument
+	 */
+	protected static function createDocumentWrapper($html, $contentType = null, $documentID = null)
+	{
+		if (function_exists('domxml_open_mem'))
+			throw new \Exception("Old PHP4 DOM XML extension detected. PhpQuery won't work until this extension is enabled.");
+		//		$id = $documentID
+		//			? $documentID
+		//			: md5(microtime());
+		$document = null;
+		if ($html instanceof \DOMDocument) {
+			if (self::getDocumentID($html)) {
+				// document already exists in PhpQuery::$documents, make a copy
+				$document = clone $html;
+			} else {
+				// new document, add it to PhpQuery::$documents
+				$wrapper = new Dom\DOMDocumentWrapper($html, $contentType, $documentID);
+			}
+		} else {
+			$wrapper = new Dom\DOMDocumentWrapper($html, $contentType, $documentID);
+		}
+		//		$wrapper->id = $id;
+		// bind document
+		PhpQuery::$documents[$wrapper->id] = $wrapper;
+		// remember last loaded document
+		PhpQuery::selectDocument($wrapper->id);
+		return $wrapper->id;
+	}
+
+	/**
+	 * Extend class namespace.
+	 *
+	 * @param string|array $target
+	 * @param array        $source
+	 * @throws \Exception
+	 * @return bool
+	 * @TODO support string $source
+	 */
+	public static function extend($target, $source)
+	{
+		switch ($target) {
+			case 'PhpQueryObject':
+				$targetRef  = & self::$extendMethods;
+				$targetRef2 = & self::$pluginsMethods;
+				break;
+			case 'PhpQuery':
+				$targetRef  = & self::$extendStaticMethods;
+				$targetRef2 = & self::$pluginsStaticMethods;
+				break;
+			default:
+				throw new \Exception("Unsupported \$target type");
+		}
+		if (is_string($source))
+			$source = array(
+				$source => $source
+			);
+		foreach ($source as $method => $callback) {
+			if (isset($targetRef[$method])) {
+				//				throw new \Exception
+				self::debug("Duplicate method '{$method}', can\'t extend '{$target}'");
+				continue;
+			}
+			if (isset($targetRef2[$method])) {
+				//				throw new \Exception
+				self::debug(
+					"Duplicate method '{$method}' from plugin '{$targetRef2[$method]}',"
+					. " can\'t extend '{$target}'"
+				);
+				continue;
+			}
+			$targetRef[$method] = $callback;
+		}
+		return true;
+	}
+
+	/**
+	 * Extend PhpQuery with $class from $file.
+	 *
+	 * @param string $class Extending class name. Real class name can be prepended PhpQuery_.
+	 * @param string $file  Filename to include. Defaults to "{$class}.php".
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public static function plugin($class, $file = null)
+	{
+		// TODO $class checked agains PhpQuery_$class
+		//		if (strpos($class, 'PhpQuery') === 0)
+		//			$class = substr($class, 8);
+		if (in_array($class, self::$pluginsLoaded))
+			return true;
+		if (!$file)
+			$file = $class . '.php';
+		$objectClassExists = class_exists('\\PhpQuery\\Plugin\\' . $class);
+		$staticClassExists = class_exists('\PhpQuery\Plugin\Util' . $class);
+		if (!$objectClassExists && !$staticClassExists)
+			require_once($file);
+		self::$pluginsLoaded[] = $class;
+		// static methods
+		if (class_exists('\PhpQuery\Plugin\Util' . $class)) {
+			$realClass = '\PhpQuery\Plugin\Util' . $class;
+			$vars      = get_class_vars($realClass);
+			$loop      = isset($vars['PhpQueryMethods'])
+			&& !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
+				: get_class_methods($realClass);
+			foreach ($loop as $method) {
+				if ($method == '__initialize')
+					continue;
+				if (!is_callable(
+					array(
+						$realClass,
+						$method
+					)
+				)
+				)
+					continue;
+				if (isset(self::$pluginsStaticMethods[$method])) {
+					throw new \Exception("Duplicate method '{$method}' from plugin '{$c}' conflicts with same method from plugin '"
+										 . self::$pluginsStaticMethods[$method] . "'");
+				}
+				self::$pluginsStaticMethods[$method] = $class;
+			}
+			if (method_exists($realClass, '__initialize'))
+				call_user_func_array(
+					array(
+						$realClass,
+						'__initialize'
+					),
+					array()
+				);
+		}
+		// object methods
+		if (class_exists('\\PhpQuery\\Plugin\\' . $class)) {
+			$realClass = '\\PhpQuery\\Plugin\\' . $class;
+			$vars      = get_class_vars($realClass);
+			$loop      = isset($vars['PhpQueryMethods'])
+			&& !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
+				: get_class_methods($realClass);
+			foreach ($loop as $method) {
+				if (!is_callable(
+					array(
+						$realClass,
+						$method
+					)
+				)
+				)
+					continue;
+				if (isset(self::$pluginsMethods[$method])) {
+					throw new \Exception("Duplicate method '{$method}' from plugin '{$class}' conflicts with same method from plugin '"
+										 . self::$pluginsMethods[$method] . "'");
+					continue;
+				}
+				self::$pluginsMethods[$method] = $class;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Unloades all or specified document from memory.
+	 *
+	 * @param null $id
+	 * @internal param mixed $documentID @see PhpQuery::getDocumentID() for supported types.
+	 */
+	public static function unloadDocuments($id = null)
+	{
+		if (isset($id)) {
+			if ($id = self::getDocumentID($id))
+				unset(PhpQuery::$documents[$id]);
+		} else {
+			foreach (PhpQuery::$documents as $k => $v) {
+				unset(PhpQuery::$documents[$k]);
+			}
+		}
+	}
+
+	/**
+	 * Parses PhpQuery object or HTML result against PHP tags and makes them active.
+	 *
+	 * @param PhpQuery|string $content
+	 * @deprecated
+	 * @return string
+	 */
+	public static function unsafePHPTags($content)
+	{
+		return self::markupToPHP($content);
+	}
+
+	public static function DOMNodeListToArray($DOMNodeList)
+	{
+		$array = array();
+		if (!$DOMNodeList)
+			return $array;
+		foreach ($DOMNodeList as $node)
+			$array[] = $node;
+		return $array;
+	}
+
+	/**
+	 * Checks if $input is HTML string, which has to start with '<'.
+	 *
+	 * @deprecated
+	 * @param String $input
+	 * @return Bool
+	 * @todo still used ?
+	 */
+	public static function isMarkup($input)
+	{
+		return is_string($input) && substr(trim($input), 0, 1) == '<';
+	}
+
+	public static function debug($text)
+	{
+		if (self::$debug)
+			print var_dump($text);
+	}
+
+	/**
+	 * Make an AJAX request.
+	 *
+	 * @param array $options
+	 * @param null  $xhr
+	 * @throws \Exception
+	 * @internal param \PhpQuery\See $array $options http://docs.jquery.com/Ajax/jQuery.ajax#toptions
+	 * Additional options are:
+	 * 'document' - document for global events, @see PhpQuery::getDocumentID()
+	 * 'referer' - implemented
+	 * 'requested_with' - TODO; not implemented (X-Requested-With)
+	 * @return \Zend_Http_Client
+	 * @link     http://docs.jquery.com/Ajax/jQuery.ajax
+	 *
+	 * @TODO $options['cache']
+	 * @TODO $options['processData']
+	 * @TODO $options['xhr']
+	 * @TODO $options['data'] as string
+	 * @TODO     XHR interface
+	 */
+	public static function ajax($options = array(), $xhr = null)
+	{
+		$options    = array_merge(self::$ajaxSettings, $options);
+		$documentID = isset($options['document']) ? self::getDocumentID($options['document'])
+			: null;
+		if ($xhr) {
+			// reuse existing XHR object, but clean it up
+			$client = $xhr;
+			//			$client->setParameterPost(null);
+			//			$client->setParameterGet(null);
+			$client->setAuth(false);
+			$client->setHeaders("If-Modified-Since", null);
+			$client->setHeaders("Referer", null);
+			$client->resetParameters();
+		} else {
+			// create new XHR object
+			$client = new \Zend_Http_Client();
+			$client->setCookieJar();
+		}
+		if (isset($options['timeout']))
+			$client->setConfig(
+				array(
+					'timeout' => $options['timeout'],
+				)
+			);
+		//			'maxredirects' => 0,
+		foreach (self::$ajaxAllowedHosts as $k => $host)
+			if ($host == '.' && isset($_SERVER['HTTP_HOST']))
+				self::$ajaxAllowedHosts[$k] = $_SERVER['HTTP_HOST'];
+		$host = parse_url($options['url'], PHP_URL_HOST);
+		if (!in_array($host, self::$ajaxAllowedHosts)) {
+			throw new \Exception("Request not permitted, host '$host' not present in "
+								 . "PhpQuery::\$ajaxAllowedHosts");
+		}
+		// JSONP
+		$jsre = "/=\\?(&|$)/";
+		if (isset($options['dataType']) && $options['dataType'] == 'jsonp') {
+			$jsonpCallbackParam = $options['jsonp'] ? $options['jsonp'] : 'callback';
+			if (strtolower($options['type']) == 'get') {
+				if (!preg_match($jsre, $options['url'])) {
+					$sep = strpos($options['url'], '?') ? '&' : '?';
+					$options['url'] .= "$sep$jsonpCallbackParam=?";
+				}
+			} else if ($options['data']) {
+				$jsonp = false;
+				foreach ($options['data'] as $n => $v) {
+					if ($v == '?')
+						$jsonp = true;
+				}
+				if (!$jsonp) {
+					$options['data'][$jsonpCallbackParam] = '?';
+				}
+			}
+			$options['dataType'] = 'json';
+		}
+		if (isset($options['dataType']) && $options['dataType'] == 'json') {
+			$jsonpCallback = 'json_' . md5(microtime());
+			$jsonpData     = $jsonpUrl = false;
+			if ($options['data']) {
+				foreach ($options['data'] as $n => $v) {
+					if ($v == '?')
+						$jsonpData = $n;
+				}
+			}
+			if (preg_match($jsre, $options['url']))
+				$jsonpUrl = true;
+			if ($jsonpData !== false || $jsonpUrl) {
+				// remember callback name for httpData()
+				$options['_jsonp'] = $jsonpCallback;
+				if ($jsonpData !== false)
+					$options['data'][$jsonpData] = $jsonpCallback;
+				if ($jsonpUrl)
+					$options['url'] = preg_replace($jsre, "=$jsonpCallback\\1", $options['url']);
+			}
+		}
+		$client->setUri($options['url']);
+		$client->setMethod(strtoupper($options['type']));
+		if (isset($options['referer']) && $options['referer'])
+			$client->setHeaders('Referer', $options['referer']);
+		$client->setHeaders(
+			array(
+				//			'content-type' => $options['contentType'],
+				'User-Agent'      => 'Mozilla/5.0 (X11; U; Linux x86; en-US; rv:1.9.0.5) Gecko'
+					. '/2008122010 Firefox/3.0.5',
+				// TODO custom charset
+				'Accept-Charset'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+				// 	 		'Connection' => 'keep-alive',
+				// 			'Accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+				'Accept-Language' => 'en-us,en;q=0.5',
+			)
+		);
+		if ($options['username'])
+			$client->setAuth($options['username'], $options['password']);
+		if (isset($options['ifModified']) && $options['ifModified'])
+			$client->setHeaders(
+				"If-Modified-Since",
+				self::$lastModified ? self::$lastModified
+					: "Thu, 01 Jan 1970 00:00:00 GMT"
+			);
+		$client->setHeaders(
+			"Accept",
+			isset($options['dataType'])
+			&& isset(self::$ajaxSettings['accepts'][$options['dataType']]) ? self::$ajaxSettings['accepts'][$options['dataType']]
+				. ", */*" : self::$ajaxSettings['accepts']['_default']
+		);
+		// TODO $options['processData']
+		if ($options['data'] instanceof PhpQueryObject) {
+			$serialized      = $options['data']->serializeArray($options['data']);
+			$options['data'] = array();
+			foreach ($serialized as $r)
+				$options['data'][$r['name']] = $r['value'];
+		}
+		if (strtolower($options['type']) == 'get') {
+			$client->setParameterGet($options['data']);
+		} else if (strtolower($options['type']) == 'post') {
+			$client->setEncType($options['contentType']);
+			$client->setParameterPost($options['data']);
+		}
+		if (self::$active == 0 && $options['global'])
+			PhpQueryEvents::trigger($documentID, 'ajaxStart');
+		self::$active++;
+		// beforeSend callback
+		if (isset($options['beforeSend']) && $options['beforeSend'])
+			PhpQuery::callbackRun(
+				$options['beforeSend'],
+				array(
+					$client
+				)
+			);
+		// ajaxSend event
+		if ($options['global'])
+			PhpQueryEvents::trigger(
+				$documentID,
+				'ajaxSend',
+				array(
+					$client,
+					$options
+				)
+			);
+		if (PhpQuery::$debug) {
+			self::debug("{$options['type']}: {$options['url']}\n");
+			self::debug("Options: <pre>" . var_export($options, true) . "</pre>\n");
+			//			if ($client->getCookieJar())
+			//				self::debug("Cookies: <pre>".var_export($client->getCookieJar()->getMatchingCookies($options['url']), true)."</pre>\n");
+		}
+		// request
+		$response = $client->request();
+		if (PhpQuery::$debug) {
+			self::debug(
+				'Status: ' . $response->getStatus() . ' / '
+				. $response->getMessage()
+			);
+			self::debug($client->getLastRequest());
+			self::debug($response->getHeaders());
+		}
+		if ($response->isSuccessful()) {
+			// XXX tempolary
+			self::$lastModified = $response->getHeader('Last-Modified');
+			$data               = self::httpData($response->getBody(), $options['dataType'], $options);
+			if (isset($options['success']) && $options['success'])
+				PhpQuery::callbackRun(
+					$options['success'],
+					array(
+						$data,
+						$response->getStatus(),
+						$options
+					)
+				);
+			if ($options['global'])
+				PhpQueryEvents::trigger(
+					$documentID,
+					'ajaxSuccess',
+					array(
+						$client,
+						$options
+					)
+				);
+		} else {
+			if (isset($options['error']) && $options['error'])
+				PhpQuery::callbackRun(
+					$options['error'],
+					array(
+						$client,
+						$response->getStatus(),
+						$response->getMessage()
+					)
+				);
+			if ($options['global'])
+				PhpQueryEvents::trigger(
+					$documentID,
+					'ajaxError',
+					array(
+						$client,
+						/*$response->getStatus(),*/
+						$response->getMessage(),
+						$options
+					)
+				);
+		}
+		if (isset($options['complete']) && $options['complete'])
+			PhpQuery::callbackRun(
+				$options['complete'],
+				array(
+					$client,
+					$response->getStatus()
+				)
+			);
+		if ($options['global'])
+			PhpQueryEvents::trigger(
+				$documentID,
+				'ajaxComplete',
+				array(
+					$client,
+					$options
+				)
+			);
+		if ($options['global'] && !--self::$active)
+			PhpQueryEvents::trigger($documentID, 'ajaxStop');
+		return $client;
+		//		if (is_null($domId))
+		//			$domId = self::$defaultDocumentID ? self::$defaultDocumentID : false;
+		//		return new PhpQueryAjaxResponse($response, $domId);
+	}
+
+	protected static function httpData($data, $type, $options)
+	{
+		if (isset($options['dataFilter']) && $options['dataFilter'])
+			$data = self::callbackRun(
+				$options['dataFilter'],
+				array(
+					$data,
+					$type
+				)
+			);
+		if (is_string($data)) {
+			if ($type == "json") {
+				if (isset($options['_jsonp']) && $options['_jsonp']) {
+					$data = preg_replace('/^\s*\w+\((.*)\)\s*$/s', '$1', $data);
+				}
+				$data = self::parseJSON($data);
+			}
+		}
+		return $data;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param array|PhpQuery $data
+	 *
+	 * @return string
+	 */
+	public static function param($data)
+	{
+		return http_build_query($data, null, '&');
+	}
+
+	public static function get($url, $data = null, $callback = null, $type = null)
+	{
+		if (!is_array($data)) {
+			$callback = $data;
+			$data     = null;
+		}
+		// TODO some array_values on this shit
+		return PhpQuery::ajax(
+			array(
+				'type'     => 'GET',
+				'url'      => $url,
+				'data'     => $data,
+				'success'  => $callback,
+				'dataType' => $type,
+			)
+		);
+	}
+
+	public static function post($url, $data = null, $callback = null, $type = null)
+	{
+		if (!is_array($data)) {
+			$callback = $data;
+			$data     = null;
+		}
+		return PhpQuery::ajax(
+			array(
+				'type'     => 'POST',
+				'url'      => $url,
+				'data'     => $data,
+				'success'  => $callback,
+				'dataType' => $type,
+			)
+		);
+	}
+
+	public static function getJSON($url, $data = null, $callback = null)
+	{
+		if (!is_array($data)) {
+			$callback = $data;
+			$data     = null;
+		}
+		// TODO some array_values on this shit
+		return PhpQuery::ajax(
+			array(
+				'type'     => 'GET',
+				'url'      => $url,
+				'data'     => $data,
+				'success'  => $callback,
+				'dataType' => 'json',
+			)
+		);
+	}
+
+	public static function ajaxSetup($options)
+	{
+		self::$ajaxSettings = array_merge(self::$ajaxSettings, $options);
+	}
+
+	public static function ajaxAllowHost($host1, $host2 = null, $host3 = null)
+	{
+		$loop = is_array($host1) ? $host1 : func_get_args();
+		foreach ($loop as $host) {
+			if ($host && !in_array($host, PhpQuery::$ajaxAllowedHosts)) {
+				PhpQuery::$ajaxAllowedHosts[] = $host;
+			}
+		}
+	}
+
+	public static function ajaxAllowURL($url1, $url2 = null, $url3 = null)
+	{
+		$loop = is_array($url1) ? $url1 : func_get_args();
+		foreach ($loop as $url)
+			PhpQuery::ajaxAllowHost(parse_url($url, PHP_URL_HOST));
+	}
+
+	/**
+	 * Returns JSON representation of $data.
+	 *
+	 * @static
+	 * @param mixed $data
+	 * @return string
+	 */
+	public static function toJSON($data)
+	{
+		if (function_exists('json_encode'))
+			return json_encode($data);
+		require_once('Zend/Json/Encoder.php');
+		return \Zend_Json_Encoder::encode($data);
+	}
+
+	/**
+	 * Parses JSON into proper PHP type.
+	 *
+	 * @static
+	 * @param string $json
+	 * @return mixed
+	 */
+	public static function parseJSON($json)
+	{
+		if (function_exists('json_decode')) {
+			$return = json_decode(trim($json), true);
+			// json_decode and UTF8 issues
+			if (isset($return))
+				return $return;
+		}
+		require_once('Zend/Json/Decoder.php');
+		return \Zend_Json_Decoder::decode($json);
+	}
+
+	/**
+	 * Returns source's document ID.
+	 *
+	 * @param $source \DOMNode|PhpQueryObject
+	 * @return string
+	 */
+	public static function getDocumentID($source)
+	{
+		if ($source instanceof \DOMDocument) {
+			foreach (PhpQuery::$documents as $id => $document) {
+				if ($source->isSameNode($document->document))
+					return $id;
+			}
+		} else if ($source instanceof \DOMNode) {
+			foreach (PhpQuery::$documents as $id => $document) {
+				if ($source->ownerDocument->isSameNode($document->document))
+					return $id;
+			}
+		} else if ($source instanceof PhpQueryObject)
+			return $source->getDocumentID();
+		else if (is_string($source) && isset(PhpQuery::$documents[$source]))
+			return $source;
+	}
+
+	/**
+	 * Get \DOMDocument object related to $source.
+	 * Returns null if such document doesn't exist.
+	 *
+	 * @param $source \DOMNode|PhpQueryObject|string
+	 * @return string
+	 */
+	public static function getDOMDocument($source)
+	{
+		if ($source instanceof \DOMDocument)
+			return $source;
+		$source = self::getDocumentID($source);
+		return $source ? self::$documents[$id]['document'] : null;
+	}
+
+	// UTILITIES
+	// http://docs.jquery.com/Utilities
+
+	/**
+	 *
+	 * @link     http://docs.jquery.com/Utilities/jQuery.makeArray
+	 * @param $object
+	 * @return array
+	 */
+	public static function makeArray($object)
+	{
+		$array = array();
+		if (is_object($object) && $object instanceof \DOMNodeList) {
+			foreach ($object as $value)
+				$array[] = $value;
+		} else if (is_object($object) && !($object instanceof \Iterator)) {
+			foreach (get_object_vars($object) as $name => $value)
+				$array[0][$name] = $value;
+		} else {
+			foreach ($object as $name => $value)
+				$array[0][$name] = $value;
+		}
+		return $array;
+	}
+
+	public static function inArray($value, $array)
+	{
+		return in_array($value, $array);
+	}
+
+	/**
+	 *
+	 * @param      $object
+	 * @param      $callback
+	 * @param null $param1
+	 * @param null $param2
+	 * @param null $param3
+	 * @link http://docs.jquery.com/Utilities/jQuery.each
+	 */
+	public static function each($object, $callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		$paramStructure = null;
+		if (func_num_args() > 2) {
+			$paramStructure = func_get_args();
+			$paramStructure = array_slice($paramStructure, 2);
+		}
+		if (is_object($object) && !($object instanceof \Iterator)) {
+			foreach (get_object_vars($object) as $name => $value)
+				PhpQuery::callbackRun(
+					$callback,
+					array(
+						$name,
+						$value
+					),
+					$paramStructure
+				);
+		} else {
+			foreach ($object as $name => $value)
+				PhpQuery::callbackRun(
+					$callback,
+					array(
+						$name,
+						$value
+					),
+					$paramStructure
+				);
+		}
+	}
+
+	/**
+	 *
+	 * @link http://docs.jquery.com/Utilities/jQuery.map
+	 */
+	public static function map($array, $callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		$result         = array();
+		$paramStructure = null;
+		if (func_num_args() > 2) {
+			$paramStructure = func_get_args();
+			$paramStructure = array_slice($paramStructure, 2);
+		}
+		foreach ($array as $v) {
+			$vv = PhpQuery::callbackRun(
+				$callback,
+				array(
+					$v
+				),
+				$paramStructure
+			);
+			//			$callbackArgs = $args;
+			//			foreach($args as $i => $arg) {
+			//				$callbackArgs[$i] = $arg instanceof CallbackParam
+			//					? $v
+			//					: $arg;
+			//			}
+			//			$vv = call_user_func_array($callback, $callbackArgs);
+			if (is_array($vv)) {
+				foreach ($vv as $vvv)
+					$result[] = $vvv;
+			} else if ($vv !== null) {
+				$result[] = $vv;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 *
+	 * @param $callback Callback
+	 * @param $params
+	 * @param $paramStructure
+	 * @return bool|mixed
+	 */
+	public static function callbackRun($callback, $params = array(), $paramStructure = null)
+	{
+		if (!$callback)
+			return;
+		if ($callback instanceof \CallbackParameterToReference) {
+			// TODO support ParamStructure to select which $param push to reference
+			if (isset($params[0]))
+				$callback->callback = $params[0];
+			return true;
+		}
+		if ($callback instanceof \Callback) {
+			$paramStructure = $callback->params;
+			$callback       = $callback->callback;
+		}
+		if (!$paramStructure)
+			return call_user_func_array($callback, $params);
+		$p = 0;
+		foreach ($paramStructure as $i => $v) {
+			$paramStructure[$i] = $v instanceof \CallbackParam ? $params[$p++] : $v;
+		}
+		return call_user_func_array($callback, $paramStructure);
+	}
+
+	/**
+	 * Merge 2 PhpQuery objects.
+	 * @param array $one
+	 * @param array $two
+	 * @return array
+	 * @protected
+	 * @todo node lists, PhpQueryObject
+	 */
+	public static function merge($one, $two)
+	{
+		$elements = $one->elements;
+		foreach ($two->elements as $node) {
+			$exists = false;
+			foreach ($elements as $node2) {
+				if ($node2->isSameNode($node))
+					$exists = true;
+			}
+			if (!$exists)
+				$elements[] = $node;
+		}
+		return $elements;
+		//		$one = $one->newInstance();
+		//		$one->elements = $elements;
+		//		return $one;
+	}
+
+	/**
+	 *
+	 * @param $array
+	 * @param $callback
+	 * @param $invert
+	 * @return array
+	 * @link http://docs.jquery.com/Utilities/jQuery.grep
+	 */
+	public static function grep($array, $callback, $invert = false)
+	{
+		$result = array();
+		foreach ($array as $k => $v) {
+			$r = call_user_func_array(
+				$callback,
+				array(
+					$v,
+					$k
+				)
+			);
+			if ($r === !(bool) $invert)
+				$result[] = $v;
+		}
+		return $result;
+	}
+
+	public static function unique($array)
+	{
+		return array_unique($array);
+	}
+
+	/**
+	 *
+	 * @param $function
+	 * @return bool
+	 * @TODO there are problems with non-static methods, second parameter pass it
+	 *    but doesnt verify is method is really callable
+	 */
+	public static function isFunction($function)
+	{
+		return is_callable($function);
+	}
+
+	public static function trim($str)
+	{
+		return trim($str);
+	}
+	/* PLUGINS NAMESPACE */
+	/**
+	 *
+	 * @param $url
+	 * @param $callback
+	 * @param $param1
+	 * @param $param2
+	 * @param $param3
+	 * @return PhpQueryObject
+	 */
+	public static function browserGet($url, $callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		if (self::plugin('WebBrowser')) {
+			$params = func_get_args();
+			return self::callbackRun(
+				array(
+					self::$plugins,
+					'browserGet'
+				),
+				$params
+			);
+		} else {
+			self::debug('WebBrowser plugin not available...');
+		}
+	}
+
+	/**
+	 *
+	 * @param $url
+	 * @param $data
+	 * @param $callback
+	 * @param $param1
+	 * @param $param2
+	 * @param $param3
+	 * @return PhpQueryObject
+	 */
+	public static function browserPost($url, $data, $callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		if (self::plugin('WebBrowser')) {
+			$params = func_get_args();
+			return self::callbackRun(
+				array(
+					self::$plugins,
+					'browserPost'
+				),
+				$params
+			);
+		} else {
+			self::debug('WebBrowser plugin not available...');
+		}
+	}
+
+	/**
+	 *
+	 * @param $ajaxSettings
+	 * @param $callback
+	 * @param $param1
+	 * @param $param2
+	 * @param $param3
+	 * @return PhpQueryObject
+	 */
+	public static function browser($ajaxSettings, $callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		if (self::plugin('WebBrowser')) {
+			$params = func_get_args();
+			return self::callbackRun(
+				array(
+					self::$plugins,
+					'browser'
+				),
+				$params
+			);
+		} else {
+			self::debug('WebBrowser plugin not available...');
+		}
+	}
+
+	/**
+	 *
+	 * @param $code
+	 * @return string
+	 */
+	public static function php($code)
+	{
+		return self::code('php', $code);
+	}
+
+	/**
+	 *
+	 * @param $type
+	 * @param $code
+	 * @return string
+	 */
+	public static function code($type, $code)
+	{
+		return "<$type><!-- " . trim($code) . " --></$type>";
+	}
+
+	public static function __callStatic($method, $params)
+	{
+		return call_user_func_array(
+			array(
+				PhpQuery::$plugins,
+				$method
+			),
+			$params
+		);
+	}
+
+	protected static function dataSetupNode($node, $documentID)
+	{
+		// search are return if alredy exists
+		foreach (PhpQuery::$documents[$documentID]->dataNodes as $dataNode) {
+			if ($node->isSameNode($dataNode))
+				return $dataNode;
+		}
+		// if doesn't, add it
+		PhpQuery::$documents[$documentID]->dataNodes[] = $node;
+		return $node;
+	}
+
+	protected static function dataRemoveNode($node, $documentID)
+	{
+		// search are return if alredy exists
+		foreach (PhpQuery::$documents[$documentID]->dataNodes as $k => $dataNode) {
+			if ($node->isSameNode($dataNode)) {
+				unset(self::$documents[$documentID]->dataNodes[$k]);
+				unset(self::$documents[$documentID]->data[$dataNode->dataID]);
+			}
+		}
+	}
+
+	public static function data($node, $name, $data, $documentID = null)
+	{
+		if (!$documentID)
+			// TODO check if this works
+			$documentID = self::getDocumentID($node);
+		$document = PhpQuery::$documents[$documentID];
+		$node     = self::dataSetupNode($node, $documentID);
+		if (!isset($node->dataID))
+			$node->dataID = ++PhpQuery::$documents[$documentID]->uuid;
+		$id = $node->dataID;
+		if (!isset($document->data[$id]))
+			$document->data[$id] = array();
+		if (!is_null($data))
+			$document->data[$id][$name] = $data;
+		if ($name) {
+			if (isset($document->data[$id][$name]))
+				return $document->data[$id][$name];
+		} else
+			return $id;
+	}
+
+	public static function removeData($node, $name, $documentID)
+	{
+		if (!$documentID)
+			// TODO check if this works
+			$documentID = self::getDocumentID($node);
+		$document = PhpQuery::$documents[$documentID];
+		$node     = self::dataSetupNode($node, $documentID);
+		$id       = $node->dataID;
+		if ($name) {
+			if (isset($document->data[$id][$name]))
+				unset($document->data[$id][$name]);
+			$name = null;
+			foreach ($document->data[$id] as $name)
+				break;
+			if (!$name)
+				self::removeData($node, $name, $documentID);
+		} else {
+			self::dataRemoveNode($node, $documentID);
+		}
+	}
 }
 
 /**
@@ -1610,24 +1610,24 @@ 
  */
 class PhpQueryPlugins
 {
-    public function __call($method, $args)
-    {
-        if (isset(PhpQuery::$extendStaticMethods[$method])) {
-            $return = call_user_func_array(PhpQuery::$extendStaticMethods[$method], $args);
-        } else if (isset(PhpQuery::$pluginsStaticMethods[$method])) {
-            $class     = PhpQuery::$pluginsStaticMethods[$method];
-            $realClass = "\PhpQuery\Plugin\Util$class";
-            $return    = call_user_func_array(
-                array(
-                    $realClass,
-                    $method
-                ),
-                $args
-            );
-            return isset($return) ? $return : $this;
-        } else
-            throw new \Exception("Method '{$method}' doesnt exist");
-    }
+	public function __call($method, $args)
+	{
+		if (isset(PhpQuery::$extendStaticMethods[$method])) {
+			$return = call_user_func_array(PhpQuery::$extendStaticMethods[$method], $args);
+		} else if (isset(PhpQuery::$pluginsStaticMethods[$method])) {
+			$class     = PhpQuery::$pluginsStaticMethods[$method];
+			$realClass = "\PhpQuery\Plugin\Util$class";
+			$return    = call_user_func_array(
+				array(
+					$realClass,
+					$method
+				),
+				$args
+			);
+			return isset($return) ? $return : $this;
+		} else
+			throw new \Exception("Method '{$method}' doesnt exist");
+	}
 }
 
 PhpQuery::$plugins = new PhpQueryPlugins();
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -14,7 +14,7 @@ 
 
 namespace PhpQuery;
 
-require_once __DIR__ . '/bootstrap.php';
+require_once __DIR__.'/bootstrap.php';
 
 /**
  * Shortcut to PhpQuery::pq($arg1, $context)
@@ -123,9 +123,9 @@ 
     public static function use_function($ns = '\\', $func = 'pq')
     {
         if ($ns{0} !== '\\') {
-            $ns = '\\' . $ns;
+            $ns = '\\'.$ns;
         }
-        if (!function_exists($ns . '\\' . $func)) {
+        if (!function_exists($ns.'\\'.$func)) {
             if ($ns === '\\') {
                 eval("function $func(\$a, \$b = '') { return \\PhpQuery\\PhpQuery::pq(\$a, \$b); }");
             } else {
@@ -424,18 +424,18 @@ 
 
     public static function _phpToMarkupCallback($m, $charset = 'utf-8')
     {
-        return $m[1] . $m[2]
+        return $m[1].$m[2]
         . htmlspecialchars(
-            "<" . "?php" . $m[4] . "?" . ">",
+            "<"."?php".$m[4]."?".">",
             ENT_QUOTES
             | ENT_NOQUOTES,
             $charset
-        ) . $m[5] . $m[2];
+        ).$m[5].$m[2];
     }
 
     public static function _markupToPHPCallback($m)
     {
-        return "<" . "?php " . htmlspecialchars_decode($m[1]) . " ?" . ">";
+        return "<"."?php ".htmlspecialchars_decode($m[1])." ?".">";
     }
 
     /**
@@ -668,15 +668,15 @@ 
         if (in_array($class, self::$pluginsLoaded))
             return true;
         if (!$file)
-            $file = $class . '.php';
-        $objectClassExists = class_exists('\\PhpQuery\\Plugin\\' . $class);
-        $staticClassExists = class_exists('\PhpQuery\Plugin\Util' . $class);
+            $file = $class.'.php';
+        $objectClassExists = class_exists('\\PhpQuery\\Plugin\\'.$class);
+        $staticClassExists = class_exists('\PhpQuery\Plugin\Util'.$class);
         if (!$objectClassExists && !$staticClassExists)
             require_once($file);
         self::$pluginsLoaded[] = $class;
         // static methods
-        if (class_exists('\PhpQuery\Plugin\Util' . $class)) {
-            $realClass = '\PhpQuery\Plugin\Util' . $class;
+        if (class_exists('\PhpQuery\Plugin\Util'.$class)) {
+            $realClass = '\PhpQuery\Plugin\Util'.$class;
             $vars      = get_class_vars($realClass);
             $loop      = isset($vars['PhpQueryMethods'])
             && !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
@@ -694,7 +694,7 @@ 
                     continue;
                 if (isset(self::$pluginsStaticMethods[$method])) {
                     throw new \Exception("Duplicate method '{$method}' from plugin '{$c}' conflicts with same method from plugin '"
-                                         . self::$pluginsStaticMethods[$method] . "'");
+                                         . self::$pluginsStaticMethods[$method]."'");
                 }
                 self::$pluginsStaticMethods[$method] = $class;
             }
@@ -708,8 +708,8 @@ 
                 );
         }
         // object methods
-        if (class_exists('\\PhpQuery\\Plugin\\' . $class)) {
-            $realClass = '\\PhpQuery\\Plugin\\' . $class;
+        if (class_exists('\\PhpQuery\\Plugin\\'.$class)) {
+            $realClass = '\\PhpQuery\\Plugin\\'.$class;
             $vars      = get_class_vars($realClass);
             $loop      = isset($vars['PhpQueryMethods'])
             && !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
@@ -725,7 +725,7 @@ 
                     continue;
                 if (isset(self::$pluginsMethods[$method])) {
                     throw new \Exception("Duplicate method '{$method}' from plugin '{$class}' conflicts with same method from plugin '"
-                                         . self::$pluginsMethods[$method] . "'");
+                                         . self::$pluginsMethods[$method]."'");
                     continue;
                 }
                 self::$pluginsMethods[$method] = $class;
@@ -869,7 +869,7 @@ 
             $options['dataType'] = 'json';
         }
         if (isset($options['dataType']) && $options['dataType'] == 'json') {
-            $jsonpCallback = 'json_' . md5(microtime());
+            $jsonpCallback = 'json_'.md5(microtime());
             $jsonpData     = $jsonpUrl = false;
             if ($options['data']) {
                 foreach ($options['data'] as $n => $v) {
@@ -954,7 +954,7 @@ 
             );
         if (PhpQuery::$debug) {
             self::debug("{$options['type']}: {$options['url']}\n");
-            self::debug("Options: <pre>" . var_export($options, true) . "</pre>\n");
+            self::debug("Options: <pre>".var_export($options, true)."</pre>\n");
             //			if ($client->getCookieJar())
             //				self::debug("Cookies: <pre>".var_export($client->getCookieJar()->getMatchingCookies($options['url']), true)."</pre>\n");
         }
@@ -962,7 +962,7 @@ 
         $response = $client->request();
         if (PhpQuery::$debug) {
             self::debug(
-                'Status: ' . $response->getStatus() . ' / '
+                'Status: '.$response->getStatus().' / '
                 . $response->getMessage()
             );
             self::debug($client->getLastRequest());
@@ -1521,7 +1521,7 @@ 
      */
     public static function code($type, $code)
     {
-        return "<$type><!-- " . trim($code) . " --></$type>";
+        return "<$type><!-- ".trim($code)." --></$type>";
     }
 
     public static function __callStatic($method, $params)

Braces +217 added lines, -146 removed lines

@@ -311,10 +311,11 @@ 
      */
     public static function getDocument($id = null)
     {
-        if ($id)
-            PhpQuery::selectDocument($id);
-        else
-            $id = PhpQuery::$defaultDocumentID;
+        if ($id) {
+                    PhpQuery::selectDocument($id);
+        } else {
+                    $id = PhpQuery::$defaultDocumentID;
+        }
         return new PhpQueryObject($id);
     }
 
@@ -328,8 +329,9 @@ 
      */
     public static function newDocument($markup = null, $contentType = null)
     {
-        if (!$markup)
-            $markup = '';
+        if (!$markup) {
+                    $markup = '';
+        }
         $documentID = PhpQuery::createDocumentWrapper($markup, $contentType);
         return new PhpQueryObject($documentID);
     }
@@ -399,8 +401,8 @@ 
             '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)<'
             . '?php?(.*?)(?:\\?>)([^"]*)"@s',
         );
-        foreach ($regexes as $regex)
-            while (preg_match($regex, $php, $matches)) {
+        foreach ($regexes as $regex) {
+                    while (preg_match($regex, $php, $matches)) {
                 $php = preg_replace_callback(
                     $regex,
                     //					create_function('$m, $charset = "'.$charset.'"',
@@ -414,6 +416,7 @@ 
                     ),
                     $php
                 );
+        }
             }
         $regex = '@(^|>[^<]*)+?(<\?php(.*?)(\?>))@s';
         //preg_match_all($regex, $php, $matches);
@@ -447,8 +450,9 @@ 
      */
     public static function markupToPHP($content)
     {
-        if ($content instanceof PhpQueryObject)
-            $content = $content->markupOuter();
+        if ($content instanceof PhpQueryObject) {
+                    $content = $content->markupOuter();
+        }
         /* <php>...</php> to <?php...? > */
         $content = preg_replace_callback(
             '@<php>\s*<!--(.*?)-->\s*</php>@s',
@@ -466,8 +470,8 @@ 
             '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^\']*)\'@s',
             '@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^"]*)"@s',
         );
-        foreach ($regexes as $regex)
-            while (preg_match($regex, $content))
+        foreach ($regexes as $regex) {
+                    while (preg_match($regex, $content))
                 $content = preg_replace_callback(
                     $regex,
                     create_function(
@@ -482,6 +486,7 @@ 
                     ),
                     $content
                 );
+        }
         return $content;
     }
 
@@ -581,8 +586,9 @@ 
      */
     protected static function createDocumentWrapper($html, $contentType = null, $documentID = null)
     {
-        if (function_exists('domxml_open_mem'))
-            throw new \Exception("Old PHP4 DOM XML extension detected. PhpQuery won't work until this extension is enabled.");
+        if (function_exists('domxml_open_mem')) {
+                    throw new \Exception("Old PHP4 DOM XML extension detected. PhpQuery won't work until this extension is enabled.");
+        }
         //		$id = $documentID
         //			? $documentID
         //			: md5(microtime());
@@ -629,10 +635,11 @@ 
             default:
                 throw new \Exception("Unsupported \$target type");
         }
-        if (is_string($source))
-            $source = array(
+        if (is_string($source)) {
+                    $source = array(
                 $source => $source
             );
+        }
         foreach ($source as $method => $callback) {
             if (isset($targetRef[$method])) {
                 //				throw new \Exception
@@ -665,14 +672,17 @@ 
         // TODO $class checked agains PhpQuery_$class
         //		if (strpos($class, 'PhpQuery') === 0)
         //			$class = substr($class, 8);
-        if (in_array($class, self::$pluginsLoaded))
-            return true;
-        if (!$file)
-            $file = $class . '.php';
+        if (in_array($class, self::$pluginsLoaded)) {
+                    return true;
+        }
+        if (!$file) {
+                    $file = $class . '.php';
+        }
         $objectClassExists = class_exists('\\PhpQuery\\Plugin\\' . $class);
         $staticClassExists = class_exists('\PhpQuery\Plugin\Util' . $class);
-        if (!$objectClassExists && !$staticClassExists)
-            require_once($file);
+        if (!$objectClassExists && !$staticClassExists) {
+                    require_once($file);
+        }
         self::$pluginsLoaded[] = $class;
         // static methods
         if (class_exists('\PhpQuery\Plugin\Util' . $class)) {
@@ -682,30 +692,33 @@ 
             && !is_null($vars['PhpQueryMethods']) ? $vars['PhpQueryMethods']
                 : get_class_methods($realClass);
             foreach ($loop as $method) {
-                if ($method == '__initialize')
-                    continue;
+                if ($method == '__initialize') {
+                                    continue;
+                }
                 if (!is_callable(
                     array(
                         $realClass,
                         $method
                     )
                 )
-                )
-                    continue;
+                ) {
+                                    continue;
+                }
                 if (isset(self::$pluginsStaticMethods[$method])) {
                     throw new \Exception("Duplicate method '{$method}' from plugin '{$c}' conflicts with same method from plugin '"
                                          . self::$pluginsStaticMethods[$method] . "'");
                 }
                 self::$pluginsStaticMethods[$method] = $class;
             }
-            if (method_exists($realClass, '__initialize'))
-                call_user_func_array(
+            if (method_exists($realClass, '__initialize')) {
+                            call_user_func_array(
                     array(
                         $realClass,
                         '__initialize'
                     ),
                     array()
                 );
+            }
         }
         // object methods
         if (class_exists('\\PhpQuery\\Plugin\\' . $class)) {
@@ -721,8 +734,9 @@ 
                         $method
                     )
                 )
-                )
-                    continue;
+                ) {
+                                    continue;
+                }
                 if (isset(self::$pluginsMethods[$method])) {
                     throw new \Exception("Duplicate method '{$method}' from plugin '{$class}' conflicts with same method from plugin '"
                                          . self::$pluginsMethods[$method] . "'");
@@ -743,8 +757,9 @@ 
     public static function unloadDocuments($id = null)
     {
         if (isset($id)) {
-            if ($id = self::getDocumentID($id))
-                unset(PhpQuery::$documents[$id]);
+            if ($id = self::getDocumentID($id)) {
+                            unset(PhpQuery::$documents[$id]);
+            }
         } else {
             foreach (PhpQuery::$documents as $k => $v) {
                 unset(PhpQuery::$documents[$k]);
@@ -767,10 +782,12 @@ 
     public static function DOMNodeListToArray($DOMNodeList)
     {
         $array = array();
-        if (!$DOMNodeList)
-            return $array;
-        foreach ($DOMNodeList as $node)
-            $array[] = $node;
+        if (!$DOMNodeList) {
+                    return $array;
+        }
+        foreach ($DOMNodeList as $node) {
+                    $array[] = $node;
+        }
         return $array;
     }
 
@@ -789,8 +806,9 @@ 
 
     public static function debug($text)
     {
-        if (self::$debug)
-            print var_dump($text);
+        if (self::$debug) {
+                    print var_dump($text);
+        }
     }
 
     /**
@@ -832,16 +850,18 @@ 
             $client = new \Zend_Http_Client();
             $client->setCookieJar();
         }
-        if (isset($options['timeout']))
-            $client->setConfig(
+        if (isset($options['timeout'])) {
+                    $client->setConfig(
                 array(
                     'timeout' => $options['timeout'],
                 )
             );
+        }
         //			'maxredirects' => 0,
-        foreach (self::$ajaxAllowedHosts as $k => $host)
-            if ($host == '.' && isset($_SERVER['HTTP_HOST']))
+        foreach (self::$ajaxAllowedHosts as $k => $host) {
+                    if ($host == '.' && isset($_SERVER['HTTP_HOST']))
                 self::$ajaxAllowedHosts[$k] = $_SERVER['HTTP_HOST'];
+        }
         $host = parse_url($options['url'], PHP_URL_HOST);
         if (!in_array($host, self::$ajaxAllowedHosts)) {
             throw new \Exception("Request not permitted, host '$host' not present in "
@@ -859,8 +879,9 @@ 
             } else if ($options['data']) {
                 $jsonp = false;
                 foreach ($options['data'] as $n => $v) {
-                    if ($v == '?')
-                        $jsonp = true;
+                    if ($v == '?') {
+                                            $jsonp = true;
+                    }
                 }
                 if (!$jsonp) {
                     $options['data'][$jsonpCallbackParam] = '?';
@@ -873,25 +894,30 @@ 
             $jsonpData     = $jsonpUrl = false;
             if ($options['data']) {
                 foreach ($options['data'] as $n => $v) {
-                    if ($v == '?')
-                        $jsonpData = $n;
+                    if ($v == '?') {
+                                            $jsonpData = $n;
+                    }
                 }
             }
-            if (preg_match($jsre, $options['url']))
-                $jsonpUrl = true;
+            if (preg_match($jsre, $options['url'])) {
+                            $jsonpUrl = true;
+            }
             if ($jsonpData !== false || $jsonpUrl) {
                 // remember callback name for httpData()
                 $options['_jsonp'] = $jsonpCallback;
-                if ($jsonpData !== false)
-                    $options['data'][$jsonpData] = $jsonpCallback;
-                if ($jsonpUrl)
-                    $options['url'] = preg_replace($jsre, "=$jsonpCallback\\1", $options['url']);
+                if ($jsonpData !== false) {
+                                    $options['data'][$jsonpData] = $jsonpCallback;
+                }
+                if ($jsonpUrl) {
+                                    $options['url'] = preg_replace($jsre, "=$jsonpCallback\\1", $options['url']);
+                }
             }
         }
         $client->setUri($options['url']);
         $client->setMethod(strtoupper($options['type']));
-        if (isset($options['referer']) && $options['referer'])
-            $client->setHeaders('Referer', $options['referer']);
+        if (isset($options['referer']) && $options['referer']) {
+                    $client->setHeaders('Referer', $options['referer']);
+        }
         $client->setHeaders(
             array(
                 //			'content-type' => $options['contentType'],
@@ -904,14 +930,16 @@ 
                 'Accept-Language' => 'en-us,en;q=0.5',
             )
         );
-        if ($options['username'])
-            $client->setAuth($options['username'], $options['password']);
-        if (isset($options['ifModified']) && $options['ifModified'])
-            $client->setHeaders(
+        if ($options['username']) {
+                    $client->setAuth($options['username'], $options['password']);
+        }
+        if (isset($options['ifModified']) && $options['ifModified']) {
+                    $client->setHeaders(
                 "If-Modified-Since",
                 self::$lastModified ? self::$lastModified
                     : "Thu, 01 Jan 1970 00:00:00 GMT"
             );
+        }
         $client->setHeaders(
             "Accept",
             isset($options['dataType'])
@@ -922,8 +950,9 @@ 
         if ($options['data'] instanceof PhpQueryObject) {
             $serialized      = $options['data']->serializeArray($options['data']);
             $options['data'] = array();
-            foreach ($serialized as $r)
-                $options['data'][$r['name']] = $r['value'];
+            foreach ($serialized as $r) {
+                            $options['data'][$r['name']] = $r['value'];
+            }
         }
         if (strtolower($options['type']) == 'get') {
             $client->setParameterGet($options['data']);
@@ -931,20 +960,22 @@ 
             $client->setEncType($options['contentType']);
             $client->setParameterPost($options['data']);
         }
-        if (self::$active == 0 && $options['global'])
-            PhpQueryEvents::trigger($documentID, 'ajaxStart');
+        if (self::$active == 0 && $options['global']) {
+                    PhpQueryEvents::trigger($documentID, 'ajaxStart');
+        }
         self::$active++;
         // beforeSend callback
-        if (isset($options['beforeSend']) && $options['beforeSend'])
-            PhpQuery::callbackRun(
+        if (isset($options['beforeSend']) && $options['beforeSend']) {
+                    PhpQuery::callbackRun(
                 $options['beforeSend'],
                 array(
                     $client
                 )
             );
+        }
         // ajaxSend event
-        if ($options['global'])
-            PhpQueryEvents::trigger(
+        if ($options['global']) {
+                    PhpQueryEvents::trigger(
                 $documentID,
                 'ajaxSend',
                 array(
@@ -952,6 +983,7 @@ 
                     $options
                 )
             );
+        }
         if (PhpQuery::$debug) {
             self::debug("{$options['type']}: {$options['url']}\n");
             self::debug("Options: <pre>" . var_export($options, true) . "</pre>\n");
@@ -972,8 +1004,8 @@ 
             // XXX tempolary
             self::$lastModified = $response->getHeader('Last-Modified');
             $data               = self::httpData($response->getBody(), $options['dataType'], $options);
-            if (isset($options['success']) && $options['success'])
-                PhpQuery::callbackRun(
+            if (isset($options['success']) && $options['success']) {
+                            PhpQuery::callbackRun(
                     $options['success'],
                     array(
                         $data,
@@ -981,8 +1013,9 @@ 
                         $options
                     )
                 );
-            if ($options['global'])
-                PhpQueryEvents::trigger(
+            }
+            if ($options['global']) {
+                            PhpQueryEvents::trigger(
                     $documentID,
                     'ajaxSuccess',
                     array(
@@ -990,9 +1023,10 @@ 
                         $options
                     )
                 );
+            }
         } else {
-            if (isset($options['error']) && $options['error'])
-                PhpQuery::callbackRun(
+            if (isset($options['error']) && $options['error']) {
+                            PhpQuery::callbackRun(
                     $options['error'],
                     array(
                         $client,
@@ -1000,8 +1034,9 @@ 
                         $response->getMessage()
                     )
                 );
-            if ($options['global'])
-                PhpQueryEvents::trigger(
+            }
+            if ($options['global']) {
+                            PhpQueryEvents::trigger(
                     $documentID,
                     'ajaxError',
                     array(
@@ -1011,17 +1046,19 @@ 
                         $options
                     )
                 );
+            }
         }
-        if (isset($options['complete']) && $options['complete'])
-            PhpQuery::callbackRun(
+        if (isset($options['complete']) && $options['complete']) {
+                    PhpQuery::callbackRun(
                 $options['complete'],
                 array(
                     $client,
                     $response->getStatus()
                 )
             );
-        if ($options['global'])
-            PhpQueryEvents::trigger(
+        }
+        if ($options['global']) {
+                    PhpQueryEvents::trigger(
                 $documentID,
                 'ajaxComplete',
                 array(
@@ -1029,8 +1066,10 @@ 
                     $options
                 )
             );
-        if ($options['global'] && !--self::$active)
-            PhpQueryEvents::trigger($documentID, 'ajaxStop');
+        }
+        if ($options['global'] && !--self::$active) {
+                    PhpQueryEvents::trigger($documentID, 'ajaxStop');
+        }
         return $client;
         //		if (is_null($domId))
         //			$domId = self::$defaultDocumentID ? self::$defaultDocumentID : false;
@@ -1039,14 +1078,15 @@ 
 
     protected static function httpData($data, $type, $options)
     {
-        if (isset($options['dataFilter']) && $options['dataFilter'])
-            $data = self::callbackRun(
+        if (isset($options['dataFilter']) && $options['dataFilter']) {
+                    $data = self::callbackRun(
                 $options['dataFilter'],
                 array(
                     $data,
                     $type
                 )
             );
+        }
         if (is_string($data)) {
             if ($type == "json") {
                 if (isset($options['_jsonp']) && $options['_jsonp']) {
@@ -1141,8 +1181,9 @@ 
     public static function ajaxAllowURL($url1, $url2 = null, $url3 = null)
     {
         $loop = is_array($url1) ? $url1 : func_get_args();
-        foreach ($loop as $url)
-            PhpQuery::ajaxAllowHost(parse_url($url, PHP_URL_HOST));
+        foreach ($loop as $url) {
+                    PhpQuery::ajaxAllowHost(parse_url($url, PHP_URL_HOST));
+        }
     }
 
     /**
@@ -1154,8 +1195,9 @@ 
      */
     public static function toJSON($data)
     {
-        if (function_exists('json_encode'))
-            return json_encode($data);
+        if (function_exists('json_encode')) {
+                    return json_encode($data);
+        }
         require_once('Zend/Json/Encoder.php');
         return \Zend_Json_Encoder::encode($data);
     }
@@ -1172,8 +1214,9 @@ 
         if (function_exists('json_decode')) {
             $return = json_decode(trim($json), true);
             // json_decode and UTF8 issues
-            if (isset($return))
-                return $return;
+            if (isset($return)) {
+                            return $return;
+            }
         }
         require_once('Zend/Json/Decoder.php');
         return \Zend_Json_Decoder::decode($json);
@@ -1189,18 +1232,21 @@ 
     {
         if ($source instanceof \DOMDocument) {
             foreach (PhpQuery::$documents as $id => $document) {
-                if ($source->isSameNode($document->document))
-                    return $id;
+                if ($source->isSameNode($document->document)) {
+                                    return $id;
+                }
             }
         } else if ($source instanceof \DOMNode) {
             foreach (PhpQuery::$documents as $id => $document) {
-                if ($source->ownerDocument->isSameNode($document->document))
-                    return $id;
+                if ($source->ownerDocument->isSameNode($document->document)) {
+                                    return $id;
+                }
             }
-        } else if ($source instanceof PhpQueryObject)
-            return $source->getDocumentID();
-        else if (is_string($source) && isset(PhpQuery::$documents[$source]))
-            return $source;
+        } else if ($source instanceof PhpQueryObject) {
+                    return $source->getDocumentID();
+        } else if (is_string($source) && isset(PhpQuery::$documents[$source])) {
+                    return $source;
+        }
     }
 
     /**
@@ -1212,8 +1258,9 @@ 
      */
     public static function getDOMDocument($source)
     {
-        if ($source instanceof \DOMDocument)
-            return $source;
+        if ($source instanceof \DOMDocument) {
+                    return $source;
+        }
         $source = self::getDocumentID($source);
         return $source ? self::$documents[$id]['document'] : null;
     }
@@ -1231,14 +1278,17 @@ 
     {
         $array = array();
         if (is_object($object) && $object instanceof \DOMNodeList) {
-            foreach ($object as $value)
-                $array[] = $value;
+            foreach ($object as $value) {
+                            $array[] = $value;
+            }
         } else if (is_object($object) && !($object instanceof \Iterator)) {
-            foreach (get_object_vars($object) as $name => $value)
-                $array[0][$name] = $value;
+            foreach (get_object_vars($object) as $name => $value) {
+                            $array[0][$name] = $value;
+            }
         } else {
-            foreach ($object as $name => $value)
-                $array[0][$name] = $value;
+            foreach ($object as $name => $value) {
+                            $array[0][$name] = $value;
+            }
         }
         return $array;
     }
@@ -1265,8 +1315,8 @@ 
             $paramStructure = array_slice($paramStructure, 2);
         }
         if (is_object($object) && !($object instanceof \Iterator)) {
-            foreach (get_object_vars($object) as $name => $value)
-                PhpQuery::callbackRun(
+            foreach (get_object_vars($object) as $name => $value) {
+                            PhpQuery::callbackRun(
                     $callback,
                     array(
                         $name,
@@ -1274,9 +1324,10 @@ 
                     ),
                     $paramStructure
                 );
+            }
         } else {
-            foreach ($object as $name => $value)
-                PhpQuery::callbackRun(
+            foreach ($object as $name => $value) {
+                            PhpQuery::callbackRun(
                     $callback,
                     array(
                         $name,
@@ -1284,6 +1335,7 @@ 
                     ),
                     $paramStructure
                 );
+            }
         }
     }
 
@@ -1315,8 +1367,9 @@ 
             //			}
             //			$vv = call_user_func_array($callback, $callbackArgs);
             if (is_array($vv)) {
-                foreach ($vv as $vvv)
-                    $result[] = $vvv;
+                foreach ($vv as $vvv) {
+                                    $result[] = $vvv;
+                }
             } else if ($vv !== null) {
                 $result[] = $vv;
             }
@@ -1333,20 +1386,23 @@ 
      */
     public static function callbackRun($callback, $params = array(), $paramStructure = null)
     {
-        if (!$callback)
-            return;
+        if (!$callback) {
+                    return;
+        }
         if ($callback instanceof \CallbackParameterToReference) {
             // TODO support ParamStructure to select which $param push to reference
-            if (isset($params[0]))
-                $callback->callback = $params[0];
+            if (isset($params[0])) {
+                            $callback->callback = $params[0];
+            }
             return true;
         }
         if ($callback instanceof \Callback) {
             $paramStructure = $callback->params;
             $callback       = $callback->callback;
         }
-        if (!$paramStructure)
-            return call_user_func_array($callback, $params);
+        if (!$paramStructure) {
+                    return call_user_func_array($callback, $params);
+        }
         $p = 0;
         foreach ($paramStructure as $i => $v) {
             $paramStructure[$i] = $v instanceof \CallbackParam ? $params[$p++] : $v;
@@ -1368,11 +1424,13 @@ 
         foreach ($two->elements as $node) {
             $exists = false;
             foreach ($elements as $node2) {
-                if ($node2->isSameNode($node))
-                    $exists = true;
+                if ($node2->isSameNode($node)) {
+                                    $exists = true;
+                }
+            }
+            if (!$exists) {
+                            $elements[] = $node;
             }
-            if (!$exists)
-                $elements[] = $node;
         }
         return $elements;
         //		$one = $one->newInstance();
@@ -1399,8 +1457,9 @@ 
                     $k
                 )
             );
-            if ($r === !(bool) $invert)
-                $result[] = $v;
+            if ($r === !(bool) $invert) {
+                            $result[] = $v;
+            }
         }
         return $result;
     }
@@ -1539,8 +1598,9 @@ 
     {
         // search are return if alredy exists
         foreach (PhpQuery::$documents[$documentID]->dataNodes as $dataNode) {
-            if ($node->isSameNode($dataNode))
-                return $dataNode;
+            if ($node->isSameNode($dataNode)) {
+                            return $dataNode;
+            }
         }
         // if doesn't, add it
         PhpQuery::$documents[$documentID]->dataNodes[] = $node;
@@ -1560,41 +1620,51 @@ 
 
     public static function data($node, $name, $data, $documentID = null)
     {
-        if (!$documentID)
-            // TODO check if this works
+        if (!$documentID) {
+                    // TODO check if this works
             $documentID = self::getDocumentID($node);
+        }
         $document = PhpQuery::$documents[$documentID];
         $node     = self::dataSetupNode($node, $documentID);
-        if (!isset($node->dataID))
-            $node->dataID = ++PhpQuery::$documents[$documentID]->uuid;
+        if (!isset($node->dataID)) {
+                    $node->dataID = ++PhpQuery::$documents[$documentID]->uuid;
+        }
         $id = $node->dataID;
-        if (!isset($document->data[$id]))
-            $document->data[$id] = array();
-        if (!is_null($data))
-            $document->data[$id][$name] = $data;
+        if (!isset($document->data[$id])) {
+                    $document->data[$id] = array();
+        }
+        if (!is_null($data)) {
+                    $document->data[$id][$name] = $data;
+        }
         if ($name) {
-            if (isset($document->data[$id][$name]))
-                return $document->data[$id][$name];
-        } else
-            return $id;
+            if (isset($document->data[$id][$name])) {
+                            return $document->data[$id][$name];
+            }
+        } else {
+                    return $id;
+        }
     }
 
     public static function removeData($node, $name, $documentID)
     {
-        if (!$documentID)
-            // TODO check if this works
+        if (!$documentID) {
+                    // TODO check if this works
             $documentID = self::getDocumentID($node);
+        }
         $document = PhpQuery::$documents[$documentID];
         $node     = self::dataSetupNode($node, $documentID);
         $id       = $node->dataID;
         if ($name) {
-            if (isset($document->data[$id][$name]))
-                unset($document->data[$id][$name]);
+            if (isset($document->data[$id][$name])) {
+                            unset($document->data[$id][$name]);
+            }
             $name = null;
-            foreach ($document->data[$id] as $name)
-                break;
-            if (!$name)
-                self::removeData($node, $name, $documentID);
+            foreach ($document->data[$id] as $name) {
+                            break;
+            }
+            if (!$name) {
+                            self::removeData($node, $name, $documentID);
+            }
         } else {
             self::dataRemoveNode($node, $documentID);
         }
@@ -1625,8 +1695,9 @@ 
                 $args
             );
             return isset($return) ? $return : $this;
-        } else
-            throw new \Exception("Method '{$method}' doesnt exist");
+        } else {
+                    throw new \Exception("Method '{$method}' doesnt exist");
+        }
     }
 }
 

src/PhpQueryEvents.php

Doc Comments +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
      * Binds a handler to one or more events (like click) for each matched element.
      * Can also bind custom events.
      *
-     * @param \DOMNode|PhpQueryObject|string $document
+     * @param string $document
      * @param                                $node
      * @param string                         $type
      * @param string                         $data Optional
@@ -141,7 +141,7 @@ 
     /**
      * Enter description here...
      *
-     * @param \DOMNode|PhpQueryObject|string $document
+     * @param string $document
      * @param                                $node
      * @param string                         $type
      * @param                                $callback

Indentation +173 added lines, -173 removed lines

@@ -12,182 +12,182 @@
  */
 abstract class PhpQueryEvents
 {
-    /**
-     * Trigger a type of event on every matched element.
-     *
-     *
-     * @TODO exclusive events (with !)
-     * @TODO global events (test)
-     * @TODO support more than event in $type (space-separated)
-     * @param       $document
-     * @param       $type
-     * @param array $data
-     * @param null  $node
-     */
-    public static function trigger($document, $type, $data = array(), $node = null)
-    {
-        // trigger: function(type, data, elem, donative, extra) {
-        $documentID = PhpQuery::getDocumentID($document);
-        $namespace  = null;
-        if (strpos($type, '.') !== false) {
-            list($name, $namespace) = explode('.', $type);
-        } else {
-            $name = $type;
-        }
-        if (!$node) {
-            if (self::issetGlobal($documentID, $type)) {
-                $pq = PhpQuery::getDocument($documentID);
-                // TODO check add($pq->document)
-                $pq->find('*')->add($pq->document)->trigger($type, $data);
-            }
-        } else {
-            if (isset($data[0]) && $data[0] instanceof DOMEvent) {
-                $event                = $data[0];
-                $event->relatedTarget = $event->target;
-                $event->target        = $node;
-                $data                 = array_slice($data, 1);
-            } else {
-                $event = new DOMEvent(array(
-                                          'type'      => $type,
-                                          'target'    => $node,
-                                          'timeStamp' => time(),
-                                      ));
-            }
-            $i = 0;
-            while ($node) {
-                // TODO whois
-                PhpQuery::debug(
-                    "Triggering " . ($i ? "bubbled " : '')
-                    . "event '{$type}' on " . "node \n"
-                );
-                //.PhpQueryObject::whois($node)."\n");
-                $event->currentTarget = $node;
-                $eventNode            = self::getNode($documentID, $node);
-                if (isset($eventNode->eventHandlers)) {
-                    foreach ($eventNode->eventHandlers as $eventType => $handlers) {
-                        $eventNamespace = null;
-                        if (strpos($type, '.') !== false) {
-                            list($eventName, $eventNamespace) = explode('.', $eventType);
-                        } else {
-                            $eventName = $eventType;
-                        }
-                        if ($name != $eventName) {
-                            continue;
-                        }
-                        if ($namespace && $eventNamespace && $namespace != $eventNamespace) {
-                            continue;
-                        }
-                        foreach ($handlers as $handler) {
-                            PhpQuery::debug("Calling event handler\n");
-                            $event->data = $handler['data'] ? $handler['data'] : null;
-                            $params      = array_merge(
-                                array(
-                                    $event
-                                ),
-                                $data
-                            );
-                            $return      = PhpQuery::callbackRun($handler['callback'], $params);
-                            if ($return === false) {
-                                $event->bubbles = false;
-                            }
-                        }
-                    }
-                }
-                // to bubble or not to bubble...
-                if (!$event->bubbles) {
-                    break;
-                }
-                $node = $node->parentNode;
-                $i++;
-            }
-        }
-    }
+	/**
+	 * Trigger a type of event on every matched element.
+	 *
+	 *
+	 * @TODO exclusive events (with !)
+	 * @TODO global events (test)
+	 * @TODO support more than event in $type (space-separated)
+	 * @param       $document
+	 * @param       $type
+	 * @param array $data
+	 * @param null  $node
+	 */
+	public static function trigger($document, $type, $data = array(), $node = null)
+	{
+		// trigger: function(type, data, elem, donative, extra) {
+		$documentID = PhpQuery::getDocumentID($document);
+		$namespace  = null;
+		if (strpos($type, '.') !== false) {
+			list($name, $namespace) = explode('.', $type);
+		} else {
+			$name = $type;
+		}
+		if (!$node) {
+			if (self::issetGlobal($documentID, $type)) {
+				$pq = PhpQuery::getDocument($documentID);
+				// TODO check add($pq->document)
+				$pq->find('*')->add($pq->document)->trigger($type, $data);
+			}
+		} else {
+			if (isset($data[0]) && $data[0] instanceof DOMEvent) {
+				$event                = $data[0];
+				$event->relatedTarget = $event->target;
+				$event->target        = $node;
+				$data                 = array_slice($data, 1);
+			} else {
+				$event = new DOMEvent(array(
+										  'type'      => $type,
+										  'target'    => $node,
+										  'timeStamp' => time(),
+									  ));
+			}
+			$i = 0;
+			while ($node) {
+				// TODO whois
+				PhpQuery::debug(
+					"Triggering " . ($i ? "bubbled " : '')
+					. "event '{$type}' on " . "node \n"
+				);
+				//.PhpQueryObject::whois($node)."\n");
+				$event->currentTarget = $node;
+				$eventNode            = self::getNode($documentID, $node);
+				if (isset($eventNode->eventHandlers)) {
+					foreach ($eventNode->eventHandlers as $eventType => $handlers) {
+						$eventNamespace = null;
+						if (strpos($type, '.') !== false) {
+							list($eventName, $eventNamespace) = explode('.', $eventType);
+						} else {
+							$eventName = $eventType;
+						}
+						if ($name != $eventName) {
+							continue;
+						}
+						if ($namespace && $eventNamespace && $namespace != $eventNamespace) {
+							continue;
+						}
+						foreach ($handlers as $handler) {
+							PhpQuery::debug("Calling event handler\n");
+							$event->data = $handler['data'] ? $handler['data'] : null;
+							$params      = array_merge(
+								array(
+									$event
+								),
+								$data
+							);
+							$return      = PhpQuery::callbackRun($handler['callback'], $params);
+							if ($return === false) {
+								$event->bubbles = false;
+							}
+						}
+					}
+				}
+				// to bubble or not to bubble...
+				if (!$event->bubbles) {
+					break;
+				}
+				$node = $node->parentNode;
+				$i++;
+			}
+		}
+	}
 
-    /**
-     * Binds a handler to one or more events (like click) for each matched element.
-     * Can also bind custom events.
-     *
-     * @param \DOMNode|PhpQueryObject|string $document
-     * @param                                $node
-     * @param string                         $type
-     * @param string                         $data Optional
-     * @param                                $callback
-     *
-     * @TODO support '!' (exclusive) events
-     * @TODO support more than event in $type (space-separated)
-     * @TODO support binding to global events
-     */
-    public static function add($document, $node, $type, $data, $callback = null)
-    {
-        PhpQuery::debug("Binding '$type' event");
-        $documentID = PhpQuery::getDocumentID($document);
-        //		if (is_null($callback) && is_callable($data)) {
-        //			$callback = $data;
-        //			$data = null;
-        //		}
-        $eventNode = self::getNode($documentID, $node);
-        if (!$eventNode) {
-            $eventNode = self::setNode($documentID, $node);
-        }
-        if (!isset($eventNode->eventHandlers[$type])) {
-            $eventNode->eventHandlers[$type] = array();
-        }
-        $eventNode->eventHandlers[$type][] = array(
-            'callback' => $callback,
-            'data'     => $data,
-        );
-    }
+	/**
+	 * Binds a handler to one or more events (like click) for each matched element.
+	 * Can also bind custom events.
+	 *
+	 * @param \DOMNode|PhpQueryObject|string $document
+	 * @param                                $node
+	 * @param string                         $type
+	 * @param string                         $data Optional
+	 * @param                                $callback
+	 *
+	 * @TODO support '!' (exclusive) events
+	 * @TODO support more than event in $type (space-separated)
+	 * @TODO support binding to global events
+	 */
+	public static function add($document, $node, $type, $data, $callback = null)
+	{
+		PhpQuery::debug("Binding '$type' event");
+		$documentID = PhpQuery::getDocumentID($document);
+		//		if (is_null($callback) && is_callable($data)) {
+		//			$callback = $data;
+		//			$data = null;
+		//		}
+		$eventNode = self::getNode($documentID, $node);
+		if (!$eventNode) {
+			$eventNode = self::setNode($documentID, $node);
+		}
+		if (!isset($eventNode->eventHandlers[$type])) {
+			$eventNode->eventHandlers[$type] = array();
+		}
+		$eventNode->eventHandlers[$type][] = array(
+			'callback' => $callback,
+			'data'     => $data,
+		);
+	}
 
-    /**
-     * Enter description here...
-     *
-     * @param \DOMNode|PhpQueryObject|string $document
-     * @param                                $node
-     * @param string                         $type
-     * @param                                $callback
-     *
-     * @TODO namespace events
-     * @TODO support more than event in $type (space-separated)
-     */
-    public static function remove($document, $node, $type = null, $callback = null)
-    {
-        $documentID = PhpQuery::getDocumentID($document);
-        $eventNode  = self::getNode($documentID, $node);
-        if (is_object($eventNode) && isset($eventNode->eventHandlers[$type])) {
-            if ($callback) {
-                foreach ($eventNode->eventHandlers[$type] as $k => $handler) {
-                    if ($handler['callback'] == $callback) {
-                        unset($eventNode->eventHandlers[$type][$k]);
-                    }
-                }
-            } else {
-                unset($eventNode->eventHandlers[$type]);
-            }
-        }
-    }
+	/**
+	 * Enter description here...
+	 *
+	 * @param \DOMNode|PhpQueryObject|string $document
+	 * @param                                $node
+	 * @param string                         $type
+	 * @param                                $callback
+	 *
+	 * @TODO namespace events
+	 * @TODO support more than event in $type (space-separated)
+	 */
+	public static function remove($document, $node, $type = null, $callback = null)
+	{
+		$documentID = PhpQuery::getDocumentID($document);
+		$eventNode  = self::getNode($documentID, $node);
+		if (is_object($eventNode) && isset($eventNode->eventHandlers[$type])) {
+			if ($callback) {
+				foreach ($eventNode->eventHandlers[$type] as $k => $handler) {
+					if ($handler['callback'] == $callback) {
+						unset($eventNode->eventHandlers[$type][$k]);
+					}
+				}
+			} else {
+				unset($eventNode->eventHandlers[$type]);
+			}
+		}
+	}
 
-    protected static function getNode($documentID, $node)
-    {
-        foreach (PhpQuery::$documents[$documentID]->eventsNodes as $eventNode) {
-            if ($node->isSameNode($eventNode)) {
-                return $eventNode;
-            }
-        }
-    }
+	protected static function getNode($documentID, $node)
+	{
+		foreach (PhpQuery::$documents[$documentID]->eventsNodes as $eventNode) {
+			if ($node->isSameNode($eventNode)) {
+				return $eventNode;
+			}
+		}
+	}
 
-    protected static function setNode($documentID, $node)
-    {
-        PhpQuery::$documents[$documentID]->eventsNodes[] = $node;
-        return PhpQuery::$documents[$documentID]->eventsNodes[count(PhpQuery::$documents[$documentID]->eventsNodes)
-        - 1];
-    }
+	protected static function setNode($documentID, $node)
+	{
+		PhpQuery::$documents[$documentID]->eventsNodes[] = $node;
+		return PhpQuery::$documents[$documentID]->eventsNodes[count(PhpQuery::$documents[$documentID]->eventsNodes)
+		- 1];
+	}
 
-    protected static function issetGlobal($documentID, $type)
-    {
-        return isset(PhpQuery::$documents[$documentID]) ? in_array(
-            $type,
-            PhpQuery::$documents[$documentID]->eventsGlobal
-        )
-            : false;
-    }
+	protected static function issetGlobal($documentID, $type)
+	{
+		return isset(PhpQuery::$documents[$documentID]) ? in_array(
+			$type,
+			PhpQuery::$documents[$documentID]->eventsGlobal
+		)
+			: false;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -57,8 +57,8 @@ 
             while ($node) {
                 // TODO whois
                 PhpQuery::debug(
-                    "Triggering " . ($i ? "bubbled " : '')
-                    . "event '{$type}' on " . "node \n"
+                    "Triggering ".($i ? "bubbled " : '')
+                    . "event '{$type}' on "."node \n"
                 );
                 //.PhpQueryObject::whois($node)."\n");
                 $event->currentTarget = $node;
@@ -86,7 +86,7 @@ 
                                 ),
                                 $data
                             );
-                            $return      = PhpQuery::callbackRun($handler['callback'], $params);
+                            $return = PhpQuery::callbackRun($handler['callback'], $params);
                             if ($return === false) {
                                 $event->bubbles = false;
                             }

src/PhpQueryObject.php

Doc Comments +31 added lines, -20 removed lines

@@ -294,6 +294,7 @@ 
      * Enter description here...
      *
      * @link http://docs.jquery.com/Ajax/serializeArray
+     * @param PhpQueryObject $submit
      * @return array
      */
     public function serializeArray($submit = null)
@@ -371,7 +372,7 @@ 
      * Determines if $char is really a char.
      *
      * @param string $char
-     * @return bool
+     * @return integer
      * @todo   rewrite me to charcode range ! ;)
      * @access private
      */
@@ -719,7 +720,7 @@ 
      * contains(tokenize(@class, '\s'), "something")
      * @param string $class
      * @param string $node
-     * @return boolean
+     * @return boolean|null
      * @access private
      */
     protected function matchClasses($class, $node)
@@ -748,6 +749,8 @@ 
 
     /**
      * @access private
+     * @param string $XQuery
+     * @param string $compare
      */
     protected function runQuery($XQuery, $selector = null, $compare = null)
     {
@@ -1572,7 +1575,7 @@ 
      * @param      $url
      * @param null $data
      * @param null $callback
-     * @return PhpQuery|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+     * @return PhpQueryObject
      * @todo Support $selector
      */
     public function load($url, $data = null, $callback = null)
@@ -1639,7 +1642,7 @@ 
      * Either sets the CSS property of an object or retrieves the
      * CSS property of a proejct.
      *
-     * @param      $property_name
+     * @param      string $property_name
      * @param bool $value
      * @return string of css property value
      * @todo
@@ -1810,7 +1813,7 @@ 
     /**
      * Trigger a type of event on every matched element.
      *
-     * @param                 $type
+     * @param                 string $type
      * @param array|\PhpQuery $data
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      * @TODO support more than event in $type (space-separated)
@@ -1839,7 +1842,7 @@ 
      * Binds a handler to one or more events (like click) for each matched element.
      * Can also bind custom events.
      *
-     * @param       $type
+     * @param       string $type
      * @param mixed $data Optional
      * @param       $callback
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
@@ -1863,7 +1866,7 @@ 
      *
      * @param string $type
      * @param        $callback
-     * @return unknown
+     * @return PhpQueryObject
      * @TODO namespace events
      * @TODO support more than event in $type (space-separated)
      */
@@ -2097,7 +2100,7 @@ 
     /**
      * Enter description here...
      *
-     * @param $num
+     * @param integer $num
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
     public function eq($num)
@@ -2113,7 +2116,7 @@ 
     /**
      * Enter description here...
      *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+     * @return integer
      */
     public function size()
     {
@@ -2123,7 +2126,7 @@ 
     /**
      * Enter description here...
      *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+     * @return integer
      * @deprecated Use length as attribute
      */
     public function length()
@@ -2186,7 +2189,7 @@ 
     /**
      * Enter description here...
      *
-     * @param String|PhpQuery $content
+     * @param string $content
      * @link http://docs.jquery.com/Manipulation/replaceWith#content
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
@@ -2261,7 +2264,7 @@ 
     /**
      * jQuey difference
      *
-     * @param      $markup
+     * @param      string $markup
      * @param null $callback1
      * @param null $callback2
      * @param null $callback3
@@ -2639,7 +2642,7 @@ 
      * Internal insert method. Don't use it.
      *
      * @param unknown_type $target
-     * @param unknown_type $type
+     * @param string $type
      * @throws \Exception
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      * @access private
@@ -2825,7 +2828,7 @@ 
     /**
      * Enter description here...
      *
-     * @param unknown_type $start
+     * @param integer $start
      * @param unknown_type $end
      *
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
@@ -3034,6 +3037,7 @@ 
 
     /**
      * @access private
+     * @param string $direction
      */
     protected function getElementSiblings($direction, $selector = null, $limitToOne = false)
     {
@@ -3062,7 +3066,7 @@ 
     /**
      * Enter description here...
      *
-     * @param null $selector
+     * @param string $selector
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
     public function siblings($selector = null)
@@ -3082,7 +3086,7 @@ 
     /**
      * Enter description here...
      *
-     * @param null $selector
+     * @param string $selector
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
     public function not($selector = null)
@@ -3312,6 +3316,9 @@ 
         }
     }
 
+    /**
+     * @param string $attr
+     */
     public function attr($attr = null, $value = null)
     {
         foreach ($this->stack(1) as $node) {
@@ -3405,7 +3412,7 @@ 
     /**
      * Enter description here...
      *
-     * @param $attr
+     * @param string $attr
      * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
      */
     public function removeAttr($attr)
@@ -3721,8 +3728,8 @@ 
     /**
      * Enter description here...
      *
-     * @param <type> $key
-     * @param <type> $value
+     * @param string $key
+     * @param string $value
      * @return $this
      */
     public function data($key, $value = null)
@@ -3859,7 +3866,7 @@ 
      * Returns node's XPath.
      *
      * @param unknown_type $oneNode
-     * @param null         $namespace
+     * @param string         $namespace
      * @return string
      * @TODO   use native getNodePath is avaible
      * @access private
@@ -3898,6 +3905,10 @@ 
     }
 
     // HELPERS
+
+    /**
+     * @return integer
+     */
     public function whois($oneNode = null)
     {
         $return = array();

Indentation +3931 added lines, -3931 removed lines

@@ -14,1050 +14,1050 @@ 
  */
 class PhpQueryObject implements \Iterator, \Countable, \ArrayAccess
 {
-    public $documentID = null;
-    /**
-     * \DOMDocument class.
-     *
-     * @var \DOMDocument
-     */
-    public $document = null;
-    public $charset = null;
-    /**
-     *
-     * @var Dom\DOMDocumentWrapper
-     */
-    public $documentWrapper = null;
-    /**
-     * XPath interface.
-     *
-     * @var \DOMXPath
-     */
-    public $xpath = null;
-    /**
-     * Stack of selected elements.
-     * @TODO refactor to ->nodes
-     * @var array
-     */
-    public $elements = array();
-    /**
-     * @access private
-     */
-    protected $elementsBackup = array();
-    /**
-     * @access private
-     */
-    protected $previous = null;
-    /**
-     * @access private
-     * @TODO   deprecate
-     */
-    protected $root = array();
-    /**
-     * Indicated if doument is just a fragment (no <html> tag).
-     *
-     * Every document is realy a full document, so even documentFragments can
-     * be queried against <html>, but getDocument(id)->htmlOuter() will return
-     * only contents of <body>.
-     *
-     * @var bool
-     */
-    public $documentFragment = true;
-    /**
-     * Iterator interface helper
-     * @access private
-     */
-    protected $elementsInterator = array();
-    /**
-     * Iterator interface helper
-     * @access private
-     */
-    protected $valid = false;
-    /**
-     * Iterator interface helper
-     * @access private
-     */
-    protected $current = null;
-
-    /**
-     * Indicates whether CSS has been parsed or not. We only parse CSS if needed.
-     * @access private
-     */
-    protected $cssIsParsed = array();
-    /**
-     * A collection of complete CSS selector strings.
-     * @access private;
-     */
-    protected $cssString = array();
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-
-    protected $attribute_css_mapping = array(
-        'bgcolor' => 'background-color',
-        'text'    => 'color',
-        'width'   => 'width',
-        'height'  => 'height'
-    );
-
-    public function __construct($documentID)
-    {
-        //		if ($documentID instanceof self)
-        //			var_dump($documentID->getDocumentID());
-        $id = $documentID instanceof self ? $documentID->getDocumentID()
-            : $documentID;
-        //		var_dump($id);
-        if (!isset(PhpQuery::$documents[$id])) {
-            //			var_dump(PhpQuery::$documents);
-            throw new \Exception("Document with ID '{$id}' isn't loaded. Use PhpQuery::newDocument(\$html) or PhpQuery::newDocumentFile(\$file) first.");
-        }
-        $this->documentID       = $id;
-        $this->documentWrapper  = & PhpQuery::$documents[$id];
-        $this->document         = & $this->documentWrapper->document;
-        $this->xpath            = & $this->documentWrapper->xpath;
-        $this->charset          = & $this->documentWrapper->charset;
-        $this->documentFragment = & $this->documentWrapper->isDocumentFragment;
-        // TODO check $this->DOM->documentElement;
-        //		$this->root = $this->document->documentElement;
-        $this->root = & $this->documentWrapper->root;
-        //		$this->toRoot();
-        $this->elements = array(
-            $this->root
-        );
-    }
-
-    /**
-     *
-     * @access private
-     * @param $attr
-     * @return \PhpQuery\PhpQueryObject|\PhpQuery\QueryTemplatesParse|\PhpQuery\QueryTemplatesSource|\PhpQuery\QueryTemplatesSourceQuery
-     */
-    public function __get($attr)
-    {
-        switch ($attr) {
-            // FIXME doesnt work at all ?
-            case 'length':
-                return $this->size();
-                break;
-            default:
-                return $this->$attr;
-        }
-    }
-
-    /**
-     * Saves actual object to $var by reference.
-     * Useful when need to break chain.
-     * @param PhpQueryObject $var
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function toReference(&$var)
-    {
-        return $var = $this;
-    }
-
-    public function documentFragment($state = null)
-    {
-        if ($state) {
-            PhpQuery::$documents[$this->getDocumentID()]['documentFragment'] = $state;
-            return $this;
-        }
-        return $this->documentFragment;
-    }
-
-    /**
-     * @access private
-     * @TODO   documentWrapper
-     */
-    protected function isRoot($node)
-    {
-        //		return $node instanceof \DOMDocument || $node->tagName == 'html';
-        return $node instanceof \DOMDocument
-        || ($node instanceof \DOMElement && $node->tagName == 'html')
-        || $this->root->isSameNode($node);
-    }
-
-    /**
-     * @access private
-     */
-    protected function stackIsRoot()
-    {
-        return $this->size() == 1 && $this->isRoot($this->elements[0]);
-    }
-
-    /**
-     * Enter description here...
-     * NON JQUERY METHOD
-     *
-     * Watch out, it doesn't creates new instance, can be reverted with end().
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function toRoot()
-    {
-        $this->elements = array(
-            $this->root
-        );
-        return $this;
-        //		return $this->newInstance(array($this->root));
-    }
-
-    /**
-     * Saves object's DocumentID to $var by reference.
-     * <code>
-     * $myDocumentId;
-     * PhpQuery::newDocument('<div/>')
-     *     ->getDocumentIDRef($myDocumentId)
-     *     ->find('div')->...
-     * </code>
-     *
-     * @param $documentID
-     * @internal param string $domId
-     * @see      PhpQuery::newDocument
-     * @see      PhpQuery::newDocumentFile
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function getDocumentIDRef(&$documentID)
-    {
-        $documentID = $this->getDocumentID();
-        return $this;
-    }
-
-    /**
-     * Returns object with stack set to document root.
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function getDocument()
-    {
-        return PhpQuery::getDocument($this->getDocumentID());
-    }
-
-    /**
-     *
-     * @return \DOMDocument
-     */
-    public function getDOMDocument()
-    {
-        return $this->document;
-    }
-
-    /**
-     * Get object's Document ID.
-     *
-     * @return string
-     */
-    public function getDocumentID()
-    {
-        return $this->documentID;
-    }
-
-    /**
-     * Unloads whole document from memory.
-     * CAUTION! None further operations will be possible on this document.
-     * All objects refering to it will be useless.
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function unloadDocument()
-    {
-        PhpQuery::unloadDocuments($this->getDocumentID());
-    }
-
-    public function isHTML()
-    {
-        return $this->documentWrapper->isHTML;
-    }
-
-    public function isXHTML()
-    {
-        return $this->documentWrapper->isXHTML;
-    }
-
-    public function isXML()
-    {
-        return $this->documentWrapper->isXML;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @link http://docs.jquery.com/Ajax/serialize
-     * @return string
-     */
-    public function serialize()
-    {
-        return PhpQuery::param($this->serializeArray());
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @link http://docs.jquery.com/Ajax/serializeArray
-     * @return array
-     */
-    public function serializeArray($submit = null)
-    {
-        $source = $this->filter('form, input, select, textarea')->find('input, select, textarea')->andSelf()->not(
-            'form'
-        );
-        $return = array();
-        //		$source->dumpDie();
-        foreach ($source as $input) {
-            $input = PhpQuery::pq($input);
-            if ($input->is('[disabled]')) {
-                continue;
-            }
-            if (!$input->is('[name]')) {
-                continue;
-            }
-            if ($input->is('[type=checkbox]') && !$input->is('[checked]')) {
-                continue;
-            }
-            // jquery diff
-            if ($submit && $input->is('[type=submit]')) {
-                if ($submit instanceof \DOMElement
-                    && !$input->elements[0]->isSameNode($submit)
-                ) {
-                    continue;
-                } else {
-                    if (is_string($submit) && $input->attr('name') != $submit) {
-                        continue;
-                    }
-                }
-            }
-            $return[] = array(
-                'name'  => $input->attr('name'),
-                'value' => $input->val(),
-            );
-        }
-        return $return;
-    }
-
-    /**
-     * @access private
-     */
-    protected function debug($in)
-    {
-        if (!PhpQuery::$debug) {
-            return;
-        }
-        print('<pre>');
-        print_r($in);
-        // file debug
-        //		file_put_contents(dirname(__FILE__).'/PhpQuery.log', print_r($in, true)."\n", FILE_APPEND);
-        // quite handy debug trace
-        //		if ( is_array($in))
-        //			print_r(array_slice(debug_backtrace(), 3));
-        print("</pre>\n");
-    }
-
-    /**
-     * @access private
-     */
-    protected function isRegexp($pattern)
-    {
-        return in_array(
-            $pattern[mb_strlen($pattern) - 1],
-            array(
-                '^',
-                '*',
-                '$'
-            )
-        );
-    }
-
-    /**
-     * Determines if $char is really a char.
-     *
-     * @param string $char
-     * @return bool
-     * @todo   rewrite me to charcode range ! ;)
-     * @access private
-     */
-    protected function isChar($char)
-    {
-        return extension_loaded('mbstring') && PhpQuery::$mbstringSupport ? mb_eregi('\w', $char)
-            : preg_match('@\w@', $char);
-    }
-
-    /**
-     * @access private
-     */
-    protected function parseSelector($query)
-    {
-        // clean spaces
-        // TODO include this inside parsing ?
-        $query   = trim(preg_replace('@\s+@', ' ', preg_replace('@\s*(>|\\+|~)\s*@', '\\1', (string) $query)));
-        $queries = array(
-            array()
-        );
-        if (!$query) {
-            return $queries;
-        }
-        $return       = & $queries[0];
-        $specialChars = array(
-            '>',
-            ' '
-        );
-        //		$specialCharsMapping = array('/' => '>');
-        $specialCharsMapping = array();
-        $strlen              = mb_strlen($query);
-        $classChars          = array(
-            '.',
-            '-'
-        );
-        $pseudoChars         = array(
-            '-'
-        );
-        $tagChars            = array(
-            '*',
-            '|',
-            '-'
-        );
-        // split multibyte string
-        // http://code.google.com/p/phpquery/issues/detail?id=76
-        $_query = array();
-        for ($i = 0; $i < $strlen; $i++) {
-            $_query[] = mb_substr($query, $i, 1);
-        }
-        $query = $_query;
-        // it works, but i dont like it...
-        $i = 0;
-        while ($i < $strlen) {
-            $c   = $query[$i];
-            $tmp = '';
-            // TAG
-            if ($this->isChar($c) || in_array($c, $tagChars)) {
-                while (isset($query[$i])
-                    && ($this->isChar($query[$i]) || in_array($query[$i], $tagChars))) {
-                    $tmp .= $query[$i];
-                    $i++;
-                }
-                $return[] = $tmp;
-                // IDs
-            } else if ($c == '#') {
-                $i++;
-                while (isset($query[$i])
-                    && ($this->isChar($query[$i]) || $query[$i] == '-')) {
-                    $tmp .= $query[$i];
-                    $i++;
-                }
-                $return[] = '#' . $tmp;
-                // SPECIAL CHARS
-            } else if (in_array($c, $specialChars)) {
-                $return[] = $c;
-                $i++;
-                // MAPPED SPECIAL MULTICHARS
-                //			} else if ( $c.$query[$i+1] == '//') {
-                //				$return[] = ' ';
-                //				$i = $i+2;
-                // MAPPED SPECIAL CHARS
-            } else if (isset($specialCharsMapping[$c])) {
-                $return[] = $specialCharsMapping[$c];
-                $i++;
-                // COMMA
-            } else if ($c == ',') {
-                $queries[] = array();
-                $return    = & $queries[count($queries) - 1];
-                $i++;
-                while (isset($query[$i]) && $query[$i] == ' ') {
-                    $i++;
-                }
-                // CLASSES
-            } else if ($c == '.') {
-                while (isset($query[$i])
-                    && ($this->isChar($query[$i]) || in_array($query[$i], $classChars))) {
-                    $tmp .= $query[$i];
-                    $i++;
-                }
-                $return[] = $tmp;
-                // ~ General Sibling Selector
-            } else if ($c == '~') {
-                $spaceAllowed = true;
-                $tmp .= $query[$i++];
-                while (isset($query[$i])
-                    && ($this->isChar($query[$i]) || in_array($query[$i], $classChars)
-                        || $query[$i] == '*' || ($query[$i] == ' ' && $spaceAllowed))) {
-                    if ($query[$i] != ' ') {
-                        $spaceAllowed = false;
-                    }
-                    $tmp .= $query[$i];
-                    $i++;
-                }
-                $return[] = $tmp;
-                // + Adjacent sibling selectors
-            } else {
-                if ($c == '+') {
-                    $spaceAllowed = true;
-                    $tmp .= $query[$i++];
-                    while (isset($query[$i])
-                        && ($this->isChar($query[$i]) || in_array($query[$i], $classChars)
-                            || $query[$i] == '*' || ($spaceAllowed && $query[$i] == ' '))) {
-                        if ($query[$i] != ' ') {
-                            $spaceAllowed = false;
-                        }
-                        $tmp .= $query[$i];
-                        $i++;
-                    }
-                    $return[] = $tmp;
-                    // ATTRS
-                } else {
-                    if ($c == '[') {
-                        $stack = 1;
-                        $tmp .= $c;
-                        while (isset($query[++$i])) {
-                            $tmp .= $query[$i];
-                            if ($query[$i] == '[') {
-                                $stack++;
-                            } else {
-                                if ($query[$i] == ']') {
-                                    $stack--;
-                                    if (!$stack) {
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        $return[] = $tmp;
-                        $i++;
-                        // PSEUDO CLASSES
-                    } else {
-                        if ($c == ':') {
-                            $stack = 1;
-                            $tmp .= $query[$i++];
-                            while (isset($query[$i])
-                                && ($this->isChar($query[$i]) || in_array($query[$i], $pseudoChars))) {
-                                $tmp .= $query[$i];
-                                $i++;
-                            }
-                            // with arguments ?
-                            if (isset($query[$i]) && $query[$i] == '(') {
-                                $tmp .= $query[$i];
-                                $stack = 1;
-                                while (isset($query[++$i])) {
-                                    $tmp .= $query[$i];
-                                    if ($query[$i] == '(') {
-                                        $stack++;
-                                    } else {
-                                        if ($query[$i] == ')') {
-                                            $stack--;
-                                            if (!$stack) {
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                                $return[] = $tmp;
-                                $i++;
-                            } else {
-                                $return[] = $tmp;
-                            }
-                        } else {
-                            $i++;
-                        }
-                    }
-                }
-            }
-        }
-        foreach ($queries as $k => $q) {
-            if (isset($q[0])) {
-                if (isset($q[0][0]) && $q[0][0] == ':')
-                    array_unshift($queries[$k], '*');
-                if ($q[0] != '>')
-                    array_unshift($queries[$k], ' ');
-            }
-        }
-        return $queries;
-    }
-
-    /**
-     * Return matched DOM nodes.
-     *
-     * @param int $index
-     * @return array|\DOMElement Single \DOMElement or array of \DOMElement.
-     */
-    public function get($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $return = isset($index) ? (isset($this->elements[$index]) ? $this->elements[$index]
-            : null) : $this->elements;
-        // pass thou callbacks
-        $args = func_get_args();
-        $args = array_slice($args, 1);
-        foreach ($args as $callback) {
-            if (is_array($return))
-                foreach ($return as $k => $v)
-                    $return[$k] = PhpQuery::callbackRun(
-                        $callback,
-                        array(
-                            $v
-                        )
-                    );
-            else
-                $return = PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $return
-                    )
-                );
-        }
-        return $return;
-    }
-
-    /**
-     * Return matched DOM nodes.
-     * jQuery difference.
-     *
-     * @param int  $index
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @return array|string Returns string if $index != null
-     * @todo implement callbacks
-     * @todo return only arrays ?
-     * @todo maybe other name...
-     */
-    public function getString($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        if ($index)
-            $return = $this->eq($index)->text();
-        else {
-            $return = array();
-            for ($i = 0; $i < $this->size(); $i++) {
-                $return[] = $this->eq($i)->text();
-            }
-        }
-        // pass thou callbacks
-        $args = func_get_args();
-        $args = array_slice($args, 1);
-        foreach ($args as $callback) {
-            $return = PhpQuery::callbackRun(
-                $callback,
-                array(
-                    $return
-                )
-            );
-        }
-        return $return;
-    }
-
-    /**
-     * Return matched DOM nodes.
-     * jQuery difference.
-     *
-     * @param int  $index
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @return array|string Returns string if $index != null
-     * @todo implement callbacks
-     * @todo return only arrays ?
-     * @todo maybe other name...
-     */
-    public function getStrings($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        if ($index)
-            $return = $this->eq($index)->text();
-        else {
-            $return = array();
-            for ($i = 0; $i < $this->size(); $i++) {
-                $return[] = $this->eq($i)->text();
-            }
-            // pass thou callbacks
-            $args = func_get_args();
-            $args = array_slice($args, 1);
-        }
-        foreach ($args as $callback) {
-            if (is_array($return))
-                foreach ($return as $k => $v)
-                    $return[$k] = PhpQuery::callbackRun(
-                        $callback,
-                        array(
-                            $v
-                        )
-                    );
-            else
-                $return = PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $return
-                    )
-                );
-        }
-        return $return;
-    }
-
-    /**
-     * Returns new instance of actual class.
-     *
-     * @param array $newStack Optional. Will replace old stack with new and move old one to history.c
-     * @return \PhpQuery\PhpQueryObject
-     */
-    public function newInstance($newStack = null)
-    {
-        $class = get_class($this);
-        // support inheritance by passing old object to overloaded constructor
-        $new           = $class != 'PhpQuery' ? new $class($this, $this->getDocumentID())
-            : new PhpQueryObject($this->getDocumentID());
-        $new->previous = $this;
-        if (is_null($newStack)) {
-            $new->elements = $this->elements;
-            if ($this->elementsBackup)
-                $this->elements = $this->elementsBackup;
-        } else if (is_string($newStack)) {
-            $new->elements = PhpQuery::pq($newStack, $this->getDocumentID())->stack();
-        } else {
-            $new->elements = $newStack;
-        }
-        return $new;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * In the future, when PHP will support XLS 2.0, then we would do that this way:
-     * contains(tokenize(@class, '\s'), "something")
-     * @param string $class
-     * @param string $node
-     * @return boolean
-     * @access private
-     */
-    protected function matchClasses($class, $node)
-    {
-        // multi-class
-        if (mb_strpos($class, '.', 1)) {
-            $classes          = explode('.', substr($class, 1));
-            $classesCount     = count($classes);
-            $nodeClasses      = explode(' ', $node->getAttribute('class'));
-            $nodeClassesCount = count($nodeClasses);
-            if ($classesCount > $nodeClassesCount)
-                return false;
-            $diff = count(array_diff($classes, $nodeClasses));
-            if (!$diff)
-                return true;
-            // single-class
-        } else {
-            return in_array(
-            // strip leading dot from class name
-                substr($class, 1),
-                // get classes for element as array
-                explode(' ', $node->getAttribute('class'))
-            );
-        }
-    }
-
-    /**
-     * @access private
-     */
-    protected function runQuery($XQuery, $selector = null, $compare = null)
-    {
-        if ($compare && !method_exists($this, $compare))
-            return false;
-        $stack = array();
-        if (!$this->elements)
-            $this->debug('Stack empty, skipping...');
-        //		var_dump($this->elements[0]->nodeType);
-        // element, document
-        foreach ($this->stack(
-                     array(
-                         1,
-                         9,
-                         13
-                     )
-                 ) as $k => $stackNode) {
-            $detachAfter = false;
-            // to work on detached nodes we need temporary place them somewhere
-            // thats because context xpath queries sucks ;]
-            $testNode = $stackNode;
-            while ($testNode) {
-                if (!$testNode->parentNode && !$this->isRoot($testNode)) {
-                    $this->root->appendChild($testNode);
-                    $detachAfter = $testNode;
-                    break;
-                }
-                $testNode = isset($testNode->parentNode) ? $testNode->parentNode : null;
-            }
-            // XXX tmp ?
-            $xpath = $this->documentWrapper->isXHTML ? $this->getNodeXpath($stackNode, 'html')
-                : $this->getNodeXpath($stackNode);
-            // FIXME pseudoclasses-only query, support XML
-            $query = $XQuery == '//' && $xpath == '/html[1]' ? '//*'
-                : $xpath . $XQuery;
-            $this->debug("XPATH: {$query}");
-            // run query, get elements
-            $nodes = $this->xpath->query($query);
-            $this->debug("QUERY FETCHED");
-            if (!$nodes->length)
-                $this->debug('Nothing found');
-            $debug = array();
-            foreach ($nodes as $node) {
-                $matched = false;
-                if ($compare) {
-                    PhpQuery::$debug ? $this->debug(
-                        "Found: " . $this->whois($node)
-                        . ", comparing with {$compare}()"
-                    ) : null;
-                    $PhpQueryDebug   = PhpQuery::$debug;
-                    PhpQuery::$debug = false;
-                    // TODO ??? use PhpQuery::callbackRun()
-                    if (call_user_func_array(
-                        array(
-                            $this,
-                            $compare
-                        ),
-                        array(
-                            $selector,
-                            $node
-                        )
-                    )
-                    )
-                        $matched = true;
-                    PhpQuery::$debug = $PhpQueryDebug;
-                } else {
-                    $matched = true;
-                }
-                if ($matched) {
-                    if (PhpQuery::$debug)
-                        $debug[] = $this->whois($node);
-                    $stack[] = $node;
-                }
-            }
-            if (PhpQuery::$debug) {
-                $this->debug("Matched " . count($debug) . ": " . implode(', ', $debug));
-            }
-            if ($detachAfter)
-                $this->root->removeChild($detachAfter);
-        }
-        $this->elements = $stack;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $selectors
-     * @param null $context
-     * @param bool $noHistory
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function find($selectors, $context = null, $noHistory = false)
-    {
-        if (!$noHistory)
-            // backup last stack /for end()/
-            $this->elementsBackup = $this->elements;
-        // allow to define context
-        // TODO combine code below with PhpQuery::pq() context guessing code
-        //   as generic function
-        if (isset($context)) {
-            if (!is_array($context) && $context instanceof \DOMElement) {
-                $this->elements = array(
-                    $context
-                );
-            } elseif (is_array($context)) {
-                $this->elements = array();
-                foreach ($context as $c)
-                    if ($c instanceof \DOMElement)
-                        $this->elements[] = $c;
-            } elseif ($context instanceof PhpQueryObject) {
-                $this->elements = $context->elements;
-            }
-        }
-
-        $queries = $this->parseSelector($selectors);
-
-        $this->debug(
-            array(
-                'FIND',
-                $selectors,
-                $queries
-            )
-        );
-        $XQuery = '';
-        // remember stack state because of multi-queries
-        $oldStack = $this->elements;
-        // here we will be keeping found elements
-        $stack = array();
-        foreach ($queries as $selector) {
-            $this->elements  = $oldStack;
-            $delimiterBefore = false;
-            foreach ($selector as $s) {
-                // TAG
-                $isTag = extension_loaded('mbstring') && PhpQuery::$mbstringSupport ? mb_ereg_match('^[\w|\||-]+$', $s)
-                    || $s == '*' : preg_match('@^[\w|\||-]+$@', $s) || $s == '*';
-                if ($isTag) {
-                    if ($this->isXML()) {
-                        // namespace support
-                        if (mb_strpos($s, '|') !== false) {
-                            $ns = $tag = null;
-                            list($ns, $tag) = explode('|', $s);
-                            $XQuery .= "$ns:$tag";
-                        } else if ($s == '*') {
-                            $XQuery .= "*";
-                        } else {
-                            $XQuery .= "*[local-name()='$s']";
-                        }
-                    } else {
-                        $XQuery .= $s;
-                    }
-                    // ID
-                } else if ($s[0] == '#') {
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
-                    $XQuery .= "[@id='" . substr($s, 1) . "']";
-                    // ATTRIBUTES
-                } else if ($s[0] == '[') {
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
-                    // strip side brackets
-                    $attr    = trim($s, '][');
-                    $execute = false;
-                    // attr with specifed value
-                    if (mb_strpos($s, '=')) {
-                        $value = null;
-                        list($attr, $value) = explode('=', $attr);
-                        $value = trim($value, "'\"");
-                        if ($this->isRegexp($attr)) {
-                            // cut regexp character
-                            $attr    = substr($attr, 0, -1);
-                            $execute = true;
-                            $XQuery .= "[@{$attr}]";
-                        } else {
-                            $XQuery .= "[@{$attr}='{$value}']";
-                        }
-                        // attr without specified value
-                    } else {
-                        $XQuery .= "[@{$attr}]";
-                    }
-                    if ($execute) {
-                        $this->runQuery($XQuery, $s, 'is');
-                        $XQuery = '';
-                        if (!$this->length())
-                            break;
-                    }
-                    // CLASSES
-                } else if ($s[0] == '.') {
-                    // TODO use return $this->find("./self::*[contains(concat(\" \",@class,\" \"), \" $class \")]");
-                    // thx wizDom ;)
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
-                    $XQuery .= '[@class]';
-                    $this->runQuery($XQuery, $s, 'matchClasses');
-                    $XQuery = '';
-                    if (!$this->length())
-                        break;
-                    // ~ General Sibling Selector
-                } else if ($s[0] == '~') {
-                    $this->runQuery($XQuery);
-                    $XQuery         = '';
-                    $this->elements = $this->siblings(substr($s, 1))->elements;
-                    if (!$this->length())
-                        break;
-                    // + Adjacent sibling selectors
-                } else if ($s[0] == '+') {
-                    // TODO /following-sibling::
-                    $this->runQuery($XQuery);
-                    $XQuery         = '';
-                    $subSelector    = substr($s, 1);
-                    $subElements    = $this->elements;
-                    $this->elements = array();
-                    foreach ($subElements as $node) {
-                        // search first \DOMElement sibling
-                        $test = $node->nextSibling;
-                        while ($test && !($test instanceof \DOMElement))
-                            $test = $test->nextSibling;
-                        if ($test && $this->is($subSelector, $test))
-                            $this->elements[] = $test;
-                    }
-                    if (!$this->length())
-                        break;
-                    // PSEUDO CLASSES
-                } else if ($s[0] == ':') {
-                    // TODO optimization for :first :last
-                    if ($XQuery) {
-                        $this->runQuery($XQuery);
-                        $XQuery = '';
-                    }
-                    if (!$this->length())
-                        break;
-                    $this->pseudoClasses($s);
-                    if (!$this->length())
-                        break;
-                    // DIRECT DESCENDANDS
-                } else if ($s == '>') {
-                    $XQuery .= '/';
-                    $delimiterBefore = 2;
-                    // ALL DESCENDANDS
-                } else if ($s == ' ') {
-                    $XQuery .= '//';
-                    $delimiterBefore = 2;
-                    // ERRORS
-                } else {
-                    PhpQuery::debug("Unrecognized token '$s'");
-                }
-                $delimiterBefore = $delimiterBefore === 2;
-            }
-            // run query if any
-            if ($XQuery && $XQuery != '//') {
-                $this->runQuery($XQuery);
-                $XQuery = '';
-            }
-            foreach ($this->elements as $node)
-                if (!$this->elementsContainsNode($node, $stack))
-                    $stack[] = $node;
-        }
-        $this->elements = $stack;
-        return $this->newInstance();
-    }
-
-    /**
-     * @todo   create API for classes with pseudoselectors
-     * @access private
-     */
-    protected function pseudoClasses($class)
-    {
-        // TODO clean args parsing ?
-        $class    = ltrim($class, ':');
-        $haveArgs = mb_strpos($class, '(');
-        if ($haveArgs !== false) {
-            $args  = substr($class, $haveArgs + 1, -1);
-            $class = substr($class, 0, $haveArgs);
-        }
-        switch ($class) {
-            case 'even':
-            case 'odd':
-                $stack = array();
-                foreach ($this->elements as $i => $node) {
-                    if ($class == 'even' && ($i % 2) == 0)
-                        $stack[] = $node;
-                    else if ($class == 'odd' && $i % 2)
-                        $stack[] = $node;
-                }
-                $this->elements = $stack;
-                break;
-            case 'eq':
-                $k              = intval($args);
-                $this->elements = isset($this->elements[$k]) ? array(
-                    $this->elements[$k]
-                ) : array();
-                break;
-            case 'gt':
-                $this->elements = array_slice($this->elements, $args + 1);
-                break;
-            case 'lt':
-                $this->elements = array_slice($this->elements, 0, $args + 1);
-                break;
-            case 'first':
-                if (isset($this->elements[0]))
-                    $this->elements = array(
-                        $this->elements[0]
-                    );
-                break;
-            case 'last':
-                if ($this->elements)
-                    $this->elements = array(
-                        $this->elements[count($this->elements) - 1]
-                    );
-                break;
-            /*case 'parent':
+	public $documentID = null;
+	/**
+	 * \DOMDocument class.
+	 *
+	 * @var \DOMDocument
+	 */
+	public $document = null;
+	public $charset = null;
+	/**
+	 *
+	 * @var Dom\DOMDocumentWrapper
+	 */
+	public $documentWrapper = null;
+	/**
+	 * XPath interface.
+	 *
+	 * @var \DOMXPath
+	 */
+	public $xpath = null;
+	/**
+	 * Stack of selected elements.
+	 * @TODO refactor to ->nodes
+	 * @var array
+	 */
+	public $elements = array();
+	/**
+	 * @access private
+	 */
+	protected $elementsBackup = array();
+	/**
+	 * @access private
+	 */
+	protected $previous = null;
+	/**
+	 * @access private
+	 * @TODO   deprecate
+	 */
+	protected $root = array();
+	/**
+	 * Indicated if doument is just a fragment (no <html> tag).
+	 *
+	 * Every document is realy a full document, so even documentFragments can
+	 * be queried against <html>, but getDocument(id)->htmlOuter() will return
+	 * only contents of <body>.
+	 *
+	 * @var bool
+	 */
+	public $documentFragment = true;
+	/**
+	 * Iterator interface helper
+	 * @access private
+	 */
+	protected $elementsInterator = array();
+	/**
+	 * Iterator interface helper
+	 * @access private
+	 */
+	protected $valid = false;
+	/**
+	 * Iterator interface helper
+	 * @access private
+	 */
+	protected $current = null;
+
+	/**
+	 * Indicates whether CSS has been parsed or not. We only parse CSS if needed.
+	 * @access private
+	 */
+	protected $cssIsParsed = array();
+	/**
+	 * A collection of complete CSS selector strings.
+	 * @access private;
+	 */
+	protected $cssString = array();
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+
+	protected $attribute_css_mapping = array(
+		'bgcolor' => 'background-color',
+		'text'    => 'color',
+		'width'   => 'width',
+		'height'  => 'height'
+	);
+
+	public function __construct($documentID)
+	{
+		//		if ($documentID instanceof self)
+		//			var_dump($documentID->getDocumentID());
+		$id = $documentID instanceof self ? $documentID->getDocumentID()
+			: $documentID;
+		//		var_dump($id);
+		if (!isset(PhpQuery::$documents[$id])) {
+			//			var_dump(PhpQuery::$documents);
+			throw new \Exception("Document with ID '{$id}' isn't loaded. Use PhpQuery::newDocument(\$html) or PhpQuery::newDocumentFile(\$file) first.");
+		}
+		$this->documentID       = $id;
+		$this->documentWrapper  = & PhpQuery::$documents[$id];
+		$this->document         = & $this->documentWrapper->document;
+		$this->xpath            = & $this->documentWrapper->xpath;
+		$this->charset          = & $this->documentWrapper->charset;
+		$this->documentFragment = & $this->documentWrapper->isDocumentFragment;
+		// TODO check $this->DOM->documentElement;
+		//		$this->root = $this->document->documentElement;
+		$this->root = & $this->documentWrapper->root;
+		//		$this->toRoot();
+		$this->elements = array(
+			$this->root
+		);
+	}
+
+	/**
+	 *
+	 * @access private
+	 * @param $attr
+	 * @return \PhpQuery\PhpQueryObject|\PhpQuery\QueryTemplatesParse|\PhpQuery\QueryTemplatesSource|\PhpQuery\QueryTemplatesSourceQuery
+	 */
+	public function __get($attr)
+	{
+		switch ($attr) {
+			// FIXME doesnt work at all ?
+			case 'length':
+				return $this->size();
+				break;
+			default:
+				return $this->$attr;
+		}
+	}
+
+	/**
+	 * Saves actual object to $var by reference.
+	 * Useful when need to break chain.
+	 * @param PhpQueryObject $var
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function toReference(&$var)
+	{
+		return $var = $this;
+	}
+
+	public function documentFragment($state = null)
+	{
+		if ($state) {
+			PhpQuery::$documents[$this->getDocumentID()]['documentFragment'] = $state;
+			return $this;
+		}
+		return $this->documentFragment;
+	}
+
+	/**
+	 * @access private
+	 * @TODO   documentWrapper
+	 */
+	protected function isRoot($node)
+	{
+		//		return $node instanceof \DOMDocument || $node->tagName == 'html';
+		return $node instanceof \DOMDocument
+		|| ($node instanceof \DOMElement && $node->tagName == 'html')
+		|| $this->root->isSameNode($node);
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function stackIsRoot()
+	{
+		return $this->size() == 1 && $this->isRoot($this->elements[0]);
+	}
+
+	/**
+	 * Enter description here...
+	 * NON JQUERY METHOD
+	 *
+	 * Watch out, it doesn't creates new instance, can be reverted with end().
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function toRoot()
+	{
+		$this->elements = array(
+			$this->root
+		);
+		return $this;
+		//		return $this->newInstance(array($this->root));
+	}
+
+	/**
+	 * Saves object's DocumentID to $var by reference.
+	 * <code>
+	 * $myDocumentId;
+	 * PhpQuery::newDocument('<div/>')
+	 *     ->getDocumentIDRef($myDocumentId)
+	 *     ->find('div')->...
+	 * </code>
+	 *
+	 * @param $documentID
+	 * @internal param string $domId
+	 * @see      PhpQuery::newDocument
+	 * @see      PhpQuery::newDocumentFile
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function getDocumentIDRef(&$documentID)
+	{
+		$documentID = $this->getDocumentID();
+		return $this;
+	}
+
+	/**
+	 * Returns object with stack set to document root.
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function getDocument()
+	{
+		return PhpQuery::getDocument($this->getDocumentID());
+	}
+
+	/**
+	 *
+	 * @return \DOMDocument
+	 */
+	public function getDOMDocument()
+	{
+		return $this->document;
+	}
+
+	/**
+	 * Get object's Document ID.
+	 *
+	 * @return string
+	 */
+	public function getDocumentID()
+	{
+		return $this->documentID;
+	}
+
+	/**
+	 * Unloads whole document from memory.
+	 * CAUTION! None further operations will be possible on this document.
+	 * All objects refering to it will be useless.
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function unloadDocument()
+	{
+		PhpQuery::unloadDocuments($this->getDocumentID());
+	}
+
+	public function isHTML()
+	{
+		return $this->documentWrapper->isHTML;
+	}
+
+	public function isXHTML()
+	{
+		return $this->documentWrapper->isXHTML;
+	}
+
+	public function isXML()
+	{
+		return $this->documentWrapper->isXML;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @link http://docs.jquery.com/Ajax/serialize
+	 * @return string
+	 */
+	public function serialize()
+	{
+		return PhpQuery::param($this->serializeArray());
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @link http://docs.jquery.com/Ajax/serializeArray
+	 * @return array
+	 */
+	public function serializeArray($submit = null)
+	{
+		$source = $this->filter('form, input, select, textarea')->find('input, select, textarea')->andSelf()->not(
+			'form'
+		);
+		$return = array();
+		//		$source->dumpDie();
+		foreach ($source as $input) {
+			$input = PhpQuery::pq($input);
+			if ($input->is('[disabled]')) {
+				continue;
+			}
+			if (!$input->is('[name]')) {
+				continue;
+			}
+			if ($input->is('[type=checkbox]') && !$input->is('[checked]')) {
+				continue;
+			}
+			// jquery diff
+			if ($submit && $input->is('[type=submit]')) {
+				if ($submit instanceof \DOMElement
+					&& !$input->elements[0]->isSameNode($submit)
+				) {
+					continue;
+				} else {
+					if (is_string($submit) && $input->attr('name') != $submit) {
+						continue;
+					}
+				}
+			}
+			$return[] = array(
+				'name'  => $input->attr('name'),
+				'value' => $input->val(),
+			);
+		}
+		return $return;
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function debug($in)
+	{
+		if (!PhpQuery::$debug) {
+			return;
+		}
+		print('<pre>');
+		print_r($in);
+		// file debug
+		//		file_put_contents(dirname(__FILE__).'/PhpQuery.log', print_r($in, true)."\n", FILE_APPEND);
+		// quite handy debug trace
+		//		if ( is_array($in))
+		//			print_r(array_slice(debug_backtrace(), 3));
+		print("</pre>\n");
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function isRegexp($pattern)
+	{
+		return in_array(
+			$pattern[mb_strlen($pattern) - 1],
+			array(
+				'^',
+				'*',
+				'$'
+			)
+		);
+	}
+
+	/**
+	 * Determines if $char is really a char.
+	 *
+	 * @param string $char
+	 * @return bool
+	 * @todo   rewrite me to charcode range ! ;)
+	 * @access private
+	 */
+	protected function isChar($char)
+	{
+		return extension_loaded('mbstring') && PhpQuery::$mbstringSupport ? mb_eregi('\w', $char)
+			: preg_match('@\w@', $char);
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function parseSelector($query)
+	{
+		// clean spaces
+		// TODO include this inside parsing ?
+		$query   = trim(preg_replace('@\s+@', ' ', preg_replace('@\s*(>|\\+|~)\s*@', '\\1', (string) $query)));
+		$queries = array(
+			array()
+		);
+		if (!$query) {
+			return $queries;
+		}
+		$return       = & $queries[0];
+		$specialChars = array(
+			'>',
+			' '
+		);
+		//		$specialCharsMapping = array('/' => '>');
+		$specialCharsMapping = array();
+		$strlen              = mb_strlen($query);
+		$classChars          = array(
+			'.',
+			'-'
+		);
+		$pseudoChars         = array(
+			'-'
+		);
+		$tagChars            = array(
+			'*',
+			'|',
+			'-'
+		);
+		// split multibyte string
+		// http://code.google.com/p/phpquery/issues/detail?id=76
+		$_query = array();
+		for ($i = 0; $i < $strlen; $i++) {
+			$_query[] = mb_substr($query, $i, 1);
+		}
+		$query = $_query;
+		// it works, but i dont like it...
+		$i = 0;
+		while ($i < $strlen) {
+			$c   = $query[$i];
+			$tmp = '';
+			// TAG
+			if ($this->isChar($c) || in_array($c, $tagChars)) {
+				while (isset($query[$i])
+					&& ($this->isChar($query[$i]) || in_array($query[$i], $tagChars))) {
+					$tmp .= $query[$i];
+					$i++;
+				}
+				$return[] = $tmp;
+				// IDs
+			} else if ($c == '#') {
+				$i++;
+				while (isset($query[$i])
+					&& ($this->isChar($query[$i]) || $query[$i] == '-')) {
+					$tmp .= $query[$i];
+					$i++;
+				}
+				$return[] = '#' . $tmp;
+				// SPECIAL CHARS
+			} else if (in_array($c, $specialChars)) {
+				$return[] = $c;
+				$i++;
+				// MAPPED SPECIAL MULTICHARS
+				//			} else if ( $c.$query[$i+1] == '//') {
+				//				$return[] = ' ';
+				//				$i = $i+2;
+				// MAPPED SPECIAL CHARS
+			} else if (isset($specialCharsMapping[$c])) {
+				$return[] = $specialCharsMapping[$c];
+				$i++;
+				// COMMA
+			} else if ($c == ',') {
+				$queries[] = array();
+				$return    = & $queries[count($queries) - 1];
+				$i++;
+				while (isset($query[$i]) && $query[$i] == ' ') {
+					$i++;
+				}
+				// CLASSES
+			} else if ($c == '.') {
+				while (isset($query[$i])
+					&& ($this->isChar($query[$i]) || in_array($query[$i], $classChars))) {
+					$tmp .= $query[$i];
+					$i++;
+				}
+				$return[] = $tmp;
+				// ~ General Sibling Selector
+			} else if ($c == '~') {
+				$spaceAllowed = true;
+				$tmp .= $query[$i++];
+				while (isset($query[$i])
+					&& ($this->isChar($query[$i]) || in_array($query[$i], $classChars)
+						|| $query[$i] == '*' || ($query[$i] == ' ' && $spaceAllowed))) {
+					if ($query[$i] != ' ') {
+						$spaceAllowed = false;
+					}
+					$tmp .= $query[$i];
+					$i++;
+				}
+				$return[] = $tmp;
+				// + Adjacent sibling selectors
+			} else {
+				if ($c == '+') {
+					$spaceAllowed = true;
+					$tmp .= $query[$i++];
+					while (isset($query[$i])
+						&& ($this->isChar($query[$i]) || in_array($query[$i], $classChars)
+							|| $query[$i] == '*' || ($spaceAllowed && $query[$i] == ' '))) {
+						if ($query[$i] != ' ') {
+							$spaceAllowed = false;
+						}
+						$tmp .= $query[$i];
+						$i++;
+					}
+					$return[] = $tmp;
+					// ATTRS
+				} else {
+					if ($c == '[') {
+						$stack = 1;
+						$tmp .= $c;
+						while (isset($query[++$i])) {
+							$tmp .= $query[$i];
+							if ($query[$i] == '[') {
+								$stack++;
+							} else {
+								if ($query[$i] == ']') {
+									$stack--;
+									if (!$stack) {
+										break;
+									}
+								}
+							}
+						}
+						$return[] = $tmp;
+						$i++;
+						// PSEUDO CLASSES
+					} else {
+						if ($c == ':') {
+							$stack = 1;
+							$tmp .= $query[$i++];
+							while (isset($query[$i])
+								&& ($this->isChar($query[$i]) || in_array($query[$i], $pseudoChars))) {
+								$tmp .= $query[$i];
+								$i++;
+							}
+							// with arguments ?
+							if (isset($query[$i]) && $query[$i] == '(') {
+								$tmp .= $query[$i];
+								$stack = 1;
+								while (isset($query[++$i])) {
+									$tmp .= $query[$i];
+									if ($query[$i] == '(') {
+										$stack++;
+									} else {
+										if ($query[$i] == ')') {
+											$stack--;
+											if (!$stack) {
+												break;
+											}
+										}
+									}
+								}
+								$return[] = $tmp;
+								$i++;
+							} else {
+								$return[] = $tmp;
+							}
+						} else {
+							$i++;
+						}
+					}
+				}
+			}
+		}
+		foreach ($queries as $k => $q) {
+			if (isset($q[0])) {
+				if (isset($q[0][0]) && $q[0][0] == ':')
+					array_unshift($queries[$k], '*');
+				if ($q[0] != '>')
+					array_unshift($queries[$k], ' ');
+			}
+		}
+		return $queries;
+	}
+
+	/**
+	 * Return matched DOM nodes.
+	 *
+	 * @param int $index
+	 * @return array|\DOMElement Single \DOMElement or array of \DOMElement.
+	 */
+	public function get($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$return = isset($index) ? (isset($this->elements[$index]) ? $this->elements[$index]
+			: null) : $this->elements;
+		// pass thou callbacks
+		$args = func_get_args();
+		$args = array_slice($args, 1);
+		foreach ($args as $callback) {
+			if (is_array($return))
+				foreach ($return as $k => $v)
+					$return[$k] = PhpQuery::callbackRun(
+						$callback,
+						array(
+							$v
+						)
+					);
+			else
+				$return = PhpQuery::callbackRun(
+					$callback,
+					array(
+						$return
+					)
+				);
+		}
+		return $return;
+	}
+
+	/**
+	 * Return matched DOM nodes.
+	 * jQuery difference.
+	 *
+	 * @param int  $index
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @return array|string Returns string if $index != null
+	 * @todo implement callbacks
+	 * @todo return only arrays ?
+	 * @todo maybe other name...
+	 */
+	public function getString($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		if ($index)
+			$return = $this->eq($index)->text();
+		else {
+			$return = array();
+			for ($i = 0; $i < $this->size(); $i++) {
+				$return[] = $this->eq($i)->text();
+			}
+		}
+		// pass thou callbacks
+		$args = func_get_args();
+		$args = array_slice($args, 1);
+		foreach ($args as $callback) {
+			$return = PhpQuery::callbackRun(
+				$callback,
+				array(
+					$return
+				)
+			);
+		}
+		return $return;
+	}
+
+	/**
+	 * Return matched DOM nodes.
+	 * jQuery difference.
+	 *
+	 * @param int  $index
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @return array|string Returns string if $index != null
+	 * @todo implement callbacks
+	 * @todo return only arrays ?
+	 * @todo maybe other name...
+	 */
+	public function getStrings($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		if ($index)
+			$return = $this->eq($index)->text();
+		else {
+			$return = array();
+			for ($i = 0; $i < $this->size(); $i++) {
+				$return[] = $this->eq($i)->text();
+			}
+			// pass thou callbacks
+			$args = func_get_args();
+			$args = array_slice($args, 1);
+		}
+		foreach ($args as $callback) {
+			if (is_array($return))
+				foreach ($return as $k => $v)
+					$return[$k] = PhpQuery::callbackRun(
+						$callback,
+						array(
+							$v
+						)
+					);
+			else
+				$return = PhpQuery::callbackRun(
+					$callback,
+					array(
+						$return
+					)
+				);
+		}
+		return $return;
+	}
+
+	/**
+	 * Returns new instance of actual class.
+	 *
+	 * @param array $newStack Optional. Will replace old stack with new and move old one to history.c
+	 * @return \PhpQuery\PhpQueryObject
+	 */
+	public function newInstance($newStack = null)
+	{
+		$class = get_class($this);
+		// support inheritance by passing old object to overloaded constructor
+		$new           = $class != 'PhpQuery' ? new $class($this, $this->getDocumentID())
+			: new PhpQueryObject($this->getDocumentID());
+		$new->previous = $this;
+		if (is_null($newStack)) {
+			$new->elements = $this->elements;
+			if ($this->elementsBackup)
+				$this->elements = $this->elementsBackup;
+		} else if (is_string($newStack)) {
+			$new->elements = PhpQuery::pq($newStack, $this->getDocumentID())->stack();
+		} else {
+			$new->elements = $newStack;
+		}
+		return $new;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * In the future, when PHP will support XLS 2.0, then we would do that this way:
+	 * contains(tokenize(@class, '\s'), "something")
+	 * @param string $class
+	 * @param string $node
+	 * @return boolean
+	 * @access private
+	 */
+	protected function matchClasses($class, $node)
+	{
+		// multi-class
+		if (mb_strpos($class, '.', 1)) {
+			$classes          = explode('.', substr($class, 1));
+			$classesCount     = count($classes);
+			$nodeClasses      = explode(' ', $node->getAttribute('class'));
+			$nodeClassesCount = count($nodeClasses);
+			if ($classesCount > $nodeClassesCount)
+				return false;
+			$diff = count(array_diff($classes, $nodeClasses));
+			if (!$diff)
+				return true;
+			// single-class
+		} else {
+			return in_array(
+			// strip leading dot from class name
+				substr($class, 1),
+				// get classes for element as array
+				explode(' ', $node->getAttribute('class'))
+			);
+		}
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function runQuery($XQuery, $selector = null, $compare = null)
+	{
+		if ($compare && !method_exists($this, $compare))
+			return false;
+		$stack = array();
+		if (!$this->elements)
+			$this->debug('Stack empty, skipping...');
+		//		var_dump($this->elements[0]->nodeType);
+		// element, document
+		foreach ($this->stack(
+					 array(
+						 1,
+						 9,
+						 13
+					 )
+				 ) as $k => $stackNode) {
+			$detachAfter = false;
+			// to work on detached nodes we need temporary place them somewhere
+			// thats because context xpath queries sucks ;]
+			$testNode = $stackNode;
+			while ($testNode) {
+				if (!$testNode->parentNode && !$this->isRoot($testNode)) {
+					$this->root->appendChild($testNode);
+					$detachAfter = $testNode;
+					break;
+				}
+				$testNode = isset($testNode->parentNode) ? $testNode->parentNode : null;
+			}
+			// XXX tmp ?
+			$xpath = $this->documentWrapper->isXHTML ? $this->getNodeXpath($stackNode, 'html')
+				: $this->getNodeXpath($stackNode);
+			// FIXME pseudoclasses-only query, support XML
+			$query = $XQuery == '//' && $xpath == '/html[1]' ? '//*'
+				: $xpath . $XQuery;
+			$this->debug("XPATH: {$query}");
+			// run query, get elements
+			$nodes = $this->xpath->query($query);
+			$this->debug("QUERY FETCHED");
+			if (!$nodes->length)
+				$this->debug('Nothing found');
+			$debug = array();
+			foreach ($nodes as $node) {
+				$matched = false;
+				if ($compare) {
+					PhpQuery::$debug ? $this->debug(
+						"Found: " . $this->whois($node)
+						. ", comparing with {$compare}()"
+					) : null;
+					$PhpQueryDebug   = PhpQuery::$debug;
+					PhpQuery::$debug = false;
+					// TODO ??? use PhpQuery::callbackRun()
+					if (call_user_func_array(
+						array(
+							$this,
+							$compare
+						),
+						array(
+							$selector,
+							$node
+						)
+					)
+					)
+						$matched = true;
+					PhpQuery::$debug = $PhpQueryDebug;
+				} else {
+					$matched = true;
+				}
+				if ($matched) {
+					if (PhpQuery::$debug)
+						$debug[] = $this->whois($node);
+					$stack[] = $node;
+				}
+			}
+			if (PhpQuery::$debug) {
+				$this->debug("Matched " . count($debug) . ": " . implode(', ', $debug));
+			}
+			if ($detachAfter)
+				$this->root->removeChild($detachAfter);
+		}
+		$this->elements = $stack;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $selectors
+	 * @param null $context
+	 * @param bool $noHistory
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function find($selectors, $context = null, $noHistory = false)
+	{
+		if (!$noHistory)
+			// backup last stack /for end()/
+			$this->elementsBackup = $this->elements;
+		// allow to define context
+		// TODO combine code below with PhpQuery::pq() context guessing code
+		//   as generic function
+		if (isset($context)) {
+			if (!is_array($context) && $context instanceof \DOMElement) {
+				$this->elements = array(
+					$context
+				);
+			} elseif (is_array($context)) {
+				$this->elements = array();
+				foreach ($context as $c)
+					if ($c instanceof \DOMElement)
+						$this->elements[] = $c;
+			} elseif ($context instanceof PhpQueryObject) {
+				$this->elements = $context->elements;
+			}
+		}
+
+		$queries = $this->parseSelector($selectors);
+
+		$this->debug(
+			array(
+				'FIND',
+				$selectors,
+				$queries
+			)
+		);
+		$XQuery = '';
+		// remember stack state because of multi-queries
+		$oldStack = $this->elements;
+		// here we will be keeping found elements
+		$stack = array();
+		foreach ($queries as $selector) {
+			$this->elements  = $oldStack;
+			$delimiterBefore = false;
+			foreach ($selector as $s) {
+				// TAG
+				$isTag = extension_loaded('mbstring') && PhpQuery::$mbstringSupport ? mb_ereg_match('^[\w|\||-]+$', $s)
+					|| $s == '*' : preg_match('@^[\w|\||-]+$@', $s) || $s == '*';
+				if ($isTag) {
+					if ($this->isXML()) {
+						// namespace support
+						if (mb_strpos($s, '|') !== false) {
+							$ns = $tag = null;
+							list($ns, $tag) = explode('|', $s);
+							$XQuery .= "$ns:$tag";
+						} else if ($s == '*') {
+							$XQuery .= "*";
+						} else {
+							$XQuery .= "*[local-name()='$s']";
+						}
+					} else {
+						$XQuery .= $s;
+					}
+					// ID
+				} else if ($s[0] == '#') {
+					if ($delimiterBefore)
+						$XQuery .= '*';
+					$XQuery .= "[@id='" . substr($s, 1) . "']";
+					// ATTRIBUTES
+				} else if ($s[0] == '[') {
+					if ($delimiterBefore)
+						$XQuery .= '*';
+					// strip side brackets
+					$attr    = trim($s, '][');
+					$execute = false;
+					// attr with specifed value
+					if (mb_strpos($s, '=')) {
+						$value = null;
+						list($attr, $value) = explode('=', $attr);
+						$value = trim($value, "'\"");
+						if ($this->isRegexp($attr)) {
+							// cut regexp character
+							$attr    = substr($attr, 0, -1);
+							$execute = true;
+							$XQuery .= "[@{$attr}]";
+						} else {
+							$XQuery .= "[@{$attr}='{$value}']";
+						}
+						// attr without specified value
+					} else {
+						$XQuery .= "[@{$attr}]";
+					}
+					if ($execute) {
+						$this->runQuery($XQuery, $s, 'is');
+						$XQuery = '';
+						if (!$this->length())
+							break;
+					}
+					// CLASSES
+				} else if ($s[0] == '.') {
+					// TODO use return $this->find("./self::*[contains(concat(\" \",@class,\" \"), \" $class \")]");
+					// thx wizDom ;)
+					if ($delimiterBefore)
+						$XQuery .= '*';
+					$XQuery .= '[@class]';
+					$this->runQuery($XQuery, $s, 'matchClasses');
+					$XQuery = '';
+					if (!$this->length())
+						break;
+					// ~ General Sibling Selector
+				} else if ($s[0] == '~') {
+					$this->runQuery($XQuery);
+					$XQuery         = '';
+					$this->elements = $this->siblings(substr($s, 1))->elements;
+					if (!$this->length())
+						break;
+					// + Adjacent sibling selectors
+				} else if ($s[0] == '+') {
+					// TODO /following-sibling::
+					$this->runQuery($XQuery);
+					$XQuery         = '';
+					$subSelector    = substr($s, 1);
+					$subElements    = $this->elements;
+					$this->elements = array();
+					foreach ($subElements as $node) {
+						// search first \DOMElement sibling
+						$test = $node->nextSibling;
+						while ($test && !($test instanceof \DOMElement))
+							$test = $test->nextSibling;
+						if ($test && $this->is($subSelector, $test))
+							$this->elements[] = $test;
+					}
+					if (!$this->length())
+						break;
+					// PSEUDO CLASSES
+				} else if ($s[0] == ':') {
+					// TODO optimization for :first :last
+					if ($XQuery) {
+						$this->runQuery($XQuery);
+						$XQuery = '';
+					}
+					if (!$this->length())
+						break;
+					$this->pseudoClasses($s);
+					if (!$this->length())
+						break;
+					// DIRECT DESCENDANDS
+				} else if ($s == '>') {
+					$XQuery .= '/';
+					$delimiterBefore = 2;
+					// ALL DESCENDANDS
+				} else if ($s == ' ') {
+					$XQuery .= '//';
+					$delimiterBefore = 2;
+					// ERRORS
+				} else {
+					PhpQuery::debug("Unrecognized token '$s'");
+				}
+				$delimiterBefore = $delimiterBefore === 2;
+			}
+			// run query if any
+			if ($XQuery && $XQuery != '//') {
+				$this->runQuery($XQuery);
+				$XQuery = '';
+			}
+			foreach ($this->elements as $node)
+				if (!$this->elementsContainsNode($node, $stack))
+					$stack[] = $node;
+		}
+		$this->elements = $stack;
+		return $this->newInstance();
+	}
+
+	/**
+	 * @todo   create API for classes with pseudoselectors
+	 * @access private
+	 */
+	protected function pseudoClasses($class)
+	{
+		// TODO clean args parsing ?
+		$class    = ltrim($class, ':');
+		$haveArgs = mb_strpos($class, '(');
+		if ($haveArgs !== false) {
+			$args  = substr($class, $haveArgs + 1, -1);
+			$class = substr($class, 0, $haveArgs);
+		}
+		switch ($class) {
+			case 'even':
+			case 'odd':
+				$stack = array();
+				foreach ($this->elements as $i => $node) {
+					if ($class == 'even' && ($i % 2) == 0)
+						$stack[] = $node;
+					else if ($class == 'odd' && $i % 2)
+						$stack[] = $node;
+				}
+				$this->elements = $stack;
+				break;
+			case 'eq':
+				$k              = intval($args);
+				$this->elements = isset($this->elements[$k]) ? array(
+					$this->elements[$k]
+				) : array();
+				break;
+			case 'gt':
+				$this->elements = array_slice($this->elements, $args + 1);
+				break;
+			case 'lt':
+				$this->elements = array_slice($this->elements, 0, $args + 1);
+				break;
+			case 'first':
+				if (isset($this->elements[0]))
+					$this->elements = array(
+						$this->elements[0]
+					);
+				break;
+			case 'last':
+				if ($this->elements)
+					$this->elements = array(
+						$this->elements[count($this->elements) - 1]
+					);
+				break;
+			/*case 'parent':
           $stack = array();
           foreach($this->elements as $node) {
               if ( $node->childNodes->length )
@@ -1065,201 +1065,201 @@ 
           }
           $this->elements = $stack;
           break;*/
-            case 'contains':
-                $text  = trim($args, "\"'");
-                $stack = array();
-                foreach ($this->elements as $node) {
-                    if (mb_stripos($node->textContent, $text) === false)
-                        continue;
-                    $stack[] = $node;
-                }
-                $this->elements = $stack;
-                break;
-            case 'not':
-                $selector       = self::unQuote($args);
-                $this->elements = $this->not($selector)->stack();
-                break;
-            case 'slice':
-                // TODO jQuery difference ?
-                $args  = explode(',', str_replace(', ', ',', trim($args, "\"'")));
-                $start = $args[0];
-                $end   = isset($args[1]) ? $args[1] : null;
-                if ($end > 0)
-                    $end = $end - $start;
-                $this->elements = array_slice($this->elements, $start, $end);
-                break;
-            case 'has':
-                $selector = trim($args, "\"'");
-                $stack    = array();
-                foreach ($this->stack(1) as $el) {
-                    if ($this->find($selector, $el, true)->length)
-                        $stack[] = $el;
-                }
-                $this->elements = $stack;
-                break;
-            case 'submit':
-            case 'reset':
-                $this->elements = PhpQuery::merge(
-                    $this->map(
-                        array(
-                            $this,
-                            'is'
-                        ),
-                        "input[type=$class]",
-                        new \CallbackParam()
-                    ),
-                    $this->map(
-                        array(
-                            $this,
-                            'is'
-                        ),
-                        "button[type=$class]",
-                        new \CallbackParam()
-                    )
-                );
-                break;
-            //				$stack = array();
-            //				foreach($this->elements as $node)
-            //					if ($node->is('input[type=submit]') || $node->is('button[type=submit]'))
-            //						$stack[] = $el;
-            //				$this->elements = $stack;
-            case 'input':
-                $this->elements = $this->map(
-                    array(
-                        $this,
-                        'is'
-                    ),
-                    'input',
-                    new \CallbackParam()
-                )->elements;
-                break;
-            case 'password':
-            case 'checkbox':
-            case 'radio':
-            case 'hidden':
-            case 'image':
-            case 'file':
-                $this->elements = $this->map(
-                    array(
-                        $this,
-                        'is'
-                    ),
-                    "input[type=$class]",
-                    new \CallbackParam()
-                )->elements;
-                break;
-            case 'parent':
-                $this->elements = $this->map(
-                    create_function(
-                        '$node',
-                        '
+			case 'contains':
+				$text  = trim($args, "\"'");
+				$stack = array();
+				foreach ($this->elements as $node) {
+					if (mb_stripos($node->textContent, $text) === false)
+						continue;
+					$stack[] = $node;
+				}
+				$this->elements = $stack;
+				break;
+			case 'not':
+				$selector       = self::unQuote($args);
+				$this->elements = $this->not($selector)->stack();
+				break;
+			case 'slice':
+				// TODO jQuery difference ?
+				$args  = explode(',', str_replace(', ', ',', trim($args, "\"'")));
+				$start = $args[0];
+				$end   = isset($args[1]) ? $args[1] : null;
+				if ($end > 0)
+					$end = $end - $start;
+				$this->elements = array_slice($this->elements, $start, $end);
+				break;
+			case 'has':
+				$selector = trim($args, "\"'");
+				$stack    = array();
+				foreach ($this->stack(1) as $el) {
+					if ($this->find($selector, $el, true)->length)
+						$stack[] = $el;
+				}
+				$this->elements = $stack;
+				break;
+			case 'submit':
+			case 'reset':
+				$this->elements = PhpQuery::merge(
+					$this->map(
+						array(
+							$this,
+							'is'
+						),
+						"input[type=$class]",
+						new \CallbackParam()
+					),
+					$this->map(
+						array(
+							$this,
+							'is'
+						),
+						"button[type=$class]",
+						new \CallbackParam()
+					)
+				);
+				break;
+			//				$stack = array();
+			//				foreach($this->elements as $node)
+			//					if ($node->is('input[type=submit]') || $node->is('button[type=submit]'))
+			//						$stack[] = $el;
+			//				$this->elements = $stack;
+			case 'input':
+				$this->elements = $this->map(
+					array(
+						$this,
+						'is'
+					),
+					'input',
+					new \CallbackParam()
+				)->elements;
+				break;
+			case 'password':
+			case 'checkbox':
+			case 'radio':
+			case 'hidden':
+			case 'image':
+			case 'file':
+				$this->elements = $this->map(
+					array(
+						$this,
+						'is'
+					),
+					"input[type=$class]",
+					new \CallbackParam()
+				)->elements;
+				break;
+			case 'parent':
+				$this->elements = $this->map(
+					create_function(
+						'$node',
+						'
 						return $node instanceof \DOMElement && $node->childNodes->length
 							? $node : null;'
-                    )
-                )->elements;
-                break;
-            case 'empty':
-                $this->elements = $this->map(
-                    create_function(
-                        '$node',
-                        '
+					)
+				)->elements;
+				break;
+			case 'empty':
+				$this->elements = $this->map(
+					create_function(
+						'$node',
+						'
 						return $node instanceof \DOMElement && $node->childNodes->length
 							? null : $node;'
-                    )
-                )->elements;
-                break;
-            case 'disabled':
-            case 'selected':
-            case 'checked':
-                $this->elements = $this->map(
-                    array(
-                        $this,
-                        'is'
-                    ),
-                    "[$class]",
-                    new \CallbackParam()
-                )->elements;
-                break;
-            case 'enabled':
-                $this->elements = $this->map(
-                    create_function(
-                        '$node',
-                        '
+					)
+				)->elements;
+				break;
+			case 'disabled':
+			case 'selected':
+			case 'checked':
+				$this->elements = $this->map(
+					array(
+						$this,
+						'is'
+					),
+					"[$class]",
+					new \CallbackParam()
+				)->elements;
+				break;
+			case 'enabled':
+				$this->elements = $this->map(
+					create_function(
+						'$node',
+						'
 						return pq($node)->not(":disabled") ? $node : null;'
-                    )
-                )->elements;
-                break;
-            case 'header':
-                $this->elements = $this->map(
-                    create_function(
-                        '$node',
-                        '$isHeader = isset($node->tagName) && in_array($node->tagName, array(
+					)
+				)->elements;
+				break;
+			case 'header':
+				$this->elements = $this->map(
+					create_function(
+						'$node',
+						'$isHeader = isset($node->tagName) && in_array($node->tagName, array(
 							"h1", "h2", "h3", "h4", "h5", "h6", "h7"
 						));
 						return $isHeader
 							? $node
 							: null;'
-                    )
-                )->elements;
-                //				$this->elements = $this->map(
-                //					create_function('$node', '$node = pq($node);
-                //						return $node->is("h1")
-                //							|| $node->is("h2")
-                //							|| $node->is("h3")
-                //							|| $node->is("h4")
-                //							|| $node->is("h5")
-                //							|| $node->is("h6")
-                //							|| $node->is("h7")
-                //							? $node
-                //							: null;')
-                //				)->elements;
-                break;
-            case 'only-child':
-                $this->elements = $this->map(
-                    create_function('$node', 'return pq($node)->siblings()->size() == 0 ? $node : null;')
-                )->elements;
-                break;
-            case 'first-child':
-                $this->elements = $this->map(
-                    create_function('$node', 'return pq($node)->prevAll()->size() == 0 ? $node : null;')
-                )->elements;
-                break;
-            case 'last-child':
-                $this->elements = $this->map(
-                    create_function('$node', 'return pq($node)->nextAll()->size() == 0 ? $node : null;')
-                )->elements;
-                break;
-            case 'nth-child':
-                $param = trim($args, "\"'");
-                if (!$param)
-                    break;
-                // nth-child(n+b) to nth-child(1n+b)
-                if ($param{0} == 'n')
-                    $param = '1' . $param;
-                // :nth-child(index/even/odd/equation)
-                if ($param == 'even' || $param == 'odd')
-                    $mapped = $this->map(
-                        create_function(
-                            '$node, $param',
-                            '$index = pq($node)->prevAll()->size()+1;
+					)
+				)->elements;
+				//				$this->elements = $this->map(
+				//					create_function('$node', '$node = pq($node);
+				//						return $node->is("h1")
+				//							|| $node->is("h2")
+				//							|| $node->is("h3")
+				//							|| $node->is("h4")
+				//							|| $node->is("h5")
+				//							|| $node->is("h6")
+				//							|| $node->is("h7")
+				//							? $node
+				//							: null;')
+				//				)->elements;
+				break;
+			case 'only-child':
+				$this->elements = $this->map(
+					create_function('$node', 'return pq($node)->siblings()->size() == 0 ? $node : null;')
+				)->elements;
+				break;
+			case 'first-child':
+				$this->elements = $this->map(
+					create_function('$node', 'return pq($node)->prevAll()->size() == 0 ? $node : null;')
+				)->elements;
+				break;
+			case 'last-child':
+				$this->elements = $this->map(
+					create_function('$node', 'return pq($node)->nextAll()->size() == 0 ? $node : null;')
+				)->elements;
+				break;
+			case 'nth-child':
+				$param = trim($args, "\"'");
+				if (!$param)
+					break;
+				// nth-child(n+b) to nth-child(1n+b)
+				if ($param{0} == 'n')
+					$param = '1' . $param;
+				// :nth-child(index/even/odd/equation)
+				if ($param == 'even' || $param == 'odd')
+					$mapped = $this->map(
+						create_function(
+							'$node, $param',
+							'$index = pq($node)->prevAll()->size()+1;
 							if ($param == "even" && ($index%2) == 0)
 								return $node;
 							else if ($param == "odd" && $index%2 == 1)
 								return $node;
 							else
 								return null;'
-                        ),
-                        new \CallbackParam(),
-                        $param
-                    );
-                else if (mb_strlen($param) > 1
-                    && preg_match('/^(\d*)n([-+]?)(\d*)/', $param) === 1
-                )
-                    // an+b
-                    $mapped = $this->map(
-                        create_function(
-                            '$node, $param',
-                            '$prevs = pq($node)->prevAll()->size();
+						),
+						new \CallbackParam(),
+						$param
+					);
+				else if (mb_strlen($param) > 1
+					&& preg_match('/^(\d*)n([-+]?)(\d*)/', $param) === 1
+				)
+					// an+b
+					$mapped = $this->map(
+						create_function(
+							'$node, $param',
+							'$prevs = pq($node)->prevAll()->size();
 							$index = 1+$prevs;
 
 							preg_match("/^(\d*)n([-+]?)(\d*)/", $param, $matches);
@@ -1295,2718 +1295,2718 @@ 
 //									? $node
 //									: null;
 							'
-                        ),
-                        new \CallbackParam(),
-                        $param
-                    );
-                else
-                    // index
-                    $mapped = $this->map(
-                        create_function(
-                            '$node, $index',
-                            '$prevs = pq($node)->prevAll()->size();
+						),
+						new \CallbackParam(),
+						$param
+					);
+				else
+					// index
+					$mapped = $this->map(
+						create_function(
+							'$node, $index',
+							'$prevs = pq($node)->prevAll()->size();
 							if ($prevs && $prevs == $index-1)
 								return $node;
 							else if (! $prevs && $index == 1)
 								return $node;
 							else
 								return null;'
-                        ),
-                        new \CallbackParam(),
-                        $param
-                    );
-                $this->elements = $mapped->elements;
-                break;
-            default:
-                $this->debug("Unknown pseudoclass '{$class}', skipping...");
-        }
-    }
-
-    /**
-     * @access private
-     */
-    protected function __pseudoClassParam($paramsString)
-    {
-        // TODO;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $selector
-     * @param null $nodes
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function is($selector, $nodes = null)
-    {
-        PhpQuery::debug(
-            array(
-                "Is:",
-                $selector
-            )
-        );
-        if (!$selector)
-            return false;
-        $oldStack    = $this->elements;
-        $returnArray = false;
-        if ($nodes && is_array($nodes)) {
-            $this->elements = $nodes;
-        } else if ($nodes)
-            $this->elements = array(
-                $nodes
-            );
-        $this->filter($selector, true);
-        $stack          = $this->elements;
-        $this->elements = $oldStack;
-        if ($nodes)
-            return $stack ? $stack : null;
-        return (bool) count($stack);
-    }
-
-    /**
-     * Enter description here...
-     * jQuery difference.
-     *
-     * Callback:
-     * - $index int
-     * - $node DOMNode
-     *
-     * @param      $callback
-     * @param bool $_skipHistory
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @link http://docs.jquery.com/Traversing/filter
-     */
-    public function filterCallback($callback, $_skipHistory = false)
-    {
-        if (!$_skipHistory) {
-            $this->elementsBackup = $this->elements;
-            $this->debug("Filtering by callback");
-        }
-        $newStack = array();
-        foreach ($this->elements as $index => $node) {
-            $result = PhpQuery::callbackRun(
-                $callback,
-                array(
-                    $index,
-                    $node
-                )
-            );
-            if (is_null($result) || (!is_null($result) && $result))
-                $newStack[] = $node;
-        }
-        $this->elements = $newStack;
-        return $_skipHistory ? $this : $this->newInstance();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $selectors
-     * @param bool $_skipHistory
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @link http://docs.jquery.com/Traversing/filter
-     */
-    public function filter($selectors, $_skipHistory = false)
-    {
-        if ($selectors instanceof \Callback OR $selectors instanceof \Closure)
-            return $this->filterCallback($selectors, $_skipHistory);
-        if (!$_skipHistory)
-            $this->elementsBackup = $this->elements;
-        $notSimpleSelector = array(
-            ' ',
-            '>',
-            '~',
-            '+',
-            '/'
-        );
-        if (!is_array($selectors))
-            $selectors = $this->parseSelector($selectors);
-        if (!$_skipHistory)
-            $this->debug(
-                array(
-                    "Filtering:",
-                    $selectors
-                )
-            );
-        $finalStack = array();
-        foreach ($selectors as $selector) {
-            $stack = array();
-            if (!$selector)
-                break;
-            // avoid first space or /
-            if (in_array($selector[0], $notSimpleSelector))
-                $selector = array_slice($selector, 1);
-            // PER NODE selector chunks
-            foreach ($this->stack() as $node) {
-                $break = false;
-                foreach ($selector as $s) {
-                    if (!($node instanceof \DOMElement)) {
-                        // all besides \DOMElement
-                        if ($s[0] == '[') {
-                            $attr = trim($s, '[]');
-                            if (mb_strpos($attr, '=')) {
-                                list($attr, $val) = explode('=', $attr);
-                                if ($attr == 'nodeType' && $node->nodeType != $val)
-                                    $break = true;
-                            }
-                        } else
-                            $break = true;
-                    } else {
-                        // \DOMElement only
-                        // ID
-                        if ($s[0] == '#') {
-                            if ($node->getAttribute('id') != substr($s, 1))
-                                $break = true;
-                            // CLASSES
-                        } else if ($s[0] == '.') {
-                            if (!$this->matchClasses($s, $node))
-                                $break = true;
-                            // ATTRS
-                        } else if ($s[0] == '[') {
-                            // strip side brackets
-                            $attr = trim($s, '[]');
-                            if (mb_strpos($attr, '=')) {
-                                list($attr, $val) = explode('=', $attr);
-                                $val = self::unQuote($val);
-                                if ($attr == 'nodeType') {
-                                    if ($val != $node->nodeType)
-                                        $break = true;
-                                } else if ($this->isRegexp($attr)) {
-                                    $val = extension_loaded('mbstring')
-                                    && PhpQuery::$mbstringSupport ? quotemeta(trim($val, '"\''))
-                                        : preg_quote(trim($val, '"\''), '@');
-                                    // switch last character
-                                    switch (substr($attr, -1)) {
-                                        // quotemeta used insted of preg_quote
-                                        // http://code.google.com/p/phpquery/issues/detail?id=76
-                                        case '^':
-                                            $pattern = '^' . $val;
-                                            break;
-                                        case '*':
-                                            $pattern = '.*' . $val . '.*';
-                                            break;
-                                        case '$':
-                                            $pattern = '.*' . $val . '$';
-                                            break;
-                                    }
-                                    // cut last character
-                                    $attr    = substr($attr, 0, -1);
-                                    $isMatch = extension_loaded('mbstring')
-                                    && PhpQuery::$mbstringSupport ? mb_ereg_match($pattern, $node->getAttribute($attr))
-                                        : preg_match("@{$pattern}@", $node->getAttribute($attr));
-                                    if (!$isMatch)
-                                        $break = true;
-                                } else if ($node->getAttribute($attr) != $val)
-                                    $break = true;
-                            } else if (!$node->hasAttribute($attr))
-                                $break = true;
-                            // PSEUDO CLASSES
-                        } else if ($s[0] == ':') {
-                            // skip
-                            // TAG
-                        } else if (trim($s)) {
-                            if ($s != '*') {
-                                // TODO namespaces
-                                if (isset($node->tagName)) {
-                                    if ($node->tagName != $s)
-                                        $break = true;
-                                } else if ($s == 'html' && !$this->isRoot($node))
-                                    $break = true;
-                            }
-                            // AVOID NON-SIMPLE SELECTORS
-                        } else if (in_array($s, $notSimpleSelector)) {
-                            $break = true;
-                            $this->debug(
-                                array(
-                                    'Skipping non simple selector',
-                                    $selector
-                                )
-                            );
-                        }
-                    }
-                    if ($break)
-                        break;
-                }
-                // if element passed all chunks of selector - add it to new stack
-                if (!$break)
-                    $stack[] = $node;
-            }
-            $tmpStack       = $this->elements;
-            $this->elements = $stack;
-            // PER ALL NODES selector chunks
-            foreach ($selector as $s)
-                // PSEUDO CLASSES
-                if ($s[0] == ':')
-                    $this->pseudoClasses($s);
-            foreach ($this->elements as $node)
-                // XXX it should be merged without duplicates
-                // but jQuery doesnt do that
-                $finalStack[] = $node;
-            $this->elements = $tmpStack;
-        }
-        $this->elements = $finalStack;
-        if ($_skipHistory) {
-            return $this;
-        } else {
-            $this->debug("Stack length after filter(): " . count($finalStack));
-            return $this->newInstance();
-        }
-    }
-
-    /**
-     *
-     * @param $value
-     * @return string
-     * @TODO implement in all methods using passed parameters
-     */
-    protected static function unQuote($value)
-    {
-        return $value[0] == '\'' || $value[0] == '"' ? substr($value, 1, -1)
-            : $value;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @link http://docs.jquery.com/Ajax/load
-     * @param      $url
-     * @param null $data
-     * @param null $callback
-     * @return PhpQuery|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo Support $selector
-     */
-    public function load($url, $data = null, $callback = null)
-    {
-        if ($data && !is_array($data)) {
-            $callback = $data;
-            $data     = null;
-        }
-        if (mb_strpos($url, ' ') !== false) {
-            $matches = null;
-            if (extension_loaded('mbstring') && PhpQuery::$mbstringSupport)
-                mb_ereg('^([^ ]+) (.*)$', $url, $matches);
-            else
-                preg_match('@^([^ ]+) (.*)$@', $url, $matches);
-            $url      = $matches[1];
-            $selector = $matches[2];
-            // FIXME this sucks, pass as callback param
-            $this->_loadSelector = $selector;
-        }
-        $ajax = array(
-            'url'      => $url,
-            'type'     => $data ? 'POST' : 'GET',
-            'data'     => $data,
-            'complete' => $callback,
-            'success'  => array(
-                $this,
-                '__loadSuccess'
-            )
-        );
-        PhpQuery::ajax($ajax);
-        return $this;
-    }
-
-    /**
-     * @access private
-     * @param $html
-     */
-    public function __loadSuccess($html)
-    {
-        if ($this->_loadSelector) {
-            $html = PhpQuery::newDocument($html)->find($this->_loadSelector);
-            unset($this->_loadSelector);
-        }
-        foreach ($this->stack(1) as $node) {
-            PhpQuery::pq($node, $this->getDocumentID())->markup($html);
-        }
-    }
-
-    /**
-     * Allows users to enter strings of CSS selectors. Useful
-     * when the CSS is loaded via style or @imports that PhpQuery can't load
-     * because it doesn't know the URL context of the request.
-     */
-    public function addCSS($string)
-    {
-        if (!isset($this->cssString[$this->getDocumentID()])) {
-            $this->cssString[$this->getDocumentID()] = '';
-        }
-        $this->cssString[$this->getDocumentID()] .= $string;
-        $this->parseCSS();
-    }
-
-    /**
-     * Either sets the CSS property of an object or retrieves the
-     * CSS property of a proejct.
-     *
-     * @param      $property_name
-     * @param bool $value
-     * @return string of css property value
-     * @todo
-     */
-    public function css($property_name, $value = false)
-    {
-        if (!isset($this->cssIsParsed[$this->getDocumentID()])
-        || $this->cssIsParsed[$this->getDocumentID()] === false
-        ) {
-            $this->parseCSS();
-        }
-        $data = PhpQuery::data($this->get(0), 'phpquery_css', null, $this->getDocumentID());
-        if (!$value) {
-            if (isset($data[$property_name])) {
-                return $data[$property_name]['value'];
-            }
-            return null;
-        }
-        $specificity          = (isset($data[$property_name])) ? $data[$property_name]['specificity']
-            + 1 : 1000;
-        $data[$property_name] = array(
-            'specificity' => $specificity,
-            'value'       => $value
-        );
-        PhpQuery::data($this->get(0), 'phpquery_css', $data, $this->getDocumentID());
-        $this->bubbleCSS(PhpQuery::pq($this->get(0), $this->getDocumentID()));
-
-        if ($specificity >= 1000) {
-            $styles = array();
-            foreach ($this->data('phpquery_css') as $k => $v) {
-                if ($v['specificity'] >= 1000) {
-                    $styles[$k] = trim($k) . ':' . trim($v['value']);
-                }
-            }
-            ksort($styles);
-            if (empty($styles)) {
-                $this->removeAttr('style');
-            } elseif (PhpQuery::$enableCssShorthand) {
-                $parser = new \Sabberworm\CSS\Parser('{' . join(';', $styles) . '}');
-                $doc    = $parser->parse();
-                $doc->createShorthands();
-                $style = trim($doc->__toString(), "\n\r\t {}");
-            } else {
-                $style = join(';', $styles);
-            }
-            $this->attr('style', $style);
-        }
-    }
-
-    public function parseCSS()
-    {
-        if (!isset($this->cssString[$this->getDocumentID()])) {
-            $this->cssString[$this->getDocumentID()] = file_get_contents(
-                dirname(__FILE__)
-                . '/Resources/default.css'
-            );
-        }
-        foreach (PhpQuery::pq('style', $this->getDocumentID()) as $style) {
-            $this->cssString[$this->getDocumentID()] .= PhpQuery::pq($style)->text();
-        }
-
-        $CssParser   = new CssParser($this->cssString[$this->getDocumentID()]);
-        $CssDocument = $CssParser->parse();
-        foreach ($CssDocument->getAllRuleSets() as $ruleset) {
-            foreach ($ruleset->getSelector() as $selector) {
-                $specificity = $selector->getSpecificity();
-                foreach (PhpQuery::pq($selector->getSelector(), $this->getDocumentID()) as $el) {
-                    $existing = pq($el)->data('phpquery_css');
-                    if (PhpQuery::$enableCssShorthand) {
-                        $ruleset->expandShorthands();
-                    }
-                    foreach ($ruleset->getRules() as $value) {
-                        $rule = $value->getRule();
-                        if (!isset($existing[$rule])
-                            || $existing[$rule]['specificity'] <= $specificity
-                        ) {
-                            $value           = $value->getValue();
-                            $value           = (is_object($value)) ? $value->__toString() : $value;
-                            $existing[$rule] = array(
-                                'specificity' => $specificity,
-                                'value'       => $value
-                            );
-                        }
-                    }
-                    PhpQuery::pq($el)->data('phpquery_css', $existing);
-                    $this->bubbleCSS(PhpQuery::pq($el));
-                }
-            }
-        }
-        foreach (PhpQuery::pq('*', $this->getDocumentID()) as $el) {
-            $existing = pq($el)->data('phpquery_css');
-            $style    = pq($el)->attr('style');
-            $style    = strlen($style) ? explode(';', $style) : array();
-            foreach ($this->attribute_css_mapping as $map => $css_equivalent) {
-                if ($el->hasAttribute($map)) {
-                    $style[] = $css_equivalent . ':' . pq($el)->attr($map);
-                }
-            }
-            if (count($style)) {
-                $CssParser   = new CssParser('#ruleset {' . implode(';', $style) . '}');
-                $CssDocument = $CssParser->parse();
-                $ruleset     = $CssDocument->getAllRulesets();
-                $ruleset     = reset($ruleset);
-                if (PhpQuery::$enableCssShorthand) {
-                    $ruleset->expandShorthands();
-                }
-                foreach ($ruleset->getRules() as $value) {
-                    $rule = $value->getRule();
-                    if (!isset($existing[$rule])
-                        || 1000 >= $existing[$rule]['specificity']
-                    ) {
-                        $value           = $value->getValue();
-                        $value           = (is_object($value)) ? $value->__toString() : $value;
-                        $existing[$rule] = array(
-                            'specificity' => 1000,
-                            'value'       => $value
-                        );
-                    }
-                }
-                PhpQuery::pq($el)->data('phpquery_css', $existing);
-                $this->bubbleCSS(PhpQuery::pq($el));
-            }
-        }
-    }
-
-    protected function bubbleCSS($element)
-    {
-        $style = $element->data('phpquery_css');
-        foreach ($element->children() as $element_child) {
-            $existing = PhpQuery::pq($element_child)->data('phpquery_css');
-            foreach ($style as $rule => $value) {
-                if (!isset($existing[$rule])
-                    || $value['specificity'] > $existing[$rule]['specificity']
-                ) {
-                    $existing[$rule] = $value;
-                }
-            }
-            PhpQuery::pq($element_child)->data('phpquery_css', $existing);
-            if (PhpQuery::pq($element_child)->children()->length) {
-                $this->bubbleCSS(PhpQuery::pq($element_child));
-            }
-        }
-    }
-
-    /**
-     * @todo
-     *
-     */
-    public function show()
-    {
-        $display = ($this->data('phpquery_display_state')) ? $this->data('phpquery_display_state')
-            : 'block';
-        $this->css('display', $display);
-        return $this;
-    }
-
-    /**
-     * @todo
-     *
-     */
-    public function hide()
-    {
-        $this->data('phpquery_display_state', $this->css('display'));
-        $this->css('display', 'none');
-        return $this;
-    }
-
-    /**
-     * Trigger a type of event on every matched element.
-     *
-     * @param                 $type
-     * @param array|\PhpQuery $data
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @TODO support more than event in $type (space-separated)
-     */
-    public function trigger($type, $data = array())
-    {
-        foreach ($this->elements as $node)
-            PhpQueryEvents::trigger($this->getDocumentID(), $type, $data, $node);
-        return $this;
-    }
-
-    /**
-     * This particular method triggers all bound event handlers on an element (for a specific event type) WITHOUT executing the browsers default actions.
-     *
-     * @param  $type
-     * @param  $data
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @TODO
-     */
-    public function triggerHandler($type, $data = array())
-    {
-        // TODO;
-    }
-
-    /**
-     * Binds a handler to one or more events (like click) for each matched element.
-     * Can also bind custom events.
-     *
-     * @param       $type
-     * @param mixed $data Optional
-     * @param       $callback
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @TODO support '!' (exclusive) events
-     * @TODO support more than event in $type (space-separated)
-     */
-    public function bind($type, $data, $callback = null)
-    {
-        // TODO check if $data is callable, not using is_callable
-        if (!isset($callback)) {
-            $callback = $data;
-            $data     = null;
-        }
-        foreach ($this->elements as $node)
-            PhpQueryEvents::add($this->getDocumentID(), $node, $type, $data, $callback);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $type
-     * @param        $callback
-     * @return unknown
-     * @TODO namespace events
-     * @TODO support more than event in $type (space-separated)
-     */
-    public function unbind($type = null, $callback = null)
-    {
-        foreach ($this->elements as $node)
-            PhpQueryEvents::remove($this->getDocumentID(), $node, $type, $callback);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $callback
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function change($callback = null)
-    {
-        if ($callback)
-            return $this->bind('change', $callback);
-        return $this->trigger('change');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $callback
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function submit($callback = null)
-    {
-        if ($callback)
-            return $this->bind('submit', $callback);
-        return $this->trigger('submit');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $callback
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function click($callback = null)
-    {
-        if ($callback)
-            return $this->bind('click', $callback);
-        return $this->trigger('click');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapAllOld($wrapper)
-    {
-        $wrapper = pq($wrapper)->_clone();
-        if (!$wrapper->length() || !$this->length())
-            return $this;
-        $wrapper->insertBefore($this->elements[0]);
-        $deepest = $wrapper->elements[0];
-        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
-            $deepest = $deepest->firstChild;
-        pq($deepest)->append($this);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * TODO testme...
-     * @param String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapAll($wrapper)
-    {
-        if (!$this->length())
-            return $this;
-        return PhpQuery::pq($wrapper, $this->getDocumentID())->clone()->insertBefore($this->get(0))->map(
-            array(
-                $this,
-                '___wrapAllCallback'
-            )
-        )->append($this);
-    }
-
-    /**
-     *
-     * @param $node
-     * @return unknown_type
-     * @access private
-     */
-    public function ___wrapAllCallback($node)
-    {
-        $deepest = $node;
-        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
-            $deepest = $deepest->firstChild;
-        return $deepest;
-    }
-
-    /**
-     * Enter description here...
-     * NON JQUERY METHOD
-     *
-     * @param $codeBefore
-     * @param $codeAfter
-     * @internal param $ String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapAllPHP($codeBefore, $codeAfter)
-    {
-        return $this->slice(0, 1)->beforePHP($codeBefore)->end()->slice(-1)->afterPHP($codeAfter)->end();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrap($wrapper)
-    {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->wrapAll($wrapper);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $codeBefore
-     * @param $codeAfter
-     * @internal param $ String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapPHP($codeBefore, $codeAfter)
-    {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->wrapAllPHP($codeBefore, $codeAfter);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapInner($wrapper)
-    {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAll($wrapper);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $codeBefore
-     * @param $codeAfter
-     * @internal param $ String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function wrapInnerPHP($codeBefore, $codeAfter)
-    {
-        foreach ($this->stack(1) as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAllPHP($codeBefore, $codeAfter);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @testme Support for text nodes
-     */
-    public function contents()
-    {
-        $stack = array();
-        foreach ($this->stack(1) as $el) {
-            // FIXME (fixed) http://code.google.com/p/phpquery/issues/detail?id=56
-            //			if (! isset($el->childNodes))
-            //				continue;
-            foreach ($el->childNodes as $node) {
-                $stack[] = $node;
-            }
-        }
-        return $this->newInstance($stack);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * jQuery difference.
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function contentsUnwrap()
-    {
-        foreach ($this->stack(1) as $node) {
-            if (!$node->parentNode)
-                continue;
-            $childNodes = array();
-            // any modification in DOM tree breaks childNodes iteration, so cache them first
-            foreach ($node->childNodes as $chNode)
-                $childNodes[] = $chNode;
-            foreach ($childNodes as $chNode)
-                //				$node->parentNode->appendChild($chNode);
-                $node->parentNode->insertBefore($chNode, $node);
-            $node->parentNode->removeChild($node);
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * jQuery difference.
-     */
-    public function switchWith($markup)
-    {
-        $markup  = pq($markup, $this->getDocumentID());
-        $content = null;
-        foreach ($this->stack(1) as $node) {
-            pq($node)->contents()->toReference($content)->end()->replaceWith($markup->clone()->append($content));
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $num
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function eq($num)
-    {
-        $oldStack             = $this->elements;
-        $this->elementsBackup = $this->elements;
-        $this->elements       = array();
-        if (isset($oldStack[$num]))
-            $this->elements[] = $oldStack[$num];
-        return $this->newInstance();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function size()
-    {
-        return count($this->elements);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @deprecated Use length as attribute
-     */
-    public function length()
-    {
-        return $this->size();
-    }
-
-    public function count()
-    {
-        return $this->size();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $level
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo $level
-     */
-    public function end($level = 1)
-    {
-        //		$this->elements = array_pop( $this->history );
-        //		return $this;
-        //		$this->previous->DOM = $this->DOM;
-        //		$this->previous->XPath = $this->XPath;
-        return $this->previous ? $this->previous : $this;
-    }
-
-    /**
-     * Enter description here...
-     * Normal use ->clone() .
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @access private
-     */
-    public function _clone()
-    {
-        $newStack = array();
-        //pr(array('copy... ', $this->whois()));
-        //$this->dumpHistory('copy');
-        $this->elementsBackup = $this->elements;
-        foreach ($this->elements as $node) {
-            $newStack[] = $node->cloneNode(true);
-        }
-        $this->elements = $newStack;
-        return $this->newInstance();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $code
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function replaceWithPHP($code)
-    {
-        return $this->replaceWith(PhpQuery::php($code));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String|PhpQuery $content
-     * @link http://docs.jquery.com/Manipulation/replaceWith#content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function replaceWith($content)
-    {
-        return $this->after($content)->remove();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo this works ?
-     */
-    public function replaceAll($selector)
-    {
-        foreach (PhpQuery::pq($selector, $this->getDocumentID()) as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->after($this->_clone())->remove();
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function remove($selector = null)
-    {
-        $loop = $selector ? $this->filter($selector)->elements : $this->elements;
-        foreach ($loop as $node) {
-            if (!$node->parentNode)
-                continue;
-            if (isset($node->tagName))
-                $this->debug("Removing '{$node->tagName}'");
-            $node->parentNode->removeChild($node);
-            // Mutation event
-            $event = new Dom\DOMEvent(array(
-                                      'target' => $node,
-                                      'type'   => 'DOMNodeRemoved'
-                                  ));
-            PhpQueryEvents::trigger(
-                $this->getDocumentID(),
-                $event->type,
-                array(
-                    $event
-                ),
-                $node
-            );
-        }
-        return $this;
-    }
-
-    protected function markupEvents($newMarkup, $oldMarkup, $node)
-    {
-        if ($node->tagName == 'textarea' && $newMarkup != $oldMarkup) {
-            $event = new Dom\DOMEvent(array(
-                                      'target' => $node,
-                                      'type'   => 'change'
-                                  ));
-            PhpQueryEvents::trigger(
-                $this->getDocumentID(),
-                $event->type,
-                array(
-                    $event
-                ),
-                $node
-            );
-        }
-    }
-
-    /**
-     * jQuey difference
-     *
-     * @param      $markup
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @return unknown_type
-     * @TODO trigger change event for textarea
-     */
-    public function markup($markup = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $args = func_get_args();
-        if ($this->documentWrapper->isXML)
-            return call_user_func_array(
-                array(
-                    $this,
-                    'xml'
-                ),
-                $args
-            );
-        else
-            return call_user_func_array(
-                array(
-                    $this,
-                    'html'
-                ),
-                $args
-            );
-    }
-
-    /**
-     * jQuey difference
-     *
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @internal param $markup
-     * @return string
-     */
-    public function markupOuter($callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $args = func_get_args();
-        if ($this->documentWrapper->isXML)
-            return call_user_func_array(
-                array(
-                    $this,
-                    'xmlOuter'
-                ),
-                $args
-            );
-        else
-            return call_user_func_array(
-                array(
-                    $this,
-                    'htmlOuter'
-                ),
-                $args
-            );
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param unknown_type $html
-     * @param null         $callback1
-     * @param null         $callback2
-     * @param null         $callback3
-     * @return string|PhpQuery|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @TODO force html result
-     */
-    public function html($html = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        if (isset($html)) {
-            // INSERT
-            $nodes = $this->documentWrapper->import($html);
-            $this->empty();
-            foreach ($this->stack(1) as $alreadyAdded => $node) {
-                // for now, limit events for textarea
-                if (($this->isXHTML() || $this->isHTML())
-                    && $node->tagName == 'textarea'
-                )
-                    $oldHtml = pq($node, $this->getDocumentID())->markup();
-                foreach ($nodes as $newNode) {
-                    $node->appendChild(
-                        $alreadyAdded ? $newNode->cloneNode(true)
-                            : $newNode
-                    );
-                }
-                // for now, limit events for textarea
-                if (($this->isXHTML() || $this->isHTML())
-                    && $node->tagName == 'textarea'
-                )
-                    $this->markupEvents($html, $oldHtml, $node);
-            }
-            return $this;
-        } else {
-            // FETCH
-            $return = $this->documentWrapper->markup($this->elements, true);
-            $args   = func_get_args();
-            foreach (array_slice($args, 1) as $callback) {
-                $return = PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $return
-                    )
-                );
-            }
-            return $return;
-        }
-    }
-
-    /**
-     * @TODO force xml result
-     */
-    public function xml($xml = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $args = func_get_args();
-        return call_user_func_array(
-            array(
-                $this,
-                'html'
-            ),
-            $args
-        );
-    }
-
-    /**
-     * Enter description here...
-     * @TODO force html result
-     *
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @return String
-     */
-    public function htmlOuter($callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $markup = $this->documentWrapper->markup($this->elements);
-        // pass thou callbacks
-        $args = func_get_args();
-        foreach ($args as $callback) {
-            $markup = PhpQuery::callbackRun(
-                $callback,
-                array(
-                    $markup
-                )
-            );
-        }
-        return $markup;
-    }
-
-    /**
-     * @TODO force xml result
-     */
-    public function xmlOuter($callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        $args = func_get_args();
-        return call_user_func_array(
-            array(
-                $this,
-                'htmlOuter'
-            ),
-            $args
-        );
-    }
-
-    public function __toString()
-    {
-        return $this->markupOuter();
-    }
-
-    /**
-     * Just like html(), but returns markup with VALID (dangerous) PHP tags.
-     *
-     * @param null $code
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo support returning markup with PHP tags when called without param
-     */
-    public function php($code = null)
-    {
-        return $this->markupPHP($code);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $code
-     * @return unknown_type
-     */
-    public function markupPHP($code = null)
-    {
-        return isset($code) ? $this->markup(PhpQuery::php($code))
-            : PhpQuery::markupToPHP($this->markup());
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @internal param $code
-     * @return string PHP code
-     */
-    public function markupOuterPHP()
-    {
-        return PhpQuery::markupToPHP($this->markupOuter());
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function children($selector = null)
-    {
-        $stack = array();
-        foreach ($this->stack(1) as $node) {
-            //			foreach($node->getElementsByTagName('*') as $newNode) {
-            foreach ($node->childNodes as $newNode) {
-                if ($newNode->nodeType != 1)
-                    continue;
-                if ($selector && !$this->is($selector, $newNode))
-                    continue;
-                if ($this->elementsContainsNode($newNode, $stack))
-                    continue;
-                $stack[] = $newNode;
-            }
-        }
-        $this->elementsBackup = $this->elements;
-        $this->elements       = $stack;
-        return $this->newInstance();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function ancestors($selector = null)
-    {
-        return $this->children($selector);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function append($content)
-    {
-        return $this->insert($content, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function appendPHP($content)
-    {
-        return $this->insert("<php><!-- {$content} --></php>", 'append');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $seletor
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function appendTo($seletor)
-    {
-        return $this->insert($seletor, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function prepend($content)
-    {
-        return $this->insert($content, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @todo accept many arguments, which are joined, arrays maybe also
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function prependPHP($content)
-    {
-        return $this->insert("<php><!-- {$content} --></php>", 'prepend');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $seletor
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function prependTo($seletor)
-    {
-        return $this->insert($seletor, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function before($content)
-    {
-        return $this->insert($content, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function beforePHP($content)
-    {
-        return $this->insert("<php><!-- {$content} --></php>", 'before');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param String|PhpQuery
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function insertBefore($seletor)
-    {
-        return $this->insert($seletor, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function after($content)
-    {
-        return $this->insert($content, __FUNCTION__);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $content
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function afterPHP($content)
-    {
-        return $this->insert("<php><!-- {$content} --></php>", 'after');
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $seletor
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function insertAfter($seletor)
-    {
-        return $this->insert($seletor, __FUNCTION__);
-    }
-
-    /**
-     * Internal insert method. Don't use it.
-     *
-     * @param unknown_type $target
-     * @param unknown_type $type
-     * @throws \Exception
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @access private
-     */
-    public function insert($target, $type)
-    {
-        $this->debug("Inserting data with '{$type}'");
-        $to = false;
-        switch ($type) {
-            case 'appendTo':
-            case 'prependTo':
-            case 'insertBefore':
-            case 'insertAfter':
-                $to = true;
-        }
-        switch (gettype($target)) {
-            case 'string':
-                $insertFrom = $insertTo = array();
-                if ($to) {
-                    // INSERT TO
-                    $insertFrom = $this->elements;
-                    if (PhpQuery::isMarkup($target)) {
-                        // $target is new markup, import it
-                        $insertTo = $this->documentWrapper->import($target);
-                        // insert into selected element
-                    } else {
-                        // $tagret is a selector
-                        $thisStack = $this->elements;
-                        $this->toRoot();
-                        $insertTo       = $this->find($target)->elements;
-                        $this->elements = $thisStack;
-                    }
-                } else {
-                    // INSERT FROM
-                    $insertTo   = $this->elements;
-                    $insertFrom = $this->documentWrapper->import($target);
-                }
-                break;
-            case 'object':
-                $insertFrom = $insertTo = array();
-                // PhpQuery
-                if ($target instanceof self) {
-                    if ($to) {
-                        $insertTo = $target->elements;
-                        if ($this->documentFragment && $this->stackIsRoot())
-                            // get all body children
-                            //							$loop = $this->find('body > *')->elements;
-                            // TODO test it, test it hard...
-                            //							$loop = $this->newInstance($this->root)->find('> *')->elements;
-                            $loop = $this->root->childNodes;
-                        else
-                            $loop = $this->elements;
-                        // import nodes if needed
-                        $insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
-                            : $target->documentWrapper->import($loop);
-                    } else {
-                        $insertTo = $this->elements;
-                        if ($target->documentFragment && $target->stackIsRoot())
-                            // get all body children
-                            //							$loop = $target->find('body > *')->elements;
-                            $loop = $target->root->childNodes;
-                        else
-                            $loop = $target->elements;
-                        // import nodes if needed
-                        $insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
-                            : $this->documentWrapper->import($loop);
-                    }
-                    // DOMNODE
-                } elseif ($target instanceof \DOMNODE) {
-                    // import node if needed
-                    //					if ( $target->ownerDocument != $this->DOM )
-                    //						$target = $this->DOM->importNode($target, true);
-                    if ($to) {
-                        $insertTo = array(
-                            $target
-                        );
-                        if ($this->documentFragment && $this->stackIsRoot())
-                            // get all body children
-                            $loop = $this->root->childNodes;
-                        //							$loop = $this->find('body > *')->elements;
-                        else
-                            $loop = $this->elements;
-                        foreach ($loop as $fromNode)
-                            // import nodes if needed
-                            $insertFrom[] = !$fromNode->ownerDocument->isSameNode(
-                                $target->ownerDocument
-                            ) ? $target->ownerDocument->importNode($fromNode, true)
-                                : $fromNode;
-                    } else {
-                        // import node if needed
-                        if (!$target->ownerDocument->isSameNode($this->document))
-                            $target = $this->document->importNode($target, true);
-                        $insertTo     = $this->elements;
-                        $insertFrom[] = $target;
-                    }
-                }
-                break;
-        }
-        PhpQuery::debug(
-            "From " . count($insertFrom) . "; To " . count($insertTo)
-            . " nodes"
-        );
-        foreach ($insertTo as $insertNumber => $toNode) {
-            // we need static relative elements in some cases
-            switch ($type) {
-                case 'prependTo':
-                case 'prepend':
-                    $firstChild = $toNode->firstChild;
-                    break;
-                case 'insertAfter':
-                case 'after':
-                    $nextSibling = $toNode->nextSibling;
-                    break;
-            }
-            foreach ($insertFrom as $fromNode) {
-                // clone if inserted already before
-                $insert = $insertNumber ? $fromNode->cloneNode(true) : $fromNode;
-                switch ($type) {
-                    case 'appendTo':
-                    case 'append':
-                        //						$toNode->insertBefore(
-                        //							$fromNode,
-                        //							$toNode->lastChild->nextSibling
-                        //						);
-                        $toNode->appendChild($insert);
-                        $eventTarget = $insert;
-                        break;
-                    case 'prependTo':
-                    case 'prepend':
-                        $toNode->insertBefore($insert, $firstChild);
-                        break;
-                    case 'insertBefore':
-                    case 'before':
-                        if (!$toNode->parentNode)
-                            throw new \Exception("No parentNode, can't do {$type}()");
-                        else
-                            $toNode->parentNode->insertBefore($insert, $toNode);
-                        break;
-                    case 'insertAfter':
-                    case 'after':
-                        if (!$toNode->parentNode)
-                            throw new \Exception("No parentNode, can't do {$type}()");
-                        else
-                            $toNode->parentNode->insertBefore($insert, $nextSibling);
-                        break;
-                }
-                // Mutation event
-                $event = new Dom\DOMEvent(array(
-                                              'target' => $insert,
-                                              'type'   => 'DOMNodeInserted'
-                                          ));
-                PhpQueryEvents::trigger(
-                    $this->getDocumentID(),
-                    $event->type,
-                    array(
-                        $event
-                    ),
-                    $insert
-                );
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $subject
-     * @return Int
-     */
-    public function index($subject)
-    {
-        $index   = -1;
-        $subject = $subject instanceof PhpQueryObject ? $subject->elements[0]
-            : $subject;
-        foreach ($this->newInstance() as $k => $node) {
-            if ($node->isSameNode($subject))
-                $index = $k;
-        }
-        return $index;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param unknown_type $start
-     * @param unknown_type $end
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @testme
-     */
-    public function slice($start, $end = null)
-    {
-        //		$last = count($this->elements)-1;
-        //		$end = $end
-        //			? min($end, $last)
-        //			: $last;
-        //		if ($start < 0)
-        //			$start = $last+$start;
-        //		if ($start > $last)
-        //			return array();
-        if ($end > 0)
-            $end = $end - $start;
-        return $this->newInstance(array_slice($this->elements, $start, $end));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function reverse()
-    {
-        $this->elementsBackup = $this->elements;
-        $this->elements       = array_reverse($this->elements);
-        return $this->newInstance();
-    }
-
-    /**
-     * Return joined text content.
-     * @param null $text
-     * @param null $callback1
-     * @param null $callback2
-     * @param null $callback3
-     * @return String
-     */
-    public function text($text = null, $callback1 = null, $callback2 = null, $callback3 = null)
-    {
-        if (isset($text))
-            return $this->html(htmlspecialchars($text));
-        $args   = func_get_args();
-        $args   = array_slice($args, 1);
-        $return = '';
-        foreach ($this->elements as $node) {
-            $text = $node->textContent;
-            if (count($this->elements) > 1 && $text)
-                $text .= "\n";
-            foreach ($args as $callback) {
-                $text = PhpQuery::callbackRun(
-                    $callback,
-                    array(
-                        $text
-                    )
-                );
-            }
-            $return .= $text;
-        }
-        return $return;
-    }
-
-    /**
-     * @param null $attr
-     * @return The text content of each matching element, like
-     * text() but returns an array with one entry per matched element.
-     * Read only.
-     */
-    public function texts($attr = null)
-    {
-        $results = array();
-        foreach ($this->elements as $node) {
-            $results[] = $node->textContent;
-        }
-        return $results;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $class
-     * @param null $file
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function plugin($class, $file = null)
-    {
-        PhpQuery::plugin($class, $file);
-        return $this;
-    }
-
-    /**
-     * Deprecated, use $pq->plugin() instead.
-     *
-     * @deprecated
-     * @param $class
-     * @param $file
-     * @return unknown_type
-     */
-    public static function extend($class, $file = null)
-    {
-        return self::plugin($class, $file);
-    }
-
-    /**
-     *
-     * @access private
-     * @param $method
-     * @param $args
-     * @throws \Exception
-     * @return unknown_type
-     */
-    public function __call($method, $args)
-    {
-        $aliasMethods = array(
-            'clone',
-            'empty'
-        );
-        if (isset(PhpQuery::$extendMethods[$method])) {
-            array_unshift($args, $this);
-            return PhpQuery::callbackRun(PhpQuery::$extendMethods[$method], $args);
-        } else if (isset(PhpQuery::$pluginsMethods[$method])) {
-            array_unshift($args, $this);
-            $class     = PhpQuery::$pluginsMethods[$method];
-            $realClass = "\\PhpQuery\\Plugin\\$class";
-            $return    = call_user_func_array(
-                array(
-                    $realClass,
-                    $method
-                ),
-                $args
-            );
-            // XXX deprecate ?
-            return is_null($return) ? $this : $return;
-        } else if (in_array($method, $aliasMethods)) {
-            return call_user_func_array(
-                array(
-                    $this,
-                    '_' . $method
-                ),
-                $args
-            );
-        } else
-            throw new \Exception("Method '{$method}' doesnt exist");
-    }
-
-    /**
-     * Safe rename of next().
-     *
-     * Use it ONLY when need to call next() on an iterated object (in same time).
-     * Normaly there is no need to do such thing ;)
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @access private
-     */
-    public function _next($selector = null)
-    {
-        return $this->newInstance($this->getElementSiblings('nextSibling', $selector, true));
-    }
-
-    /**
-     * Use prev() and next().
-     *
-     * @deprecated
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @access private
-     */
-    public function _prev($selector = null)
-    {
-        return $this->prev($selector);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function prev($selector = null)
-    {
-        return $this->newInstance($this->getElementSiblings('previousSibling', $selector, true));
-    }
-
-    /**
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo
-     */
-    public function prevAll($selector = null)
-    {
-        return $this->newInstance($this->getElementSiblings('previousSibling', $selector));
-    }
-
-    /**
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo FIXME: returns source elements insted of next siblings
-     */
-    public function nextAll($selector = null)
-    {
-        return $this->newInstance($this->getElementSiblings('nextSibling', $selector));
-    }
-
-    /**
-     * @access private
-     */
-    protected function getElementSiblings($direction, $selector = null, $limitToOne = false)
-    {
-        $stack = array();
-        $count = 0;
-        foreach ($this->stack() as $node) {
-            $test = $node;
-            while (isset($test->{$direction}) && $test->{$direction}) {
-                $test = $test->{$direction};
-                if (!$test instanceof \DOMElement)
-                    continue;
-                $stack[] = $test;
-                if ($limitToOne)
-                    break;
-            }
-        }
-        if ($selector) {
-            $stackOld       = $this->elements;
-            $this->elements = $stack;
-            $stack          = $this->filter($selector, true)->stack();
-            $this->elements = $stackOld;
-        }
-        return $stack;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function siblings($selector = null)
-    {
-        $stack    = array();
-        $siblings = array_merge(
-            $this->getElementSiblings('previousSibling', $selector),
-            $this->getElementSiblings('nextSibling', $selector)
-        );
-        foreach ($siblings as $node) {
-            if (!$this->elementsContainsNode($node, $stack))
-                $stack[] = $node;
-        }
-        return $this->newInstance($stack);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function not($selector = null)
-    {
-        if (is_string($selector))
-            PhpQuery::debug(
-                array(
-                    'not',
-                    $selector
-                )
-            );
-        else
-            PhpQuery::debug('not');
-        $stack = array();
-        if ($selector instanceof self || $selector instanceof \DOMNODE) {
-            foreach ($this->stack() as $node) {
-                if ($selector instanceof self) {
-                    $matchFound = false;
-                    foreach ($selector->stack() as $notNode) {
-                        if ($notNode->isSameNode($node))
-                            $matchFound = true;
-                    }
-                    if (!$matchFound)
-                        $stack[] = $node;
-                } else if ($selector instanceof \DOMNODE) {
-                    if (!$selector->isSameNode($node))
-                        $stack[] = $node;
-                } else {
-                    if (!$this->is($selector))
-                        $stack[] = $node;
-                }
-            }
-        } else {
-            $orgStack = $this->stack();
-            $matched  = $this->filter($selector, true)->stack();
-            //			$matched = array();
-            //			// simulate OR in filter() instead of AND 5y
-            //			foreach($this->parseSelector($selector) as $s) {
-            //				$matched = array_merge($matched,
-            //					$this->filter(array($s))->stack()
-            //				);
-            //			}
-            foreach ($orgStack as $node)
-                if (!$this->elementsContainsNode($node, $matched))
-                    $stack[] = $node;
-        }
-        return $this->newInstance($stack);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string|PhpQueryObject
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function add($selector = null)
-    {
-        if (!$selector)
-            return $this;
-        $stack                = array();
-        $this->elementsBackup = $this->elements;
-        $found                = PhpQuery::pq($selector, $this->getDocumentID());
-        $this->merge($found->elements);
-        return $this->newInstance();
-    }
-
-    /**
-     * @access private
-     */
-    protected function merge()
-    {
-        foreach (func_get_args() as $nodes)
-            foreach ($nodes as $newNode)
-                if (!$this->elementsContainsNode($newNode))
-                    $this->elements[] = $newNode;
-    }
-
-    /**
-     * @access private
-     * TODO refactor to stackContainsNode
-     */
-    protected function elementsContainsNode($nodeToCheck, $elementsStack = null)
-    {
-        $loop = !is_null($elementsStack) ? $elementsStack : $this->elements;
-        foreach ($loop as $node) {
-            if ($node->isSameNode($nodeToCheck))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function parent($selector = null)
-    {
-        $stack = array();
-        foreach ($this->elements as $node)
-            if ($node->parentNode
-                && !$this->elementsContainsNode($node->parentNode, $stack)
-            )
-                $stack[] = $node->parentNode;
-        $this->elementsBackup = $this->elements;
-        $this->elements       = $stack;
-        if ($selector)
-            $this->filter($selector, true);
-        return $this->newInstance();
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param null $selector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function parents($selector = null)
-    {
-        $stack = array();
-        if (!$this->elements)
-            $this->debug('parents() - stack empty');
-        foreach ($this->elements as $node) {
-            $test = $node;
-            while ($test->parentNode) {
-                $test = $test->parentNode;
-                if ($this->isRoot($test))
-                    break;
-                if (!$this->elementsContainsNode($test, $stack)) {
-                    $stack[] = $test;
-                    continue;
-                }
-            }
-        }
-        $this->elementsBackup = $this->elements;
-        $this->elements       = $stack;
-        if ($selector)
-            $this->filter($selector, true);
-        return $this->newInstance();
-    }
-
-    /**
-     * Internal stack iterator.
-     *
-     * @access private
-     * @param null $nodeTypes
-     * @return array {Array.<DOMNode>}
-     */
-    public function stack($nodeTypes = null)
-    {
-        if (!isset($nodeTypes))
-            return $this->elements;
-        if (!is_array($nodeTypes))
-            $nodeTypes = array(
-                $nodeTypes
-            );
-        $return = array();
-        foreach ($this->elements as $node) {
-            if (in_array($node->nodeType, $nodeTypes))
-                $return[] = $node;
-        }
-        return $return;
-    }
-
-    // TODO phpdoc; $oldAttr is result of hasAttribute, before any changes
-    protected function attrEvents($attr, $oldAttr, $oldValue, $node)
-    {
-        // skip events for XML documents
-        if (!$this->isXHTML() && !$this->isHTML())
-            return;
-        $event = null;
-        // identify
-        $isInputValue = $node->tagName == 'input'
-            && (in_array(
-                    $node->getAttribute('type'),
-                    array(
-                        'text',
-                        'password',
-                        'hidden'
-                    )
-                ) || !$node->getAttribute('type'));
-        $isRadio      = $node->tagName == 'input'
-            && $node->getAttribute('type') == 'radio';
-        $isCheckbox   = $node->tagName == 'input'
-            && $node->getAttribute('type') == 'checkbox';
-        $isOption     = $node->tagName == 'option';
-        if ($isInputValue && $attr == 'value'
-            && $oldValue != $node->getAttribute($attr)
-        ) {
-            $event = new Dom\DOMEvent(array(
-                                          'target' => $node,
-                                          'type'   => 'change'
-                                      ));
-        } else if (($isRadio || $isCheckbox) && $attr == 'checked'
-            && (
-                // check
-                (!$oldAttr && $node->hasAttribute($attr))
-                // un-check
-                || (!$node->hasAttribute($attr) && $oldAttr))
-        ) {
-            $event = new Dom\DOMEvent(array(
-                                          'target' => $node,
-                                          'type'   => 'change'
-                                      ));
-        } else if ($isOption && $node->parentNode && $attr == 'selected'
-            && (
-                // select
-                (!$oldAttr && $node->hasAttribute($attr))
-                // un-select
-                || (!$node->hasAttribute($attr) && $oldAttr))
-        ) {
-            $event = new Dom\DOMEvent(array(
-                                          'target' => $node->parentNode,
-                                          'type'   => 'change'
-                                      ));
-        }
-        if ($event) {
-            PhpQueryEvents::trigger(
-                $this->getDocumentID(),
-                $event->type,
-                array(
-                    $event
-                ),
-                $node
-            );
-        }
-    }
-
-    public function attr($attr = null, $value = null)
-    {
-        foreach ($this->stack(1) as $node) {
-            if (!is_null($value)) {
-                $loop = $attr == '*' ? $this->getNodeAttrs($node)
-                    : array(
-                        $attr
-                    );
-                foreach ($loop as $a) {
-                    $oldValue = $node->getAttribute($a);
-                    $oldAttr  = $node->hasAttribute($a);
-                    // TODO raises an error when charset other than UTF-8
-                    // while document's charset is also not UTF-8
-                    @$node->setAttribute($a, $value);
-                    $this->attrEvents($a, $oldAttr, $oldValue, $node);
-                }
-            } else if ($attr == '*') {
-                // jQuery difference
-                $return = array();
-                foreach ($node->attributes as $n => $v)
-                    $return[$n] = $v->value;
-                return $return;
-            } else
-                return $node->hasAttribute($attr) ? $node->getAttribute($attr) : null;
-        }
-        return is_null($value) ? '' : $this;
-    }
-
-    /**
-     * @param null $attr
-     * @return The same attribute of each matching element, like
-     * attr() but returns an array with one entry per matched element.
-     * Read only.
-     */
-    public function attrs($attr = null)
-    {
-        $results = array();
-        foreach ($this->stack(1) as $node) {
-            $results[] = $node->hasAttribute($attr) ? $node->getAttribute($attr)
-                : null;
-        }
-        return $results;
-    }
-
-    /**
-     * @access private
-     */
-    protected function getNodeAttrs($node)
-    {
-        $return = array();
-        foreach ($node->attributes as $n => $o)
-            $return[] = $n;
-        return $return;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $attr
-     * @param $code
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo check CDATA ???
-     */
-    public function attrPHP($attr, $code)
-    {
-        if (!is_null($code)) {
-            $value = '<' . '?php ' . $code . ' ?' . '>';
-            // TODO tempolary solution
-            // http://code.google.com/p/phpquery/issues/detail?id=17
-            //			if (function_exists('mb_detect_encoding') && mb_detect_encoding($value) == 'ASCII')
-            //				$value	= mb_convert_encoding($value, 'UTF-8', 'HTML-ENTITIES');
-        }
-        foreach ($this->stack(1) as $node) {
-            if (!is_null($code)) {
-                //				$attrNode = $this->DOM->createAttribute($attr);
-                $node->setAttribute($attr, $value);
-                //				$attrNode->value = $value;
-                //				$node->appendChild($attrNode);
-            } else if ($attr == '*') {
-                // jQuery diff
-                $return = array();
-                foreach ($node->attributes as $n => $v)
-                    $return[$n] = $v->value;
-                return $return;
-            } else
-                return $node->getAttribute($attr);
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $attr
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function removeAttr($attr)
-    {
-        foreach ($this->stack(1) as $node) {
-            $loop = $attr == '*' ? $this->getNodeAttrs($node)
-                : array(
-                    $attr
-                );
-            foreach ($loop as $a) {
-                $oldValue = $node->getAttribute($a);
-                $node->removeAttribute($a);
-                $this->attrEvents($a, $oldValue, null, $node);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Return form element value.
-     *
-     * @param null $val
-     * @return String Fields value.
-     */
-    public function val($val = null)
-    {
-        if (!isset($val)) {
-            if ($this->eq(0)->is('select')) {
-                $selected = $this->eq(0)->find('option[selected=selected]');
-                if ($selected->is('[value]'))
-                    return $selected->attr('value');
-                else
-                    return $selected->text();
-            } else if ($this->eq(0)->is('textarea'))
-                return $this->eq(0)->markup();
-            else
-                return $this->eq(0)->attr('value');
-        } else {
-            $_val = null;
-            foreach ($this->stack(1) as $node) {
-                $node = pq($node, $this->getDocumentID());
-                if (is_array($val)
-                    && in_array(
-                        $node->attr('type'),
-                        array(
-                            'checkbox',
-                            'radio'
-                        )
-                    )
-                ) {
-                    $isChecked = in_array($node->attr('value'), $val)
-                        || in_array($node->attr('name'), $val);
-                    if ($isChecked)
-                        $node->attr('checked', 'checked');
-                    else
-                        $node->removeAttr('checked');
-                } else if ($node->get(0)->tagName == 'select') {
-                    if (!isset($_val)) {
-                        $_val = array();
-                        if (!is_array($val))
-                            $_val = array(
-                                (string) $val
-                            );
-                        else
-                            foreach ($val as $v)
-                                $_val[] = $v;
-                    }
-                    foreach ($node['option']->stack(1) as $option) {
-                        $option   = pq($option, $this->getDocumentID());
-                        $selected = false;
-                        // XXX: workaround for string comparsion, see issue #96
-                        // http://code.google.com/p/phpquery/issues/detail?id=96
-                        $selected = is_null($option->attr('value')) ? in_array($option->markup(), $_val)
-                            : in_array($option->attr('value'), $_val);
-                        //						$optionValue = $option->attr('value');
-                        //						$optionText = $option->text();
-                        //						$optionTextLenght = mb_strlen($optionText);
-                        //						foreach($_val as $v)
-                        //							if ($optionValue == $v)
-                        //								$selected = true;
-                        //							else if ($optionText == $v && $optionTextLenght == mb_strlen($v))
-                        //								$selected = true;
-                        if ($selected)
-                            $option->attr('selected', 'selected');
-                        else
-                            $option->removeAttr('selected');
-                    }
-                } else if ($node->get(0)->tagName == 'textarea')
-                    $node->markup($val);
-                else
-                    $node->attr('value', $val);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function andSelf()
-    {
-        if ($this->previous)
-            $this->elements = array_merge($this->elements, $this->previous->elements);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $className
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function addClass($className)
-    {
-        if (!$className)
-            return $this;
-        foreach ($this->stack(1) as $node) {
-            if (!$this->is(".$className", $node))
-                $node->setAttribute(
-                    'class',
-                    trim(
-                        $node->getAttribute('class') . ' '
-                        . $className
-                    )
-                );
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $className
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function addClassPHP($className)
-    {
-        foreach ($this->stack(1) as $node) {
-            $classes  = $node->getAttribute('class');
-            $newValue = $classes ? $classes . ' <' . '?php ' . $className . ' ?'
-                . '>' : '<' . '?php ' . $className . ' ?' . '>';
-            $node->setAttribute('class', $newValue);
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param    string $className
-     * @return    bool
-     */
-    public function hasClass($className)
-    {
-        foreach ($this->stack(1) as $node) {
-            if ($this->is(".$className", $node))
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $className
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function removeClass($className)
-    {
-        foreach ($this->stack(1) as $node) {
-            $classes = explode(' ', $node->getAttribute('class'));
-            if (in_array($className, $classes)) {
-                $classes = array_diff(
-                    $classes,
-                    array(
-                        $className
-                    )
-                );
-                if ($classes)
-                    $node->setAttribute('class', implode(' ', $classes));
-                else
-                    $node->removeAttribute('class');
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param $className
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function toggleClass($className)
-    {
-        foreach ($this->stack(1) as $node) {
-            if ($this->is($node, '.' . $className))
-                $this->removeClass($className);
-            else
-                $this->addClass($className);
-        }
-        return $this;
-    }
-
-    /**
-     * Proper name without underscore (just ->empty()) also works.
-     *
-     * Removes all child nodes from the set of matched elements.
-     *
-     * Example:
-     * pq("p")._empty()
-     *
-     * HTML:
-     * <p>Hello, <span>Person</span> <a href="#">and person</a></p>
-     *
-     * Result:
-     * [ <p></p> ]
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @access private
-     */
-    public function _empty()
-    {
-        foreach ($this->stack(1) as $node) {
-            // thx to 'dave at dgx dot cz'
-            $node->nodeValue = '';
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param array|string $callback Expects $node as first param, $index as second
-     * @param null         $param1
-     * @param null         $param2
-     * @param null         $param3
-     * @internal param array $scope External variables passed to callback. Use compact('varName1', 'varName2'...) and extract($scope)
-     * @internal param array $arg1 Will ba passed as third and futher args to callback.
-     * @internal param array $arg2 Will ba passed as fourth and futher args to callback, and so on...
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function each($callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        $paramStructure = null;
-        if (func_num_args() > 1) {
-            $paramStructure = func_get_args();
-            $paramStructure = array_slice($paramStructure, 1);
-        }
-        foreach ($this->elements as $v)
-            PhpQuery::callbackRun(
-                $callback,
-                array(
-                    $v
-                ),
-                $paramStructure
-            );
-        return $this;
-    }
-
-    /**
-     * Run callback on actual object.
-     *
-     * @param      $callback
-     * @param null $param1
-     * @param null $param2
-     * @param null $param3
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function callback($callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        $params    = func_get_args();
-        $params[0] = $this;
-        PhpQuery::callbackRun($callback, $params);
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param      $callback
-     * @param null $param1
-     * @param null $param2
-     * @param null $param3
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     * @todo add $scope and $args as in each() ???
-     */
-    public function map($callback, $param1 = null, $param2 = null, $param3 = null)
-    {
-        //		$stack = array();
-        ////		foreach($this->newInstance() as $node) {
-        //		foreach($this->newInstance() as $node) {
-        //			$result = call_user_func($callback, $node);
-        //			if ($result)
-        //				$stack[] = $result;
-        //		}
-        $params = func_get_args();
-        array_unshift($params, $this->elements);
-        return $this->newInstance(
-            call_user_func_array(
-                array(
-                    '\\PhpQuery\\PhpQuery',
-                    'map'
-                ),
-                $params
-            )
-        //			PhpQuery::map($this->elements, $callback)
-        );
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param <type> $key
-     * @param <type> $value
-     * @return $this
-     */
-    public function data($key, $value = null)
-    {
-        if (!isset($value)) {
-            // TODO? implement specific jQuery behavior od returning parent values
-            // is child which we look up doesn't exist
-            return PhpQuery::data($this->get(0), $key, $value, $this->getDocumentID());
-        } else {
-            foreach ($this as $node)
-                PhpQuery::data($node, $key, $value, $this->getDocumentID());
-            return $this;
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param <type> $key
-     * @return $this
-     */
-    public function removeData($key)
-    {
-        foreach ($this as $node)
-            PhpQuery::removeData($node, $key, $this->getDocumentID());
-        return $this;
-    }
-    // INTERFACE IMPLEMENTATIONS
-
-    // ITERATOR INTERFACE
-    /**
-     * @access private
-     */
-    public function rewind()
-    {
-        $this->debug('iterating foreach');
-        //		PhpQuery::selectDocument($this->getDocumentID());
-        $this->elementsBackup    = $this->elements;
-        $this->elementsInterator = $this->elements;
-        $this->valid             = isset($this->elements[0]) ? 1 : 0;
-        // 		$this->elements = $this->valid
-        // 			? array($this->elements[0])
-        // 			: array();
-        $this->current = 0;
-    }
-
-    /**
-     * @access private
-     */
-    public function current()
-    {
-        return $this->elementsInterator[$this->current];
-    }
-
-    /**
-     * @access private
-     */
-    public function key()
-    {
-        return $this->current;
-    }
-
-    /**
-     * Double-function method.
-     *
-     * First: main iterator interface method.
-     * Second: Returning next sibling, alias for _next().
-     *
-     * Proper functionality is choosed automagicaly.
-     *
-     * @see PhpQueryObject::_next()
-     * @param null $cssSelector
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     */
-    public function next($cssSelector = null)
-    {
-        //		if ($cssSelector || $this->valid)
-        //			return $this->_next($cssSelector);
-        $this->valid = isset($this->elementsInterator[$this->current + 1]) ? true
-            : false;
-        if (!$this->valid && $this->elementsInterator) {
-            $this->elementsInterator = null;
-        } else if ($this->valid) {
-            $this->current++;
-        } else {
-            return $this->_next($cssSelector);
-        }
-    }
-
-    /**
-     * @access private
-     */
-    public function valid()
-    {
-        return $this->valid;
-    }
-    // ITERATOR INTERFACE END
-    // ARRAYACCESS INTERFACE
-    /**
-     * @access private
-     */
-    public function offsetExists($offset)
-    {
-        return $this->find($offset)->size() > 0;
-    }
-
-    /**
-     * @access private
-     */
-    public function offsetGet($offset)
-    {
-        return $this->find($offset);
-    }
-
-    /**
-     * @access private
-     */
-    public function offsetSet($offset, $value)
-    {
-        //		$this->find($offset)->replaceWith($value);
-        $this->find($offset)->html($value);
-    }
-
-    /**
-     * @access private
-     */
-    public function offsetUnset($offset)
-    {
-        // empty
-        throw new \Exception("Can't do unset, use array interface only for calling queries and replacing HTML.");
-    }
-    // ARRAYACCESS INTERFACE END
-    /**
-     * Returns node's XPath.
-     *
-     * @param unknown_type $oneNode
-     * @param null         $namespace
-     * @return string
-     * @TODO   use native getNodePath is avaible
-     * @access private
-     */
-    protected function getNodeXpath($oneNode = null, $namespace = null)
-    {
-        $return = array();
-        $loop   = $oneNode ? array(
-            $oneNode
-        ) : $this->elements;
-        //		if ($namespace)
-        //			$namespace .= ':';
-        foreach ($loop as $node) {
-            if ($node instanceof \DOMDocument) {
-                $return[] = '';
-                continue;
-            }
-            $xpath = array();
-            while (!($node instanceof \DOMDocument)) {
-                $i       = 1;
-                $sibling = $node;
-                while ($sibling->previousSibling) {
-                    $sibling   = $sibling->previousSibling;
-                    $isElement = $sibling instanceof \DOMElement;
-                    if ($isElement && $sibling->tagName == $node->tagName)
-                        $i++;
-                }
-                $xpath[] = $this->isXML() ? "*[local-name()='{$node->tagName}'][{$i}]"
-                    : "{$node->tagName}[{$i}]";
-                $node    = $node->parentNode;
-            }
-            $xpath    = join('/', array_reverse($xpath));
-            $return[] = '/' . $xpath;
-        }
-        return $oneNode ? $return[0] : $return;
-    }
-
-    // HELPERS
-    public function whois($oneNode = null)
-    {
-        $return = array();
-        $loop   = $oneNode ? array(
-            $oneNode
-        ) : $this->elements;
-        foreach ($loop as $node) {
-            if (isset($node->tagName)) {
-                $tag      = in_array(
-                    $node->tagName,
-                    array(
-                        'php',
-                        'js'
-                    )
-                ) ? strtoupper($node->tagName) : $node->tagName;
-                $return[] = $tag
-                    . ($node->getAttribute('id') ? '#' . $node->getAttribute('id') : '')
-                    . ($node->getAttribute('class') ? '.'
-                        . join('.', explode(' ', $node->getAttribute('class'))) : '')
-                    . ($node->getAttribute('name') ? '[name="'
-                        . $node->getAttribute('name') . '"]' : '')
-                    . ($node->getAttribute('value')
-                    && strpos($node->getAttribute('value'), '<' . '?php') === false ? '[value="'
-                        . substr(str_replace("\n", '', $node->getAttribute('value')), 0, 15)
-                        . '"]' : '')
-                    . ($node->getAttribute('value')
-                    && strpos($node->getAttribute('value'), '<' . '?php') !== false ? '[value=PHP]'
-                        : '') . ($node->getAttribute('selected') ? '[selected]' : '')
-                    . ($node->getAttribute('checked') ? '[checked]' : '');
-            } else if ($node instanceof \DOMTEXT) {
-                if (trim($node->textContent))
-                    $return[] = 'Text:'
-                        . substr(str_replace("\n", ' ', $node->textContent), 0, 15);
-            } else {
-
-            }
-        }
-        return $oneNode && isset($return[0]) ? $return[0] : $return;
-    }
-
-    /**
-     * Dump htmlOuter and preserve chain. Usefull for debugging.
-     *
-     * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
-     *
-     */
-    public function dump()
-    {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
-        PhpQuery::$debug = false;
-        //		print __FILE__.':'.__LINE__."\n";
-        var_dump($this->htmlOuter());
-        return $this;
-    }
-
-    public function dumpWhois()
-    {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
-        $debug           = PhpQuery::$debug;
-        PhpQuery::$debug = false;
-        //		print __FILE__.':'.__LINE__."\n";
-        var_dump('whois', $this->whois());
-        PhpQuery::$debug = $debug;
-        return $this;
-    }
-
-    public function dumpLength()
-    {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
-        $debug           = PhpQuery::$debug;
-        PhpQuery::$debug = false;
-        //		print __FILE__.':'.__LINE__."\n";
-        var_dump('length', $this->length());
-        PhpQuery::$debug = $debug;
-        return $this;
-    }
-
-    public function dumpTree($html = true, $title = true)
-    {
-        $output          = $title ? 'DUMP #' . (PhpQuery::$dumpCount++) . " \n" : '';
-        $debug           = PhpQuery::$debug;
-        PhpQuery::$debug = false;
-        foreach ($this->stack() as $node)
-            $output .= $this->__dumpTree($node);
-        PhpQuery::$debug = $debug;
-        print $html ? nl2br(str_replace(' ', '&nbsp;', $output)) : $output;
-        return $this;
-    }
-
-    private function __dumpTree($node, $intend = 0)
-    {
-        $whois  = $this->whois($node);
-        $return = '';
-        if ($whois)
-            $return .= str_repeat(' - ', $intend) . $whois . "\n";
-        if (isset($node->childNodes))
-            foreach ($node->childNodes as $chNode)
-                $return .= $this->__dumpTree($chNode, $intend + 1);
-        return $return;
-    }
-
-    /**
-     * Dump htmlOuter and stop script execution. Usefull for debugging.
-     *
-     */
-    public function dumpDie()
-    {
-        print __FILE__ . ':' . __LINE__;
-        var_dump($this->htmlOuter());
-        die();
-    }
+						),
+						new \CallbackParam(),
+						$param
+					);
+				$this->elements = $mapped->elements;
+				break;
+			default:
+				$this->debug("Unknown pseudoclass '{$class}', skipping...");
+		}
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function __pseudoClassParam($paramsString)
+	{
+		// TODO;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $selector
+	 * @param null $nodes
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function is($selector, $nodes = null)
+	{
+		PhpQuery::debug(
+			array(
+				"Is:",
+				$selector
+			)
+		);
+		if (!$selector)
+			return false;
+		$oldStack    = $this->elements;
+		$returnArray = false;
+		if ($nodes && is_array($nodes)) {
+			$this->elements = $nodes;
+		} else if ($nodes)
+			$this->elements = array(
+				$nodes
+			);
+		$this->filter($selector, true);
+		$stack          = $this->elements;
+		$this->elements = $oldStack;
+		if ($nodes)
+			return $stack ? $stack : null;
+		return (bool) count($stack);
+	}
+
+	/**
+	 * Enter description here...
+	 * jQuery difference.
+	 *
+	 * Callback:
+	 * - $index int
+	 * - $node DOMNode
+	 *
+	 * @param      $callback
+	 * @param bool $_skipHistory
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @link http://docs.jquery.com/Traversing/filter
+	 */
+	public function filterCallback($callback, $_skipHistory = false)
+	{
+		if (!$_skipHistory) {
+			$this->elementsBackup = $this->elements;
+			$this->debug("Filtering by callback");
+		}
+		$newStack = array();
+		foreach ($this->elements as $index => $node) {
+			$result = PhpQuery::callbackRun(
+				$callback,
+				array(
+					$index,
+					$node
+				)
+			);
+			if (is_null($result) || (!is_null($result) && $result))
+				$newStack[] = $node;
+		}
+		$this->elements = $newStack;
+		return $_skipHistory ? $this : $this->newInstance();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $selectors
+	 * @param bool $_skipHistory
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @link http://docs.jquery.com/Traversing/filter
+	 */
+	public function filter($selectors, $_skipHistory = false)
+	{
+		if ($selectors instanceof \Callback OR $selectors instanceof \Closure)
+			return $this->filterCallback($selectors, $_skipHistory);
+		if (!$_skipHistory)
+			$this->elementsBackup = $this->elements;
+		$notSimpleSelector = array(
+			' ',
+			'>',
+			'~',
+			'+',
+			'/'
+		);
+		if (!is_array($selectors))
+			$selectors = $this->parseSelector($selectors);
+		if (!$_skipHistory)
+			$this->debug(
+				array(
+					"Filtering:",
+					$selectors
+				)
+			);
+		$finalStack = array();
+		foreach ($selectors as $selector) {
+			$stack = array();
+			if (!$selector)
+				break;
+			// avoid first space or /
+			if (in_array($selector[0], $notSimpleSelector))
+				$selector = array_slice($selector, 1);
+			// PER NODE selector chunks
+			foreach ($this->stack() as $node) {
+				$break = false;
+				foreach ($selector as $s) {
+					if (!($node instanceof \DOMElement)) {
+						// all besides \DOMElement
+						if ($s[0] == '[') {
+							$attr = trim($s, '[]');
+							if (mb_strpos($attr, '=')) {
+								list($attr, $val) = explode('=', $attr);
+								if ($attr == 'nodeType' && $node->nodeType != $val)
+									$break = true;
+							}
+						} else
+							$break = true;
+					} else {
+						// \DOMElement only
+						// ID
+						if ($s[0] == '#') {
+							if ($node->getAttribute('id') != substr($s, 1))
+								$break = true;
+							// CLASSES
+						} else if ($s[0] == '.') {
+							if (!$this->matchClasses($s, $node))
+								$break = true;
+							// ATTRS
+						} else if ($s[0] == '[') {
+							// strip side brackets
+							$attr = trim($s, '[]');
+							if (mb_strpos($attr, '=')) {
+								list($attr, $val) = explode('=', $attr);
+								$val = self::unQuote($val);
+								if ($attr == 'nodeType') {
+									if ($val != $node->nodeType)
+										$break = true;
+								} else if ($this->isRegexp($attr)) {
+									$val = extension_loaded('mbstring')
+									&& PhpQuery::$mbstringSupport ? quotemeta(trim($val, '"\''))
+										: preg_quote(trim($val, '"\''), '@');
+									// switch last character
+									switch (substr($attr, -1)) {
+										// quotemeta used insted of preg_quote
+										// http://code.google.com/p/phpquery/issues/detail?id=76
+										case '^':
+											$pattern = '^' . $val;
+											break;
+										case '*':
+											$pattern = '.*' . $val . '.*';
+											break;
+										case '$':
+											$pattern = '.*' . $val . '$';
+											break;
+									}
+									// cut last character
+									$attr    = substr($attr, 0, -1);
+									$isMatch = extension_loaded('mbstring')
+									&& PhpQuery::$mbstringSupport ? mb_ereg_match($pattern, $node->getAttribute($attr))
+										: preg_match("@{$pattern}@", $node->getAttribute($attr));
+									if (!$isMatch)
+										$break = true;
+								} else if ($node->getAttribute($attr) != $val)
+									$break = true;
+							} else if (!$node->hasAttribute($attr))
+								$break = true;
+							// PSEUDO CLASSES
+						} else if ($s[0] == ':') {
+							// skip
+							// TAG
+						} else if (trim($s)) {
+							if ($s != '*') {
+								// TODO namespaces
+								if (isset($node->tagName)) {
+									if ($node->tagName != $s)
+										$break = true;
+								} else if ($s == 'html' && !$this->isRoot($node))
+									$break = true;
+							}
+							// AVOID NON-SIMPLE SELECTORS
+						} else if (in_array($s, $notSimpleSelector)) {
+							$break = true;
+							$this->debug(
+								array(
+									'Skipping non simple selector',
+									$selector
+								)
+							);
+						}
+					}
+					if ($break)
+						break;
+				}
+				// if element passed all chunks of selector - add it to new stack
+				if (!$break)
+					$stack[] = $node;
+			}
+			$tmpStack       = $this->elements;
+			$this->elements = $stack;
+			// PER ALL NODES selector chunks
+			foreach ($selector as $s)
+				// PSEUDO CLASSES
+				if ($s[0] == ':')
+					$this->pseudoClasses($s);
+			foreach ($this->elements as $node)
+				// XXX it should be merged without duplicates
+				// but jQuery doesnt do that
+				$finalStack[] = $node;
+			$this->elements = $tmpStack;
+		}
+		$this->elements = $finalStack;
+		if ($_skipHistory) {
+			return $this;
+		} else {
+			$this->debug("Stack length after filter(): " . count($finalStack));
+			return $this->newInstance();
+		}
+	}
+
+	/**
+	 *
+	 * @param $value
+	 * @return string
+	 * @TODO implement in all methods using passed parameters
+	 */
+	protected static function unQuote($value)
+	{
+		return $value[0] == '\'' || $value[0] == '"' ? substr($value, 1, -1)
+			: $value;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @link http://docs.jquery.com/Ajax/load
+	 * @param      $url
+	 * @param null $data
+	 * @param null $callback
+	 * @return PhpQuery|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo Support $selector
+	 */
+	public function load($url, $data = null, $callback = null)
+	{
+		if ($data && !is_array($data)) {
+			$callback = $data;
+			$data     = null;
+		}
+		if (mb_strpos($url, ' ') !== false) {
+			$matches = null;
+			if (extension_loaded('mbstring') && PhpQuery::$mbstringSupport)
+				mb_ereg('^([^ ]+) (.*)$', $url, $matches);
+			else
+				preg_match('@^([^ ]+) (.*)$@', $url, $matches);
+			$url      = $matches[1];
+			$selector = $matches[2];
+			// FIXME this sucks, pass as callback param
+			$this->_loadSelector = $selector;
+		}
+		$ajax = array(
+			'url'      => $url,
+			'type'     => $data ? 'POST' : 'GET',
+			'data'     => $data,
+			'complete' => $callback,
+			'success'  => array(
+				$this,
+				'__loadSuccess'
+			)
+		);
+		PhpQuery::ajax($ajax);
+		return $this;
+	}
+
+	/**
+	 * @access private
+	 * @param $html
+	 */
+	public function __loadSuccess($html)
+	{
+		if ($this->_loadSelector) {
+			$html = PhpQuery::newDocument($html)->find($this->_loadSelector);
+			unset($this->_loadSelector);
+		}
+		foreach ($this->stack(1) as $node) {
+			PhpQuery::pq($node, $this->getDocumentID())->markup($html);
+		}
+	}
+
+	/**
+	 * Allows users to enter strings of CSS selectors. Useful
+	 * when the CSS is loaded via style or @imports that PhpQuery can't load
+	 * because it doesn't know the URL context of the request.
+	 */
+	public function addCSS($string)
+	{
+		if (!isset($this->cssString[$this->getDocumentID()])) {
+			$this->cssString[$this->getDocumentID()] = '';
+		}
+		$this->cssString[$this->getDocumentID()] .= $string;
+		$this->parseCSS();
+	}
+
+	/**
+	 * Either sets the CSS property of an object or retrieves the
+	 * CSS property of a proejct.
+	 *
+	 * @param      $property_name
+	 * @param bool $value
+	 * @return string of css property value
+	 * @todo
+	 */
+	public function css($property_name, $value = false)
+	{
+		if (!isset($this->cssIsParsed[$this->getDocumentID()])
+		|| $this->cssIsParsed[$this->getDocumentID()] === false
+		) {
+			$this->parseCSS();
+		}
+		$data = PhpQuery::data($this->get(0), 'phpquery_css', null, $this->getDocumentID());
+		if (!$value) {
+			if (isset($data[$property_name])) {
+				return $data[$property_name]['value'];
+			}
+			return null;
+		}
+		$specificity          = (isset($data[$property_name])) ? $data[$property_name]['specificity']
+			+ 1 : 1000;
+		$data[$property_name] = array(
+			'specificity' => $specificity,
+			'value'       => $value
+		);
+		PhpQuery::data($this->get(0), 'phpquery_css', $data, $this->getDocumentID());
+		$this->bubbleCSS(PhpQuery::pq($this->get(0), $this->getDocumentID()));
+
+		if ($specificity >= 1000) {
+			$styles = array();
+			foreach ($this->data('phpquery_css') as $k => $v) {
+				if ($v['specificity'] >= 1000) {
+					$styles[$k] = trim($k) . ':' . trim($v['value']);
+				}
+			}
+			ksort($styles);
+			if (empty($styles)) {
+				$this->removeAttr('style');
+			} elseif (PhpQuery::$enableCssShorthand) {
+				$parser = new \Sabberworm\CSS\Parser('{' . join(';', $styles) . '}');
+				$doc    = $parser->parse();
+				$doc->createShorthands();
+				$style = trim($doc->__toString(), "\n\r\t {}");
+			} else {
+				$style = join(';', $styles);
+			}
+			$this->attr('style', $style);
+		}
+	}
+
+	public function parseCSS()
+	{
+		if (!isset($this->cssString[$this->getDocumentID()])) {
+			$this->cssString[$this->getDocumentID()] = file_get_contents(
+				dirname(__FILE__)
+				. '/Resources/default.css'
+			);
+		}
+		foreach (PhpQuery::pq('style', $this->getDocumentID()) as $style) {
+			$this->cssString[$this->getDocumentID()] .= PhpQuery::pq($style)->text();
+		}
+
+		$CssParser   = new CssParser($this->cssString[$this->getDocumentID()]);
+		$CssDocument = $CssParser->parse();
+		foreach ($CssDocument->getAllRuleSets() as $ruleset) {
+			foreach ($ruleset->getSelector() as $selector) {
+				$specificity = $selector->getSpecificity();
+				foreach (PhpQuery::pq($selector->getSelector(), $this->getDocumentID()) as $el) {
+					$existing = pq($el)->data('phpquery_css');
+					if (PhpQuery::$enableCssShorthand) {
+						$ruleset->expandShorthands();
+					}
+					foreach ($ruleset->getRules() as $value) {
+						$rule = $value->getRule();
+						if (!isset($existing[$rule])
+							|| $existing[$rule]['specificity'] <= $specificity
+						) {
+							$value           = $value->getValue();
+							$value           = (is_object($value)) ? $value->__toString() : $value;
+							$existing[$rule] = array(
+								'specificity' => $specificity,
+								'value'       => $value
+							);
+						}
+					}
+					PhpQuery::pq($el)->data('phpquery_css', $existing);
+					$this->bubbleCSS(PhpQuery::pq($el));
+				}
+			}
+		}
+		foreach (PhpQuery::pq('*', $this->getDocumentID()) as $el) {
+			$existing = pq($el)->data('phpquery_css');
+			$style    = pq($el)->attr('style');
+			$style    = strlen($style) ? explode(';', $style) : array();
+			foreach ($this->attribute_css_mapping as $map => $css_equivalent) {
+				if ($el->hasAttribute($map)) {
+					$style[] = $css_equivalent . ':' . pq($el)->attr($map);
+				}
+			}
+			if (count($style)) {
+				$CssParser   = new CssParser('#ruleset {' . implode(';', $style) . '}');
+				$CssDocument = $CssParser->parse();
+				$ruleset     = $CssDocument->getAllRulesets();
+				$ruleset     = reset($ruleset);
+				if (PhpQuery::$enableCssShorthand) {
+					$ruleset->expandShorthands();
+				}
+				foreach ($ruleset->getRules() as $value) {
+					$rule = $value->getRule();
+					if (!isset($existing[$rule])
+						|| 1000 >= $existing[$rule]['specificity']
+					) {
+						$value           = $value->getValue();
+						$value           = (is_object($value)) ? $value->__toString() : $value;
+						$existing[$rule] = array(
+							'specificity' => 1000,
+							'value'       => $value
+						);
+					}
+				}
+				PhpQuery::pq($el)->data('phpquery_css', $existing);
+				$this->bubbleCSS(PhpQuery::pq($el));
+			}
+		}
+	}
+
+	protected function bubbleCSS($element)
+	{
+		$style = $element->data('phpquery_css');
+		foreach ($element->children() as $element_child) {
+			$existing = PhpQuery::pq($element_child)->data('phpquery_css');
+			foreach ($style as $rule => $value) {
+				if (!isset($existing[$rule])
+					|| $value['specificity'] > $existing[$rule]['specificity']
+				) {
+					$existing[$rule] = $value;
+				}
+			}
+			PhpQuery::pq($element_child)->data('phpquery_css', $existing);
+			if (PhpQuery::pq($element_child)->children()->length) {
+				$this->bubbleCSS(PhpQuery::pq($element_child));
+			}
+		}
+	}
+
+	/**
+	 * @todo
+	 *
+	 */
+	public function show()
+	{
+		$display = ($this->data('phpquery_display_state')) ? $this->data('phpquery_display_state')
+			: 'block';
+		$this->css('display', $display);
+		return $this;
+	}
+
+	/**
+	 * @todo
+	 *
+	 */
+	public function hide()
+	{
+		$this->data('phpquery_display_state', $this->css('display'));
+		$this->css('display', 'none');
+		return $this;
+	}
+
+	/**
+	 * Trigger a type of event on every matched element.
+	 *
+	 * @param                 $type
+	 * @param array|\PhpQuery $data
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @TODO support more than event in $type (space-separated)
+	 */
+	public function trigger($type, $data = array())
+	{
+		foreach ($this->elements as $node)
+			PhpQueryEvents::trigger($this->getDocumentID(), $type, $data, $node);
+		return $this;
+	}
+
+	/**
+	 * This particular method triggers all bound event handlers on an element (for a specific event type) WITHOUT executing the browsers default actions.
+	 *
+	 * @param  $type
+	 * @param  $data
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @TODO
+	 */
+	public function triggerHandler($type, $data = array())
+	{
+		// TODO;
+	}
+
+	/**
+	 * Binds a handler to one or more events (like click) for each matched element.
+	 * Can also bind custom events.
+	 *
+	 * @param       $type
+	 * @param mixed $data Optional
+	 * @param       $callback
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @TODO support '!' (exclusive) events
+	 * @TODO support more than event in $type (space-separated)
+	 */
+	public function bind($type, $data, $callback = null)
+	{
+		// TODO check if $data is callable, not using is_callable
+		if (!isset($callback)) {
+			$callback = $data;
+			$data     = null;
+		}
+		foreach ($this->elements as $node)
+			PhpQueryEvents::add($this->getDocumentID(), $node, $type, $data, $callback);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param string $type
+	 * @param        $callback
+	 * @return unknown
+	 * @TODO namespace events
+	 * @TODO support more than event in $type (space-separated)
+	 */
+	public function unbind($type = null, $callback = null)
+	{
+		foreach ($this->elements as $node)
+			PhpQueryEvents::remove($this->getDocumentID(), $node, $type, $callback);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $callback
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function change($callback = null)
+	{
+		if ($callback)
+			return $this->bind('change', $callback);
+		return $this->trigger('change');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $callback
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function submit($callback = null)
+	{
+		if ($callback)
+			return $this->bind('submit', $callback);
+		return $this->trigger('submit');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $callback
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function click($callback = null)
+	{
+		if ($callback)
+			return $this->bind('click', $callback);
+		return $this->trigger('click');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapAllOld($wrapper)
+	{
+		$wrapper = pq($wrapper)->_clone();
+		if (!$wrapper->length() || !$this->length())
+			return $this;
+		$wrapper->insertBefore($this->elements[0]);
+		$deepest = $wrapper->elements[0];
+		while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
+			$deepest = $deepest->firstChild;
+		pq($deepest)->append($this);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * TODO testme...
+	 * @param String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapAll($wrapper)
+	{
+		if (!$this->length())
+			return $this;
+		return PhpQuery::pq($wrapper, $this->getDocumentID())->clone()->insertBefore($this->get(0))->map(
+			array(
+				$this,
+				'___wrapAllCallback'
+			)
+		)->append($this);
+	}
+
+	/**
+	 *
+	 * @param $node
+	 * @return unknown_type
+	 * @access private
+	 */
+	public function ___wrapAllCallback($node)
+	{
+		$deepest = $node;
+		while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
+			$deepest = $deepest->firstChild;
+		return $deepest;
+	}
+
+	/**
+	 * Enter description here...
+	 * NON JQUERY METHOD
+	 *
+	 * @param $codeBefore
+	 * @param $codeAfter
+	 * @internal param $ String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapAllPHP($codeBefore, $codeAfter)
+	{
+		return $this->slice(0, 1)->beforePHP($codeBefore)->end()->slice(-1)->afterPHP($codeAfter)->end();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrap($wrapper)
+	{
+		foreach ($this->stack() as $node)
+			PhpQuery::pq($node, $this->getDocumentID())->wrapAll($wrapper);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $codeBefore
+	 * @param $codeAfter
+	 * @internal param $ String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapPHP($codeBefore, $codeAfter)
+	{
+		foreach ($this->stack() as $node)
+			PhpQuery::pq($node, $this->getDocumentID())->wrapAllPHP($codeBefore, $codeAfter);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapInner($wrapper)
+	{
+		foreach ($this->stack() as $node)
+			PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAll($wrapper);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $codeBefore
+	 * @param $codeAfter
+	 * @internal param $ String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function wrapInnerPHP($codeBefore, $codeAfter)
+	{
+		foreach ($this->stack(1) as $node)
+			PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAllPHP($codeBefore, $codeAfter);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @testme Support for text nodes
+	 */
+	public function contents()
+	{
+		$stack = array();
+		foreach ($this->stack(1) as $el) {
+			// FIXME (fixed) http://code.google.com/p/phpquery/issues/detail?id=56
+			//			if (! isset($el->childNodes))
+			//				continue;
+			foreach ($el->childNodes as $node) {
+				$stack[] = $node;
+			}
+		}
+		return $this->newInstance($stack);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * jQuery difference.
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function contentsUnwrap()
+	{
+		foreach ($this->stack(1) as $node) {
+			if (!$node->parentNode)
+				continue;
+			$childNodes = array();
+			// any modification in DOM tree breaks childNodes iteration, so cache them first
+			foreach ($node->childNodes as $chNode)
+				$childNodes[] = $chNode;
+			foreach ($childNodes as $chNode)
+				//				$node->parentNode->appendChild($chNode);
+				$node->parentNode->insertBefore($chNode, $node);
+			$node->parentNode->removeChild($node);
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * jQuery difference.
+	 */
+	public function switchWith($markup)
+	{
+		$markup  = pq($markup, $this->getDocumentID());
+		$content = null;
+		foreach ($this->stack(1) as $node) {
+			pq($node)->contents()->toReference($content)->end()->replaceWith($markup->clone()->append($content));
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $num
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function eq($num)
+	{
+		$oldStack             = $this->elements;
+		$this->elementsBackup = $this->elements;
+		$this->elements       = array();
+		if (isset($oldStack[$num]))
+			$this->elements[] = $oldStack[$num];
+		return $this->newInstance();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function size()
+	{
+		return count($this->elements);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @deprecated Use length as attribute
+	 */
+	public function length()
+	{
+		return $this->size();
+	}
+
+	public function count()
+	{
+		return $this->size();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param int $level
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo $level
+	 */
+	public function end($level = 1)
+	{
+		//		$this->elements = array_pop( $this->history );
+		//		return $this;
+		//		$this->previous->DOM = $this->DOM;
+		//		$this->previous->XPath = $this->XPath;
+		return $this->previous ? $this->previous : $this;
+	}
+
+	/**
+	 * Enter description here...
+	 * Normal use ->clone() .
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @access private
+	 */
+	public function _clone()
+	{
+		$newStack = array();
+		//pr(array('copy... ', $this->whois()));
+		//$this->dumpHistory('copy');
+		$this->elementsBackup = $this->elements;
+		foreach ($this->elements as $node) {
+			$newStack[] = $node->cloneNode(true);
+		}
+		$this->elements = $newStack;
+		return $this->newInstance();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $code
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function replaceWithPHP($code)
+	{
+		return $this->replaceWith(PhpQuery::php($code));
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String|PhpQuery $content
+	 * @link http://docs.jquery.com/Manipulation/replaceWith#content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function replaceWith($content)
+	{
+		return $this->after($content)->remove();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo this works ?
+	 */
+	public function replaceAll($selector)
+	{
+		foreach (PhpQuery::pq($selector, $this->getDocumentID()) as $node)
+			PhpQuery::pq($node, $this->getDocumentID())->after($this->_clone())->remove();
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function remove($selector = null)
+	{
+		$loop = $selector ? $this->filter($selector)->elements : $this->elements;
+		foreach ($loop as $node) {
+			if (!$node->parentNode)
+				continue;
+			if (isset($node->tagName))
+				$this->debug("Removing '{$node->tagName}'");
+			$node->parentNode->removeChild($node);
+			// Mutation event
+			$event = new Dom\DOMEvent(array(
+									  'target' => $node,
+									  'type'   => 'DOMNodeRemoved'
+								  ));
+			PhpQueryEvents::trigger(
+				$this->getDocumentID(),
+				$event->type,
+				array(
+					$event
+				),
+				$node
+			);
+		}
+		return $this;
+	}
+
+	protected function markupEvents($newMarkup, $oldMarkup, $node)
+	{
+		if ($node->tagName == 'textarea' && $newMarkup != $oldMarkup) {
+			$event = new Dom\DOMEvent(array(
+									  'target' => $node,
+									  'type'   => 'change'
+								  ));
+			PhpQueryEvents::trigger(
+				$this->getDocumentID(),
+				$event->type,
+				array(
+					$event
+				),
+				$node
+			);
+		}
+	}
+
+	/**
+	 * jQuey difference
+	 *
+	 * @param      $markup
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @return unknown_type
+	 * @TODO trigger change event for textarea
+	 */
+	public function markup($markup = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$args = func_get_args();
+		if ($this->documentWrapper->isXML)
+			return call_user_func_array(
+				array(
+					$this,
+					'xml'
+				),
+				$args
+			);
+		else
+			return call_user_func_array(
+				array(
+					$this,
+					'html'
+				),
+				$args
+			);
+	}
+
+	/**
+	 * jQuey difference
+	 *
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @internal param $markup
+	 * @return string
+	 */
+	public function markupOuter($callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$args = func_get_args();
+		if ($this->documentWrapper->isXML)
+			return call_user_func_array(
+				array(
+					$this,
+					'xmlOuter'
+				),
+				$args
+			);
+		else
+			return call_user_func_array(
+				array(
+					$this,
+					'htmlOuter'
+				),
+				$args
+			);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param unknown_type $html
+	 * @param null         $callback1
+	 * @param null         $callback2
+	 * @param null         $callback3
+	 * @return string|PhpQuery|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @TODO force html result
+	 */
+	public function html($html = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		if (isset($html)) {
+			// INSERT
+			$nodes = $this->documentWrapper->import($html);
+			$this->empty();
+			foreach ($this->stack(1) as $alreadyAdded => $node) {
+				// for now, limit events for textarea
+				if (($this->isXHTML() || $this->isHTML())
+					&& $node->tagName == 'textarea'
+				)
+					$oldHtml = pq($node, $this->getDocumentID())->markup();
+				foreach ($nodes as $newNode) {
+					$node->appendChild(
+						$alreadyAdded ? $newNode->cloneNode(true)
+							: $newNode
+					);
+				}
+				// for now, limit events for textarea
+				if (($this->isXHTML() || $this->isHTML())
+					&& $node->tagName == 'textarea'
+				)
+					$this->markupEvents($html, $oldHtml, $node);
+			}
+			return $this;
+		} else {
+			// FETCH
+			$return = $this->documentWrapper->markup($this->elements, true);
+			$args   = func_get_args();
+			foreach (array_slice($args, 1) as $callback) {
+				$return = PhpQuery::callbackRun(
+					$callback,
+					array(
+						$return
+					)
+				);
+			}
+			return $return;
+		}
+	}
+
+	/**
+	 * @TODO force xml result
+	 */
+	public function xml($xml = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$args = func_get_args();
+		return call_user_func_array(
+			array(
+				$this,
+				'html'
+			),
+			$args
+		);
+	}
+
+	/**
+	 * Enter description here...
+	 * @TODO force html result
+	 *
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @return String
+	 */
+	public function htmlOuter($callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$markup = $this->documentWrapper->markup($this->elements);
+		// pass thou callbacks
+		$args = func_get_args();
+		foreach ($args as $callback) {
+			$markup = PhpQuery::callbackRun(
+				$callback,
+				array(
+					$markup
+				)
+			);
+		}
+		return $markup;
+	}
+
+	/**
+	 * @TODO force xml result
+	 */
+	public function xmlOuter($callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		$args = func_get_args();
+		return call_user_func_array(
+			array(
+				$this,
+				'htmlOuter'
+			),
+			$args
+		);
+	}
+
+	public function __toString()
+	{
+		return $this->markupOuter();
+	}
+
+	/**
+	 * Just like html(), but returns markup with VALID (dangerous) PHP tags.
+	 *
+	 * @param null $code
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo support returning markup with PHP tags when called without param
+	 */
+	public function php($code = null)
+	{
+		return $this->markupPHP($code);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $code
+	 * @return unknown_type
+	 */
+	public function markupPHP($code = null)
+	{
+		return isset($code) ? $this->markup(PhpQuery::php($code))
+			: PhpQuery::markupToPHP($this->markup());
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @internal param $code
+	 * @return string PHP code
+	 */
+	public function markupOuterPHP()
+	{
+		return PhpQuery::markupToPHP($this->markupOuter());
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function children($selector = null)
+	{
+		$stack = array();
+		foreach ($this->stack(1) as $node) {
+			//			foreach($node->getElementsByTagName('*') as $newNode) {
+			foreach ($node->childNodes as $newNode) {
+				if ($newNode->nodeType != 1)
+					continue;
+				if ($selector && !$this->is($selector, $newNode))
+					continue;
+				if ($this->elementsContainsNode($newNode, $stack))
+					continue;
+				$stack[] = $newNode;
+			}
+		}
+		$this->elementsBackup = $this->elements;
+		$this->elements       = $stack;
+		return $this->newInstance();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function ancestors($selector = null)
+	{
+		return $this->children($selector);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function append($content)
+	{
+		return $this->insert($content, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function appendPHP($content)
+	{
+		return $this->insert("<php><!-- {$content} --></php>", 'append');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $seletor
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function appendTo($seletor)
+	{
+		return $this->insert($seletor, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function prepend($content)
+	{
+		return $this->insert($content, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @todo accept many arguments, which are joined, arrays maybe also
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function prependPHP($content)
+	{
+		return $this->insert("<php><!-- {$content} --></php>", 'prepend');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $seletor
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function prependTo($seletor)
+	{
+		return $this->insert($seletor, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function before($content)
+	{
+		return $this->insert($content, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function beforePHP($content)
+	{
+		return $this->insert("<php><!-- {$content} --></php>", 'before');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param String|PhpQuery
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function insertBefore($seletor)
+	{
+		return $this->insert($seletor, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function after($content)
+	{
+		return $this->insert($content, __FUNCTION__);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $content
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function afterPHP($content)
+	{
+		return $this->insert("<php><!-- {$content} --></php>", 'after');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $seletor
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function insertAfter($seletor)
+	{
+		return $this->insert($seletor, __FUNCTION__);
+	}
+
+	/**
+	 * Internal insert method. Don't use it.
+	 *
+	 * @param unknown_type $target
+	 * @param unknown_type $type
+	 * @throws \Exception
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @access private
+	 */
+	public function insert($target, $type)
+	{
+		$this->debug("Inserting data with '{$type}'");
+		$to = false;
+		switch ($type) {
+			case 'appendTo':
+			case 'prependTo':
+			case 'insertBefore':
+			case 'insertAfter':
+				$to = true;
+		}
+		switch (gettype($target)) {
+			case 'string':
+				$insertFrom = $insertTo = array();
+				if ($to) {
+					// INSERT TO
+					$insertFrom = $this->elements;
+					if (PhpQuery::isMarkup($target)) {
+						// $target is new markup, import it
+						$insertTo = $this->documentWrapper->import($target);
+						// insert into selected element
+					} else {
+						// $tagret is a selector
+						$thisStack = $this->elements;
+						$this->toRoot();
+						$insertTo       = $this->find($target)->elements;
+						$this->elements = $thisStack;
+					}
+				} else {
+					// INSERT FROM
+					$insertTo   = $this->elements;
+					$insertFrom = $this->documentWrapper->import($target);
+				}
+				break;
+			case 'object':
+				$insertFrom = $insertTo = array();
+				// PhpQuery
+				if ($target instanceof self) {
+					if ($to) {
+						$insertTo = $target->elements;
+						if ($this->documentFragment && $this->stackIsRoot())
+							// get all body children
+							//							$loop = $this->find('body > *')->elements;
+							// TODO test it, test it hard...
+							//							$loop = $this->newInstance($this->root)->find('> *')->elements;
+							$loop = $this->root->childNodes;
+						else
+							$loop = $this->elements;
+						// import nodes if needed
+						$insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
+							: $target->documentWrapper->import($loop);
+					} else {
+						$insertTo = $this->elements;
+						if ($target->documentFragment && $target->stackIsRoot())
+							// get all body children
+							//							$loop = $target->find('body > *')->elements;
+							$loop = $target->root->childNodes;
+						else
+							$loop = $target->elements;
+						// import nodes if needed
+						$insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
+							: $this->documentWrapper->import($loop);
+					}
+					// DOMNODE
+				} elseif ($target instanceof \DOMNODE) {
+					// import node if needed
+					//					if ( $target->ownerDocument != $this->DOM )
+					//						$target = $this->DOM->importNode($target, true);
+					if ($to) {
+						$insertTo = array(
+							$target
+						);
+						if ($this->documentFragment && $this->stackIsRoot())
+							// get all body children
+							$loop = $this->root->childNodes;
+						//							$loop = $this->find('body > *')->elements;
+						else
+							$loop = $this->elements;
+						foreach ($loop as $fromNode)
+							// import nodes if needed
+							$insertFrom[] = !$fromNode->ownerDocument->isSameNode(
+								$target->ownerDocument
+							) ? $target->ownerDocument->importNode($fromNode, true)
+								: $fromNode;
+					} else {
+						// import node if needed
+						if (!$target->ownerDocument->isSameNode($this->document))
+							$target = $this->document->importNode($target, true);
+						$insertTo     = $this->elements;
+						$insertFrom[] = $target;
+					}
+				}
+				break;
+		}
+		PhpQuery::debug(
+			"From " . count($insertFrom) . "; To " . count($insertTo)
+			. " nodes"
+		);
+		foreach ($insertTo as $insertNumber => $toNode) {
+			// we need static relative elements in some cases
+			switch ($type) {
+				case 'prependTo':
+				case 'prepend':
+					$firstChild = $toNode->firstChild;
+					break;
+				case 'insertAfter':
+				case 'after':
+					$nextSibling = $toNode->nextSibling;
+					break;
+			}
+			foreach ($insertFrom as $fromNode) {
+				// clone if inserted already before
+				$insert = $insertNumber ? $fromNode->cloneNode(true) : $fromNode;
+				switch ($type) {
+					case 'appendTo':
+					case 'append':
+						//						$toNode->insertBefore(
+						//							$fromNode,
+						//							$toNode->lastChild->nextSibling
+						//						);
+						$toNode->appendChild($insert);
+						$eventTarget = $insert;
+						break;
+					case 'prependTo':
+					case 'prepend':
+						$toNode->insertBefore($insert, $firstChild);
+						break;
+					case 'insertBefore':
+					case 'before':
+						if (!$toNode->parentNode)
+							throw new \Exception("No parentNode, can't do {$type}()");
+						else
+							$toNode->parentNode->insertBefore($insert, $toNode);
+						break;
+					case 'insertAfter':
+					case 'after':
+						if (!$toNode->parentNode)
+							throw new \Exception("No parentNode, can't do {$type}()");
+						else
+							$toNode->parentNode->insertBefore($insert, $nextSibling);
+						break;
+				}
+				// Mutation event
+				$event = new Dom\DOMEvent(array(
+											  'target' => $insert,
+											  'type'   => 'DOMNodeInserted'
+										  ));
+				PhpQueryEvents::trigger(
+					$this->getDocumentID(),
+					$event->type,
+					array(
+						$event
+					),
+					$insert
+				);
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $subject
+	 * @return Int
+	 */
+	public function index($subject)
+	{
+		$index   = -1;
+		$subject = $subject instanceof PhpQueryObject ? $subject->elements[0]
+			: $subject;
+		foreach ($this->newInstance() as $k => $node) {
+			if ($node->isSameNode($subject))
+				$index = $k;
+		}
+		return $index;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param unknown_type $start
+	 * @param unknown_type $end
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @testme
+	 */
+	public function slice($start, $end = null)
+	{
+		//		$last = count($this->elements)-1;
+		//		$end = $end
+		//			? min($end, $last)
+		//			: $last;
+		//		if ($start < 0)
+		//			$start = $last+$start;
+		//		if ($start > $last)
+		//			return array();
+		if ($end > 0)
+			$end = $end - $start;
+		return $this->newInstance(array_slice($this->elements, $start, $end));
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function reverse()
+	{
+		$this->elementsBackup = $this->elements;
+		$this->elements       = array_reverse($this->elements);
+		return $this->newInstance();
+	}
+
+	/**
+	 * Return joined text content.
+	 * @param null $text
+	 * @param null $callback1
+	 * @param null $callback2
+	 * @param null $callback3
+	 * @return String
+	 */
+	public function text($text = null, $callback1 = null, $callback2 = null, $callback3 = null)
+	{
+		if (isset($text))
+			return $this->html(htmlspecialchars($text));
+		$args   = func_get_args();
+		$args   = array_slice($args, 1);
+		$return = '';
+		foreach ($this->elements as $node) {
+			$text = $node->textContent;
+			if (count($this->elements) > 1 && $text)
+				$text .= "\n";
+			foreach ($args as $callback) {
+				$text = PhpQuery::callbackRun(
+					$callback,
+					array(
+						$text
+					)
+				);
+			}
+			$return .= $text;
+		}
+		return $return;
+	}
+
+	/**
+	 * @param null $attr
+	 * @return The text content of each matching element, like
+	 * text() but returns an array with one entry per matched element.
+	 * Read only.
+	 */
+	public function texts($attr = null)
+	{
+		$results = array();
+		foreach ($this->elements as $node) {
+			$results[] = $node->textContent;
+		}
+		return $results;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $class
+	 * @param null $file
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function plugin($class, $file = null)
+	{
+		PhpQuery::plugin($class, $file);
+		return $this;
+	}
+
+	/**
+	 * Deprecated, use $pq->plugin() instead.
+	 *
+	 * @deprecated
+	 * @param $class
+	 * @param $file
+	 * @return unknown_type
+	 */
+	public static function extend($class, $file = null)
+	{
+		return self::plugin($class, $file);
+	}
+
+	/**
+	 *
+	 * @access private
+	 * @param $method
+	 * @param $args
+	 * @throws \Exception
+	 * @return unknown_type
+	 */
+	public function __call($method, $args)
+	{
+		$aliasMethods = array(
+			'clone',
+			'empty'
+		);
+		if (isset(PhpQuery::$extendMethods[$method])) {
+			array_unshift($args, $this);
+			return PhpQuery::callbackRun(PhpQuery::$extendMethods[$method], $args);
+		} else if (isset(PhpQuery::$pluginsMethods[$method])) {
+			array_unshift($args, $this);
+			$class     = PhpQuery::$pluginsMethods[$method];
+			$realClass = "\\PhpQuery\\Plugin\\$class";
+			$return    = call_user_func_array(
+				array(
+					$realClass,
+					$method
+				),
+				$args
+			);
+			// XXX deprecate ?
+			return is_null($return) ? $this : $return;
+		} else if (in_array($method, $aliasMethods)) {
+			return call_user_func_array(
+				array(
+					$this,
+					'_' . $method
+				),
+				$args
+			);
+		} else
+			throw new \Exception("Method '{$method}' doesnt exist");
+	}
+
+	/**
+	 * Safe rename of next().
+	 *
+	 * Use it ONLY when need to call next() on an iterated object (in same time).
+	 * Normaly there is no need to do such thing ;)
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @access private
+	 */
+	public function _next($selector = null)
+	{
+		return $this->newInstance($this->getElementSiblings('nextSibling', $selector, true));
+	}
+
+	/**
+	 * Use prev() and next().
+	 *
+	 * @deprecated
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @access private
+	 */
+	public function _prev($selector = null)
+	{
+		return $this->prev($selector);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function prev($selector = null)
+	{
+		return $this->newInstance($this->getElementSiblings('previousSibling', $selector, true));
+	}
+
+	/**
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo
+	 */
+	public function prevAll($selector = null)
+	{
+		return $this->newInstance($this->getElementSiblings('previousSibling', $selector));
+	}
+
+	/**
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo FIXME: returns source elements insted of next siblings
+	 */
+	public function nextAll($selector = null)
+	{
+		return $this->newInstance($this->getElementSiblings('nextSibling', $selector));
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function getElementSiblings($direction, $selector = null, $limitToOne = false)
+	{
+		$stack = array();
+		$count = 0;
+		foreach ($this->stack() as $node) {
+			$test = $node;
+			while (isset($test->{$direction}) && $test->{$direction}) {
+				$test = $test->{$direction};
+				if (!$test instanceof \DOMElement)
+					continue;
+				$stack[] = $test;
+				if ($limitToOne)
+					break;
+			}
+		}
+		if ($selector) {
+			$stackOld       = $this->elements;
+			$this->elements = $stack;
+			$stack          = $this->filter($selector, true)->stack();
+			$this->elements = $stackOld;
+		}
+		return $stack;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function siblings($selector = null)
+	{
+		$stack    = array();
+		$siblings = array_merge(
+			$this->getElementSiblings('previousSibling', $selector),
+			$this->getElementSiblings('nextSibling', $selector)
+		);
+		foreach ($siblings as $node) {
+			if (!$this->elementsContainsNode($node, $stack))
+				$stack[] = $node;
+		}
+		return $this->newInstance($stack);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function not($selector = null)
+	{
+		if (is_string($selector))
+			PhpQuery::debug(
+				array(
+					'not',
+					$selector
+				)
+			);
+		else
+			PhpQuery::debug('not');
+		$stack = array();
+		if ($selector instanceof self || $selector instanceof \DOMNODE) {
+			foreach ($this->stack() as $node) {
+				if ($selector instanceof self) {
+					$matchFound = false;
+					foreach ($selector->stack() as $notNode) {
+						if ($notNode->isSameNode($node))
+							$matchFound = true;
+					}
+					if (!$matchFound)
+						$stack[] = $node;
+				} else if ($selector instanceof \DOMNODE) {
+					if (!$selector->isSameNode($node))
+						$stack[] = $node;
+				} else {
+					if (!$this->is($selector))
+						$stack[] = $node;
+				}
+			}
+		} else {
+			$orgStack = $this->stack();
+			$matched  = $this->filter($selector, true)->stack();
+			//			$matched = array();
+			//			// simulate OR in filter() instead of AND 5y
+			//			foreach($this->parseSelector($selector) as $s) {
+			//				$matched = array_merge($matched,
+			//					$this->filter(array($s))->stack()
+			//				);
+			//			}
+			foreach ($orgStack as $node)
+				if (!$this->elementsContainsNode($node, $matched))
+					$stack[] = $node;
+		}
+		return $this->newInstance($stack);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param string|PhpQueryObject
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function add($selector = null)
+	{
+		if (!$selector)
+			return $this;
+		$stack                = array();
+		$this->elementsBackup = $this->elements;
+		$found                = PhpQuery::pq($selector, $this->getDocumentID());
+		$this->merge($found->elements);
+		return $this->newInstance();
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function merge()
+	{
+		foreach (func_get_args() as $nodes)
+			foreach ($nodes as $newNode)
+				if (!$this->elementsContainsNode($newNode))
+					$this->elements[] = $newNode;
+	}
+
+	/**
+	 * @access private
+	 * TODO refactor to stackContainsNode
+	 */
+	protected function elementsContainsNode($nodeToCheck, $elementsStack = null)
+	{
+		$loop = !is_null($elementsStack) ? $elementsStack : $this->elements;
+		foreach ($loop as $node) {
+			if ($node->isSameNode($nodeToCheck))
+				return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function parent($selector = null)
+	{
+		$stack = array();
+		foreach ($this->elements as $node)
+			if ($node->parentNode
+				&& !$this->elementsContainsNode($node->parentNode, $stack)
+			)
+				$stack[] = $node->parentNode;
+		$this->elementsBackup = $this->elements;
+		$this->elements       = $stack;
+		if ($selector)
+			$this->filter($selector, true);
+		return $this->newInstance();
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param null $selector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function parents($selector = null)
+	{
+		$stack = array();
+		if (!$this->elements)
+			$this->debug('parents() - stack empty');
+		foreach ($this->elements as $node) {
+			$test = $node;
+			while ($test->parentNode) {
+				$test = $test->parentNode;
+				if ($this->isRoot($test))
+					break;
+				if (!$this->elementsContainsNode($test, $stack)) {
+					$stack[] = $test;
+					continue;
+				}
+			}
+		}
+		$this->elementsBackup = $this->elements;
+		$this->elements       = $stack;
+		if ($selector)
+			$this->filter($selector, true);
+		return $this->newInstance();
+	}
+
+	/**
+	 * Internal stack iterator.
+	 *
+	 * @access private
+	 * @param null $nodeTypes
+	 * @return array {Array.<DOMNode>}
+	 */
+	public function stack($nodeTypes = null)
+	{
+		if (!isset($nodeTypes))
+			return $this->elements;
+		if (!is_array($nodeTypes))
+			$nodeTypes = array(
+				$nodeTypes
+			);
+		$return = array();
+		foreach ($this->elements as $node) {
+			if (in_array($node->nodeType, $nodeTypes))
+				$return[] = $node;
+		}
+		return $return;
+	}
+
+	// TODO phpdoc; $oldAttr is result of hasAttribute, before any changes
+	protected function attrEvents($attr, $oldAttr, $oldValue, $node)
+	{
+		// skip events for XML documents
+		if (!$this->isXHTML() && !$this->isHTML())
+			return;
+		$event = null;
+		// identify
+		$isInputValue = $node->tagName == 'input'
+			&& (in_array(
+					$node->getAttribute('type'),
+					array(
+						'text',
+						'password',
+						'hidden'
+					)
+				) || !$node->getAttribute('type'));
+		$isRadio      = $node->tagName == 'input'
+			&& $node->getAttribute('type') == 'radio';
+		$isCheckbox   = $node->tagName == 'input'
+			&& $node->getAttribute('type') == 'checkbox';
+		$isOption     = $node->tagName == 'option';
+		if ($isInputValue && $attr == 'value'
+			&& $oldValue != $node->getAttribute($attr)
+		) {
+			$event = new Dom\DOMEvent(array(
+										  'target' => $node,
+										  'type'   => 'change'
+									  ));
+		} else if (($isRadio || $isCheckbox) && $attr == 'checked'
+			&& (
+				// check
+				(!$oldAttr && $node->hasAttribute($attr))
+				// un-check
+				|| (!$node->hasAttribute($attr) && $oldAttr))
+		) {
+			$event = new Dom\DOMEvent(array(
+										  'target' => $node,
+										  'type'   => 'change'
+									  ));
+		} else if ($isOption && $node->parentNode && $attr == 'selected'
+			&& (
+				// select
+				(!$oldAttr && $node->hasAttribute($attr))
+				// un-select
+				|| (!$node->hasAttribute($attr) && $oldAttr))
+		) {
+			$event = new Dom\DOMEvent(array(
+										  'target' => $node->parentNode,
+										  'type'   => 'change'
+									  ));
+		}
+		if ($event) {
+			PhpQueryEvents::trigger(
+				$this->getDocumentID(),
+				$event->type,
+				array(
+					$event
+				),
+				$node
+			);
+		}
+	}
+
+	public function attr($attr = null, $value = null)
+	{
+		foreach ($this->stack(1) as $node) {
+			if (!is_null($value)) {
+				$loop = $attr == '*' ? $this->getNodeAttrs($node)
+					: array(
+						$attr
+					);
+				foreach ($loop as $a) {
+					$oldValue = $node->getAttribute($a);
+					$oldAttr  = $node->hasAttribute($a);
+					// TODO raises an error when charset other than UTF-8
+					// while document's charset is also not UTF-8
+					@$node->setAttribute($a, $value);
+					$this->attrEvents($a, $oldAttr, $oldValue, $node);
+				}
+			} else if ($attr == '*') {
+				// jQuery difference
+				$return = array();
+				foreach ($node->attributes as $n => $v)
+					$return[$n] = $v->value;
+				return $return;
+			} else
+				return $node->hasAttribute($attr) ? $node->getAttribute($attr) : null;
+		}
+		return is_null($value) ? '' : $this;
+	}
+
+	/**
+	 * @param null $attr
+	 * @return The same attribute of each matching element, like
+	 * attr() but returns an array with one entry per matched element.
+	 * Read only.
+	 */
+	public function attrs($attr = null)
+	{
+		$results = array();
+		foreach ($this->stack(1) as $node) {
+			$results[] = $node->hasAttribute($attr) ? $node->getAttribute($attr)
+				: null;
+		}
+		return $results;
+	}
+
+	/**
+	 * @access private
+	 */
+	protected function getNodeAttrs($node)
+	{
+		$return = array();
+		foreach ($node->attributes as $n => $o)
+			$return[] = $n;
+		return $return;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $attr
+	 * @param $code
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo check CDATA ???
+	 */
+	public function attrPHP($attr, $code)
+	{
+		if (!is_null($code)) {
+			$value = '<' . '?php ' . $code . ' ?' . '>';
+			// TODO tempolary solution
+			// http://code.google.com/p/phpquery/issues/detail?id=17
+			//			if (function_exists('mb_detect_encoding') && mb_detect_encoding($value) == 'ASCII')
+			//				$value	= mb_convert_encoding($value, 'UTF-8', 'HTML-ENTITIES');
+		}
+		foreach ($this->stack(1) as $node) {
+			if (!is_null($code)) {
+				//				$attrNode = $this->DOM->createAttribute($attr);
+				$node->setAttribute($attr, $value);
+				//				$attrNode->value = $value;
+				//				$node->appendChild($attrNode);
+			} else if ($attr == '*') {
+				// jQuery diff
+				$return = array();
+				foreach ($node->attributes as $n => $v)
+					$return[$n] = $v->value;
+				return $return;
+			} else
+				return $node->getAttribute($attr);
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $attr
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function removeAttr($attr)
+	{
+		foreach ($this->stack(1) as $node) {
+			$loop = $attr == '*' ? $this->getNodeAttrs($node)
+				: array(
+					$attr
+				);
+			foreach ($loop as $a) {
+				$oldValue = $node->getAttribute($a);
+				$node->removeAttribute($a);
+				$this->attrEvents($a, $oldValue, null, $node);
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Return form element value.
+	 *
+	 * @param null $val
+	 * @return String Fields value.
+	 */
+	public function val($val = null)
+	{
+		if (!isset($val)) {
+			if ($this->eq(0)->is('select')) {
+				$selected = $this->eq(0)->find('option[selected=selected]');
+				if ($selected->is('[value]'))
+					return $selected->attr('value');
+				else
+					return $selected->text();
+			} else if ($this->eq(0)->is('textarea'))
+				return $this->eq(0)->markup();
+			else
+				return $this->eq(0)->attr('value');
+		} else {
+			$_val = null;
+			foreach ($this->stack(1) as $node) {
+				$node = pq($node, $this->getDocumentID());
+				if (is_array($val)
+					&& in_array(
+						$node->attr('type'),
+						array(
+							'checkbox',
+							'radio'
+						)
+					)
+				) {
+					$isChecked = in_array($node->attr('value'), $val)
+						|| in_array($node->attr('name'), $val);
+					if ($isChecked)
+						$node->attr('checked', 'checked');
+					else
+						$node->removeAttr('checked');
+				} else if ($node->get(0)->tagName == 'select') {
+					if (!isset($_val)) {
+						$_val = array();
+						if (!is_array($val))
+							$_val = array(
+								(string) $val
+							);
+						else
+							foreach ($val as $v)
+								$_val[] = $v;
+					}
+					foreach ($node['option']->stack(1) as $option) {
+						$option   = pq($option, $this->getDocumentID());
+						$selected = false;
+						// XXX: workaround for string comparsion, see issue #96
+						// http://code.google.com/p/phpquery/issues/detail?id=96
+						$selected = is_null($option->attr('value')) ? in_array($option->markup(), $_val)
+							: in_array($option->attr('value'), $_val);
+						//						$optionValue = $option->attr('value');
+						//						$optionText = $option->text();
+						//						$optionTextLenght = mb_strlen($optionText);
+						//						foreach($_val as $v)
+						//							if ($optionValue == $v)
+						//								$selected = true;
+						//							else if ($optionText == $v && $optionTextLenght == mb_strlen($v))
+						//								$selected = true;
+						if ($selected)
+							$option->attr('selected', 'selected');
+						else
+							$option->removeAttr('selected');
+					}
+				} else if ($node->get(0)->tagName == 'textarea')
+					$node->markup($val);
+				else
+					$node->attr('value', $val);
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function andSelf()
+	{
+		if ($this->previous)
+			$this->elements = array_merge($this->elements, $this->previous->elements);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $className
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function addClass($className)
+	{
+		if (!$className)
+			return $this;
+		foreach ($this->stack(1) as $node) {
+			if (!$this->is(".$className", $node))
+				$node->setAttribute(
+					'class',
+					trim(
+						$node->getAttribute('class') . ' '
+						. $className
+					)
+				);
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $className
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function addClassPHP($className)
+	{
+		foreach ($this->stack(1) as $node) {
+			$classes  = $node->getAttribute('class');
+			$newValue = $classes ? $classes . ' <' . '?php ' . $className . ' ?'
+				. '>' : '<' . '?php ' . $className . ' ?' . '>';
+			$node->setAttribute('class', $newValue);
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param    string $className
+	 * @return    bool
+	 */
+	public function hasClass($className)
+	{
+		foreach ($this->stack(1) as $node) {
+			if ($this->is(".$className", $node))
+				return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $className
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function removeClass($className)
+	{
+		foreach ($this->stack(1) as $node) {
+			$classes = explode(' ', $node->getAttribute('class'));
+			if (in_array($className, $classes)) {
+				$classes = array_diff(
+					$classes,
+					array(
+						$className
+					)
+				);
+				if ($classes)
+					$node->setAttribute('class', implode(' ', $classes));
+				else
+					$node->removeAttribute('class');
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param $className
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function toggleClass($className)
+	{
+		foreach ($this->stack(1) as $node) {
+			if ($this->is($node, '.' . $className))
+				$this->removeClass($className);
+			else
+				$this->addClass($className);
+		}
+		return $this;
+	}
+
+	/**
+	 * Proper name without underscore (just ->empty()) also works.
+	 *
+	 * Removes all child nodes from the set of matched elements.
+	 *
+	 * Example:
+	 * pq("p")._empty()
+	 *
+	 * HTML:
+	 * <p>Hello, <span>Person</span> <a href="#">and person</a></p>
+	 *
+	 * Result:
+	 * [ <p></p> ]
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @access private
+	 */
+	public function _empty()
+	{
+		foreach ($this->stack(1) as $node) {
+			// thx to 'dave at dgx dot cz'
+			$node->nodeValue = '';
+		}
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param array|string $callback Expects $node as first param, $index as second
+	 * @param null         $param1
+	 * @param null         $param2
+	 * @param null         $param3
+	 * @internal param array $scope External variables passed to callback. Use compact('varName1', 'varName2'...) and extract($scope)
+	 * @internal param array $arg1 Will ba passed as third and futher args to callback.
+	 * @internal param array $arg2 Will ba passed as fourth and futher args to callback, and so on...
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function each($callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		$paramStructure = null;
+		if (func_num_args() > 1) {
+			$paramStructure = func_get_args();
+			$paramStructure = array_slice($paramStructure, 1);
+		}
+		foreach ($this->elements as $v)
+			PhpQuery::callbackRun(
+				$callback,
+				array(
+					$v
+				),
+				$paramStructure
+			);
+		return $this;
+	}
+
+	/**
+	 * Run callback on actual object.
+	 *
+	 * @param      $callback
+	 * @param null $param1
+	 * @param null $param2
+	 * @param null $param3
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function callback($callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		$params    = func_get_args();
+		$params[0] = $this;
+		PhpQuery::callbackRun($callback, $params);
+		return $this;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param      $callback
+	 * @param null $param1
+	 * @param null $param2
+	 * @param null $param3
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 * @todo add $scope and $args as in each() ???
+	 */
+	public function map($callback, $param1 = null, $param2 = null, $param3 = null)
+	{
+		//		$stack = array();
+		////		foreach($this->newInstance() as $node) {
+		//		foreach($this->newInstance() as $node) {
+		//			$result = call_user_func($callback, $node);
+		//			if ($result)
+		//				$stack[] = $result;
+		//		}
+		$params = func_get_args();
+		array_unshift($params, $this->elements);
+		return $this->newInstance(
+			call_user_func_array(
+				array(
+					'\\PhpQuery\\PhpQuery',
+					'map'
+				),
+				$params
+			)
+		//			PhpQuery::map($this->elements, $callback)
+		);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param <type> $key
+	 * @param <type> $value
+	 * @return $this
+	 */
+	public function data($key, $value = null)
+	{
+		if (!isset($value)) {
+			// TODO? implement specific jQuery behavior od returning parent values
+			// is child which we look up doesn't exist
+			return PhpQuery::data($this->get(0), $key, $value, $this->getDocumentID());
+		} else {
+			foreach ($this as $node)
+				PhpQuery::data($node, $key, $value, $this->getDocumentID());
+			return $this;
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param <type> $key
+	 * @return $this
+	 */
+	public function removeData($key)
+	{
+		foreach ($this as $node)
+			PhpQuery::removeData($node, $key, $this->getDocumentID());
+		return $this;
+	}
+	// INTERFACE IMPLEMENTATIONS
+
+	// ITERATOR INTERFACE
+	/**
+	 * @access private
+	 */
+	public function rewind()
+	{
+		$this->debug('iterating foreach');
+		//		PhpQuery::selectDocument($this->getDocumentID());
+		$this->elementsBackup    = $this->elements;
+		$this->elementsInterator = $this->elements;
+		$this->valid             = isset($this->elements[0]) ? 1 : 0;
+		// 		$this->elements = $this->valid
+		// 			? array($this->elements[0])
+		// 			: array();
+		$this->current = 0;
+	}
+
+	/**
+	 * @access private
+	 */
+	public function current()
+	{
+		return $this->elementsInterator[$this->current];
+	}
+
+	/**
+	 * @access private
+	 */
+	public function key()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Double-function method.
+	 *
+	 * First: main iterator interface method.
+	 * Second: Returning next sibling, alias for _next().
+	 *
+	 * Proper functionality is choosed automagicaly.
+	 *
+	 * @see PhpQueryObject::_next()
+	 * @param null $cssSelector
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 */
+	public function next($cssSelector = null)
+	{
+		//		if ($cssSelector || $this->valid)
+		//			return $this->_next($cssSelector);
+		$this->valid = isset($this->elementsInterator[$this->current + 1]) ? true
+			: false;
+		if (!$this->valid && $this->elementsInterator) {
+			$this->elementsInterator = null;
+		} else if ($this->valid) {
+			$this->current++;
+		} else {
+			return $this->_next($cssSelector);
+		}
+	}
+
+	/**
+	 * @access private
+	 */
+	public function valid()
+	{
+		return $this->valid;
+	}
+	// ITERATOR INTERFACE END
+	// ARRAYACCESS INTERFACE
+	/**
+	 * @access private
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->find($offset)->size() > 0;
+	}
+
+	/**
+	 * @access private
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->find($offset);
+	}
+
+	/**
+	 * @access private
+	 */
+	public function offsetSet($offset, $value)
+	{
+		//		$this->find($offset)->replaceWith($value);
+		$this->find($offset)->html($value);
+	}
+
+	/**
+	 * @access private
+	 */
+	public function offsetUnset($offset)
+	{
+		// empty
+		throw new \Exception("Can't do unset, use array interface only for calling queries and replacing HTML.");
+	}
+	// ARRAYACCESS INTERFACE END
+	/**
+	 * Returns node's XPath.
+	 *
+	 * @param unknown_type $oneNode
+	 * @param null         $namespace
+	 * @return string
+	 * @TODO   use native getNodePath is avaible
+	 * @access private
+	 */
+	protected function getNodeXpath($oneNode = null, $namespace = null)
+	{
+		$return = array();
+		$loop   = $oneNode ? array(
+			$oneNode
+		) : $this->elements;
+		//		if ($namespace)
+		//			$namespace .= ':';
+		foreach ($loop as $node) {
+			if ($node instanceof \DOMDocument) {
+				$return[] = '';
+				continue;
+			}
+			$xpath = array();
+			while (!($node instanceof \DOMDocument)) {
+				$i       = 1;
+				$sibling = $node;
+				while ($sibling->previousSibling) {
+					$sibling   = $sibling->previousSibling;
+					$isElement = $sibling instanceof \DOMElement;
+					if ($isElement && $sibling->tagName == $node->tagName)
+						$i++;
+				}
+				$xpath[] = $this->isXML() ? "*[local-name()='{$node->tagName}'][{$i}]"
+					: "{$node->tagName}[{$i}]";
+				$node    = $node->parentNode;
+			}
+			$xpath    = join('/', array_reverse($xpath));
+			$return[] = '/' . $xpath;
+		}
+		return $oneNode ? $return[0] : $return;
+	}
+
+	// HELPERS
+	public function whois($oneNode = null)
+	{
+		$return = array();
+		$loop   = $oneNode ? array(
+			$oneNode
+		) : $this->elements;
+		foreach ($loop as $node) {
+			if (isset($node->tagName)) {
+				$tag      = in_array(
+					$node->tagName,
+					array(
+						'php',
+						'js'
+					)
+				) ? strtoupper($node->tagName) : $node->tagName;
+				$return[] = $tag
+					. ($node->getAttribute('id') ? '#' . $node->getAttribute('id') : '')
+					. ($node->getAttribute('class') ? '.'
+						. join('.', explode(' ', $node->getAttribute('class'))) : '')
+					. ($node->getAttribute('name') ? '[name="'
+						. $node->getAttribute('name') . '"]' : '')
+					. ($node->getAttribute('value')
+					&& strpos($node->getAttribute('value'), '<' . '?php') === false ? '[value="'
+						. substr(str_replace("\n", '', $node->getAttribute('value')), 0, 15)
+						. '"]' : '')
+					. ($node->getAttribute('value')
+					&& strpos($node->getAttribute('value'), '<' . '?php') !== false ? '[value=PHP]'
+						: '') . ($node->getAttribute('selected') ? '[selected]' : '')
+					. ($node->getAttribute('checked') ? '[checked]' : '');
+			} else if ($node instanceof \DOMTEXT) {
+				if (trim($node->textContent))
+					$return[] = 'Text:'
+						. substr(str_replace("\n", ' ', $node->textContent), 0, 15);
+			} else {
+
+			}
+		}
+		return $oneNode && isset($return[0]) ? $return[0] : $return;
+	}
+
+	/**
+	 * Dump htmlOuter and preserve chain. Usefull for debugging.
+	 *
+	 * @return PhpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery
+	 *
+	 */
+	public function dump()
+	{
+		print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+		PhpQuery::$debug = false;
+		//		print __FILE__.':'.__LINE__."\n";
+		var_dump($this->htmlOuter());
+		return $this;
+	}
+
+	public function dumpWhois()
+	{
+		print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+		$debug           = PhpQuery::$debug;
+		PhpQuery::$debug = false;
+		//		print __FILE__.':'.__LINE__."\n";
+		var_dump('whois', $this->whois());
+		PhpQuery::$debug = $debug;
+		return $this;
+	}
+
+	public function dumpLength()
+	{
+		print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+		$debug           = PhpQuery::$debug;
+		PhpQuery::$debug = false;
+		//		print __FILE__.':'.__LINE__."\n";
+		var_dump('length', $this->length());
+		PhpQuery::$debug = $debug;
+		return $this;
+	}
+
+	public function dumpTree($html = true, $title = true)
+	{
+		$output          = $title ? 'DUMP #' . (PhpQuery::$dumpCount++) . " \n" : '';
+		$debug           = PhpQuery::$debug;
+		PhpQuery::$debug = false;
+		foreach ($this->stack() as $node)
+			$output .= $this->__dumpTree($node);
+		PhpQuery::$debug = $debug;
+		print $html ? nl2br(str_replace(' ', '&nbsp;', $output)) : $output;
+		return $this;
+	}
+
+	private function __dumpTree($node, $intend = 0)
+	{
+		$whois  = $this->whois($node);
+		$return = '';
+		if ($whois)
+			$return .= str_repeat(' - ', $intend) . $whois . "\n";
+		if (isset($node->childNodes))
+			foreach ($node->childNodes as $chNode)
+				$return .= $this->__dumpTree($chNode, $intend + 1);
+		return $return;
+	}
+
+	/**
+	 * Dump htmlOuter and stop script execution. Usefull for debugging.
+	 *
+	 */
+	public function dumpDie()
+	{
+		print __FILE__ . ':' . __LINE__;
+		var_dump($this->htmlOuter());
+		die();
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -443,7 +443,7 @@ 
                     $tmp .= $query[$i];
                     $i++;
                 }
-                $return[] = '#' . $tmp;
+                $return[] = '#'.$tmp;
                 // SPECIAL CHARS
             } else if (in_array($c, $specialChars)) {
                 $return[] = $c;
@@ -782,7 +782,7 @@ 
                 : $this->getNodeXpath($stackNode);
             // FIXME pseudoclasses-only query, support XML
             $query = $XQuery == '//' && $xpath == '/html[1]' ? '//*'
-                : $xpath . $XQuery;
+                : $xpath.$XQuery;
             $this->debug("XPATH: {$query}");
             // run query, get elements
             $nodes = $this->xpath->query($query);
@@ -794,7 +794,7 @@ 
                 $matched = false;
                 if ($compare) {
                     PhpQuery::$debug ? $this->debug(
-                        "Found: " . $this->whois($node)
+                        "Found: ".$this->whois($node)
                         . ", comparing with {$compare}()"
                     ) : null;
                     $PhpQueryDebug   = PhpQuery::$debug;
@@ -823,7 +823,7 @@ 
                 }
             }
             if (PhpQuery::$debug) {
-                $this->debug("Matched " . count($debug) . ": " . implode(', ', $debug));
+                $this->debug("Matched ".count($debug).": ".implode(', ', $debug));
             }
             if ($detachAfter)
                 $this->root->removeChild($detachAfter);
@@ -902,7 +902,7 @@ 
                 } else if ($s[0] == '#') {
                     if ($delimiterBefore)
                         $XQuery .= '*';
-                    $XQuery .= "[@id='" . substr($s, 1) . "']";
+                    $XQuery .= "[@id='".substr($s, 1)."']";
                     // ATTRIBUTES
                 } else if ($s[0] == '[') {
                     if ($delimiterBefore)
@@ -1026,9 +1026,9 @@ 
             case 'odd':
                 $stack = array();
                 foreach ($this->elements as $i => $node) {
-                    if ($class == 'even' && ($i % 2) == 0)
+                    if ($class == 'even' && ($i%2) == 0)
                         $stack[] = $node;
-                    else if ($class == 'odd' && $i % 2)
+                    else if ($class == 'odd' && $i%2)
                         $stack[] = $node;
                 }
                 $this->elements = $stack;
@@ -1235,7 +1235,7 @@ 
                     break;
                 // nth-child(n+b) to nth-child(1n+b)
                 if ($param{0} == 'n')
-                    $param = '1' . $param;
+                    $param = '1'.$param;
                 // :nth-child(index/even/odd/equation)
                 if ($param == 'even' || $param == 'odd')
                     $mapped = $this->map(
@@ -1480,13 +1480,13 @@ 
                                         // quotemeta used insted of preg_quote
                                         // http://code.google.com/p/phpquery/issues/detail?id=76
                                         case '^':
-                                            $pattern = '^' . $val;
+                                            $pattern = '^'.$val;
                                             break;
                                         case '*':
-                                            $pattern = '.*' . $val . '.*';
+                                            $pattern = '.*'.$val.'.*';
                                             break;
                                         case '$':
-                                            $pattern = '.*' . $val . '$';
+                                            $pattern = '.*'.$val.'$';
                                             break;
                                     }
                                     // cut last character
@@ -1548,7 +1548,7 @@ 
         if ($_skipHistory) {
             return $this;
         } else {
-            $this->debug("Stack length after filter(): " . count($finalStack));
+            $this->debug("Stack length after filter(): ".count($finalStack));
             return $this->newInstance();
         }
     }
@@ -1671,14 +1671,14 @@ 
             $styles = array();
             foreach ($this->data('phpquery_css') as $k => $v) {
                 if ($v['specificity'] >= 1000) {
-                    $styles[$k] = trim($k) . ':' . trim($v['value']);
+                    $styles[$k] = trim($k).':'.trim($v['value']);
                 }
             }
             ksort($styles);
             if (empty($styles)) {
                 $this->removeAttr('style');
             } elseif (PhpQuery::$enableCssShorthand) {
-                $parser = new \Sabberworm\CSS\Parser('{' . join(';', $styles) . '}');
+                $parser = new \Sabberworm\CSS\Parser('{'.join(';', $styles).'}');
                 $doc    = $parser->parse();
                 $doc->createShorthands();
                 $style = trim($doc->__toString(), "\n\r\t {}");
@@ -1735,11 +1735,11 @@ 
             $style    = strlen($style) ? explode(';', $style) : array();
             foreach ($this->attribute_css_mapping as $map => $css_equivalent) {
                 if ($el->hasAttribute($map)) {
-                    $style[] = $css_equivalent . ':' . pq($el)->attr($map);
+                    $style[] = $css_equivalent.':'.pq($el)->attr($map);
                 }
             }
             if (count($style)) {
-                $CssParser   = new CssParser('#ruleset {' . implode(';', $style) . '}');
+                $CssParser   = new CssParser('#ruleset {'.implode(';', $style).'}');
                 $CssDocument = $CssParser->parse();
                 $ruleset     = $CssDocument->getAllRulesets();
                 $ruleset     = reset($ruleset);
@@ -2739,7 +2739,7 @@ 
                 break;
         }
         PhpQuery::debug(
-            "From " . count($insertFrom) . "; To " . count($insertTo)
+            "From ".count($insertFrom)."; To ".count($insertTo)
             . " nodes"
         );
         foreach ($insertTo as $insertNumber => $toNode) {
@@ -2965,7 +2965,7 @@ 
             return call_user_func_array(
                 array(
                     $this,
-                    '_' . $method
+                    '_'.$method
                 ),
                 $args
             );
@@ -3378,7 +3378,7 @@ 
     public function attrPHP($attr, $code)
     {
         if (!is_null($code)) {
-            $value = '<' . '?php ' . $code . ' ?' . '>';
+            $value = '<'.'?php '.$code.' ?'.'>';
             // TODO tempolary solution
             // http://code.google.com/p/phpquery/issues/detail?id=17
             //			if (function_exists('mb_detect_encoding') && mb_detect_encoding($value) == 'ASCII')
@@ -3529,7 +3529,7 @@ 
                 $node->setAttribute(
                     'class',
                     trim(
-                        $node->getAttribute('class') . ' '
+                        $node->getAttribute('class').' '
                         . $className
                     )
                 );
@@ -3547,8 +3547,8 @@ 
     {
         foreach ($this->stack(1) as $node) {
             $classes  = $node->getAttribute('class');
-            $newValue = $classes ? $classes . ' <' . '?php ' . $className . ' ?'
-                . '>' : '<' . '?php ' . $className . ' ?' . '>';
+            $newValue = $classes ? $classes.' <'.'?php '.$className.' ?'
+                . '>' : '<'.'?php '.$className.' ?'.'>';
             $node->setAttribute('class', $newValue);
         }
         return $this;
@@ -3604,7 +3604,7 @@ 
     public function toggleClass($className)
     {
         foreach ($this->stack(1) as $node) {
-            if ($this->is($node, '.' . $className))
+            if ($this->is($node, '.'.$className))
                 $this->removeClass($className);
             else
                 $this->addClass($className);
@@ -3892,7 +3892,7 @@ 
                 $node    = $node->parentNode;
             }
             $xpath    = join('/', array_reverse($xpath));
-            $return[] = '/' . $xpath;
+            $return[] = '/'.$xpath;
         }
         return $oneNode ? $return[0] : $return;
     }
@@ -3906,7 +3906,7 @@ 
         ) : $this->elements;
         foreach ($loop as $node) {
             if (isset($node->tagName)) {
-                $tag      = in_array(
+                $tag = in_array(
                     $node->tagName,
                     array(
                         'php',
@@ -3914,18 +3914,18 @@ 
                     )
                 ) ? strtoupper($node->tagName) : $node->tagName;
                 $return[] = $tag
-                    . ($node->getAttribute('id') ? '#' . $node->getAttribute('id') : '')
+                    . ($node->getAttribute('id') ? '#'.$node->getAttribute('id') : '')
                     . ($node->getAttribute('class') ? '.'
                         . join('.', explode(' ', $node->getAttribute('class'))) : '')
                     . ($node->getAttribute('name') ? '[name="'
-                        . $node->getAttribute('name') . '"]' : '')
+                        . $node->getAttribute('name').'"]' : '')
                     . ($node->getAttribute('value')
-                    && strpos($node->getAttribute('value'), '<' . '?php') === false ? '[value="'
+                    && strpos($node->getAttribute('value'), '<'.'?php') === false ? '[value="'
                         . substr(str_replace("\n", '', $node->getAttribute('value')), 0, 15)
                         . '"]' : '')
                     . ($node->getAttribute('value')
-                    && strpos($node->getAttribute('value'), '<' . '?php') !== false ? '[value=PHP]'
-                        : '') . ($node->getAttribute('selected') ? '[selected]' : '')
+                    && strpos($node->getAttribute('value'), '<'.'?php') !== false ? '[value=PHP]'
+                        : '').($node->getAttribute('selected') ? '[selected]' : '')
                     . ($node->getAttribute('checked') ? '[checked]' : '');
             } else if ($node instanceof \DOMTEXT) {
                 if (trim($node->textContent))
@@ -3946,7 +3946,7 @@ 
      */
     public function dump()
     {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+        print 'DUMP #'.(PhpQuery::$dumpCount++).' ';
         PhpQuery::$debug = false;
         //		print __FILE__.':'.__LINE__."\n";
         var_dump($this->htmlOuter());
@@ -3955,7 +3955,7 @@ 
 
     public function dumpWhois()
     {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+        print 'DUMP #'.(PhpQuery::$dumpCount++).' ';
         $debug           = PhpQuery::$debug;
         PhpQuery::$debug = false;
         //		print __FILE__.':'.__LINE__."\n";
@@ -3966,7 +3966,7 @@ 
 
     public function dumpLength()
     {
-        print 'DUMP #' . (PhpQuery::$dumpCount++) . ' ';
+        print 'DUMP #'.(PhpQuery::$dumpCount++).' ';
         $debug           = PhpQuery::$debug;
         PhpQuery::$debug = false;
         //		print __FILE__.':'.__LINE__."\n";
@@ -3977,7 +3977,7 @@ 
 
     public function dumpTree($html = true, $title = true)
     {
-        $output          = $title ? 'DUMP #' . (PhpQuery::$dumpCount++) . " \n" : '';
+        $output          = $title ? 'DUMP #'.(PhpQuery::$dumpCount++)." \n" : '';
         $debug           = PhpQuery::$debug;
         PhpQuery::$debug = false;
         foreach ($this->stack() as $node)
@@ -3992,7 +3992,7 @@ 
         $whois  = $this->whois($node);
         $return = '';
         if ($whois)
-            $return .= str_repeat(' - ', $intend) . $whois . "\n";
+            $return .= str_repeat(' - ', $intend).$whois."\n";
         if (isset($node->childNodes))
             foreach ($node->childNodes as $chNode)
                 $return .= $this->__dumpTree($chNode, $intend + 1);
@@ -4005,7 +4005,7 @@ 
      */
     public function dumpDie()
     {
-        print __FILE__ . ':' . __LINE__;
+        print __FILE__.':'.__LINE__;
         var_dump($this->htmlOuter());
         die();
     }

Braces +493 added lines, -345 removed lines

@@ -562,10 +562,12 @@ 
         }
         foreach ($queries as $k => $q) {
             if (isset($q[0])) {
-                if (isset($q[0][0]) && $q[0][0] == ':')
-                    array_unshift($queries[$k], '*');
-                if ($q[0] != '>')
-                    array_unshift($queries[$k], ' ');
+                if (isset($q[0][0]) && $q[0][0] == ':') {
+                                    array_unshift($queries[$k], '*');
+                }
+                if ($q[0] != '>') {
+                                    array_unshift($queries[$k], ' ');
+                }
             }
         }
         return $queries;
@@ -585,21 +587,22 @@ 
         $args = func_get_args();
         $args = array_slice($args, 1);
         foreach ($args as $callback) {
-            if (is_array($return))
-                foreach ($return as $k => $v)
+            if (is_array($return)) {
+                            foreach ($return as $k => $v)
                     $return[$k] = PhpQuery::callbackRun(
                         $callback,
                         array(
                             $v
                         )
                     );
-            else
-                $return = PhpQuery::callbackRun(
+            } else {
+                            $return = PhpQuery::callbackRun(
                     $callback,
                     array(
                         $return
                     )
                 );
+            }
         }
         return $return;
     }
@@ -619,9 +622,9 @@ 
      */
     public function getString($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
     {
-        if ($index)
-            $return = $this->eq($index)->text();
-        else {
+        if ($index) {
+                    $return = $this->eq($index)->text();
+        } else {
             $return = array();
             for ($i = 0; $i < $this->size(); $i++) {
                 $return[] = $this->eq($i)->text();
@@ -656,9 +659,9 @@ 
      */
     public function getStrings($index = null, $callback1 = null, $callback2 = null, $callback3 = null)
     {
-        if ($index)
-            $return = $this->eq($index)->text();
-        else {
+        if ($index) {
+                    $return = $this->eq($index)->text();
+        } else {
             $return = array();
             for ($i = 0; $i < $this->size(); $i++) {
                 $return[] = $this->eq($i)->text();
@@ -668,21 +671,22 @@ 
             $args = array_slice($args, 1);
         }
         foreach ($args as $callback) {
-            if (is_array($return))
-                foreach ($return as $k => $v)
+            if (is_array($return)) {
+                            foreach ($return as $k => $v)
                     $return[$k] = PhpQuery::callbackRun(
                         $callback,
                         array(
                             $v
                         )
                     );
-            else
-                $return = PhpQuery::callbackRun(
+            } else {
+                            $return = PhpQuery::callbackRun(
                     $callback,
                     array(
                         $return
                     )
                 );
+            }
         }
         return $return;
     }
@@ -702,8 +706,9 @@ 
         $new->previous = $this;
         if (is_null($newStack)) {
             $new->elements = $this->elements;
-            if ($this->elementsBackup)
-                $this->elements = $this->elementsBackup;
+            if ($this->elementsBackup) {
+                            $this->elements = $this->elementsBackup;
+            }
         } else if (is_string($newStack)) {
             $new->elements = PhpQuery::pq($newStack, $this->getDocumentID())->stack();
         } else {
@@ -730,11 +735,13 @@ 
             $classesCount     = count($classes);
             $nodeClasses      = explode(' ', $node->getAttribute('class'));
             $nodeClassesCount = count($nodeClasses);
-            if ($classesCount > $nodeClassesCount)
-                return false;
+            if ($classesCount > $nodeClassesCount) {
+                            return false;
+            }
             $diff = count(array_diff($classes, $nodeClasses));
-            if (!$diff)
-                return true;
+            if (!$diff) {
+                            return true;
+            }
             // single-class
         } else {
             return in_array(
@@ -751,11 +758,13 @@ 
      */
     protected function runQuery($XQuery, $selector = null, $compare = null)
     {
-        if ($compare && !method_exists($this, $compare))
-            return false;
+        if ($compare && !method_exists($this, $compare)) {
+                    return false;
+        }
         $stack = array();
-        if (!$this->elements)
-            $this->debug('Stack empty, skipping...');
+        if (!$this->elements) {
+                    $this->debug('Stack empty, skipping...');
+        }
         //		var_dump($this->elements[0]->nodeType);
         // element, document
         foreach ($this->stack(
@@ -787,8 +796,9 @@ 
             // run query, get elements
             $nodes = $this->xpath->query($query);
             $this->debug("QUERY FETCHED");
-            if (!$nodes->length)
-                $this->debug('Nothing found');
+            if (!$nodes->length) {
+                            $this->debug('Nothing found');
+            }
             $debug = array();
             foreach ($nodes as $node) {
                 $matched = false;
@@ -810,23 +820,26 @@ 
                             $node
                         )
                     )
-                    )
-                        $matched = true;
+                    ) {
+                                            $matched = true;
+                    }
                     PhpQuery::$debug = $PhpQueryDebug;
                 } else {
                     $matched = true;
                 }
                 if ($matched) {
-                    if (PhpQuery::$debug)
-                        $debug[] = $this->whois($node);
+                    if (PhpQuery::$debug) {
+                                            $debug[] = $this->whois($node);
+                    }
                     $stack[] = $node;
                 }
             }
             if (PhpQuery::$debug) {
                 $this->debug("Matched " . count($debug) . ": " . implode(', ', $debug));
             }
-            if ($detachAfter)
-                $this->root->removeChild($detachAfter);
+            if ($detachAfter) {
+                            $this->root->removeChild($detachAfter);
+            }
         }
         $this->elements = $stack;
     }
@@ -841,9 +854,10 @@ 
      */
     public function find($selectors, $context = null, $noHistory = false)
     {
-        if (!$noHistory)
-            // backup last stack /for end()/
+        if (!$noHistory) {
+                    // backup last stack /for end()/
             $this->elementsBackup = $this->elements;
+        }
         // allow to define context
         // TODO combine code below with PhpQuery::pq() context guessing code
         //   as generic function
@@ -854,9 +868,10 @@ 
                 );
             } elseif (is_array($context)) {
                 $this->elements = array();
-                foreach ($context as $c)
-                    if ($c instanceof \DOMElement)
+                foreach ($context as $c) {
+                                    if ($c instanceof \DOMElement)
                         $this->elements[] = $c;
+                }
             } elseif ($context instanceof PhpQueryObject) {
                 $this->elements = $context->elements;
             }
@@ -900,13 +915,15 @@ 
                     }
                     // ID
                 } else if ($s[0] == '#') {
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
+                    if ($delimiterBefore) {
+                                            $XQuery .= '*';
+                    }
                     $XQuery .= "[@id='" . substr($s, 1) . "']";
                     // ATTRIBUTES
                 } else if ($s[0] == '[') {
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
+                    if ($delimiterBefore) {
+                                            $XQuery .= '*';
+                    }
                     // strip side brackets
                     $attr    = trim($s, '][');
                     $execute = false;
@@ -930,27 +947,31 @@ 
                     if ($execute) {
                         $this->runQuery($XQuery, $s, 'is');
                         $XQuery = '';
-                        if (!$this->length())
-                            break;
+                        if (!$this->length()) {
+                                                    break;
+                        }
                     }
                     // CLASSES
                 } else if ($s[0] == '.') {
                     // TODO use return $this->find("./self::*[contains(concat(\" \",@class,\" \"), \" $class \")]");
                     // thx wizDom ;)
-                    if ($delimiterBefore)
-                        $XQuery .= '*';
+                    if ($delimiterBefore) {
+                                            $XQuery .= '*';
+                    }
                     $XQuery .= '[@class]';
                     $this->runQuery($XQuery, $s, 'matchClasses');
                     $XQuery = '';
-                    if (!$this->length())
-                        break;
+                    if (!$this->length()) {
+                                            break;
+                    }
                     // ~ General Sibling Selector
                 } else if ($s[0] == '~') {
                     $this->runQuery($XQuery);
                     $XQuery         = '';
                     $this->elements = $this->siblings(substr($s, 1))->elements;
-                    if (!$this->length())
-                        break;
+                    if (!$this->length()) {
+                                            break;
+                    }
                     // + Adjacent sibling selectors
                 } else if ($s[0] == '+') {
                     // TODO /following-sibling::
@@ -962,13 +983,16 @@ 
                     foreach ($subElements as $node) {
                         // search first \DOMElement sibling
                         $test = $node->nextSibling;
-                        while ($test && !($test instanceof \DOMElement))
-                            $test = $test->nextSibling;
-                        if ($test && $this->is($subSelector, $test))
-                            $this->elements[] = $test;
+                        while ($test && !($test instanceof \DOMElement)) {
+                                                    $test = $test->nextSibling;
+                        }
+                        if ($test && $this->is($subSelector, $test)) {
+                                                    $this->elements[] = $test;
+                        }
+                    }
+                    if (!$this->length()) {
+                                            break;
                     }
-                    if (!$this->length())
-                        break;
                     // PSEUDO CLASSES
                 } else if ($s[0] == ':') {
                     // TODO optimization for :first :last
@@ -976,11 +1000,13 @@ 
                         $this->runQuery($XQuery);
                         $XQuery = '';
                     }
-                    if (!$this->length())
-                        break;
+                    if (!$this->length()) {
+                                            break;
+                    }
                     $this->pseudoClasses($s);
-                    if (!$this->length())
-                        break;
+                    if (!$this->length()) {
+                                            break;
+                    }
                     // DIRECT DESCENDANDS
                 } else if ($s == '>') {
                     $XQuery .= '/';
@@ -1000,9 +1026,10 @@ 
                 $this->runQuery($XQuery);
                 $XQuery = '';
             }
-            foreach ($this->elements as $node)
-                if (!$this->elementsContainsNode($node, $stack))
+            foreach ($this->elements as $node) {
+                            if (!$this->elementsContainsNode($node, $stack))
                     $stack[] = $node;
+            }
         }
         $this->elements = $stack;
         return $this->newInstance();
@@ -1026,10 +1053,11 @@ 
             case 'odd':
                 $stack = array();
                 foreach ($this->elements as $i => $node) {
-                    if ($class == 'even' && ($i % 2) == 0)
-                        $stack[] = $node;
-                    else if ($class == 'odd' && $i % 2)
-                        $stack[] = $node;
+                    if ($class == 'even' && ($i % 2) == 0) {
+                                            $stack[] = $node;
+                    } else if ($class == 'odd' && $i % 2) {
+                                            $stack[] = $node;
+                    }
                 }
                 $this->elements = $stack;
                 break;
@@ -1046,16 +1074,18 @@ 
                 $this->elements = array_slice($this->elements, 0, $args + 1);
                 break;
             case 'first':
-                if (isset($this->elements[0]))
-                    $this->elements = array(
+                if (isset($this->elements[0])) {
+                                    $this->elements = array(
                         $this->elements[0]
                     );
+                }
                 break;
             case 'last':
-                if ($this->elements)
-                    $this->elements = array(
+                if ($this->elements) {
+                                    $this->elements = array(
                         $this->elements[count($this->elements) - 1]
                     );
+                }
                 break;
             /*case 'parent':
           $stack = array();
@@ -1069,8 +1099,9 @@ 
                 $text  = trim($args, "\"'");
                 $stack = array();
                 foreach ($this->elements as $node) {
-                    if (mb_stripos($node->textContent, $text) === false)
-                        continue;
+                    if (mb_stripos($node->textContent, $text) === false) {
+                                            continue;
+                    }
                     $stack[] = $node;
                 }
                 $this->elements = $stack;
@@ -1084,16 +1115,18 @@ 
                 $args  = explode(',', str_replace(', ', ',', trim($args, "\"'")));
                 $start = $args[0];
                 $end   = isset($args[1]) ? $args[1] : null;
-                if ($end > 0)
-                    $end = $end - $start;
+                if ($end > 0) {
+                                    $end = $end - $start;
+                }
                 $this->elements = array_slice($this->elements, $start, $end);
                 break;
             case 'has':
                 $selector = trim($args, "\"'");
                 $stack    = array();
                 foreach ($this->stack(1) as $el) {
-                    if ($this->find($selector, $el, true)->length)
-                        $stack[] = $el;
+                    if ($this->find($selector, $el, true)->length) {
+                                            $stack[] = $el;
+                    }
                 }
                 $this->elements = $stack;
                 break;
@@ -1231,14 +1264,16 @@ 
                 break;
             case 'nth-child':
                 $param = trim($args, "\"'");
-                if (!$param)
-                    break;
+                if (!$param) {
+                                    break;
+                }
                 // nth-child(n+b) to nth-child(1n+b)
-                if ($param{0} == 'n')
-                    $param = '1' . $param;
+                if ($param{0} == 'n') {
+                                    $param = '1' . $param;
+                }
                 // :nth-child(index/even/odd/equation)
-                if ($param == 'even' || $param == 'odd')
-                    $mapped = $this->map(
+                if ($param == 'even' || $param == 'odd') {
+                                    $mapped = $this->map(
                         create_function(
                             '$node, $param',
                             '$index = pq($node)->prevAll()->size()+1;
@@ -1252,10 +1287,10 @@ 
                         new \CallbackParam(),
                         $param
                     );
-                else if (mb_strlen($param) > 1
+                } else if (mb_strlen($param) > 1
                     && preg_match('/^(\d*)n([-+]?)(\d*)/', $param) === 1
-                )
-                    // an+b
+                ) {
+                                    // an+b
                     $mapped = $this->map(
                         create_function(
                             '$node, $param',
@@ -1299,8 +1334,8 @@ 
                         new \CallbackParam(),
                         $param
                     );
-                else
-                    // index
+                } else {
+                                    // index
                     $mapped = $this->map(
                         create_function(
                             '$node, $index',
@@ -1315,6 +1350,7 @@ 
                         new \CallbackParam(),
                         $param
                     );
+                }
                 $this->elements = $mapped->elements;
                 break;
             default:
@@ -1345,21 +1381,24 @@ 
                 $selector
             )
         );
-        if (!$selector)
-            return false;
+        if (!$selector) {
+                    return false;
+        }
         $oldStack    = $this->elements;
         $returnArray = false;
         if ($nodes && is_array($nodes)) {
             $this->elements = $nodes;
-        } else if ($nodes)
-            $this->elements = array(
+        } else if ($nodes) {
+                    $this->elements = array(
                 $nodes
             );
+        }
         $this->filter($selector, true);
         $stack          = $this->elements;
         $this->elements = $oldStack;
-        if ($nodes)
-            return $stack ? $stack : null;
+        if ($nodes) {
+                    return $stack ? $stack : null;
+        }
         return (bool) count($stack);
     }
 
@@ -1391,8 +1430,9 @@ 
                     $node
                 )
             );
-            if (is_null($result) || (!is_null($result) && $result))
-                $newStack[] = $node;
+            if (is_null($result) || (!is_null($result) && $result)) {
+                            $newStack[] = $node;
+            }
         }
         $this->elements = $newStack;
         return $_skipHistory ? $this : $this->newInstance();
@@ -1408,10 +1448,12 @@ 
      */
     public function filter($selectors, $_skipHistory = false)
     {
-        if ($selectors instanceof \Callback OR $selectors instanceof \Closure)
-            return $this->filterCallback($selectors, $_skipHistory);
-        if (!$_skipHistory)
-            $this->elementsBackup = $this->elements;
+        if ($selectors instanceof \Callback OR $selectors instanceof \Closure) {
+                    return $this->filterCallback($selectors, $_skipHistory);
+        }
+        if (!$_skipHistory) {
+                    $this->elementsBackup = $this->elements;
+        }
         $notSimpleSelector = array(
             ' ',
             '>',
@@ -1419,23 +1461,27 @@ 
             '+',
             '/'
         );
-        if (!is_array($selectors))
-            $selectors = $this->parseSelector($selectors);
-        if (!$_skipHistory)
-            $this->debug(
+        if (!is_array($selectors)) {
+                    $selectors = $this->parseSelector($selectors);
+        }
+        if (!$_skipHistory) {
+                    $this->debug(
                 array(
                     "Filtering:",
                     $selectors
                 )
             );
+        }
         $finalStack = array();
         foreach ($selectors as $selector) {
             $stack = array();
-            if (!$selector)
-                break;
+            if (!$selector) {
+                            break;
+            }
             // avoid first space or /
-            if (in_array($selector[0], $notSimpleSelector))
-                $selector = array_slice($selector, 1);
+            if (in_array($selector[0], $notSimpleSelector)) {
+                            $selector = array_slice($selector, 1);
+            }
             // PER NODE selector chunks
             foreach ($this->stack() as $node) {
                 $break = false;
@@ -1446,21 +1492,25 @@ 
                             $attr = trim($s, '[]');
                             if (mb_strpos($attr, '=')) {
                                 list($attr, $val) = explode('=', $attr);
-                                if ($attr == 'nodeType' && $node->nodeType != $val)
-                                    $break = true;
+                                if ($attr == 'nodeType' && $node->nodeType != $val) {
+                                                                    $break = true;
+                                }
                             }
-                        } else
-                            $break = true;
+                        } else {
+                                                    $break = true;
+                        }
                     } else {
                         // \DOMElement only
                         // ID
                         if ($s[0] == '#') {
-                            if ($node->getAttribute('id') != substr($s, 1))
-                                $break = true;
+                            if ($node->getAttribute('id') != substr($s, 1)) {
+                                                            $break = true;
+                            }
                             // CLASSES
                         } else if ($s[0] == '.') {
-                            if (!$this->matchClasses($s, $node))
-                                $break = true;
+                            if (!$this->matchClasses($s, $node)) {
+                                                            $break = true;
+                            }
                             // ATTRS
                         } else if ($s[0] == '[') {
                             // strip side brackets
@@ -1469,8 +1519,9 @@ 
                                 list($attr, $val) = explode('=', $attr);
                                 $val = self::unQuote($val);
                                 if ($attr == 'nodeType') {
-                                    if ($val != $node->nodeType)
-                                        $break = true;
+                                    if ($val != $node->nodeType) {
+                                                                            $break = true;
+                                    }
                                 } else if ($this->isRegexp($attr)) {
                                     $val = extension_loaded('mbstring')
                                     && PhpQuery::$mbstringSupport ? quotemeta(trim($val, '"\''))
@@ -1494,12 +1545,15 @@ 
                                     $isMatch = extension_loaded('mbstring')
                                     && PhpQuery::$mbstringSupport ? mb_ereg_match($pattern, $node->getAttribute($attr))
                                         : preg_match("@{$pattern}@", $node->getAttribute($attr));
-                                    if (!$isMatch)
-                                        $break = true;
-                                } else if ($node->getAttribute($attr) != $val)
-                                    $break = true;
-                            } else if (!$node->hasAttribute($attr))
-                                $break = true;
+                                    if (!$isMatch) {
+                                                                            $break = true;
+                                    }
+                                } else if ($node->getAttribute($attr) != $val) {
+                                                                    $break = true;
+                                }
+                            } else if (!$node->hasAttribute($attr)) {
+                                                            $break = true;
+                            }
                             // PSEUDO CLASSES
                         } else if ($s[0] == ':') {
                             // skip
@@ -1508,10 +1562,12 @@ 
                             if ($s != '*') {
                                 // TODO namespaces
                                 if (isset($node->tagName)) {
-                                    if ($node->tagName != $s)
-                                        $break = true;
-                                } else if ($s == 'html' && !$this->isRoot($node))
-                                    $break = true;
+                                    if ($node->tagName != $s) {
+                                                                            $break = true;
+                                    }
+                                } else if ($s == 'html' && !$this->isRoot($node)) {
+                                                                    $break = true;
+                                }
                             }
                             // AVOID NON-SIMPLE SELECTORS
                         } else if (in_array($s, $notSimpleSelector)) {
@@ -1524,24 +1580,28 @@ 
                             );
                         }
                     }
-                    if ($break)
-                        break;
+                    if ($break) {
+                                            break;
+                    }
                 }
                 // if element passed all chunks of selector - add it to new stack
-                if (!$break)
-                    $stack[] = $node;
+                if (!$break) {
+                                    $stack[] = $node;
+                }
             }
             $tmpStack       = $this->elements;
             $this->elements = $stack;
             // PER ALL NODES selector chunks
-            foreach ($selector as $s)
-                // PSEUDO CLASSES
+            foreach ($selector as $s) {
+                            // PSEUDO CLASSES
                 if ($s[0] == ':')
                     $this->pseudoClasses($s);
-            foreach ($this->elements as $node)
-                // XXX it should be merged without duplicates
+            }
+            foreach ($this->elements as $node) {
+                            // XXX it should be merged without duplicates
                 // but jQuery doesnt do that
                 $finalStack[] = $node;
+            }
             $this->elements = $tmpStack;
         }
         $this->elements = $finalStack;
@@ -1583,10 +1643,11 @@ 
         }
         if (mb_strpos($url, ' ') !== false) {
             $matches = null;
-            if (extension_loaded('mbstring') && PhpQuery::$mbstringSupport)
-                mb_ereg('^([^ ]+) (.*)$', $url, $matches);
-            else
-                preg_match('@^([^ ]+) (.*)$@', $url, $matches);
+            if (extension_loaded('mbstring') && PhpQuery::$mbstringSupport) {
+                            mb_ereg('^([^ ]+) (.*)$', $url, $matches);
+            } else {
+                            preg_match('@^([^ ]+) (.*)$@', $url, $matches);
+            }
             $url      = $matches[1];
             $selector = $matches[2];
             // FIXME this sucks, pass as callback param
@@ -1817,8 +1878,9 @@ 
      */
     public function trigger($type, $data = array())
     {
-        foreach ($this->elements as $node)
-            PhpQueryEvents::trigger($this->getDocumentID(), $type, $data, $node);
+        foreach ($this->elements as $node) {
+                    PhpQueryEvents::trigger($this->getDocumentID(), $type, $data, $node);
+        }
         return $this;
     }
 
@@ -1853,8 +1915,9 @@ 
             $callback = $data;
             $data     = null;
         }
-        foreach ($this->elements as $node)
-            PhpQueryEvents::add($this->getDocumentID(), $node, $type, $data, $callback);
+        foreach ($this->elements as $node) {
+                    PhpQueryEvents::add($this->getDocumentID(), $node, $type, $data, $callback);
+        }
         return $this;
     }
 
@@ -1869,8 +1932,9 @@ 
      */
     public function unbind($type = null, $callback = null)
     {
-        foreach ($this->elements as $node)
-            PhpQueryEvents::remove($this->getDocumentID(), $node, $type, $callback);
+        foreach ($this->elements as $node) {
+                    PhpQueryEvents::remove($this->getDocumentID(), $node, $type, $callback);
+        }
         return $this;
     }
 
@@ -1882,8 +1946,9 @@ 
      */
     public function change($callback = null)
     {
-        if ($callback)
-            return $this->bind('change', $callback);
+        if ($callback) {
+                    return $this->bind('change', $callback);
+        }
         return $this->trigger('change');
     }
 
@@ -1895,8 +1960,9 @@ 
      */
     public function submit($callback = null)
     {
-        if ($callback)
-            return $this->bind('submit', $callback);
+        if ($callback) {
+                    return $this->bind('submit', $callback);
+        }
         return $this->trigger('submit');
     }
 
@@ -1908,8 +1974,9 @@ 
      */
     public function click($callback = null)
     {
-        if ($callback)
-            return $this->bind('click', $callback);
+        if ($callback) {
+                    return $this->bind('click', $callback);
+        }
         return $this->trigger('click');
     }
 
@@ -1922,12 +1989,14 @@ 
     public function wrapAllOld($wrapper)
     {
         $wrapper = pq($wrapper)->_clone();
-        if (!$wrapper->length() || !$this->length())
-            return $this;
+        if (!$wrapper->length() || !$this->length()) {
+                    return $this;
+        }
         $wrapper->insertBefore($this->elements[0]);
         $deepest = $wrapper->elements[0];
-        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
-            $deepest = $deepest->firstChild;
+        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement) {
+                    $deepest = $deepest->firstChild;
+        }
         pq($deepest)->append($this);
         return $this;
     }
@@ -1941,8 +2010,9 @@ 
      */
     public function wrapAll($wrapper)
     {
-        if (!$this->length())
-            return $this;
+        if (!$this->length()) {
+                    return $this;
+        }
         return PhpQuery::pq($wrapper, $this->getDocumentID())->clone()->insertBefore($this->get(0))->map(
             array(
                 $this,
@@ -1960,8 +2030,9 @@ 
     public function ___wrapAllCallback($node)
     {
         $deepest = $node;
-        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement)
-            $deepest = $deepest->firstChild;
+        while ($deepest->firstChild && $deepest->firstChild instanceof \DOMElement) {
+                    $deepest = $deepest->firstChild;
+        }
         return $deepest;
     }
 
@@ -1987,8 +2058,9 @@ 
      */
     public function wrap($wrapper)
     {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->wrapAll($wrapper);
+        foreach ($this->stack() as $node) {
+                    PhpQuery::pq($node, $this->getDocumentID())->wrapAll($wrapper);
+        }
         return $this;
     }
 
@@ -2002,8 +2074,9 @@ 
      */
     public function wrapPHP($codeBefore, $codeAfter)
     {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->wrapAllPHP($codeBefore, $codeAfter);
+        foreach ($this->stack() as $node) {
+                    PhpQuery::pq($node, $this->getDocumentID())->wrapAllPHP($codeBefore, $codeAfter);
+        }
         return $this;
     }
 
@@ -2015,8 +2088,9 @@ 
      */
     public function wrapInner($wrapper)
     {
-        foreach ($this->stack() as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAll($wrapper);
+        foreach ($this->stack() as $node) {
+                    PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAll($wrapper);
+        }
         return $this;
     }
 
@@ -2030,8 +2104,9 @@ 
      */
     public function wrapInnerPHP($codeBefore, $codeAfter)
     {
-        foreach ($this->stack(1) as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAllPHP($codeBefore, $codeAfter);
+        foreach ($this->stack(1) as $node) {
+                    PhpQuery::pq($node, $this->getDocumentID())->contents()->wrapAllPHP($codeBefore, $codeAfter);
+        }
         return $this;
     }
 
@@ -2065,15 +2140,18 @@ 
     public function contentsUnwrap()
     {
         foreach ($this->stack(1) as $node) {
-            if (!$node->parentNode)
-                continue;
+            if (!$node->parentNode) {
+                            continue;
+            }
             $childNodes = array();
             // any modification in DOM tree breaks childNodes iteration, so cache them first
-            foreach ($node->childNodes as $chNode)
-                $childNodes[] = $chNode;
-            foreach ($childNodes as $chNode)
-                //				$node->parentNode->appendChild($chNode);
+            foreach ($node->childNodes as $chNode) {
+                            $childNodes[] = $chNode;
+            }
+            foreach ($childNodes as $chNode) {
+                            //				$node->parentNode->appendChild($chNode);
                 $node->parentNode->insertBefore($chNode, $node);
+            }
             $node->parentNode->removeChild($node);
         }
         return $this;
@@ -2105,8 +2183,9 @@ 
         $oldStack             = $this->elements;
         $this->elementsBackup = $this->elements;
         $this->elements       = array();
-        if (isset($oldStack[$num]))
-            $this->elements[] = $oldStack[$num];
+        if (isset($oldStack[$num])) {
+                    $this->elements[] = $oldStack[$num];
+        }
         return $this->newInstance();
     }
 
@@ -2204,8 +2283,9 @@ 
      */
     public function replaceAll($selector)
     {
-        foreach (PhpQuery::pq($selector, $this->getDocumentID()) as $node)
-            PhpQuery::pq($node, $this->getDocumentID())->after($this->_clone())->remove();
+        foreach (PhpQuery::pq($selector, $this->getDocumentID()) as $node) {
+                    PhpQuery::pq($node, $this->getDocumentID())->after($this->_clone())->remove();
+        }
         return $this;
     }
 
@@ -2218,10 +2298,12 @@ 
     {
         $loop = $selector ? $this->filter($selector)->elements : $this->elements;
         foreach ($loop as $node) {
-            if (!$node->parentNode)
-                continue;
-            if (isset($node->tagName))
-                $this->debug("Removing '{$node->tagName}'");
+            if (!$node->parentNode) {
+                            continue;
+            }
+            if (isset($node->tagName)) {
+                            $this->debug("Removing '{$node->tagName}'");
+            }
             $node->parentNode->removeChild($node);
             // Mutation event
             $event = new Dom\DOMEvent(array(
@@ -2271,22 +2353,23 @@ 
     public function markup($markup = null, $callback1 = null, $callback2 = null, $callback3 = null)
     {
         $args = func_get_args();
-        if ($this->documentWrapper->isXML)
-            return call_user_func_array(
+        if ($this->documentWrapper->isXML) {
+                    return call_user_func_array(
                 array(
                     $this,
                     'xml'
                 ),
                 $args
             );
-        else
-            return call_user_func_array(
+        } else {
+                    return call_user_func_array(
                 array(
                     $this,
                     'html'
                 ),
                 $args
             );
+        }
     }
 
     /**
@@ -2301,22 +2384,23 @@ 
     public function markupOuter($callback1 = null, $callback2 = null, $callback3 = null)
     {
         $args = func_get_args();
-        if ($this->documentWrapper->isXML)
-            return call_user_func_array(
+        if ($this->documentWrapper->isXML) {
+                    return call_user_func_array(
                 array(
                     $this,
                     'xmlOuter'
                 ),
                 $args
             );
-        else
-            return call_user_func_array(
+        } else {
+                    return call_user_func_array(
                 array(
                     $this,
                     'htmlOuter'
                 ),
                 $args
             );
+        }
     }
 
     /**
@@ -2339,8 +2423,9 @@ 
                 // for now, limit events for textarea
                 if (($this->isXHTML() || $this->isHTML())
                     && $node->tagName == 'textarea'
-                )
-                    $oldHtml = pq($node, $this->getDocumentID())->markup();
+                ) {
+                                    $oldHtml = pq($node, $this->getDocumentID())->markup();
+                }
                 foreach ($nodes as $newNode) {
                     $node->appendChild(
                         $alreadyAdded ? $newNode->cloneNode(true)
@@ -2350,8 +2435,9 @@ 
                 // for now, limit events for textarea
                 if (($this->isXHTML() || $this->isHTML())
                     && $node->tagName == 'textarea'
-                )
-                    $this->markupEvents($html, $oldHtml, $node);
+                ) {
+                                    $this->markupEvents($html, $oldHtml, $node);
+                }
             }
             return $this;
         } else {
@@ -2477,12 +2563,15 @@ 
         foreach ($this->stack(1) as $node) {
             //			foreach($node->getElementsByTagName('*') as $newNode) {
             foreach ($node->childNodes as $newNode) {
-                if ($newNode->nodeType != 1)
-                    continue;
-                if ($selector && !$this->is($selector, $newNode))
-                    continue;
-                if ($this->elementsContainsNode($newNode, $stack))
-                    continue;
+                if ($newNode->nodeType != 1) {
+                                    continue;
+                }
+                if ($selector && !$this->is($selector, $newNode)) {
+                                    continue;
+                }
+                if ($this->elementsContainsNode($newNode, $stack)) {
+                                    continue;
+                }
                 $stack[] = $newNode;
             }
         }
@@ -2684,25 +2773,27 @@ 
                 if ($target instanceof self) {
                     if ($to) {
                         $insertTo = $target->elements;
-                        if ($this->documentFragment && $this->stackIsRoot())
-                            // get all body children
+                        if ($this->documentFragment && $this->stackIsRoot()) {
+                                                    // get all body children
                             //							$loop = $this->find('body > *')->elements;
                             // TODO test it, test it hard...
                             //							$loop = $this->newInstance($this->root)->find('> *')->elements;
                             $loop = $this->root->childNodes;
-                        else
-                            $loop = $this->elements;
+                        } else {
+                                                    $loop = $this->elements;
+                        }
                         // import nodes if needed
                         $insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
                             : $target->documentWrapper->import($loop);
                     } else {
                         $insertTo = $this->elements;
-                        if ($target->documentFragment && $target->stackIsRoot())
-                            // get all body children
+                        if ($target->documentFragment && $target->stackIsRoot()) {
+                                                    // get all body children
                             //							$loop = $target->find('body > *')->elements;
                             $loop = $target->root->childNodes;
-                        else
-                            $loop = $target->elements;
+                        } else {
+                                                    $loop = $target->elements;
+                        }
                         // import nodes if needed
                         $insertFrom = $this->getDocumentID() == $target->getDocumentID() ? $loop
                             : $this->documentWrapper->import($loop);
@@ -2716,22 +2807,26 @@ 
                         $insertTo = array(
                             $target
                         );
-                        if ($this->documentFragment && $this->stackIsRoot())
-                            // get all body children
+                        if ($this->documentFragment && $this->stackIsRoot()) {
+                                                    // get all body children
                             $loop = $this->root->childNodes;
+                        }
                         //							$loop = $this->find('body > *')->elements;
-                        else
-                            $loop = $this->elements;
-                        foreach ($loop as $fromNode)
-                            // import nodes if needed
+                        else {
+                                                    $loop = $this->elements;
+                        }
+                        foreach ($loop as $fromNode) {
+                                                    // import nodes if needed
                             $insertFrom[] = !$fromNode->ownerDocument->isSameNode(
                                 $target->ownerDocument
                             ) ? $target->ownerDocument->importNode($fromNode, true)
                                 : $fromNode;
+                        }
                     } else {
                         // import node if needed
-                        if (!$target->ownerDocument->isSameNode($this->document))
-                            $target = $this->document->importNode($target, true);
+                        if (!$target->ownerDocument->isSameNode($this->document)) {
+                                                    $target = $this->document->importNode($target, true);
+                        }
                         $insertTo     = $this->elements;
                         $insertFrom[] = $target;
                     }
@@ -2773,17 +2868,19 @@ 
                         break;
                     case 'insertBefore':
                     case 'before':
-                        if (!$toNode->parentNode)
-                            throw new \Exception("No parentNode, can't do {$type}()");
-                        else
-                            $toNode->parentNode->insertBefore($insert, $toNode);
+                        if (!$toNode->parentNode) {
+                                                    throw new \Exception("No parentNode, can't do {$type}()");
+                        } else {
+                                                    $toNode->parentNode->insertBefore($insert, $toNode);
+                        }
                         break;
                     case 'insertAfter':
                     case 'after':
-                        if (!$toNode->parentNode)
-                            throw new \Exception("No parentNode, can't do {$type}()");
-                        else
-                            $toNode->parentNode->insertBefore($insert, $nextSibling);
+                        if (!$toNode->parentNode) {
+                                                    throw new \Exception("No parentNode, can't do {$type}()");
+                        } else {
+                                                    $toNode->parentNode->insertBefore($insert, $nextSibling);
+                        }
                         break;
                 }
                 // Mutation event
@@ -2816,8 +2913,9 @@ 
         $subject = $subject instanceof PhpQueryObject ? $subject->elements[0]
             : $subject;
         foreach ($this->newInstance() as $k => $node) {
-            if ($node->isSameNode($subject))
-                $index = $k;
+            if ($node->isSameNode($subject)) {
+                            $index = $k;
+            }
         }
         return $index;
     }
@@ -2841,8 +2939,9 @@ 
         //			$start = $last+$start;
         //		if ($start > $last)
         //			return array();
-        if ($end > 0)
-            $end = $end - $start;
+        if ($end > 0) {
+                    $end = $end - $start;
+        }
         return $this->newInstance(array_slice($this->elements, $start, $end));
     }
 
@@ -2868,15 +2967,17 @@ 
      */
     public function text($text = null, $callback1 = null, $callback2 = null, $callback3 = null)
     {
-        if (isset($text))
-            return $this->html(htmlspecialchars($text));
+        if (isset($text)) {
+                    return $this->html(htmlspecialchars($text));
+        }
         $args   = func_get_args();
         $args   = array_slice($args, 1);
         $return = '';
         foreach ($this->elements as $node) {
             $text = $node->textContent;
-            if (count($this->elements) > 1 && $text)
-                $text .= "\n";
+            if (count($this->elements) > 1 && $text) {
+                            $text .= "\n";
+            }
             foreach ($args as $callback) {
                 $text = PhpQuery::callbackRun(
                     $callback,
@@ -2969,8 +3070,9 @@ 
                 ),
                 $args
             );
-        } else
-            throw new \Exception("Method '{$method}' doesnt exist");
+        } else {
+                    throw new \Exception("Method '{$method}' doesnt exist");
+        }
     }
 
     /**
@@ -3043,11 +3145,13 @@ 
             $test = $node;
             while (isset($test->{$direction}) && $test->{$direction}) {
                 $test = $test->{$direction};
-                if (!$test instanceof \DOMElement)
-                    continue;
+                if (!$test instanceof \DOMElement) {
+                                    continue;
+                }
                 $stack[] = $test;
-                if ($limitToOne)
-                    break;
+                if ($limitToOne) {
+                                    break;
+                }
             }
         }
         if ($selector) {
@@ -3073,8 +3177,9 @@ 
             $this->getElementSiblings('nextSibling', $selector)
         );
         foreach ($siblings as $node) {
-            if (!$this->elementsContainsNode($node, $stack))
-                $stack[] = $node;
+            if (!$this->elementsContainsNode($node, $stack)) {
+                            $stack[] = $node;
+            }
         }
         return $this->newInstance($stack);
     }
@@ -3087,32 +3192,37 @@ 
      */
     public function not($selector = null)
     {
-        if (is_string($selector))
-            PhpQuery::debug(
+        if (is_string($selector)) {
+                    PhpQuery::debug(
                 array(
                     'not',
                     $selector
                 )
             );
-        else
-            PhpQuery::debug('not');
+        } else {
+                    PhpQuery::debug('not');
+        }
         $stack = array();
         if ($selector instanceof self || $selector instanceof \DOMNODE) {
             foreach ($this->stack() as $node) {
                 if ($selector instanceof self) {
                     $matchFound = false;
                     foreach ($selector->stack() as $notNode) {
-                        if ($notNode->isSameNode($node))
-                            $matchFound = true;
+                        if ($notNode->isSameNode($node)) {
+                                                    $matchFound = true;
+                        }
+                    }
+                    if (!$matchFound) {
+                                            $stack[] = $node;
                     }
-                    if (!$matchFound)
-                        $stack[] = $node;
                 } else if ($selector instanceof \DOMNODE) {
-                    if (!$selector->isSameNode($node))
-                        $stack[] = $node;
+                    if (!$selector->isSameNode($node)) {
+                                            $stack[] = $node;
+                    }
                 } else {
-                    if (!$this->is($selector))
-                        $stack[] = $node;
+                    if (!$this->is($selector)) {
+                                            $stack[] = $node;
+                    }
                 }
             }
         } else {
@@ -3125,9 +3235,10 @@ 
             //					$this->filter(array($s))->stack()
             //				);
             //			}
-            foreach ($orgStack as $node)
-                if (!$this->elementsContainsNode($node, $matched))
+            foreach ($orgStack as $node) {
+                            if (!$this->elementsContainsNode($node, $matched))
                     $stack[] = $node;
+            }
         }
         return $this->newInstance($stack);
     }
@@ -3140,8 +3251,9 @@ 
      */
     public function add($selector = null)
     {
-        if (!$selector)
-            return $this;
+        if (!$selector) {
+                    return $this;
+        }
         $stack                = array();
         $this->elementsBackup = $this->elements;
         $found                = PhpQuery::pq($selector, $this->getDocumentID());
@@ -3154,10 +3266,11 @@ 
      */
     protected function merge()
     {
-        foreach (func_get_args() as $nodes)
-            foreach ($nodes as $newNode)
+        foreach (func_get_args() as $nodes) {
+                    foreach ($nodes as $newNode)
                 if (!$this->elementsContainsNode($newNode))
                     $this->elements[] = $newNode;
+        }
     }
 
     /**
@@ -3168,8 +3281,9 @@ 
     {
         $loop = !is_null($elementsStack) ? $elementsStack : $this->elements;
         foreach ($loop as $node) {
-            if ($node->isSameNode($nodeToCheck))
-                return true;
+            if ($node->isSameNode($nodeToCheck)) {
+                            return true;
+            }
         }
         return false;
     }
@@ -3183,15 +3297,17 @@ 
     public function parent($selector = null)
     {
         $stack = array();
-        foreach ($this->elements as $node)
-            if ($node->parentNode
+        foreach ($this->elements as $node) {
+                    if ($node->parentNode
                 && !$this->elementsContainsNode($node->parentNode, $stack)
             )
                 $stack[] = $node->parentNode;
+        }
         $this->elementsBackup = $this->elements;
         $this->elements       = $stack;
-        if ($selector)
-            $this->filter($selector, true);
+        if ($selector) {
+                    $this->filter($selector, true);
+        }
         return $this->newInstance();
     }
 
@@ -3204,14 +3320,16 @@ 
     public function parents($selector = null)
     {
         $stack = array();
-        if (!$this->elements)
-            $this->debug('parents() - stack empty');
+        if (!$this->elements) {
+                    $this->debug('parents() - stack empty');
+        }
         foreach ($this->elements as $node) {
             $test = $node;
             while ($test->parentNode) {
                 $test = $test->parentNode;
-                if ($this->isRoot($test))
-                    break;
+                if ($this->isRoot($test)) {
+                                    break;
+                }
                 if (!$this->elementsContainsNode($test, $stack)) {
                     $stack[] = $test;
                     continue;
@@ -3220,8 +3338,9 @@ 
         }
         $this->elementsBackup = $this->elements;
         $this->elements       = $stack;
-        if ($selector)
-            $this->filter($selector, true);
+        if ($selector) {
+                    $this->filter($selector, true);
+        }
         return $this->newInstance();
     }
 
@@ -3234,16 +3353,19 @@ 
      */
     public function stack($nodeTypes = null)
     {
-        if (!isset($nodeTypes))
-            return $this->elements;
-        if (!is_array($nodeTypes))
-            $nodeTypes = array(
+        if (!isset($nodeTypes)) {
+                    return $this->elements;
+        }
+        if (!is_array($nodeTypes)) {
+                    $nodeTypes = array(
                 $nodeTypes
             );
+        }
         $return = array();
         foreach ($this->elements as $node) {
-            if (in_array($node->nodeType, $nodeTypes))
-                $return[] = $node;
+            if (in_array($node->nodeType, $nodeTypes)) {
+                            $return[] = $node;
+            }
         }
         return $return;
     }
@@ -3252,8 +3374,9 @@ 
     protected function attrEvents($attr, $oldAttr, $oldValue, $node)
     {
         // skip events for XML documents
-        if (!$this->isXHTML() && !$this->isHTML())
-            return;
+        if (!$this->isXHTML() && !$this->isHTML()) {
+                    return;
+        }
         $event = null;
         // identify
         $isInputValue = $node->tagName == 'input'
@@ -3331,11 +3454,13 @@ 
             } else if ($attr == '*') {
                 // jQuery difference
                 $return = array();
-                foreach ($node->attributes as $n => $v)
-                    $return[$n] = $v->value;
+                foreach ($node->attributes as $n => $v) {
+                                    $return[$n] = $v->value;
+                }
                 return $return;
-            } else
-                return $node->hasAttribute($attr) ? $node->getAttribute($attr) : null;
+            } else {
+                            return $node->hasAttribute($attr) ? $node->getAttribute($attr) : null;
+            }
         }
         return is_null($value) ? '' : $this;
     }
@@ -3362,8 +3487,9 @@ 
     protected function getNodeAttrs($node)
     {
         $return = array();
-        foreach ($node->attributes as $n => $o)
-            $return[] = $n;
+        foreach ($node->attributes as $n => $o) {
+                    $return[] = $n;
+        }
         return $return;
     }
 
@@ -3393,11 +3519,13 @@ 
             } else if ($attr == '*') {
                 // jQuery diff
                 $return = array();
-                foreach ($node->attributes as $n => $v)
-                    $return[$n] = $v->value;
+                foreach ($node->attributes as $n => $v) {
+                                    $return[$n] = $v->value;
+                }
                 return $return;
-            } else
-                return $node->getAttribute($attr);
+            } else {
+                            return $node->getAttribute($attr);
+            }
         }
         return $this;
     }
@@ -3435,14 +3563,16 @@ 
         if (!isset($val)) {
             if ($this->eq(0)->is('select')) {
                 $selected = $this->eq(0)->find('option[selected=selected]');
-                if ($selected->is('[value]'))
-                    return $selected->attr('value');
-                else
-                    return $selected->text();
-            } else if ($this->eq(0)->is('textarea'))
-                return $this->eq(0)->markup();
-            else
-                return $this->eq(0)->attr('value');
+                if ($selected->is('[value]')) {
+                                    return $selected->attr('value');
+                } else {
+                                    return $selected->text();
+                }
+            } else if ($this->eq(0)->is('textarea')) {
+                            return $this->eq(0)->markup();
+            } else {
+                            return $this->eq(0)->attr('value');
+            }
         } else {
             $_val = null;
             foreach ($this->stack(1) as $node) {
@@ -3458,20 +3588,22 @@ 
                 ) {
                     $isChecked = in_array($node->attr('value'), $val)
                         || in_array($node->attr('name'), $val);
-                    if ($isChecked)
-                        $node->attr('checked', 'checked');
-                    else
-                        $node->removeAttr('checked');
+                    if ($isChecked) {
+                                            $node->attr('checked', 'checked');
+                    } else {
+                                            $node->removeAttr('checked');
+                    }
                 } else if ($node->get(0)->tagName == 'select') {
                     if (!isset($_val)) {
                         $_val = array();
-                        if (!is_array($val))
-                            $_val = array(
+                        if (!is_array($val)) {
+                                                    $_val = array(
                                 (string) $val
                             );
-                        else
-                            foreach ($val as $v)
+                        } else {
+                                                    foreach ($val as $v)
                                 $_val[] = $v;
+                        }
                     }
                     foreach ($node['option']->stack(1) as $option) {
                         $option   = pq($option, $this->getDocumentID());
@@ -3488,15 +3620,17 @@ 
                         //								$selected = true;
                         //							else if ($optionText == $v && $optionTextLenght == mb_strlen($v))
                         //								$selected = true;
-                        if ($selected)
-                            $option->attr('selected', 'selected');
-                        else
-                            $option->removeAttr('selected');
+                        if ($selected) {
+                                                    $option->attr('selected', 'selected');
+                        } else {
+                                                    $option->removeAttr('selected');
+                        }
                     }
-                } else if ($node->get(0)->tagName == 'textarea')
-                    $node->markup($val);
-                else
-                    $node->attr('value', $val);
+                } else if ($node->get(0)->tagName == 'textarea') {
+                                    $node->markup($val);
+                } else {
+                                    $node->attr('value', $val);
+                }
             }
         }
         return $this;
@@ -3509,8 +3643,9 @@ 
      */
     public function andSelf()
     {
-        if ($this->previous)
-            $this->elements = array_merge($this->elements, $this->previous->elements);
+        if ($this->previous) {
+                    $this->elements = array_merge($this->elements, $this->previous->elements);
+        }
         return $this;
     }
 
@@ -3522,17 +3657,19 @@ 
      */
     public function addClass($className)
     {
-        if (!$className)
-            return $this;
+        if (!$className) {
+                    return $this;
+        }
         foreach ($this->stack(1) as $node) {
-            if (!$this->is(".$className", $node))
-                $node->setAttribute(
+            if (!$this->is(".$className", $node)) {
+                            $node->setAttribute(
                     'class',
                     trim(
                         $node->getAttribute('class') . ' '
                         . $className
                     )
                 );
+            }
         }
         return $this;
     }
@@ -3563,8 +3700,9 @@ 
     public function hasClass($className)
     {
         foreach ($this->stack(1) as $node) {
-            if ($this->is(".$className", $node))
-                return true;
+            if ($this->is(".$className", $node)) {
+                            return true;
+            }
         }
         return false;
     }
@@ -3586,10 +3724,11 @@ 
                         $className
                     )
                 );
-                if ($classes)
-                    $node->setAttribute('class', implode(' ', $classes));
-                else
-                    $node->removeAttribute('class');
+                if ($classes) {
+                                    $node->setAttribute('class', implode(' ', $classes));
+                } else {
+                                    $node->removeAttribute('class');
+                }
             }
         }
         return $this;
@@ -3604,10 +3743,11 @@ 
     public function toggleClass($className)
     {
         foreach ($this->stack(1) as $node) {
-            if ($this->is($node, '.' . $className))
-                $this->removeClass($className);
-            else
-                $this->addClass($className);
+            if ($this->is($node, '.' . $className)) {
+                            $this->removeClass($className);
+            } else {
+                            $this->addClass($className);
+            }
         }
         return $this;
     }
@@ -3657,14 +3797,15 @@ 
             $paramStructure = func_get_args();
             $paramStructure = array_slice($paramStructure, 1);
         }
-        foreach ($this->elements as $v)
-            PhpQuery::callbackRun(
+        foreach ($this->elements as $v) {
+                    PhpQuery::callbackRun(
                 $callback,
                 array(
                     $v
                 ),
                 $paramStructure
             );
+        }
         return $this;
     }
 
@@ -3732,8 +3873,9 @@ 
             // is child which we look up doesn't exist
             return PhpQuery::data($this->get(0), $key, $value, $this->getDocumentID());
         } else {
-            foreach ($this as $node)
-                PhpQuery::data($node, $key, $value, $this->getDocumentID());
+            foreach ($this as $node) {
+                            PhpQuery::data($node, $key, $value, $this->getDocumentID());
+            }
             return $this;
         }
     }
@@ -3746,8 +3888,9 @@ 
      */
     public function removeData($key)
     {
-        foreach ($this as $node)
-            PhpQuery::removeData($node, $key, $this->getDocumentID());
+        foreach ($this as $node) {
+                    PhpQuery::removeData($node, $key, $this->getDocumentID());
+        }
         return $this;
     }
     // INTERFACE IMPLEMENTATIONS
@@ -3884,8 +4027,9 @@ 
                 while ($sibling->previousSibling) {
                     $sibling   = $sibling->previousSibling;
                     $isElement = $sibling instanceof \DOMElement;
-                    if ($isElement && $sibling->tagName == $node->tagName)
-                        $i++;
+                    if ($isElement && $sibling->tagName == $node->tagName) {
+                                            $i++;
+                    }
                 }
                 $xpath[] = $this->isXML() ? "*[local-name()='{$node->tagName}'][{$i}]"
                     : "{$node->tagName}[{$i}]";
@@ -3928,9 +4072,10 @@ 
                         : '') . ($node->getAttribute('selected') ? '[selected]' : '')
                     . ($node->getAttribute('checked') ? '[checked]' : '');
             } else if ($node instanceof \DOMTEXT) {
-                if (trim($node->textContent))
-                    $return[] = 'Text:'
+                if (trim($node->textContent)) {
+                                    $return[] = 'Text:'
                         . substr(str_replace("\n", ' ', $node->textContent), 0, 15);
+                }
             } else {
 
             }
@@ -3980,8 +4125,9 @@ 
         $output          = $title ? 'DUMP #' . (PhpQuery::$dumpCount++) . " \n" : '';
         $debug           = PhpQuery::$debug;
         PhpQuery::$debug = false;
-        foreach ($this->stack() as $node)
-            $output .= $this->__dumpTree($node);
+        foreach ($this->stack() as $node) {
+                    $output .= $this->__dumpTree($node);
+        }
         PhpQuery::$debug = $debug;
         print $html ? nl2br(str_replace(' ', '&nbsp;', $output)) : $output;
         return $this;
@@ -3991,11 +4137,13 @@ 
     {
         $whois  = $this->whois($node);
         $return = '';
-        if ($whois)
-            $return .= str_repeat(' - ', $intend) . $whois . "\n";
-        if (isset($node->childNodes))
-            foreach ($node->childNodes as $chNode)
+        if ($whois) {
+                    $return .= str_repeat(' - ', $intend) . $whois . "\n";
+        }
+        if (isset($node->childNodes)) {
+                    foreach ($node->childNodes as $chNode)
                 $return .= $this->__dumpTree($chNode, $intend + 1);
+        }
         return $return;
     }
 

src/Plugin/Scripts.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * @param $name
      * @param $callback
      * @throws \Exception
-     * @return bool
+     * @return boolean|null
      */
 	public static function script($name, $callback) {
 		if (\PhpQuery\Plugin\UtilScripts::$scriptMethods[$name])

Indentation +21 added lines, -21 removed lines

@@ -20,13 +20,13 @@ 
 	public static $PhpQueryMethods = null;
 	public static $config = array();
 
-    /**
-     * Enter description here...
-     *
-     * @param \PhpQuery\PhpQueryObject $self
-     * @param                          $arg1
-     * @return null|\PhpQuery\PhpQueryObject
-     */
+	/**
+	 * Enter description here...
+	 *
+	 * @param \PhpQuery\PhpQueryObject $self
+	 * @param                          $arg1
+	 * @return null|\PhpQuery\PhpQueryObject
+	 */
 	public static function script($self, $arg1) {
 		$params = func_get_args();
 		$params = array_slice($params, 2);
@@ -57,20 +57,20 @@ 
 		}
 	}
 
-    /**
-     * Extend scripts' namespace with $name related with $callback.
-     *
-     * Callback parameter order looks like this:
-     * - $this
-     * - $params
-     * - &$return
-     * - $config
-     *
-     * @param $name
-     * @param $callback
-     * @throws \Exception
-     * @return bool
-     */
+	/**
+	 * Extend scripts' namespace with $name related with $callback.
+	 *
+	 * Callback parameter order looks like this:
+	 * - $this
+	 * - $params
+	 * - &$return
+	 * - $config
+	 *
+	 * @param $name
+	 * @param $callback
+	 * @throws \Exception
+	 * @return bool
+	 */
 	public static function script($name, $callback) {
 		if (\PhpQuery\Plugin\UtilScripts::$scriptMethods[$name])
 			throw new \Exception("Script name conflict - '$name'");

Braces +3 added lines, -2 removed lines

@@ -72,8 +72,9 @@
      * @return bool
      */
 	public static function script($name, $callback) {
-		if (\PhpQuery\Plugin\UtilScripts::$scriptMethods[$name])
-			throw new \Exception("Script name conflict - '$name'");
+		if (\PhpQuery\Plugin\UtilScripts::$scriptMethods[$name]) {
+					throw new \Exception("Script name conflict - '$name'");
+		}
 		\PhpQuery\Plugin\UtilScripts::$scriptMethods[$name] = $callback;
 	}
 }
\ No newline at end of file

src/Tests/BasicTest.php

Doc Comments -1 removed lines

@@ -187,7 +187,6 @@
   }
 
   /**
-   * @param PhpQueryObject $pq
    * @dataProvider provider
    * @return void
    */

Indentation +95 added lines, -95 removed lines

@@ -7,12 +7,12 @@ 
 
 class BasicTest extends \PHPUnit_Framework_TestCase {
   function provider() {
-    // TODO change filename
-    return array(
-      array(
-        PhpQuery::newDocumentFile(__DIR__ . '/test.html')
-      )
-    );
+	// TODO change filename
+	return array(
+	  array(
+		PhpQuery::newDocumentFile(__DIR__ . '/test.html')
+	  )
+	);
   }
 
   /**
@@ -21,12 +21,12 @@ 
    * @return void
    */
   function testFilterWithPseudoclass($pq) {
-    $pq = $pq->find('p')->filter('.body:gt(1)');
-    $result = array(
-      'p.body',
-    );
+	$pq = $pq->find('p')->filter('.body:gt(1)');
+	$result = array(
+	  'p.body',
+	);
 
-    $this->assertTrue($pq->whois() == $result);
+	$this->assertTrue($pq->whois() == $result);
   }
 
   /**
@@ -35,12 +35,12 @@ 
    * @return void
    */
   function testSlice($pq) {
-    $testResult = array(
-      'li#testID',
-    );
-    $pq = $pq->find('li')->slice(1, 2);
+	$testResult = array(
+	  'li#testID',
+	);
+	$pq = $pq->find('li')->slice(1, 2);
 
-    $this->assertTrue($pq->whois() == $testResult);
+	$this->assertTrue($pq->whois() == $testResult);
   }
 
   /**
@@ -49,29 +49,29 @@ 
    * @return void
    */
   function testSlice2($pq) {
-    // SLICE2
-    $testResult = array(
-      'li#testID',
-      'li',
-      'li#i_have_nested_list',
-      'li.nested',
-    );
+	// SLICE2
+	$testResult = array(
+	  'li#testID',
+	  'li',
+	  'li#i_have_nested_list',
+	  'li.nested',
+	);
 
-    $pq = $pq->find('li')->slice(1, -1);
+	$pq = $pq->find('li')->slice(1, -1);
 
-    $this->assertTrue($pq->whois() == $testResult);
+	$this->assertTrue($pq->whois() == $testResult);
   }
 
   /**
    * @return void
    */
   function testMultiInsert() {
-    // Multi-insert
-    $pq = PhpQuery::newDocument('<li><span class="field1"></span><span class="field1"></span></li>')->find('.field1')->php('longlongtest');
-    $validResult = '<li><span class="field1"><php>longlongtest</php></span><span class="field1"><php>longlongtest</php></span></li>';
-    similar_text($pq->htmlOuter(), $validResult, $similarity);
+	// Multi-insert
+	$pq = PhpQuery::newDocument('<li><span class="field1"></span><span class="field1"></span></li>')->find('.field1')->php('longlongtest');
+	$validResult = '<li><span class="field1"><php>longlongtest</php></span><span class="field1"><php>longlongtest</php></span></li>';
+	similar_text($pq->htmlOuter(), $validResult, $similarity);
 
-    $this->assertGreaterThan(80, $similarity);
+	$this->assertGreaterThan(80, $similarity);
 
   }
 
@@ -81,10 +81,10 @@ 
    * @return void
    */
   function testIndex($pq) {
-    $testResult = 1;
-    $pq = $pq->find('p')->index($pq->find('p.title:first'));
+	$testResult = 1;
+	$pq = $pq->find('p')->index($pq->find('p.title:first'));
 
-    $this->assertTrue($pq == $testResult);
+	$this->assertTrue($pq == $testResult);
   }
 
   /**
@@ -93,20 +93,20 @@ 
    * @return void
    */
   function testClone($pq) {
-    $testResult = 3;
-    $document = null;
-    $pq = $pq->toReference($document)->find('p:first');
-
-    foreach (array(
-      0,
-      1,
-      2
-    ) as $i) {
-      $pq->clone()->addClass("clone-test")->addClass("class-$i")->insertBefore($pq);
-    }
-
-    $size = $document->find('.clone-test')->size();
-    $this->assertEquals($testResult, $size);
+	$testResult = 3;
+	$document = null;
+	$pq = $pq->toReference($document)->find('p:first');
+
+	foreach (array(
+	  0,
+	  1,
+	  2
+	) as $i) {
+	  $pq->clone()->addClass("clone-test")->addClass("class-$i")->insertBefore($pq);
+	}
+
+	$size = $document->find('.clone-test')->size();
+	$this->assertEquals($testResult, $size);
   }
 
   /**
@@ -115,11 +115,11 @@ 
    * @return void
    */
   function testNextSibling($pq) {
-    $testResult = 3;
-    $document = null;
-    $result = $pq->find('li:first')->next()->next()->prev()->is('#testID');
+	$testResult = 3;
+	$document = null;
+	$result = $pq->find('li:first')->next()->next()->prev()->is('#testID');
 
-    $this->assertTrue($result);
+	$this->assertTrue($result);
   }
 
   /**
@@ -128,8 +128,8 @@ 
    * @return void
    */
   function testSimpleDataInsertion($pq) {
-    $testName = 'Simple data insertion';
-    $testResult = <<<EOF
+	$testName = 'Simple data insertion';
+	$testResult = <<<EOF
 <div class="articles">
         div.articles text node
         <ul>
@@ -154,36 +154,36 @@ 
 <p class="after">paragraph after UL</p>
     </div>
 EOF;
-    $expected_pq = PhpQuery::newDocumentHTML($testResult);
-    $rows = array(
-      array(
-        'title' => 'News 1 title',
-        'body' => 'News 1 body',
-      ),
-      array(
-        'title' => 'News 2 title',
-        'body' => 'News 2 body',
-      ),
-      array(
-        'title' => 'News 3',
-        'body' => 'News 3 body',
-      ),
-    );
-    $articles = $pq->find('.articles ul');
-    $rowSrc = $articles->find('li')->remove()->eq(0);
-    foreach ($rows as $r) {
-      $row = $rowSrc->_clone();
-      foreach ($r as $field => $value) {
-        $row->find(".{$field}")->html($value);
-        //		die($row->htmlOuter());
-      }
-      $row->appendTo($articles);
-    }
-    $result = $pq->find('.articles')->htmlOuter();
-    //         print htmlspecialchars("<pre>{$result}</pre>").'<br />';
-
-    $this->assertEqualXMLStructure($expected_pq->find('.articles')->elements[0], $pq->find('.articles')->elements[0]);
-    //         $this->assertEqualXMLStructure(DOMDocument::loadHTML($testResult)->documentElement, DOMDocument::loadHTML($result)->documentElement);
+	$expected_pq = PhpQuery::newDocumentHTML($testResult);
+	$rows = array(
+	  array(
+		'title' => 'News 1 title',
+		'body' => 'News 1 body',
+	  ),
+	  array(
+		'title' => 'News 2 title',
+		'body' => 'News 2 body',
+	  ),
+	  array(
+		'title' => 'News 3',
+		'body' => 'News 3 body',
+	  ),
+	);
+	$articles = $pq->find('.articles ul');
+	$rowSrc = $articles->find('li')->remove()->eq(0);
+	foreach ($rows as $r) {
+	  $row = $rowSrc->_clone();
+	  foreach ($r as $field => $value) {
+		$row->find(".{$field}")->html($value);
+		//		die($row->htmlOuter());
+	  }
+	  $row->appendTo($articles);
+	}
+	$result = $pq->find('.articles')->htmlOuter();
+	//         print htmlspecialchars("<pre>{$result}</pre>").'<br />';
+
+	$this->assertEqualXMLStructure($expected_pq->find('.articles')->elements[0], $pq->find('.articles')->elements[0]);
+	//         $this->assertEqualXMLStructure(DOMDocument::loadHTML($testResult)->documentElement, DOMDocument::loadHTML($result)->documentElement);
   }
 
   /**
@@ -192,17 +192,17 @@ 
    * @return void
    */
   public function testCssParser() {
-    PhpQuery::$enableCssShorthand = FALSE;
-
-    $expected_html = '<div style="color:red;display:none;margin:20px;padding:10px"><span>Hello World!</span></div>';
-    $expected_pq = PhpQuery::newDocumentHTML($expected_html);
-
-    $test_pq = PhpQuery::newDocumentHTML('<div style="margin:10px; padding:10px">');
-    $test = pq('div');
-    $test->append('<span>Hello World!</span>');
-    $test->hide();
-    $test->css('color', 'red');
-    $test->css('margin', '20px');
-    $this->assertEqualXMLStructure($expected_pq->find('div')->elements[0], $test->elements[0]);
+	PhpQuery::$enableCssShorthand = FALSE;
+
+	$expected_html = '<div style="color:red;display:none;margin:20px;padding:10px"><span>Hello World!</span></div>';
+	$expected_pq = PhpQuery::newDocumentHTML($expected_html);
+
+	$test_pq = PhpQuery::newDocumentHTML('<div style="margin:10px; padding:10px">');
+	$test = pq('div');
+	$test->append('<span>Hello World!</span>');
+	$test->hide();
+	$test->css('color', 'red');
+	$test->css('margin', '20px');
+	$this->assertEqualXMLStructure($expected_pq->find('div')->elements[0], $test->elements[0]);
   }
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     // TODO change filename
     return array(
       array(
-        PhpQuery::newDocumentFile(__DIR__ . '/test.html')
+        PhpQuery::newDocumentFile(__DIR__.'/test.html')
       )
     );
   }

src/Plugin/Scripts/fix_webroot.php

Spacing +3 added lines, -3 removed lines

@@ -5,12 +5,12 @@
 		.':not([href^=http://])'
 		.':not([src^=http://])'
 		.':not([src^=/])';
-foreach($self[$selector]->filter($filter) as $el) {
+foreach ($self[$selector]->filter($filter) as $el) {
 	$el = pq($el, $self->getDocumentID());
 	// imgs and scripts
-	if ( $el->is('img') || $el->is('script') )
+	if ($el->is('img') || $el->is('script'))
 		$el->attr('src', $params[0].$el->attr('src'));
 	// css
-	if ( $el->is('link') )
+	if ($el->is('link'))
 		$el->attr('href', $params[0].$el->attr('href'));
 }
\ No newline at end of file

Braces +7 added lines, -5 removed lines

@@ -8,9 +8,11 @@
 foreach($self[$selector]->filter($filter) as $el) {
 	$el = pq($el, $self->getDocumentID());
 	// imgs and scripts
-	if ( $el->is('img') || $el->is('script') )
-		$el->attr('src', $params[0].$el->attr('src'));
+	if ( $el->is('img') || $el->is('script') ) {
+			$el->attr('src', $params[0].$el->attr('src'));
+	}
 	// css
-	if ( $el->is('link') )
-		$el->attr('href', $params[0].$el->attr('href'));
-}
\ No newline at end of file
+	if ( $el->is('link') ) {
+			$el->attr('href', $params[0].$el->attr('href'));
+	}
+	}
\ No newline at end of file