TobiaszCudnik · AlexSuperStar · Nov 16, 2012 · Dec 14, 2012 · Dec 14, 2012 · Jan 24, 2013
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,80 @@
+## phpQuery, one more fork!
+
+My intent is to have it easily integrated in differents projects, so available on packagist.
+I've gathered some fix and new features here and there, as will keep looking for new stuff on github about phpQuery
+
+### github repos i've integrated:
+
+* https://github.com/ralph-tice/phpquery (one commit: added WebBrowser->browserDownload)
+* https://github.com/aptivate/phpquery (three commits)
+* https://github.com/panrafal/phpquery (remove zend)
+
+### github repos i've looked at:
+
+* https://github.com/denis-isaev/phpquery
+* https://github.com/r-sal/phpquery
+* https://github.com/damien-list/phpquery-1
+* https://github.com/nev3rm0re/phpquery
+* https://github.com/Aurielle/phpquery
+* https://github.com/kevee/phpquery (include php-css-parser)
+* https://github.com/lucassouza1/phpquery
+
+## Manual
+
+* [Manual](wiki/README.md) imported from http://code.google.com/p/phpquery/wiki
+
+## Extracts from fmorrow README.md:
+
+### Whats phpQuery?
+To quote the phpQuery *(orignally concieved and developed by Tobiasz Cudnik, available on Google Code and Github)* project documentation:
+
+>phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library.
+>
+>Library is written in PHP5 and provides additional Command Line Interface (CLI).
+
+### Example usage
+
+(copied from http://code.google.com/p/phpquery/wiki/Basics)
+
+Complete working example:
+
+```php
+<?php
+include 'phpQuery-onefile.php';
+
+$file = 'test.html'; // see below for source
+
+// loads the file
+// basically think of your php script as a regular HTML page running client side with jQuery.  This loads whatever file you want to be the current page
+phpQuery::newDocumentFileHTML($file);
+
+// Once the page is loaded, you can then make queries on whatever DOM is loaded.
+// This example grabs the title of the currently loaded page.
+$titleElement = pq('title'); // in jQuery, this would return a jQuery object.  I'm guessing something similar is happening here with pq.
+
+// You can then use any of the functionality available to that pq object.  Such as getting the innerHTML like I do here.
+$title = $titleElement->html();
+
+// And output the result
+echo '<h2>Title:</h2>';
+echo '<p>' . htmlentities( $title) . '</p>';
+
+?>
+```
+
+====
+
+Source for test.html:
+
+```html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Hello World!</title>
+</head>
+<body>
+</body>
+</html>
+```
+
diff --git a/composer.json b/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "electrolinux/phpquery"
+    ,"type": "library"
+    ,"description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library"
+    ,"version": "0.9.6"
+    ,"keywords": []
+    ,"homepage": "http://code.google.com/p/phpquery/"
+    ,"license": "MIT"
+    ,"authors": [
+        {
+            "name": "Tobiasz Cudnik"
+            ,"email": "[email protected]"
+            ,"homepage": "https://github.com/TobiaszCudnik"
+            ,"role": "Developer"
+        }
+        ,{
+            "name": "didier Belot"
+            ,"role": "Packager"
+        }
+    ],
+    "autoload": {
+        "classmap": ["phpQuery/"]
+    }
+}
diff --git a/phpQuery/phpQuery.php b/phpQuery/phpQuery.php
@@ -998,7 +998,7 @@ public static function getDOMDocument($source) {
 	 * @return unknown_type
 	 * @link http://docs.jquery.com/Utilities/jQuery.makeArray
 	 */
-	public static function makeArray($obj) {
+	public static function makeArray($object) {
 		$array = array();
 		if (is_object($object) && $object instanceof DOMNODELIST) {
 			foreach($object as $value)

diff --git a/phpQuery/phpQuery/DOMDocumentWrapper.php b/phpQuery/phpQuery/DOMDocumentWrapper.php
@@ -59,6 +59,7 @@ public function load($markup, $contentType = null, $newDocumentID = null) {
 			$this->root = $this->document;
 			$this->charset = $this->document->encoding;
 			// TODO isDocumentFragment
+			$loaded = true;
 		} else {
 			$loaded = $this->loadMarkup($markup);
 		}
@@ -313,8 +314,6 @@ protected function isXML($markup) {
 	}
 
 	protected function contentTypeToArray($contentType) {
-        $test = null;
-        $test =
 		$matches = explode(';', trim(strtolower($contentType)));
 		if (isset($matches[1])) {
 			$matches[1] = explode('=', $matches[1]);
@@ -350,7 +349,7 @@ protected function charsetFromHTML($markup) {
 		return $contentType[1];
 	}
 	protected function charsetFromXML($markup) {
-		$matches;
+		$matches = array();
 		// find declaration
 		preg_match('@<'.'?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i',
 			$markup, $matches
@@ -677,4 +676,4 @@ public static function expandEmptyTag($tag, $xml){
         }
         return $xml;
 	}
-}
+}
diff --git a/phpQuery/phpQuery/Zend/Exception.php b/phpQuery/phpQuery/Zend/Exception.php