task 97: phpQuery::getJSON

http://code.google.com/p/phpquery/issues/detail?id=97

git-svn-id: http://phpquery.googlecode.com/svn/branches/dev@355 afc5ee8f-4a33-0410-9214-8715c29b7d85

demo.php

@@ -26,14 +26,14 @@
 // save it anywhere in the chain
 		->toReference($li);
 
-// SELECT IT
+// SELECT DOCUMENT
 // pq(); is using selected document as default
 phpQuery::selectDocument($doc);
-// documents are selected when created, iterated or by above method
+// documents are selected when created or by above method
 // query all unordered lists in last selected document
 $ul = pq('ul')->insertAfter('div');
 
-// INTERATE IT
+// ITERATE IT
 // all direct LIs from $ul
 foreach($ul['> li'] as $li) {
 	// iteration returns PLAIN dom nodes, NOT phpQuery objects

phpQuery/Callback.php

@@ -3,12 +3,13 @@
  * Callback class implementing ParamStructures, pattern similar to Currying.
  *
  * @link http://code.google.com/p/phpquery/wiki/Callbacks#Param_Structures
- * @author Tobiasz Cudnik
+ * @author Tobiasz Cudnik <tobiasz.cudnik/gmail.com>
  */
 class Callback
 	implements ICallbackNamed {
 	public $callback = null;
 	public $params = null;
+	protected $name;
 	public function __construct($callback, $param1 = null, $param2 = null, $param3 = null) {
 		$params = func_get_args();
 		$params = array_slice($params, 1);
@@ -29,12 +30,17 @@ public function setName($name) {
 		$this->name = $name;
 		return $this;
 	}
-	// TODO test me !!!
+	// TODO test me
 //	public function addParams() {
 //		$params = func_get_args();
 //		return new Callback($this->callback, $this->params+$params);
 //	}
 }
+/**
+ * Callback type which on execution returns reference passed during creation.
+ * 
+ * @author Tobiasz Cudnik <tobiasz.cudnik/gmail.com>
+ */
 class CallbackReturnReference extends Callback
 	implements ICallbackNamed {
 	protected $reference;
@@ -52,6 +58,11 @@ public function hasName() {
 		return isset($this->name) && $this->name;
 	}
 }
+/**
+ * Callback type which on execution returns value passed during creation.
+ * 
+ * @author Tobiasz Cudnik <tobiasz.cudnik/gmail.com>
+ */
 class CallbackReturnValue extends Callback
 	implements ICallbackNamed {
 	protected $value;
@@ -80,22 +91,18 @@ function getName();
 }
 /**
  * CallbackParameterToReference can be used when we don't really want a callback,
- * only parameter passed to it. CallbackReference takes first parameter's value
- * and passes it to reference. Thanks to that, we can use *if statement* instead
- * of *callback function*.
+ * only parameter passed to it. CallbackParameterToReference takes first 
+ * parameter's value and passes it to reference.
  *
  * @author Tobiasz Cudnik <tobiasz.cudnik/gmail.com>
- *
  */
 class CallbackParameterToReference extends Callback {
 	/**
-	 *
 	 * @param $reference
-	 * @param $paramIndex
 	 * @TODO implement $paramIndex; 
 	 * param index choose which callback param will be passed to reference
 	 */
-	public function __construct(&$reference, $paramIndex = null){
+	public function __construct(&$reference){
 		$this->callback =& $reference;
 	}
 }

phpQuery/DOMDocumentWrapper.php

@@ -501,9 +501,9 @@ protected function documentFragmentToMarkup($fragment) {
 		return $markup;
 	}
 	/**
-	 * Return document markup, starting with optional $node as root.
+	 * Return document markup, starting with optional $nodes as root.
 	 *
-	 * @param $node	DOMNode|DOMNodeList
+	 * @param $nodes	DOMNode|DOMNodeList
 	 * @return string
 	 */
 	public function markup($nodes = null, $innerMarkup = false) {