Ysurac / FlightAirMap

require/class.Source.php

Indentation +66 added lines, -66 removed lines

@@ -7,73 +7,73 @@
 	function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-        }
-       public function getAllLocationInfo() {
-                $query = "SELECT * FROM source_location";
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-       public function getLocationInfobyName($name) {
-                $query = "SELECT * FROM source_location WHERE name = :name";
-                $query_values = array(':name' => $name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-       public function getLocationInfobySourceName($name) {
-                $query = "SELECT * FROM source_location WHERE source = :name";
-                $query_values = array(':name' => $name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+		}
+	   public function getAllLocationInfo() {
+				$query = "SELECT * FROM source_location";
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+	   public function getLocationInfobyName($name) {
+				$query = "SELECT * FROM source_location WHERE name = :name";
+				$query_values = array(':name' => $name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+	   public function getLocationInfobySourceName($name) {
+				$query = "SELECT * FROM source_location WHERE source = :name";
+				$query_values = array(':name' => $name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
   
-       public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
-                $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
-                $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
+				$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
+				$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteLocation($id) {
-                $query = "DELETE FROM source_location WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllLocation() {
-                $query = "DELETE FROM source_location";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteLocation($id) {
+				$query = "DELETE FROM source_location WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllLocation() {
+				$query = "DELETE FROM source_location";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 }
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -26,7 +26,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -38,20 +38,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
   
-       public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
+       public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png') {
                 $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
-                $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
+                $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -62,7 +62,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -71,7 +71,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }

require/libs/simple_html_dom.php

Indentation +5 added lines, -5 removed lines

@@ -824,11 +824,11 @@
 	}
 
 	/**
-	* Returns true if $string is valid UTF-8 and false otherwise.
-	*
-	* @param mixed $str String to be tested
-	* @return boolean
-	*/
+	 * Returns true if $string is valid UTF-8 and false otherwise.
+	 *
+	 * @param mixed $str String to be tested
+	 * @return boolean
+	 */
 	static function is_utf8($str)
 	{
 		$c=0; $b=0;

Spacing +238 added lines, -238 removed lines

@@ -45,21 +45,21 @@ 
  */
 define('HDOM_TYPE_ELEMENT', 1);
 define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT',	3);
-define('HDOM_TYPE_ENDTAG',  4);
-define('HDOM_TYPE_ROOT',	5);
+define('HDOM_TYPE_TEXT', 3);
+define('HDOM_TYPE_ENDTAG', 4);
+define('HDOM_TYPE_ROOT', 5);
 define('HDOM_TYPE_UNKNOWN', 6);
 define('HDOM_QUOTE_DOUBLE', 0);
 define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO',	 3);
-define('HDOM_INFO_BEGIN',   0);
-define('HDOM_INFO_END',	 1);
-define('HDOM_INFO_QUOTE',   2);
-define('HDOM_INFO_SPACE',   3);
-define('HDOM_INFO_TEXT',	4);
-define('HDOM_INFO_INNER',   5);
-define('HDOM_INFO_OUTER',   6);
-define('HDOM_INFO_ENDSPACE',7);
+define('HDOM_QUOTE_NO', 3);
+define('HDOM_INFO_BEGIN', 0);
+define('HDOM_INFO_END', 1);
+define('HDOM_INFO_QUOTE', 2);
+define('HDOM_INFO_SPACE', 3);
+define('HDOM_INFO_TEXT', 4);
+define('HDOM_INFO_INNER', 5);
+define('HDOM_INFO_OUTER', 6);
+define('HDOM_INFO_ENDSPACE', 7);
 define('DEFAULT_TARGET_CHARSET', 'UTF-8');
 define('DEFAULT_BR_TEXT', "\r\n");
 define('DEFAULT_SPAN_TEXT', " ");
@@ -68,7 +68,7 @@ 
 // -----------------------------------------------------------------------------
 // get html dom from file
 // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
-function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	// We DO force the tags to be terminated.
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
@@ -86,7 +86,7 @@ 
 }
 
 // get html dom from string
-function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
 	if (empty($str) || strlen($str) > MAX_FILE_SIZE)
@@ -99,7 +99,7 @@ 
 }
 
 // dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0)
+function dump_html_tree($node, $show_attr = true, $deep = 0)
 {
 	$node->dump($node);
 }
@@ -151,12 +151,12 @@ 
 	}
 
 	// dump node's tree
-	function dump($show_attr=true, $deep=0)
+	function dump($show_attr = true, $deep = 0)
 	{
 		$lead = str_repeat('	', $deep);
 
 		echo $lead.$this->tag;
-		if ($show_attr && count($this->attr)>0)
+		if ($show_attr && count($this->attr) > 0)
 		{
 			echo '(';
 			foreach ($this->attr as $k=>$v)
@@ -169,18 +169,18 @@ 
 		{
 			foreach ($this->nodes as $c)
 			{
-				$c->dump($show_attr, $deep+1);
+				$c->dump($show_attr, $deep + 1);
 			}
 		}
 	}
 
 
 	// Debugging function to dump a single dom node with a bunch of information about it.
-	function dump_node($echo=true)
+	function dump_node($echo = true)
 	{
 
 		$string = $this->tag;
-		if (count($this->attr)>0)
+		if (count($this->attr) > 0)
 		{
 			$string .= '(';
 			foreach ($this->attr as $k=>$v)
@@ -189,7 +189,7 @@ 
 			}
 			$string .= ')';
 		}
-		if (count($this->_)>0)
+		if (count($this->_) > 0)
 		{
 			$string .= ' $_ (';
 			foreach ($this->_ as $k=>$v)
@@ -211,22 +211,22 @@ 
 
 		if (isset($this->text))
 		{
-			$string .= " text: (" . $this->text . ")";
+			$string .= " text: (".$this->text.")";
 		}
 
 		$string .= " HDOM_INNER_INFO: '";
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
-			$string .= $node->_[HDOM_INFO_INNER] . "'";
+			$string .= $node->_[HDOM_INFO_INNER]."'";
 		}
 		else
 		{
 			$string .= ' NULL ';
 		}
 
-		$string .= " children: " . count($this->children);
-		$string .= " nodes: " . count($this->nodes);
-		$string .= " tag_start: " . $this->tag_start;
+		$string .= " children: ".count($this->children);
+		$string .= " nodes: ".count($this->nodes);
+		$string .= " tag_start: ".$this->tag_start;
 		$string .= "\n";
 
 		if ($echo)
@@ -242,7 +242,7 @@ 
 
 	// returns the parent of node
 	// If a node is passed in, it will reset the parent of the current node to that one.
-	function parent($parent=null)
+	function parent($parent = null)
 	{
 		// I am SURE that this doesn't work properly.
 		// It fails to unset the current node from it's current parents nodes or children list first.
@@ -263,9 +263,9 @@ 
 	}
 
 	// returns children of node
-	function children($idx=-1)
+	function children($idx = -1)
 	{
-		if ($idx===-1)
+		if ($idx === -1)
 		{
 			return $this->children;
 		}
@@ -279,7 +279,7 @@ 
 	// returns the first child of node
 	function first_child()
 	{
-		if (count($this->children)>0)
+		if (count($this->children) > 0)
 		{
 			return $this->children[0];
 		}
@@ -289,9 +289,9 @@ 
 	// returns the last child of node
 	function last_child()
 	{
-		if (($count=count($this->children))>0)
+		if (($count = count($this->children)) > 0)
 		{
-			return $this->children[$count-1];
+			return $this->children[$count - 1];
 		}
 		return null;
 	}
@@ -299,18 +299,18 @@ 
 	// returns the next sibling of node
 	function next_sibling()
 	{
-		if ($this->parent===null)
+		if ($this->parent === null)
 		{
 			return null;
 		}
 
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 		{
 			++$idx;
 		}
-		if (++$idx>=$count)
+		if (++$idx >= $count)
 		{
 			return null;
 		}
@@ -320,12 +320,12 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent === null) return null;
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 			++$idx;
-		if (--$idx<0) return null;
+		if (--$idx < 0) return null;
 		return $this->parent->children[$idx];
 	}
 
@@ -340,7 +340,7 @@ 
 
 		while (!is_null($returnDom))
 		{
-			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); }
+			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: ".$returnDom->tag); }
 
 			if ($returnDom->tag == $tag)
 			{
@@ -374,16 +374,16 @@ 
 			{
 				if (!empty($this->text))
 				{
-					$text = " with text: " . $this->text;
+					$text = " with text: ".$this->text;
 				}
 			}
-			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
+			$debug_object->debug_log(1, 'Innertext of tag: '.$this->tag.$text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag === 'root') return $this->innertext();
 
 		// trigger callback
-		if ($this->dom && $this->dom->callback!==null)
+		if ($this->dom && $this->dom->callback !== null)
 		{
 			call_user_func_array($this->dom->callback, array($this));
 		}
@@ -418,7 +418,7 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
 			$ret .= '</'.$this->tag.'>';
 		return $ret;
 	}
@@ -433,8 +433,8 @@ 
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script') === 0) return '';
+		if (strcasecmp($this->tag, 'style') === 0) return '';
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -480,12 +480,12 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
+			if ($val === null || $val === false)
 				continue;
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
+			if ($val === true)
 				$ret .= $key;
 			else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
@@ -498,34 +498,34 @@ 
 			}
 		}
 		$ret = $this->dom->restore_noise($ret);
-		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+		return $ret.$this->_[HDOM_INFO_ENDSPACE].'>';
 	}
 
 	// find elements by css selector
 	//PaperG - added ability for find to lowercase the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count = count($selectors)) === 0) return array();
 		$found_keys = array();
 
 		// find each selector
-		for ($c=0; $c<$count; ++$c)
+		for ($c = 0; $c < $count; ++$c)
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
+			if (($levle = count($selectors[$c])) === 0) return array();
 			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
 			// handle descendant selectors, no recursive!
-			for ($l=0; $l<$levle; ++$l)
+			for ($l = 0; $l < $levle; ++$l)
 			{
 				$ret = array();
 				foreach ($head as $k=>$v)
 				{
-					$n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
+					$n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
 					//PaperG - Pass this optional parameter on to the seek function.
 					$n->seek($selectors[$c][$l], $ret, $lowercase);
 				}
@@ -550,13 +550,13 @@ 
 
 		// return nth-element or array
 		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		else if ($idx < 0) $idx = count($found) + $idx;
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
 	// seek for given conditions
 	// PaperG - added parameter to allow for case insensitive testing of the value of a selector.
-	protected function seek($selector, &$ret, $lowercase=false)
+	protected function seek($selector, &$ret, $lowercase = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
@@ -569,8 +569,8 @@ 
 			$count = 0;
 			foreach ($this->children as $c)
 			{
-				if ($tag==='*' || $tag===$c->tag) {
-					if (++$count==$key) {
+				if ($tag === '*' || $tag === $c->tag) {
+					if (++$count == $key) {
 						$ret[$c->_[HDOM_INFO_BEGIN]] = 1;
 						return;
 					}
@@ -580,38 +580,38 @@ 
 		}
 
 		$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-		if ($end==0) {
+		if ($end == 0) {
 			$parent = $this->parent;
-			while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
+			while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
 				$end -= 1;
 				$parent = $parent->parent;
 			}
 			$end += $parent->_[HDOM_INFO_END];
 		}
 
-		for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
+		for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) {
 			$node = $this->dom->nodes[$i];
 
 			$pass = true;
 
-			if ($tag==='*' && !$key) {
+			if ($tag === '*' && !$key) {
 				if (in_array($node, $this->children, true))
 					$ret[$i] = 1;
 				continue;
 			}
 
 			// compare tag
-			if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+			if ($tag && $tag != $node->tag && $tag !== '*') {$pass = false; }
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) $pass = false;
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false;
 				}
 			}
 			// compare value
-			if ($pass && $key && $val  && $val!=='*') {
+			if ($pass && $key && $val && $val !== '*') {
 				// If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
 				if ($key == "plaintext") {
 					// $node->plaintext actually returns $node->text();
@@ -620,7 +620,7 @@ 
 					// this is a normal search, we want the value of that attribute of the tag.
 					$nodeKeyValue = $node->attr[$key];
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: ".$node->tag." for attribute: ".$key.$exp.$val." where nodes value is: ".$nodeKeyValue); }
 
 				//PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
 				if ($lowercase) {
@@ -628,11 +628,11 @@ 
 				} else {
 					$check = $this->match($exp, $val, $nodeKeyValue);
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: ".($check ? "true" : "false")); }
 
 				// handle multiple class
-				if (!$check && strcasecmp($key, 'class')===0) {
-					foreach (explode(' ',$node->attr[$key]) as $k) {
+				if (!$check && strcasecmp($key, 'class') === 0) {
+					foreach (explode(' ', $node->attr[$key]) as $k) {
 						// Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
 						if (!empty($k)) {
 							if ($lowercase) {
@@ -650,24 +650,24 @@ 
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
-		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret); }
 	}
 
 	protected function match($exp, $pattern, $value) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($exp) {
 			case '=':
-				return ($value===$pattern);
+				return ($value === $pattern);
 			case '!=':
-				return ($value!==$pattern);
+				return ($value !== $pattern);
 			case '^=':
-				return preg_match("/^".preg_quote($pattern,'/')."/", $value);
+				return preg_match("/^".preg_quote($pattern, '/')."/", $value);
 			case '$=':
-				return preg_match("/".preg_quote($pattern,'/')."$/", $value);
+				return preg_match("/".preg_quote($pattern, '/')."$/", $value);
 			case '*=':
-				if ($pattern[0]=='/') {
+				if ($pattern[0] == '/') {
 					return preg_match($pattern, $value);
 				}
 				return preg_match("/".$pattern."/i", $value);
@@ -677,7 +677,7 @@ 
 
 	protected function parse_selector($selector_string) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		// pattern of CSS selectors, modified from mootools
 		// Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
@@ -688,7 +688,7 @@ 
 //		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
-		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);}
+		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches); }
 
 		$selectors = array();
 		$result = array();
@@ -696,29 +696,29 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue;
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1] === 'tbody') continue;
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-			if (!empty($m[2])) {$key='id'; $val=$m[2];}
-			if (!empty($m[3])) {$key='class'; $val=$m[3];}
-			if (!empty($m[4])) {$key=$m[4];}
-			if (!empty($m[5])) {$exp=$m[5];}
-			if (!empty($m[6])) {$val=$m[6];}
+			if (!empty($m[2])) {$key = 'id'; $val = $m[2]; }
+			if (!empty($m[3])) {$key = 'class'; $val = $m[3]; }
+			if (!empty($m[4])) {$key = $m[4]; }
+			if (!empty($m[5])) {$exp = $m[5]; }
+			if (!empty($m[6])) {$val = $m[6]; }
 
 			// convert to lowercase
-			if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
+			if ($this->dom->lowercase) {$tag = strtolower($tag); $key = strtolower($key); }
 			//elements that do NOT have the specified attribute
-			if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+			if (isset($key[0]) && $key[0] === '!') {$key = substr($key, 1); $no_key = true; }
 
 			$result[] = array($tag, $key, $val, $exp, $no_key);
-			if (trim($m[7])===',') {
+			if (trim($m[7]) === ',') {
 				$selectors[] = $result;
 				$result = array();
 			}
 		}
-		if (count($result)>0)
+		if (count($result) > 0)
 			$selectors[] = $result;
 		return $selectors;
 	}
@@ -742,7 +742,7 @@ 
 	function __set($name, $value)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($name)
 		{
@@ -780,7 +780,7 @@ 
 	function convert_text($text)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		$converted_text = $text;
 
@@ -792,7 +792,7 @@ 
 			$sourceCharset = strtoupper($this->dom->_charset);
 			$targetCharset = strtoupper($this->dom->_target_charset);
 		}
-		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: ".$sourceCharset." target charaset: ".$targetCharset); }
 
 		if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0))
 		{
@@ -831,27 +831,27 @@ 
 	*/
 	static function is_utf8($str)
 	{
-		$c=0; $b=0;
-		$bits=0;
-		$len=strlen($str);
-		for($i=0; $i<$len; $i++)
+		$c = 0; $b = 0;
+		$bits = 0;
+		$len = strlen($str);
+		for ($i = 0; $i < $len; $i++)
 		{
-			$c=ord($str[$i]);
-			if($c > 128)
+			$c = ord($str[$i]);
+			if ($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
+				if (($c >= 254)) return false;
+				elseif ($c >= 252) $bits = 6;
+				elseif ($c >= 248) $bits = 5;
+				elseif ($c >= 240) $bits = 4;
+				elseif ($c >= 224) $bits = 3;
+				elseif ($c >= 192) $bits = 2;
 				else return false;
-				if(($i+$bits) > $len) return false;
-				while($bits > 1)
+				if (($i + $bits) > $len) return false;
+				while ($bits > 1)
 				{
 					$i++;
-					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					$b = ord($str[$i]);
+					if ($b < 128 || $b > 191) return false;
 					$bits--;
 				}
 			}
@@ -955,24 +955,24 @@ 
 	}
 
 	// camel naming conventions
-	function getAllAttributes() {return $this->attr;}
-	function getAttribute($name) {return $this->__get($name);}
-	function setAttribute($name, $value) {$this->__set($name, $value);}
-	function hasAttribute($name) {return $this->__isset($name);}
-	function removeAttribute($name) {$this->__set($name, null);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-	function parentNode() {return $this->parent();}
-	function childNodes($idx=-1) {return $this->children($idx);}
-	function firstChild() {return $this->first_child();}
-	function lastChild() {return $this->last_child();}
-	function nextSibling() {return $this->next_sibling();}
-	function previousSibling() {return $this->prev_sibling();}
-	function hasChildNodes() {return $this->has_child();}
-	function nodeName() {return $this->tag;}
-	function appendChild($node) {$node->parent($this); return $node;}
+	function getAllAttributes() {return $this->attr; }
+	function getAttribute($name) {return $this->__get($name); }
+	function setAttribute($name, $value) {$this->__set($name, $value); }
+	function hasAttribute($name) {return $this->__isset($name); }
+	function removeAttribute($name) {$this->__set($name, null); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = null) {return $this->find($name, $idx); }
+	function parentNode() {return $this->parent(); }
+	function childNodes($idx = -1) {return $this->children($idx); }
+	function firstChild() {return $this->first_child(); }
+	function lastChild() {return $this->last_child(); }
+	function nextSibling() {return $this->next_sibling(); }
+	function previousSibling() {return $this->prev_sibling(); }
+	function hasChildNodes() {return $this->has_child(); }
+	function nodeName() {return $this->tag; }
+	function appendChild($node) {$node->parent($this); return $node; }
 
 }
 
@@ -1028,11 +1028,11 @@ 
 		'option'=>array('option'=>1),
 	);
 
-	function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		if ($str)
 		{
-			if (preg_match("/^http:\/\//i",$str) || is_file($str))
+			if (preg_match("/^http:\/\//i", $str) || is_file($str))
 			{
 				$this->load_file($str);
 			}
@@ -1043,7 +1043,7 @@ 
 		}
 		// Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
 		if (!$forceTagsClosed) {
-			$this->optional_closing_array=array();
+			$this->optional_closing_array = array();
 		}
 		$this->_target_charset = $target_charset;
 	}
@@ -1054,7 +1054,7 @@ 
 	}
 
 	// load html from string
-	function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		global $debug_object;
 
@@ -1096,7 +1096,7 @@ 
 		$args = func_get_args();
 		$this->load(call_user_func_array('file_get_contents', $args), true);
 		// Throw an error if we can't properly load the dom.
-		if (($error=error_get_last())!==null) {
+		if (($error = error_get_last()) !== null) {
 			$this->clear();
 			return false;
 		}
@@ -1115,16 +1115,16 @@ 
 	}
 
 	// save dom as string
-	function save($filepath='')
+	function save($filepath = '')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX);
 		return $ret;
 	}
 
 	// find dom node by css selector
 	// Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		return $this->root->find($selector, $idx, $lowercase);
 	}
@@ -1132,22 +1132,22 @@ 
 	// clean up memory due to php5 circular references memory leak...
 	function clear()
 	{
-		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
+		foreach ($this->nodes as $n) {$n->clear(); $n = null; }
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
-		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
-		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
+		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null; }
+		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent); }
+		if (isset($this->root)) {$this->root->clear(); unset($this->root); }
 		unset($this->doc);
 		unset($this->noise);
 	}
 
-	function dump($show_attr=true)
+	function dump($show_attr = true)
 	{
 		$this->root->dump($show_attr);
 	}
 
 	// prepare HTML data and init everything
-	protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		$this->clear();
 
@@ -1178,13 +1178,13 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size > 0) $this->char = $this->doc[0];
 	}
 
 	// parse html content
 	protected function parse()
 	{
-		if (($s = $this->copy_until_char('<'))==='')
+		if (($s = $this->copy_until_char('<')) === '')
 		{
 			return $this->read_tag();
 		}
@@ -1213,18 +1213,18 @@ 
 			if ($success)
 			{
 				$charset = $matches[1];
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: '.$charset); }
 			}
 
 		}
 
 		if (empty($charset))
 		{
-			$el = $this->root->find('meta[http-equiv=Content-Type]',0, true);
+			$el = $this->root->find('meta[http-equiv=Content-Type]', 0, true);
 			if (!empty($el))
 			{
 				$fullvalue = $el->content;
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found'.$fullvalue); }
 
 				if (!empty($fullvalue))
 				{
@@ -1236,7 +1236,7 @@ 
 					else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
-						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
+						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.'); }
 						$charset = 'ISO-8859-1';
 					}
 				}
@@ -1251,14 +1251,14 @@ 
 			if (function_exists('mb_detect_encoding'))
 			{
 				// Have php try to detect the encoding from the text given to us.
-				$charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) );
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);}
+				$charset = mb_detect_encoding($this->root->plaintext."ascii", $encoding_list = array("UTF-8", "CP1252"));
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: '.$charset); }
 			}
 
 			// and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
 			if ($charset === false)
 			{
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8'); }
 				$charset = 'UTF-8';
 			}
 		}
@@ -1266,11 +1266,11 @@ 
 		// Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
 		if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1')))
 		{
-			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');}
+			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing '.$charset.' with CP1252 as its a superset'); }
 			$charset = 'CP1252';
 		}
 
-		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - '.$charset); }
 
 		return $this->_charset = $charset;
 	}
@@ -1278,41 +1278,41 @@ 
 	// read tag info
 	protected function read_tag()
 	{
-		if ($this->char!=='<')
+		if ($this->char !== '<')
 		{
 			$this->root->_[HDOM_INFO_END] = $this->cursor;
 			return false;
 		}
 		$begin_tag_pos = $this->pos;
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// end tag
-		if ($this->char==='/')
+		if ($this->char === '/')
 		{
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			// This represents the change in the simple_html_dom trunk from revision 180 to 181.
 			// $this->skip($this->token_blank_t);
 			$this->skip($this->token_blank);
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
+			if (($pos = strpos($tag, ' ')) !== false)
 				$tag = substr($tag, 0, $pos);
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
 
-			if ($parent_lower!==$tag_lower)
+			if ($parent_lower !== $tag_lower)
 			{
 				if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower) {
+					if (strtolower($this->parent->tag) !== $tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
 						if ($this->parent->parent) $this->parent = $this->parent->parent;
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
@@ -1324,17 +1324,17 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower)
+					if (strtolower($this->parent->tag) !== $tag_lower)
 					{
 						$this->parent = $org_parent; // restore origonal parent
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
 				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
@@ -1346,7 +1346,7 @@ 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
 			if ($this->parent->parent) $this->parent = $this->parent->parent;
 
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1357,25 +1357,25 @@ 
 		$node->tag_start = $begin_tag_pos;
 
 		// doctype, cdata & comments...
-		if (isset($tag[0]) && $tag[0]==='!') {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+		if (isset($tag[0]) && $tag[0] === '!') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until_char('>');
 
-			if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
+			if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') {
 				$node->nodetype = HDOM_TYPE_COMMENT;
 				$node->tag = 'comment';
 			} else {
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, true);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
 		// text
-		if ($pos=strpos($tag, '<')!==false) {
-			$tag = '<' . substr($tag, 0, -1);
+		if ($pos = strpos($tag, '<') !== false) {
+			$tag = '<'.substr($tag, 0, -1);
 			$node->_[HDOM_INFO_TEXT] = $tag;
 			$this->link_nodes($node, false);
 			$this->char = $this->doc[--$this->pos]; // prev
@@ -1383,15 +1383,15 @@ 
 		}
 
 		if (!preg_match("/^[\w-:]+$/", $tag)) {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-			if ($this->char==='<') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until('<>');
+			if ($this->char === '<') {
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, false);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1401,7 +1401,7 @@ 
 		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
 
 		// handle optional closing tags
-		if (isset($this->optional_closing_tags[$tag_lower]) )
+		if (isset($this->optional_closing_tags[$tag_lower]))
 		{
 			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)]))
 			{
@@ -1417,67 +1417,67 @@ 
 		// attributes
 		do
 		{
-			if ($this->char!==null && $space[0]==='')
+			if ($this->char !== null && $space[0] === '')
 			{
 				break;
 			}
 			$name = $this->copy_until($this->token_equal);
-			if ($guard===$this->pos)
+			if ($guard === $this->pos)
 			{
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				continue;
 			}
 			$guard = $this->pos;
 
 			// handle endless '<'
-			if ($this->pos>=$this->size-1 && $this->char!=='>') {
+			if ($this->pos >= $this->size - 1 && $this->char !== '>') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
+				$node->_[HDOM_INFO_TEXT] = '<'.$tag.$space[0].$name;
 				$node->tag = 'text';
 				$this->link_nodes($node, false);
 				return true;
 			}
 
 			// handle mismatch '<'
-			if ($this->doc[$this->pos-1]=='<') {
+			if ($this->doc[$this->pos - 1] == '<') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->tag = 'text';
 				$node->attr = array();
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
+				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1);
 				$this->pos -= 2;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($name!=='/' && $name!=='') {
+			if ($name !== '/' && $name !== '') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
 				if ($this->lowercase) $name = strtolower($name);
-				if ($this->char==='=') {
-					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				if ($this->char === '=') {
+					$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
 				}
 				else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
 			}
 			else
 				break;
-		} while ($this->char!=='>' && $this->char!=='/');
+		} while ($this->char !== '>' && $this->char !== '/');
 
 		$this->link_nodes($node, true);
 		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
 
 		// check self closing
-		if ($this->copy_until_char_escape('>')==='/')
+		if ($this->copy_until_char_escape('>') === '/')
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
@@ -1487,7 +1487,7 @@ 
 			// reset parent
 			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
 		}
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// If it's a BR tag, we need to set it's text to the default text.
 		// This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1514,15 +1514,15 @@ 
 		switch ($this->char) {
 			case '"':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			case '\'':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			default:
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
@@ -1553,16 +1553,16 @@ 
 	{
 		$node = new simple_html_dom_node($this);
 		++$this->cursor;
-		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+		$node->_[HDOM_INFO_TEXT] = '</'.$tag.'>';
 		$this->link_nodes($node, false);
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return true;
 	}
 
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
 	protected function copy_skip($chars)
@@ -1570,8 +1570,8 @@ 
 		$pos = $this->pos;
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		if ($len === 0) return '';
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1580,70 +1580,70 @@ 
 		$pos = $this->pos;
 		$len = strcspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return substr($this->doc, $pos, $len);
 	}
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
-		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
-			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+		if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
+			$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 			$this->char = null;
 			$this->pos = $this->size;
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos === $this->pos) return '';
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
-		return substr($this->doc, $pos_old, $pos-$pos_old);
+		return substr($this->doc, $pos_old, $pos - $pos_old);
 	}
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
 		$start = $this->pos;
 		while (1)
 		{
-			if (($pos = strpos($this->doc, $char, $start))===false)
+			if (($pos = strpos($this->doc, $char, $start)) === false)
 			{
-				$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+				$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 				$this->char = null;
 				$this->pos = $this->size;
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos === $this->pos) return '';
 
-			if ($this->doc[$pos-1]==='\\') {
-				$start = $pos+1;
+			if ($this->doc[$pos - 1] === '\\') {
+				$start = $pos + 1;
 				continue;
 			}
 
 			$pos_old = $this->pos;
 			$this->char = $this->doc[$pos];
 			$this->pos = $pos;
-			return substr($this->doc, $pos_old, $pos-$pos_old);
+			return substr($this->doc, $pos_old, $pos - $pos_old);
 		}
 	}
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
-	protected function remove_noise($pattern, $remove_tag=false)
+	protected function remove_noise($pattern, $remove_tag = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
 		$count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
 
-		for ($i=$count-1; $i>-1; --$i)
+		for ($i = $count - 1; $i > -1; --$i)
 		{
-			$key = '___noise___'.sprintf('% 5d', count($this->noise)+1000);
-			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: ' . $key); }
+			$key = '___noise___'.sprintf('% 5d', count($this->noise) + 1000);
+			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: '.$key); }
 			$idx = ($remove_tag) ? 0 : 1;
 			$this->noise[$key] = $matches[$i][$idx][0];
 			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
@@ -1651,7 +1651,7 @@ 
 
 		// reset the length of content
 		$this->size = strlen($this->doc);
-		if ($this->size>0)
+		if ($this->size > 0)
 		{
 			$this->char = $this->doc[0];
 		}
@@ -1663,28 +1663,28 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		while (($pos=strpos($text, '___noise___'))!==false)
+		while (($pos = strpos($text, '___noise___')) !== false)
 		{
 			// Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
-			if (strlen($text) > $pos+15)
+			if (strlen($text) > $pos + 15)
 			{
-				$key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15];
-				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: ' . $key); }
+				$key = '___noise___'.$text[$pos + 11].$text[$pos + 12].$text[$pos + 13].$text[$pos + 14].$text[$pos + 15];
+				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: '.$key); }
 
 				if (isset($this->noise[$key]))
 				{
-					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
+					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos + 16);
 				}
 				else
 				{
 					// do this to prevent an infinite loop.
-					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
+					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key.substr($text, $pos + 16);
 				}
 			}
 			else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
-				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
+				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY'.substr($text, $pos + 11);
 			}
 		}
 		return $text;
@@ -1696,9 +1696,9 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		foreach($this->noise as $noiseElement)
+		foreach ($this->noise as $noiseElement)
 		{
-			if (strpos($noiseElement, $text)!==false)
+			if (strpos($noiseElement, $text) !== false)
 			{
 				return $noiseElement;
 			}
@@ -1727,16 +1727,16 @@ 
 	}
 
 	// camel naming conventions
-	function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-	function firstChild() {return $this->root->first_child();}
-	function lastChild() {return $this->root->last_child();}
-	function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
-	function createTextNode($value) {return @end(str_get_html($value)->nodes);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-	function loadFile() {$args = func_get_args();$this->load_file($args);}
+	function childNodes($idx = -1) {return $this->root->childNodes($idx); }
+	function firstChild() {return $this->root->first_child(); }
+	function lastChild() {return $this->root->last_child(); }
+	function createElement($name, $value = null) {return @str_get_html("<$name>$value</$name>")->first_child(); }
+	function createTextNode($value) {return @end(str_get_html($value)->nodes); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = -1) {return $this->find($name, $idx); }
+	function loadFile() {$args = func_get_args(); $this->load_file($args); }
 }
 
 ?>
\ No newline at end of file

Braces +193 added lines, -101 removed lines

@@ -159,8 +159,9 @@ 
 		if ($show_attr && count($this->attr)>0)
 		{
 			echo '(';
-			foreach ($this->attr as $k=>$v)
-				echo "[$k]=>\"".$this->$k.'", ';
+			foreach ($this->attr as $k=>$v) {
+							echo "[$k]=>\"".$this->$k.'", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -218,8 +219,7 @@ 
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
 			$string .= $node->_[HDOM_INFO_INNER] . "'";
-		}
-		else
+		} else
 		{
 			$string .= ' NULL ';
 		}
@@ -233,8 +233,7 @@ 
 		{
 			echo $string;
 			return;
-		}
-		else
+		} else
 		{
 			return $string;
 		}
@@ -320,12 +319,17 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent===null) {
+			return null;
+		}
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
-			++$idx;
-		if (--$idx<0) return null;
+		while ($idx<$count && $this!==$this->parent->children[$idx]) {
+					++$idx;
+		}
+		if (--$idx<0) {
+			return null;
+		}
 		return $this->parent->children[$idx];
 	}
 
@@ -354,12 +358,17 @@ 
 	// get dom node's inner html
 	function innertext()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '';
-		foreach ($this->nodes as $n)
-			$ret .= $n->outertext();
+		foreach ($this->nodes as $n) {
+					$ret .= $n->outertext();
+		}
 		return $ret;
 	}
 
@@ -380,7 +389,9 @@ 
 			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag==='root') {
+			return $this->innertext();
+		}
 
 		// trigger callback
 		if ($this->dom && $this->dom->callback!==null)
@@ -388,8 +399,12 @@ 
 			call_user_func_array($this->dom->callback, array($this));
 		}
 
-		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_OUTER])) {
+			return $this->_[HDOM_INFO_OUTER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		// render begin tag
 		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
@@ -418,23 +433,30 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-			$ret .= '</'.$this->tag.'>';
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) {
+					$ret .= '</'.$this->tag.'>';
+		}
 		return $ret;
 	}
 
 	// get dom node's plain text
 	function text()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
 		switch ($this->nodetype)
 		{
 			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script')===0) {
+			return '';
+		}
+		if (strcasecmp($this->tag, 'style')===0) {
+			return '';
+		}
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -470,7 +492,9 @@ 
 	function makeup()
 	{
 		// text, comment, unknown
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '<'.$this->tag;
 		$i = -1;
@@ -480,14 +504,15 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
-				continue;
+			if ($val===null || $val===false) {
+							continue;
+			}
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
-				$ret .= $key;
-			else {
+			if ($val===true) {
+							$ret .= $key;
+			} else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
 				{
 					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
@@ -506,7 +531,9 @@ 
 	function find($selector, $idx=null, $lowercase=false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count=count($selectors))===0) {
+			return array();
+		}
 		$found_keys = array();
 
 		// find each selector
@@ -514,8 +541,12 @@ 
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
-			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+			if (($levle=count($selectors[$c]))===0) {
+				return array();
+			}
+			if (!isset($this->_[HDOM_INFO_BEGIN])) {
+				return array();
+			}
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
@@ -545,12 +576,16 @@ 
 		ksort($found_keys);
 
 		$found = array();
-		foreach ($found_keys as $k=>$v)
-			$found[] = $this->dom->nodes[$k];
+		foreach ($found_keys as $k=>$v) {
+					$found[] = $this->dom->nodes[$k];
+		}
 
 		// return nth-element or array
-		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		if (is_null($idx)) {
+			return $found;
+		} else if ($idx<0) {
+			$idx = count($found) + $idx;
+		}
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
@@ -595,8 +630,9 @@ 
 			$pass = true;
 
 			if ($tag==='*' && !$key) {
-				if (in_array($node, $this->children, true))
-					$ret[$i] = 1;
+				if (in_array($node, $this->children, true)) {
+									$ret[$i] = 1;
+				}
 				continue;
 			}
 
@@ -605,9 +641,13 @@ 
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) {
+						$pass=false;
+					}
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) {
+						$pass=false;
+					}
 				}
 			}
 			// compare value
@@ -640,13 +680,19 @@ 
 							} else {
 								$check = $this->match($exp, $val, $k);
 							}
-							if ($check) break;
+							if ($check) {
+								break;
+							}
 						}
 					}
 				}
-				if (!$check) $pass = false;
+				if (!$check) {
+					$pass = false;
+				}
+			}
+			if ($pass) {
+				$ret[$i] = 1;
 			}
-			if ($pass) $ret[$i] = 1;
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
@@ -696,9 +742,13 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') {
+				continue;
+			}
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1]==='tbody') {
+				continue;
+			}
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 			if (!empty($m[2])) {$key='id'; $val=$m[2];}
@@ -718,8 +768,9 @@ 
 				$result = array();
 			}
 		}
-		if (count($result)>0)
-			$selectors[] = $result;
+		if (count($result)>0) {
+					$selectors[] = $result;
+		}
 		return $selectors;
 	}
 
@@ -748,7 +799,9 @@ 
 		{
 			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 			case 'innertext':
-				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+				if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+				}
 				return $this->_[HDOM_INFO_INNER] = $value;
 		}
 		if (!isset($this->attr[$name]))
@@ -772,8 +825,9 @@ 
 	}
 
 	function __unset($name) {
-		if (isset($this->attr[$name]))
-			unset($this->attr[$name]);
+		if (isset($this->attr[$name])) {
+					unset($this->attr[$name]);
+		}
 	}
 
 	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
@@ -800,8 +854,7 @@ 
 			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
 			{
 				$converted_text = $text;
-			}
-			else
+			} else
 			{
 				$converted_text = iconv($sourceCharset, $targetCharset, $text);
 			}
@@ -839,19 +892,31 @@ 
 			$c=ord($str[$i]);
 			if($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
-				else return false;
-				if(($i+$bits) > $len) return false;
+				if(($c >= 254)) {
+					return false;
+				} elseif($c >= 252) {
+					$bits=6;
+				} elseif($c >= 248) {
+					$bits=5;
+				} elseif($c >= 240) {
+					$bits=4;
+				} elseif($c >= 224) {
+					$bits=3;
+				} elseif($c >= 192) {
+					$bits=2;
+				} else {
+					return false;
+				}
+				if(($i+$bits) > $len) {
+					return false;
+				}
 				while($bits > 1)
 				{
 					$i++;
 					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					if($b < 128 || $b > 191) {
+						return false;
+					}
 					$bits--;
 				}
 			}
@@ -1035,8 +1100,7 @@ 
 			if (preg_match("/^http:\/\//i",$str) || is_file($str))
 			{
 				$this->load_file($str);
-			}
-			else
+			} else
 			{
 				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
 			}
@@ -1118,7 +1182,9 @@ 
 	function save($filepath='')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath!=='') {
+			file_put_contents($filepath, $ret, LOCK_EX);
+		}
 		return $ret;
 	}
 
@@ -1134,7 +1200,10 @@ 
 	{
 		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+		if (isset($this->children)) {
+			foreach ($this->children as $n) {$n->clear();
+		}
+		$n = null;}
 		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
 		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
 		unset($this->doc);
@@ -1178,7 +1247,9 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size>0) {
+			$this->char = $this->doc[0];
+		}
 	}
 
 	// parse html content
@@ -1232,8 +1303,7 @@ 
 					if ($success)
 					{
 						$charset = $matches[1];
-					}
-					else
+					} else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
 						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
@@ -1296,8 +1366,9 @@ 
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
-				$tag = substr($tag, 0, $pos);
+			if (($pos = strpos($tag, ' '))!==false) {
+							$tag = substr($tag, 0, $pos);
+			}
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
@@ -1309,23 +1380,26 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
-						if ($this->parent->parent) $this->parent = $this->parent->parent;
+						if ($this->parent->parent) {
+							$this->parent = $this->parent->parent;
+						}
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+				} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower)
 					{
@@ -1333,18 +1407,19 @@ 
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				} else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
+				} else {
+									return $this->as_text_node($tag);
 				}
-				else
-					return $this->as_text_node($tag);
 			}
 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
-			if ($this->parent->parent) $this->parent = $this->parent->parent;
+			if ($this->parent->parent) {
+				$this->parent = $this->parent->parent;
+			}
 
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1367,7 +1442,9 @@ 
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, true);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1389,7 +1466,9 @@ 
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, false);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1455,22 +1534,26 @@ 
 			if ($name!=='/' && $name!=='') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
-				if ($this->lowercase) $name = strtolower($name);
+				if ($this->lowercase) {
+					$name = strtolower($name);
+				}
 				if ($this->char==='=') {
 					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
-				}
-				else {
+				} else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char!='>') {
+						$this->char = $this->doc[--$this->pos];
+					}
+					// prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
+			} else {
+							break;
 			}
-			else
-				break;
 		} while ($this->char!=='>' && $this->char!=='/');
 
 		$this->link_nodes($node, true);
@@ -1481,11 +1564,12 @@ 
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
-		}
-		else
+		} else
 		{
 			// reset parent
-			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+				$this->parent = $node;
+			}
 		}
 		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 
@@ -1571,7 +1655,9 @@ 
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		if ($len===0) {
+			return '';
+		}
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1586,7 +1672,9 @@ 
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
 			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
@@ -1595,7 +1683,9 @@ 
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos===$this->pos) {
+			return '';
+		}
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
@@ -1604,7 +1694,9 @@ 
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		$start = $this->pos;
 		while (1)
@@ -1617,7 +1709,9 @@ 
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos===$this->pos) {
+				return '';
+			}
 
 			if ($this->doc[$pos-1]==='\\') {
 				$start = $pos+1;
@@ -1674,14 +1768,12 @@ 
 				if (isset($this->noise[$key]))
 				{
 					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
-				}
-				else
+				} else
 				{
 					// do this to prevent an infinite loop.
 					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
 				}
-			}
-			else
+			} else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
 				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);

Doc Comments +40 added lines

@@ -125,6 +125,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1501,6 +1504,11 @@ 
 	}
 
 	// parse attributes
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param string[] $space
+	 */
 	protected function parse_attr($node, $name, &$space)
 	{
 		// Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1538,6 +1546,11 @@ 
 	}
 
 	// link node's parent
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param boolean $is_child
+	 */
 	protected function link_nodes(&$node, $is_child)
 	{
 		$node->parent = $this->parent;
@@ -1549,6 +1562,10 @@ 
 	}
 
 	// as a text node
+
+	/**
+	 * @param string $tag
+	 */
 	protected function as_text_node($tag)
 	{
 		$node = new simple_html_dom_node($this);
@@ -1559,12 +1576,18 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_skip($chars)
 	{
 		$pos = $this->pos;
@@ -1575,6 +1598,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_until($chars)
 	{
 		$pos = $this->pos;
@@ -1584,6 +1610,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char($char)
 	{
 		if ($this->char===null) return '';
@@ -1602,6 +1631,9 @@ 
 		return substr($this->doc, $pos_old, $pos-$pos_old);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char_escape($char)
 	{
 		if ($this->char===null) return '';
@@ -1633,6 +1665,10 @@ 
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
+
+	/**
+	 * @param string $pattern
+	 */
 	protected function remove_noise($pattern, $remove_tag=false)
 	{
 		global $debug_object;
@@ -1658,6 +1694,10 @@ 
 	}
 
 	// restore noise to html content
+
+	/**
+	 * @param string|null $text
+	 */
 	function restore_noise($text)
 	{
 		global $debug_object;

require/libs/geoPHP/tests/tests/20120702Test.php

Indentation +268 added lines, -268 removed lines

@@ -9,281 +9,281 @@
   }
 
   function testMethods() {
-    $format = 'gpx';
-    $value = file_get_contents('./input/20120702.gpx');
-    $geometry = geoPHP::load($value, $format);
+	$format = 'gpx';
+	$value = file_get_contents('./input/20120702.gpx');
+	$geometry = geoPHP::load($value, $format);
 
-    $methods = array(
-      array('name' => 'area'),
-      array('name' => 'boundary'),
-      array('name' => 'getBBox'),
-      array('name' => 'centroid'),
-      array('name' => 'length'),
-      array('name' => 'greatCircleLength', 'argument' => 6378137),
-      array('name' => 'haversineLength'),
-      array('name' => 'y'),
-      array('name' => 'x'),
-      array('name' => 'numGeometries'),
-      array('name' => 'geometryN', 'argument' => '1'),
-      array('name' => 'startPoint'),
-      array('name' => 'endPoint'),
-      array('name' => 'isRing'),
-      array('name' => 'isClosed'),
-      array('name' => 'numPoints'),
-      array('name' => 'pointN', 'argument' => '1'),
-      array('name' => 'exteriorRing'),
-      array('name' => 'numInteriorRings'),
-      array('name' => 'interiorRingN', 'argument' => '1'),
-      array('name' => 'dimension'),
-      array('name' => 'geometryType'),
-      array('name' => 'SRID'),
-      array('name' => 'setSRID', 'argument' => '4326'),
-    );
+	$methods = array(
+	  array('name' => 'area'),
+	  array('name' => 'boundary'),
+	  array('name' => 'getBBox'),
+	  array('name' => 'centroid'),
+	  array('name' => 'length'),
+	  array('name' => 'greatCircleLength', 'argument' => 6378137),
+	  array('name' => 'haversineLength'),
+	  array('name' => 'y'),
+	  array('name' => 'x'),
+	  array('name' => 'numGeometries'),
+	  array('name' => 'geometryN', 'argument' => '1'),
+	  array('name' => 'startPoint'),
+	  array('name' => 'endPoint'),
+	  array('name' => 'isRing'),
+	  array('name' => 'isClosed'),
+	  array('name' => 'numPoints'),
+	  array('name' => 'pointN', 'argument' => '1'),
+	  array('name' => 'exteriorRing'),
+	  array('name' => 'numInteriorRings'),
+	  array('name' => 'interiorRingN', 'argument' => '1'),
+	  array('name' => 'dimension'),
+	  array('name' => 'geometryType'),
+	  array('name' => 'SRID'),
+	  array('name' => 'setSRID', 'argument' => '4326'),
+	);
 
-    foreach($methods as $method) {
-      $argument = NULL;
-      $method_name = $method['name'];
-      if (isset($method['argument'])) {
-        $argument = $method['argument'];
-      }
-      $this->_methods_tester($geometry, $method_name, $argument);
-    }
+	foreach($methods as $method) {
+	  $argument = NULL;
+	  $method_name = $method['name'];
+	  if (isset($method['argument'])) {
+		$argument = $method['argument'];
+	  }
+	  $this->_methods_tester($geometry, $method_name, $argument);
+	}
   }
 
   function _methods_tester($geometry, $method_name, $argument) {
 
-    if (!method_exists($geometry, $method_name)) {
-      $this->fail("Method ".$method_name.'() doesn\'t exists.');
-      return;
-    }
+	if (!method_exists($geometry, $method_name)) {
+	  $this->fail("Method ".$method_name.'() doesn\'t exists.');
+	  return;
+	}
 
-    switch ($method_name) {
-      case 'y':
-      case 'x':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'geometryN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'startPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method startPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'endPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method endPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isClosed':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'pointN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method pointN() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'exteriorRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numInteriorRings':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'interiorRingN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'setSRID':
-        //TODO: The method setSRID() should return TRUE.
-        break;
-      case 'SRID':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'getBBox':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'centroid':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'length':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numGeometries':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numPoints':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'dimension':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'boundary':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'greatCircleLength':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
-        }
-        break;
-      case 'haversineLength':
-      case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-    }
+	switch ($method_name) {
+	  case 'y':
+	  case 'x':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'geometryN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'startPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method startPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'endPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method endPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isClosed':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'pointN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method pointN() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'exteriorRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numInteriorRings':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'interiorRingN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'setSRID':
+		//TODO: The method setSRID() should return TRUE.
+		break;
+	  case 'SRID':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'getBBox':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'centroid':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'length':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numGeometries':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numPoints':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'dimension':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'boundary':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'greatCircleLength':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'haversineLength':
+	  case 'area':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  case 'geometryType':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  default:
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+	}
   }
 }
 

Spacing +58 added lines, -58 removed lines

@@ -40,7 +40,7 @@ 
       array('name' => 'setSRID', 'argument' => '4326'),
     );
 
-    foreach($methods as $method) {
+    foreach ($methods as $method) {
       $argument = NULL;
       $method_name = $method['name'];
       if (isset($method['argument'])) {
@@ -61,32 +61,32 @@ 
       case 'y':
       case 'x':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'geometryN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'startPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method startPoint() to MultiLineString.
@@ -95,10 +95,10 @@ 
         break;
       case 'endPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method endPoint() to MultiLineString.
@@ -107,32 +107,32 @@ 
         break;
       case 'isRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'isClosed':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'pointN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method pointN() to MultiLineString.
@@ -141,35 +141,35 @@ 
         break;
       case 'exteriorRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numInteriorRings':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'interiorRingN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'setSRID':
@@ -177,112 +177,112 @@ 
         break;
       case 'SRID':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'getBBox':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'centroid':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'length':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
+          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on '.$method_name);
         }
         break;
       case 'numGeometries':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numPoints':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'dimension':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'boundary':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'greatCircleLength':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
+          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on '.$method_name);
         }
         break;
       case 'haversineLength':
       case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
     }
   }
 }

require/libs/geoPHP/tests/tests/geosTest.php

Indentation +68 added lines, -68 removed lines

@@ -9,78 +9,78 @@
   }
 
   function testGeos() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $geosMethods = array(
-          array('name' => 'geos'),
-          array('name' => 'setGeos', 'argument' => $geometry->geos()),
-          array('name' => 'PointOnSurface'),
-          array('name' => 'equals', 'argument' => $geometry),
-          array('name' => 'equalsExact', 'argument' => $geometry),
-          array('name' => 'relate', 'argument' => $geometry),
-          array('name' => 'checkValidity'),
-          array('name' => 'isSimple'),
-          array('name' => 'buffer', 'argument' => '10'),
-          array('name' => 'intersection', 'argument' => $geometry),
-          array('name' => 'convexHull'),
-          array('name' => 'difference', 'argument' => $geometry),
-          array('name' => 'symDifference', 'argument' => $geometry),
-          array('name' => 'union', 'argument' => $geometry),
-          array('name' => 'simplify', 'argument' => '0'),
-          array('name' => 'disjoint', 'argument' => $geometry),
-          array('name' => 'touches', 'argument' => $geometry),
-          array('name' => 'intersects', 'argument' => $geometry),
-          array('name' => 'crosses', 'argument' => $geometry),
-          array('name' => 'within', 'argument' => $geometry),
-          array('name' => 'contains', 'argument' => $geometry),
-          array('name' => 'overlaps', 'argument' => $geometry),
-          array('name' => 'covers', 'argument' => $geometry),
-          array('name' => 'coveredBy', 'argument' => $geometry),
-          array('name' => 'distance', 'argument' => $geometry),
-          array('name' => 'hausdorffDistance', 'argument' => $geometry),
-        );
+		$geosMethods = array(
+		  array('name' => 'geos'),
+		  array('name' => 'setGeos', 'argument' => $geometry->geos()),
+		  array('name' => 'PointOnSurface'),
+		  array('name' => 'equals', 'argument' => $geometry),
+		  array('name' => 'equalsExact', 'argument' => $geometry),
+		  array('name' => 'relate', 'argument' => $geometry),
+		  array('name' => 'checkValidity'),
+		  array('name' => 'isSimple'),
+		  array('name' => 'buffer', 'argument' => '10'),
+		  array('name' => 'intersection', 'argument' => $geometry),
+		  array('name' => 'convexHull'),
+		  array('name' => 'difference', 'argument' => $geometry),
+		  array('name' => 'symDifference', 'argument' => $geometry),
+		  array('name' => 'union', 'argument' => $geometry),
+		  array('name' => 'simplify', 'argument' => '0'),
+		  array('name' => 'disjoint', 'argument' => $geometry),
+		  array('name' => 'touches', 'argument' => $geometry),
+		  array('name' => 'intersects', 'argument' => $geometry),
+		  array('name' => 'crosses', 'argument' => $geometry),
+		  array('name' => 'within', 'argument' => $geometry),
+		  array('name' => 'contains', 'argument' => $geometry),
+		  array('name' => 'overlaps', 'argument' => $geometry),
+		  array('name' => 'covers', 'argument' => $geometry),
+		  array('name' => 'coveredBy', 'argument' => $geometry),
+		  array('name' => 'distance', 'argument' => $geometry),
+		  array('name' => 'hausdorffDistance', 'argument' => $geometry),
+		);
 
-        foreach($geosMethods as $method) {
-          $argument = NULL;
-          $method_name = $method['name'];
-          if (isset($method['argument'])) {
-            $argument = $method['argument'];
-          }
+		foreach($geosMethods as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          switch ($method_name) {
-            case 'isSimple':
-            case 'equals':
-            case 'geos':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              break;
-            default:
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-          }
-        }
+		  switch ($method_name) {
+			case 'isSimple':
+			case 'equals':
+			case 'geos':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  break;
+			default:
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+		  }
+		}
 
-      }
-    }
+	  }
+	}
   }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 
   function testGeos() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -45,7 +45,7 @@ 
           array('name' => 'hausdorffDistance', 'argument' => $geometry),
         );
 
-        foreach($geosMethods as $method) {
+        foreach ($geosMethods as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -57,24 +57,24 @@ 
             case 'equals':
             case 'geos':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             default:
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
           }
         }

require/libs/geoPHP/tests/tests/aliasesTest.php

Indentation +91 added lines, -91 removed lines

@@ -9,101 +9,101 @@
   }
 
   function testAliases() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $aliases = array(
-          array('name' => 'getCentroid'),
-          array('name' => 'getArea'),
-          array('name' => 'getX'),
-          array('name' => 'getY'),
-          array('name' => 'getGeos'),
-          array('name' => 'getGeomType'),
-          array('name' => 'getSRID'),
-          array('name' => 'asText'),
-          array('name' => 'asBinary'),
-        );
+		$aliases = array(
+		  array('name' => 'getCentroid'),
+		  array('name' => 'getArea'),
+		  array('name' => 'getX'),
+		  array('name' => 'getY'),
+		  array('name' => 'getGeos'),
+		  array('name' => 'getGeomType'),
+		  array('name' => 'getSRID'),
+		  array('name' => 'asText'),
+		  array('name' => 'asBinary'),
+		);
 
-        foreach($aliases as $alias) {
-          $argument = NULL;
-          $alias_name = $alias['name'];
-          if (isset($alias['argument'])) {
-            $argument = $alias['argument'];
-          }
+		foreach($aliases as $alias) {
+		  $argument = NULL;
+		  $alias_name = $alias['name'];
+		  if (isset($alias['argument'])) {
+			$argument = $alias['argument'];
+		  }
 
-          switch ($alias_name) {
-            case 'getSRID':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              break;
-            case 'getGeos':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              break;
-            case 'getX':
-            case 'getY':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              break;
-            case 'getArea':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              break;
-            case 'getCentroid':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              }
-              break;
-            case 'asText':
-            case 'asBinary':
-            case 'getGeomType':
-              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-              break;
-            default:
-              $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
-          }
-        }
+		  switch ($alias_name) {
+			case 'getSRID':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  break;
+			case 'getGeos':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  break;
+			case 'getX':
+			case 'getY':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  break;
+			case 'getArea':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  break;
+			case 'getCentroid':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  }
+			  break;
+			case 'asText':
+			case 'asBinary':
+			case 'getGeomType':
+			  $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+			  break;
+			default:
+			  $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+		  }
+		}
 
-      }
-    }
+	  }
+	}
   }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -10,7 +10,7 @@ 
 
   function testAliases() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -28,7 +28,7 @@ 
           array('name' => 'asBinary'),
         );
 
-        foreach($aliases as $alias) {
+        foreach ($aliases as $alias) {
           $argument = NULL;
           $alias_name = $alias['name'];
           if (isset($alias['argument'])) {
@@ -38,67 +38,67 @@ 
           switch ($alias_name) {
             case 'getSRID':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getGeos':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getX':
             case 'getY':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getArea':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'getCentroid':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               }
               break;
             case 'asText':
             case 'asBinary':
             case 'getGeomType':
-              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
               break;
             default:
-              $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
+              $this->assertTrue($geometry->$alias_name($argument), 'Failed on '.$alias_name);
           }
         }
 

require/libs/geoPHP/tests/tests/adaptersTest.php

Indentation +42 added lines, -42 removed lines

@@ -9,56 +9,56 @@
   }
 
   function testAdapters() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $input = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($input, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$input = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($input, $format);
 
-        // Test adapter output and input. Do a round-trip and re-test
-        foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
-          if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
-            $output = $geometry->out($adapter_key);
-            $this->assertNotNull($output, "Empty output on "  . $adapter_key);
-            if ($output) {
-              $adapter_loader = new $adapter_class();
-              $test_geom_1 = $adapter_loader->read($output);
-              $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
-            }
-          }
-        }
+		// Test adapter output and input. Do a round-trip and re-test
+		foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
+		  if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+			$output = $geometry->out($adapter_key);
+			$this->assertNotNull($output, "Empty output on "  . $adapter_key);
+			if ($output) {
+			  $adapter_loader = new $adapter_class();
+			  $test_geom_1 = $adapter_loader->read($output);
+			  $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
+			}
+		  }
+		}
 
-        // Test to make sure adapter work the same wether GEOS is ON or OFF
-        // Cannot test methods if GEOS is not intstalled
-        if (!geoPHP::geosInstalled()) return;
+		// Test to make sure adapter work the same wether GEOS is ON or OFF
+		// Cannot test methods if GEOS is not intstalled
+		if (!geoPHP::geosInstalled()) return;
 
-        foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
-          if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
-            // Turn GEOS on
-            geoPHP::geosInstalled(TRUE);
+		foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
+		  if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+			// Turn GEOS on
+			geoPHP::geosInstalled(TRUE);
 
-            $output = $geometry->out($adapter_key);
-            if ($output) {
-              $adapter_loader = new $adapter_class();
+			$output = $geometry->out($adapter_key);
+			if ($output) {
+			  $adapter_loader = new $adapter_class();
 
-              $test_geom_1 = $adapter_loader->read($output);
+			  $test_geom_1 = $adapter_loader->read($output);
 
-              // Turn GEOS off
-              geoPHP::geosInstalled(FALSE);
+			  // Turn GEOS off
+			  geoPHP::geosInstalled(FALSE);
 
-              $test_geom_2 = $adapter_loader->read($output);
+			  $test_geom_2 = $adapter_loader->read($output);
 
-              // Turn GEOS back On
-              geoPHP::geosInstalled(TRUE);
+			  // Turn GEOS back On
+			  geoPHP::geosInstalled(TRUE);
 
-              // Check to make sure a both are the same with geos and without
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
-            }
-          }
-        }
-      }
-    }
+			  // Check to make sure a both are the same with geos and without
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
+			}
+		  }
+		}
+	  }
+	}
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
   function testAdapters() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $input = file_get_contents('./input/'.$file);
@@ -20,7 +20,7 @@ 
         foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
           if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
             $output = $geometry->out($adapter_key);
-            $this->assertNotNull($output, "Empty output on "  . $adapter_key);
+            $this->assertNotNull($output, "Empty output on ".$adapter_key);
             if ($output) {
               $adapter_loader = new $adapter_class();
               $test_geom_1 = $adapter_loader->read($output);

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         // Test to make sure adapter work the same wether GEOS is ON or OFF
         // Cannot test methods if GEOS is not intstalled
-        if (!geoPHP::geosInstalled()) return;
+        if (!geoPHP::geosInstalled()) {
+        	return;
+        }
 
         foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
           if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test

require/libs/geoPHP/tests/tests/placeholdersTest.php

Indentation +55 added lines, -55 removed lines

@@ -9,65 +9,65 @@
   }
 
   function testPlaceholders() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $placeholders = array(
-          array('name' => 'hasZ'),
-          array('name' => 'is3D'),
-          array('name' => 'isMeasured'),
-          array('name' => 'isEmpty'),
-          array('name' => 'coordinateDimension'),
-          array('name' => 'z'),
-          array('name' => 'm'),
-        );
+		$placeholders = array(
+		  array('name' => 'hasZ'),
+		  array('name' => 'is3D'),
+		  array('name' => 'isMeasured'),
+		  array('name' => 'isEmpty'),
+		  array('name' => 'coordinateDimension'),
+		  array('name' => 'z'),
+		  array('name' => 'm'),
+		);
 
-        foreach($placeholders as $method) {
-          $argument = NULL;
-          $method_name = $method['name'];
-          if (isset($method['argument'])) {
-            $argument = $method['argument'];
-          }
+		foreach($placeholders as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          switch ($method_name) {
-            case 'm':
-            case 'z':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              break;
-            case 'coordinateDimension':
-            case 'isEmpty':
-            case 'isMeasured':
-            case 'is3D':
-            case 'hasZ':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              break;
-            default:
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-          }
-        }
+		  switch ($method_name) {
+			case 'm':
+			case 'z':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  break;
+			case 'coordinateDimension':
+			case 'isEmpty':
+			case 'isMeasured':
+			case 'is3D':
+			case 'hasZ':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  break;
+			default:
+			  $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		  }
+		}
 
-      }
-    }
+	  }
+	}
 
   }
 }

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 
   function testPlaceholders() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -26,7 +26,7 @@ 
           array('name' => 'm'),
         );
 
-        foreach($placeholders as $method) {
+        foreach ($placeholders as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -37,13 +37,13 @@ 
             case 'm':
             case 'z':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             case 'coordinateDimension':
@@ -52,17 +52,17 @@ 
             case 'is3D':
             case 'hasZ':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             default:
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+              $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
           }
         }
 

require/libs/geoPHP/lib/adapters/EWKT.class.php

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
    * @return string The Extended-WKT string representation of the input geometries
    */
   public function write(Geometry $geometry) {
-    $srid = $geometry->SRID();
-    $wkt = '';
-    if ($srid) {
-      $wkt = 'SRID=' . $srid . ';';
-      $wkt .= $geometry->out('wkt');
-      return $wkt;
-    }
-    else {
-      return $geometry->out('wkt');
-    }
+	$srid = $geometry->SRID();
+	$wkt = '';
+	if ($srid) {
+	  $wkt = 'SRID=' . $srid . ';';
+	  $wkt .= $geometry->out('wkt');
+	  return $wkt;
+	}
+	else {
+	  return $geometry->out('wkt');
+	}
   }
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     $srid = $geometry->SRID();
     $wkt = '';
     if ($srid) {
-      $wkt = 'SRID=' . $srid . ';';
+      $wkt = 'SRID='.$srid.';';
       $wkt .= $geometry->out('wkt');
       return $wkt;
     }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       $wkt = 'SRID=' . $srid . ';';
       $wkt .= $geometry->out('wkt');
       return $wkt;
-    }
-    else {
+    } else {
       return $geometry->out('wkt');
     }
   }

require/libs/geoPHP/lib/adapters/GoogleGeocode.class.php

Indentation +90 added lines, -90 removed lines

@@ -30,55 +30,55 @@ 
    * @return Geometry|GeometryCollection
    */
   public function read($address, $return_type = 'point', $bounds = FALSE, $return_multiple = FALSE) {
-    if (is_array($address)) $address = join(',', $address);
+	if (is_array($address)) $address = join(',', $address);
     
-    if (gettype($bounds) == 'object') {
-      $bounds = $bounds->getBBox();
-    }
-    if (gettype($bounds) == 'array') {
-      $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
-      $bounds_string = '';
-    }
+	if (gettype($bounds) == 'object') {
+	  $bounds = $bounds->getBBox();
+	}
+	if (gettype($bounds) == 'array') {
+	  $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
+	}
+	else {
+	  $bounds_string = '';
+	}
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
-    $url .= $bounds_string;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?address='. urlencode($address);
+	$url .= $bounds_string;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_multiple == FALSE) {
-        if ($return_type == 'point') {
-          return $this->getPoint();
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          return $this->getPolygon();
-        }
-      }
-      if ($return_multiple == TRUE) {
-        if ($return_type == 'point') {
-          $points = array();
-          foreach ($this->result->results as $delta => $item) {
-            $points[] = $this->getPoint($delta);
-          }
-          return new MultiPoint($points);
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          $polygons = array();
-          foreach ($this->result->results as $delta => $item) {
-            $polygons[] = $this->getPolygon($delta);
-          }
-          return new MultiPolygon($polygons);
-        }
-      }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Geocoder');
-      return FALSE;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_multiple == FALSE) {
+		if ($return_type == 'point') {
+		  return $this->getPoint();
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  return $this->getPolygon();
+		}
+	  }
+	  if ($return_multiple == TRUE) {
+		if ($return_type == 'point') {
+		  $points = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$points[] = $this->getPoint($delta);
+		  }
+		  return new MultiPoint($points);
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  $polygons = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$polygons[] = $this->getPolygon($delta);
+		  }
+		  return new MultiPolygon($polygons);
+		}
+	  }
+	}
+	else {
+	  if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
+	  else throw new Exception('Unknown error in Google Geocoder');
+	  return FALSE;
+	}
   }
 
   /**
@@ -90,69 +90,69 @@ 
    * @return string Does a reverse geocode of the geometry
    */
   public function write(Geometry $geometry, $return_type = 'string') {
-    $centroid = $geometry->getCentroid();
-    $lat = $centroid->getY();
-    $lon = $centroid->getX();
+	$centroid = $geometry->getCentroid();
+	$lat = $centroid->getY();
+	$lon = $centroid->getX();
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?latlng='.$lat.','.$lon;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?latlng='.$lat.','.$lon;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_type == 'string') {
-        return $this->result->results[0]->formatted_address;
-      }
-      if ($return_type == 'array') {
-        return $this->result->results[0]->address_components;
-      }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Reverse Geocoder');
-      return FALSE;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_type == 'string') {
+		return $this->result->results[0]->formatted_address;
+	  }
+	  if ($return_type == 'array') {
+		return $this->result->results[0]->address_components;
+	  }
+	}
+	else {
+	  if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
+	  else throw new Exception('Unknown error in Google Reverse Geocoder');
+	  return FALSE;
+	}
   }
   
   private function getPoint($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->location->lat;
-    $lon = $this->result->results[$delta]->geometry->location->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->location->lat;
+	$lon = $this->result->results[$delta]->geometry->location->lng;
+	return new Point($lon, $lat);
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
-      $this->getTopLeft($delta),
-      $this->getTopRight($delta),
-      $this->getBottomRight($delta),
-      $this->getBottomLeft($delta),
-      $this->getTopLeft($delta),
-    );
-    $outer_ring = new LineString($points);
-    return new Polygon(array($outer_ring));
+	$points = array (
+	  $this->getTopLeft($delta),
+	  $this->getTopRight($delta),
+	  $this->getBottomRight($delta),
+	  $this->getBottomLeft($delta),
+	  $this->getTopLeft($delta),
+	);
+	$outer_ring = new LineString($points);
+	return new Polygon(array($outer_ring));
   }
 
   private function getTopLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	return new Point($lon, $lat);
   }
 
   private function getTopRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
   
   private function getBottomLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-     return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	 return new Point($lon, $lat);
   }
 
   private function getBottomRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     }
     
     $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
+    $url .= '?address='.urlencode($address);
     $url .= $bounds_string;
     $url .= '&sensor=false';
     $this->result = json_decode(@file_get_contents($url));
@@ -121,7 +121,7 @@ 
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
+    $points = array(
       $this->getTopLeft($delta),
       $this->getTopRight($delta),
       $this->getBottomRight($delta),

Braces +16 added lines, -11 removed lines

@@ -30,15 +30,16 @@ 
    * @return Geometry|GeometryCollection
    */
   public function read($address, $return_type = 'point', $bounds = FALSE, $return_multiple = FALSE) {
-    if (is_array($address)) $address = join(',', $address);
+    if (is_array($address)) {
+    	$address = join(',', $address);
+    }
     
     if (gettype($bounds) == 'object') {
       $bounds = $bounds->getBBox();
     }
     if (gettype($bounds) == 'array') {
       $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
+    } else {
       $bounds_string = '';
     }
     
@@ -73,10 +74,12 @@ 
           return new MultiPolygon($polygons);
         }
       }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Geocoder');
+    } else {
+      if ($this->result->status) {
+      	throw new Exception('Error in Google Geocoder: '.$this->result->status);
+      } else {
+      	throw new Exception('Unknown error in Google Geocoder');
+      }
       return FALSE;
     }
   }
@@ -106,10 +109,12 @@ 
       if ($return_type == 'array') {
         return $this->result->results[0]->address_components;
       }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Reverse Geocoder');
+    } else {
+      if ($this->result->status) {
+      	throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
+      } else {
+      	throw new Exception('Unknown error in Google Reverse Geocoder');
+      }
       return FALSE;
     }
   }