c-harris / phpquery

src/PhpQuery.php

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/PhpQueryObject.php

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/fix_webroot.php

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

src/Plugin/WebBrowser.php

Braces +65 added lines, -41 removed lines

@@ -31,9 +31,9 @@ 
 			: $self->document->xhr->getUri(true);
 		// FIXME tmp
 		$self->document->WebBrowserCallback = $callback;
-		if (! $location)
-			throw new \Exception('Location needed to activate WebBrowser plugin !');
-		else {
+		if (! $location) {
+					throw new \Exception('Location needed to activate WebBrowser plugin !');
+		} else {
 			$self->bind('click', array($location, $callback), array('\PhpQuery\Plugin\UtilWebBrowser', 'hadleClick'));
 			$self->bind('submit', array($location, $callback), array('\PhpQuery\Plugin\UtilWebBrowser', 'handleSubmit'));
 		}
@@ -43,14 +43,16 @@ 
 	}
 	public static function downloadTo($self, $dir = null, $filename = null) {
 		$url = null;
-		if ($self->is('a[href]'))
-			$url = $self->attr('href');
-		else if ($self->find('a')->length)
-			$url = $self->find('a')->attr('href');
+		if ($self->is('a[href]')) {
+					$url = $self->attr('href');
+		} else if ($self->find('a')->length) {
+					$url = $self->find('a')->attr('href');
+		}
 		if ($url) {
 			$url = resolve_url($self->document->location, $url);
-			if (! $dir)
-				$dir = getcwd();
+			if (! $dir) {
+							$dir = getcwd();
+			}
 			// TODO resolv name from response headers
 			if (! $filename) {
 				$matches = null;
@@ -84,11 +86,12 @@ 
 		$return = false;
 		if ($xhr->getLastResponse()->isSuccessful()) {
 			$return = \PhpQuery\Plugin\UtilWebBrowser::browserReceive($xhr);
-			if (isset($self->document->WebBrowserCallback))
-				PhpQuery::callbackRun(
+			if (isset($self->document->WebBrowserCallback)) {
+							PhpQuery::callbackRun(
 					$self->document->WebBrowserCallback,
 					array($return)
 				);
+			}
 		}
 		return $return;
 	}
@@ -104,11 +107,12 @@ 
 		$return = false;
 		if ($xhr->getLastResponse()->isSuccessful()) {
 			$return = \PhpQuery\Plugin\UtilWebBrowser::browserDownload($xhr);
-			if (isset($self->document->WebBrowserCallback))
-				PhpQuery::callbackRun(
+			if (isset($self->document->WebBrowserCallback)) {
+							PhpQuery::callbackRun(
 					$self->document->WebBrowserCallback,
 					array($return)
 				);
+			}
 		}
 		return $return;
         }
@@ -184,8 +188,9 @@ 
 //				self::browserReceive($xhr)//->WebBrowser($callback)
 //			));
 			return $xhr;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 	/**
 	 *
@@ -216,13 +221,15 @@ 
 //				self::browserReceive($xhr)//->WebBrowser($callback)
 //			));
 			return $xhr;
-		} else
-			return false;
+		} else {
+					return false;
+		}
 	}
 	protected static function authorizeHost($url) {
 		$host = parse_url($url, PHP_URL_HOST);
-		if ($host)
-			PhpQuery::ajaxAllowHost($host);
+		if ($host) {
+					PhpQuery::ajaxAllowHost($host);
+		}
 	}
 	protected static function ajaxSettingsPrepare($settings) {
 		unset($settings['success']);
@@ -271,8 +278,9 @@ 
 					array('\PhpQuery\Plugin\UtilWebBrowser', 'browserReceive'), array($xhr)
 				);
 			}
-		} else
-			return $pq;
+		} else {
+					return $pq;
+		}
 	}
         
         /**
@@ -302,14 +310,17 @@ 
 				'url' => resolve_url($e->data[0], $node->attr('href')),
 				'referer' => $node->document->location,
 			), $xhr);
-			if ((! $callback || !($callback instanceof \Callback)) && $e->data[1])
-				$callback = $e->data[1];
-			if ($xhr->getLastResponse()->isSuccessful() && $callback)
-				PhpQuery::callbackRun($callback, array(
+			if ((! $callback || !($callback instanceof \Callback)) && $e->data[1]) {
+							$callback = $e->data[1];
+			}
+			if ($xhr->getLastResponse()->isSuccessful() && $callback) {
+							PhpQuery::callbackRun($callback, array(
 					self::browserReceive($xhr)
 				));
-		} else if ($node->is(':submit') && $node->parents('form')->size())
-			$node->parents('form')->trigger('submit', array($e));
+			}
+		} else if ($node->is(':submit') && $node->parents('form')->size()) {
+					$node->parents('form')->trigger('submit', array($e));
+		}
 	}
 
     /**
@@ -321,8 +332,9 @@ 
      */
 	public static function handleSubmit($e, $callback = null) {
 		$node = PhpQuery::pq($e->target);
-		if (!$node->is('form') || !$node->is('[action]'))
-			return;
+		if (!$node->is('form') || !$node->is('[action]')) {
+					return;
+		}
 		// TODO document.location
 		$xhr = isset($node->document->xhr)
 			? $node->document->xhr
@@ -333,10 +345,11 @@ 
 //			: $node->find(':submit:first')->get(0);
 			: $node->find('*:submit:first')->get(0);
 		$data = array();
-		foreach($node->serializeArray($submit) as $r)
-		// XXXt.c maybe $node->not(':submit')->add($sumit) would be better ?
+		foreach($node->serializeArray($submit) as $r) {
+				// XXXt.c maybe $node->not(':submit')->add($sumit) would be better ?
 //		foreach($node->serializeArray($submit) as $r)
 			$data[ $r['name'] ] = $r['value'];
+		}
 		$options = array(
 			'type' => $node->attr('method')
 				? $node->attr('method')
@@ -346,15 +359,18 @@ 
 			'referer' => $node->document->location,
 //			'success' => $e->data[1],
 		);
-		if ($node->attr('enctype'))
-			$options['contentType'] = $node->attr('enctype');
+		if ($node->attr('enctype')) {
+					$options['contentType'] = $node->attr('enctype');
+		}
 		$xhr = PhpQuery::ajax($options, $xhr);
-		if ((! $callback || !($callback instanceof Callback)) && $e->data[1])
-			$callback = $e->data[1];
-		if ($xhr->getLastResponse()->isSuccessful() && $callback)
-			PhpQuery::callbackRun($callback, array(
+		if ((! $callback || !($callback instanceof Callback)) && $e->data[1]) {
+					$callback = $e->data[1];
+		}
+		if ($xhr->getLastResponse()->isSuccessful() && $callback) {
+					PhpQuery::callbackRun($callback, array(
 				self::browserReceive($xhr)
 			));
+		}
 	}
 }
 /**
@@ -364,7 +380,9 @@ 
  */
 function glue_url($parsed)
     {
-    if (! is_array($parsed)) return false;
+    if (! is_array($parsed)) {
+    	return false;
+    }
     $uri = isset($parsed['scheme']) ? $parsed['scheme'].':'.((strtolower($parsed['scheme']) == 'mailto') ? '':'//'): '';
     $uri .= isset($parsed['user']) ? $parsed['user'].($parsed['pass']? ':'.$parsed['pass']:'').'@':'';
     $uri .= isset($parsed['host']) ? $parsed['host'] : '';
@@ -383,11 +401,17 @@ 
  * @author adrian-php at sixfingeredman dot net
  */
 function resolve_url($base, $url) {
-        if (!strlen($base)) return $url;
+        if (!strlen($base)) {
+        	return $url;
+        }
         // Step 2
-        if (!strlen($url)) return $base;
+        if (!strlen($url)) {
+        	return $base;
+        }
         // Step 3
-        if (preg_match('!^[a-z]+:!i', $url)) return $url;
+        if (preg_match('!^[a-z]+:!i', $url)) {
+        	return $url;
+        }
         $base = parse_url($base);
         if ($url{0} == "#") {
                 // Step 2 (fragment)

src/Plugin/Scripts.php

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/Proxy/jQueryServer.php

Braces +15 added lines, -14 removed lines

@@ -33,13 +33,15 @@ 
     include_once(dirname(__FILE__) . '/../PhpQuery/PhpQuery.php');
     if (file_exists(dirname(__FILE__) . '/jQueryServer.config.php')) {
       include_once(dirname(__FILE__) . '/jQueryServer.config.php');
-      if ($jQueryServerConfig)
-        $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
+      if ($jQueryServerConfig) {
+              $this->config = array_merge_recursive($this->config, $jQueryServerConfig);
+      }
     }
     if ($this->config['refererMustMatch']) {
-      foreach ($this->config['allowedRefererHosts'] as $i => $host)
-        if ($host == '.')
+      foreach ($this->config['allowedRefererHosts'] as $i => $host) {
+              if ($host == '.')
           $this->config['allowedRefererHosts'][$i] = $_SERVER['HTTP_HOST'];
+      }
       $referer = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
       $authorized = $referer
         && in_array($referer, $this->config['allowedRefererHosts']);
@@ -65,8 +67,7 @@ 
         'success'
       );
       PhpQuery::ajax($ajax);
-    }
-    else {
+    } else {
       throw new \Exception("URL needed to download content");
     }
   }
@@ -77,25 +78,25 @@ 
       if (!method_exists(get_class($pq), $r['method'])) {
         throw new \Exception("Method '{$r['method']}' not implemented in PhpQuery, sorry...");
         // execute method
-      }
-      else {
+      } else {
         $pq = call_user_func_array(array(
           $pq,
           $r['method']
         ), $r['arguments']);
       }
     }
-    if (!isset($this->options['dataType']))
-      $this->options['dataType'] = '';
+    if (!isset($this->options['dataType'])) {
+          $this->options['dataType'] = '';
+    }
     switch (strtolower($this->options['dataType'])) {
       case 'json':
         if ($pq instanceof PhpQueryObject) {
           $results = array();
-          foreach ($pq as $node)
-            $results[] = pq($node)->htmlOuter();
+          foreach ($pq as $node) {
+                      $results[] = pq($node)->htmlOuter();
+          }
           print PhpQuery::toJSON($results);
-        }
-        else {
+        } else {
           print PhpQuery::toJSON($pq);
         }
         break;

src/Tests/_archive/test_ajax.php

Braces +5 added lines, -5 removed lines

@@ -35,9 +35,9 @@ 
 $test = PhpQuery::newDocumentFile('test.html')
 	->find('div:first')
 	->load('http://wikipedia.org/ div[lang]');
-if (pq('div[lang]')->size())
+if (pq('div[lang]')->size()) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	print "</pre>\n";
@@ -53,9 +53,9 @@ 
 ));
 function a789fhasdui3124($html) {
 	$testName = 'AJAX request text node';
-	if ( $html == 'hello world' )
-		print "Test '$testName' PASSED :)";
-	else {
+	if ( $html == 'hello world' ) {
+			print "Test '$testName' PASSED :)";
+	} else {
 		print "Test '$testName' <strong>FAILED</strong> !!! ";
 	}
 	print "\n";

src/Tests/_archive/test_scripts.php

Braces +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 $testName = 'Scripts/example';
 $doc = PhpQuery::newDocumentFile('test.html');
 $testResult = 10;
-if ($doc->script('example', 'p')->length == $testResult)
+if ($doc->script('example', 'p')->length == $testResult) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	var_dump($doc->whois());
@@ -26,9 +26,9 @@ 
 $editor = PhpQuery::newDocument('<div/>')
 	->script('google_login')
 	->location($url);
-if ($editor->find('textarea#content')->length == $testResult)
+if ($editor->find('textarea#content')->length == $testResult) {
 	print "Test '$testName' PASSED :)";
-else {
+} else {
 	print "Test '$testName' <strong>FAILED</strong> !!! ";
 	print "<pre>";
 	var_dump($doc->whois());

src/Tests/_archive/test_attr.php

Braces +8 added lines, -5 removed lines

@@ -7,20 +7,23 @@
 $result = PhpQuery::newDocumentFile('test.html')
 	->find('p[rel]:first')
 		->attr('rel', $expected);
-if ($result->attr('rel') == $expected)
+if ($result->attr('rel') == $expected) {
 	print "Test '{$testName}' passed :)";
-else
+} else {
 	print "Test '{$testName}' <strong>FAILED</strong> !!!";
+}
 print "\n";
 
 
 $testName = 'Attribute change in iteration';
 $expected = 'new attr value';
 $doc = PhpQuery::newDocumentFile('test.html');
-foreach($doc['p[rel]:first'] as $p)
+foreach($doc['p[rel]:first'] as $p) {
 	pq($p)->attr('rel', $expected);
-if ($doc['p[rel]:first']->attr('rel') == $expected)
+}
+if ($doc['p[rel]:first']->attr('rel') == $expected) {
 	print "Test '{$testName}' passed :)";
-else
+} else {
 	print "Test '{$testName}' <strong>FAILED</strong> !!!";
+}
 print "\n";
\ No newline at end of file