Ysurac / FlightAirMap

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

Doc Comments +12 added lines

@@ -123,6 +123,9 @@ 
     return new Polygon($components);

   }

 

+  /**
+   * @param string $type
+   */
   function getMulti(&$mem, $type) {

     // Get the number of items expected in this multi out of the first 4 bytes

     $multi_length = unpack('L',fread($mem,4));

@@ -196,6 +199,9 @@ 
     }

   }

 

+  /**
+   * @param Geometry $point
+   */
   function writePoint($point) {

     // Set the coords

     $wkb = pack('dd',$point->x(), $point->y());

@@ -215,6 +221,9 @@ 
     return $wkb;

   }

 

+  /**
+   * @param Geometry $poly
+   */
   function writePolygon($poly) {

     // Set the number of lines in this poly

     $wkb = pack('L',$poly->numGeometries());

@@ -227,6 +236,9 @@ 
     return $wkb;

   }

 

+  /**
+   * @param Geometry $geometry
+   */
   function writeMulti($geometry) {

     // Set the number of components

     $wkb = pack('L',$geometry->numGeometries());

Indentation +161 added lines, -161 removed lines

@@ -29,120 +29,120 @@ 
    * @return Geometry

    */

   public function read($wkb, $is_hex_string = FALSE) {

-    if ($is_hex_string) {

-      $wkb = pack('H*',$wkb);

-    }

+	if ($is_hex_string) {

+	  $wkb = pack('H*',$wkb);

+	}

 

-    if (empty($wkb)) {

-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

-    }

+	if (empty($wkb)) {

+	  throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

+	}

 

-    $mem = fopen('php://memory', 'r+');

-    fwrite($mem, $wkb);

-    fseek($mem, 0);

+	$mem = fopen('php://memory', 'r+');

+	fwrite($mem, $wkb);

+	fseek($mem, 0);

 

-    $geometry = $this->getGeometry($mem);

-    fclose($mem);

-    return $geometry;

+	$geometry = $this->getGeometry($mem);

+	fclose($mem);

+	return $geometry;

   }

 

   function getGeometry(&$mem) {

-    $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));

-    if ($base_info['order'] !== 1) {

-      throw new Exception('Only NDR (little endian) SKB format is supported at the moment');

-    }

-

-    if ($base_info['z']) {

-      $this->dimension++;

-      $this->z = TRUE;

-    }

-    if ($base_info['m']) {

-      $this->dimension++;

-      $this->m = TRUE;

-    }

-

-    // If there is SRID information, ignore it - use EWKB Adapter to get SRID support

-    if ($base_info['s']) {

-      fread($mem, 4);

-    }

-

-    switch ($base_info['type']) {

-      case 1:

-        return $this->getPoint($mem);

-      case 2:

-        return $this->getLinstring($mem);

-      case 3:

-        return $this->getPolygon($mem);

-      case 4:

-        return $this->getMulti($mem,'point');

-      case 5:

-        return $this->getMulti($mem,'line');

-      case 6:

-        return $this->getMulti($mem,'polygon');

-      case 7:

-        return $this->getMulti($mem,'geometry');

-    }

+	$base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));

+	if ($base_info['order'] !== 1) {

+	  throw new Exception('Only NDR (little endian) SKB format is supported at the moment');

+	}

+

+	if ($base_info['z']) {

+	  $this->dimension++;

+	  $this->z = TRUE;

+	}

+	if ($base_info['m']) {

+	  $this->dimension++;

+	  $this->m = TRUE;

+	}

+

+	// If there is SRID information, ignore it - use EWKB Adapter to get SRID support

+	if ($base_info['s']) {

+	  fread($mem, 4);

+	}

+

+	switch ($base_info['type']) {

+	  case 1:

+		return $this->getPoint($mem);

+	  case 2:

+		return $this->getLinstring($mem);

+	  case 3:

+		return $this->getPolygon($mem);

+	  case 4:

+		return $this->getMulti($mem,'point');

+	  case 5:

+		return $this->getMulti($mem,'line');

+	  case 6:

+		return $this->getMulti($mem,'polygon');

+	  case 7:

+		return $this->getMulti($mem,'geometry');

+	}

   }

 

   function getPoint(&$mem) {

-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));

-    return new Point($point_coords[1],$point_coords[2]);

+	$point_coords = unpack("d*", fread($mem,$this->dimension*8));

+	return new Point($point_coords[1],$point_coords[2]);

   }

 

   function getLinstring(&$mem) {

-    // Get the number of points expected in this string out of the first 4 bytes

-    $line_length = unpack('L',fread($mem,4));

-

-    // Return an empty linestring if there is no line-length

-    if (!$line_length[1]) return new LineString();

-

-    // Read the nubmer of points x2 (each point is two coords) into decimal-floats

-    $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));

-

-    // We have our coords, build up the linestring

-    $components = array();

-    $i = 1;

-    $num_coords = count($line_coords);

-    while ($i <= $num_coords) {

-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

-      $i += 2;

-    }

-    return new LineString($components);

+	// Get the number of points expected in this string out of the first 4 bytes

+	$line_length = unpack('L',fread($mem,4));

+

+	// Return an empty linestring if there is no line-length

+	if (!$line_length[1]) return new LineString();

+

+	// Read the nubmer of points x2 (each point is two coords) into decimal-floats

+	$line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));

+

+	// We have our coords, build up the linestring

+	$components = array();

+	$i = 1;

+	$num_coords = count($line_coords);

+	while ($i <= $num_coords) {

+	  $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

+	  $i += 2;

+	}

+	return new LineString($components);

   }

 

   function getPolygon(&$mem) {

-    // Get the number of linestring expected in this poly out of the first 4 bytes

-    $poly_length = unpack('L',fread($mem,4));

-

-    $components = array();

-    $i = 1;

-    while ($i <= $poly_length[1]) {

-      $components[] = $this->getLinstring($mem);

-      $i++;

-    }

-    return new Polygon($components);

+	// Get the number of linestring expected in this poly out of the first 4 bytes

+	$poly_length = unpack('L',fread($mem,4));

+

+	$components = array();

+	$i = 1;

+	while ($i <= $poly_length[1]) {

+	  $components[] = $this->getLinstring($mem);

+	  $i++;

+	}

+	return new Polygon($components);

   }

 

   function getMulti(&$mem, $type) {

-    // Get the number of items expected in this multi out of the first 4 bytes

-    $multi_length = unpack('L',fread($mem,4));

-

-    $components = array();

-    $i = 1;

-    while ($i <= $multi_length[1]) {

-      $components[] = $this->getGeometry($mem);

-      $i++;

-    }

-    switch ($type) {

-      case 'point':

-        return new MultiPoint($components);

-      case 'line':

-        return new MultiLineString($components);

-      case 'polygon':

-        return new MultiPolygon($components);

-      case 'geometry':

-        return new GeometryCollection($components);

-    }

+	// Get the number of items expected in this multi out of the first 4 bytes

+	$multi_length = unpack('L',fread($mem,4));

+

+	$components = array();

+	$i = 1;

+	while ($i <= $multi_length[1]) {

+	  $components[] = $this->getGeometry($mem);

+	  $i++;

+	}

+	switch ($type) {

+	  case 'point':

+		return new MultiPoint($components);

+	  case 'line':

+		return new MultiLineString($components);

+	  case 'polygon':

+		return new MultiPolygon($components);

+	  case 'geometry':

+		return new GeometryCollection($components);

+	}

   }

 

   /**

@@ -153,90 +153,90 @@ 
    * @return string The WKB string representation of the input geometries

    */

   public function write(Geometry $geometry, $write_as_hex = FALSE) {

-    // We always write into NDR (little endian)

-    $wkb = pack('c',1);

-

-    switch ($geometry->getGeomType()) {

-      case 'Point';

-        $wkb .= pack('L',1);

-        $wkb .= $this->writePoint($geometry);

-        break;

-      case 'LineString';

-        $wkb .= pack('L',2);

-        $wkb .= $this->writeLineString($geometry);

-        break;

-      case 'Polygon';

-        $wkb .= pack('L',3);

-        $wkb .= $this->writePolygon($geometry);

-        break;

-      case 'MultiPoint';

-        $wkb .= pack('L',4);

-        $wkb .= $this->writeMulti($geometry);

-        break;

-      case 'MultiLineString';

-        $wkb .= pack('L',5);

-        $wkb .= $this->writeMulti($geometry);

-        break;

-      case 'MultiPolygon';

-        $wkb .= pack('L',6);

-        $wkb .= $this->writeMulti($geometry);

-        break;

-      case 'GeometryCollection';

-        $wkb .= pack('L',7);

-        $wkb .= $this->writeMulti($geometry);

-        break;

-    }

-

-    if ($write_as_hex) {

-      $unpacked = unpack('H*',$wkb);

-      return $unpacked[1];

-    }

-    else {

-      return $wkb;

-    }

+	// We always write into NDR (little endian)

+	$wkb = pack('c',1);

+

+	switch ($geometry->getGeomType()) {

+	  case 'Point';

+		$wkb .= pack('L',1);

+		$wkb .= $this->writePoint($geometry);

+		break;

+	  case 'LineString';

+		$wkb .= pack('L',2);

+		$wkb .= $this->writeLineString($geometry);

+		break;

+	  case 'Polygon';

+		$wkb .= pack('L',3);

+		$wkb .= $this->writePolygon($geometry);

+		break;

+	  case 'MultiPoint';

+		$wkb .= pack('L',4);

+		$wkb .= $this->writeMulti($geometry);

+		break;

+	  case 'MultiLineString';

+		$wkb .= pack('L',5);

+		$wkb .= $this->writeMulti($geometry);

+		break;

+	  case 'MultiPolygon';

+		$wkb .= pack('L',6);

+		$wkb .= $this->writeMulti($geometry);

+		break;

+	  case 'GeometryCollection';

+		$wkb .= pack('L',7);

+		$wkb .= $this->writeMulti($geometry);

+		break;

+	}

+

+	if ($write_as_hex) {

+	  $unpacked = unpack('H*',$wkb);

+	  return $unpacked[1];

+	}

+	else {

+	  return $wkb;

+	}

   }

 

   function writePoint($point) {

-    // Set the coords

-    $wkb = pack('dd',$point->x(), $point->y());

+	// Set the coords

+	$wkb = pack('dd',$point->x(), $point->y());

 

-    return $wkb;

+	return $wkb;

   }

 

   function writeLineString($line) {

-    // Set the number of points in this line

-    $wkb = pack('L',$line->numPoints());

+	// Set the number of points in this line

+	$wkb = pack('L',$line->numPoints());

 

-    // Set the coords

-    foreach ($line->getComponents() as $point) {

-      $wkb .= pack('dd',$point->x(), $point->y());

-    }

+	// Set the coords

+	foreach ($line->getComponents() as $point) {

+	  $wkb .= pack('dd',$point->x(), $point->y());

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

   function writePolygon($poly) {

-    // Set the number of lines in this poly

-    $wkb = pack('L',$poly->numGeometries());

+	// Set the number of lines in this poly

+	$wkb = pack('L',$poly->numGeometries());

 

-    // Write the lines

-    foreach ($poly->getComponents() as $line) {

-      $wkb .= $this->writeLineString($line);

-    }

+	// Write the lines

+	foreach ($poly->getComponents() as $line) {

+	  $wkb .= $this->writeLineString($line);

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

   function writeMulti($geometry) {

-    // Set the number of components

-    $wkb = pack('L',$geometry->numGeometries());

+	// Set the number of components

+	$wkb = pack('L',$geometry->numGeometries());

 

-    // Write the components

-    foreach ($geometry->getComponents() as $component) {

-      $wkb .= $this->write($component);

-    }

+	// Write the components

+	foreach ($geometry->getComponents() as $component) {

+	  $wkb .= $this->write($component);

+	}

 

-    return $wkb;

+	return $wkb;

   }

 

 }

Spacing +27 added lines, -27 removed lines

@@ -30,11 +30,11 @@ 
    */

   public function read($wkb, $is_hex_string = FALSE) {

     if ($is_hex_string) {

-      $wkb = pack('H*',$wkb);

+      $wkb = pack('H*', $wkb);

     }

 

     if (empty($wkb)) {

-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

+      throw new Exception('Cannot read empty WKB geometry. Found '.gettype($wkb));

     }

 

     $mem = fopen('php://memory', 'r+');

@@ -74,37 +74,37 @@ 
       case 3:

         return $this->getPolygon($mem);

       case 4:

-        return $this->getMulti($mem,'point');

+        return $this->getMulti($mem, 'point');

       case 5:

-        return $this->getMulti($mem,'line');

+        return $this->getMulti($mem, 'line');

       case 6:

-        return $this->getMulti($mem,'polygon');

+        return $this->getMulti($mem, 'polygon');

       case 7:

-        return $this->getMulti($mem,'geometry');

+        return $this->getMulti($mem, 'geometry');

     }

   }

 

   function getPoint(&$mem) {

-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));

-    return new Point($point_coords[1],$point_coords[2]);

+    $point_coords = unpack("d*", fread($mem, $this->dimension*8));

+    return new Point($point_coords[1], $point_coords[2]);

   }

 

   function getLinstring(&$mem) {

     // Get the number of points expected in this string out of the first 4 bytes

-    $line_length = unpack('L',fread($mem,4));

+    $line_length = unpack('L', fread($mem, 4));

 

     // Return an empty linestring if there is no line-length

     if (!$line_length[1]) return new LineString();

 

     // Read the nubmer of points x2 (each point is two coords) into decimal-floats

-    $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));

+    $line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));

 

     // We have our coords, build up the linestring

     $components = array();

     $i = 1;

     $num_coords = count($line_coords);

     while ($i <= $num_coords) {

-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

+      $components[] = new Point($line_coords[$i], $line_coords[$i + 1]);

       $i += 2;

     }

     return new LineString($components);

@@ -112,7 +112,7 @@ 
 

   function getPolygon(&$mem) {

     // Get the number of linestring expected in this poly out of the first 4 bytes

-    $poly_length = unpack('L',fread($mem,4));

+    $poly_length = unpack('L', fread($mem, 4));

 

     $components = array();

     $i = 1;

@@ -125,7 +125,7 @@ 
 

   function getMulti(&$mem, $type) {

     // Get the number of items expected in this multi out of the first 4 bytes

-    $multi_length = unpack('L',fread($mem,4));

+    $multi_length = unpack('L', fread($mem, 4));

 

     $components = array();

     $i = 1;

@@ -154,41 +154,41 @@ 
    */

   public function write(Geometry $geometry, $write_as_hex = FALSE) {

     // We always write into NDR (little endian)

-    $wkb = pack('c',1);

+    $wkb = pack('c', 1);

 

     switch ($geometry->getGeomType()) {

       case 'Point';

-        $wkb .= pack('L',1);

+        $wkb .= pack('L', 1);

         $wkb .= $this->writePoint($geometry);

         break;

       case 'LineString';

-        $wkb .= pack('L',2);

+        $wkb .= pack('L', 2);

         $wkb .= $this->writeLineString($geometry);

         break;

       case 'Polygon';

-        $wkb .= pack('L',3);

+        $wkb .= pack('L', 3);

         $wkb .= $this->writePolygon($geometry);

         break;

       case 'MultiPoint';

-        $wkb .= pack('L',4);

+        $wkb .= pack('L', 4);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'MultiLineString';

-        $wkb .= pack('L',5);

+        $wkb .= pack('L', 5);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'MultiPolygon';

-        $wkb .= pack('L',6);

+        $wkb .= pack('L', 6);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'GeometryCollection';

-        $wkb .= pack('L',7);

+        $wkb .= pack('L', 7);

         $wkb .= $this->writeMulti($geometry);

         break;

     }

 

     if ($write_as_hex) {

-      $unpacked = unpack('H*',$wkb);

+      $unpacked = unpack('H*', $wkb);

       return $unpacked[1];

     }

     else {

@@ -198,18 +198,18 @@ 
 

   function writePoint($point) {

     // Set the coords

-    $wkb = pack('dd',$point->x(), $point->y());

+    $wkb = pack('dd', $point->x(), $point->y());

 

     return $wkb;

   }

 

   function writeLineString($line) {

     // Set the number of points in this line

-    $wkb = pack('L',$line->numPoints());

+    $wkb = pack('L', $line->numPoints());

 

     // Set the coords

     foreach ($line->getComponents() as $point) {

-      $wkb .= pack('dd',$point->x(), $point->y());

+      $wkb .= pack('dd', $point->x(), $point->y());

     }

 

     return $wkb;

@@ -217,7 +217,7 @@ 
 

   function writePolygon($poly) {

     // Set the number of lines in this poly

-    $wkb = pack('L',$poly->numGeometries());

+    $wkb = pack('L', $poly->numGeometries());

 

     // Write the lines

     foreach ($poly->getComponents() as $line) {

@@ -229,7 +229,7 @@ 
 

   function writeMulti($geometry) {

     // Set the number of components

-    $wkb = pack('L',$geometry->numGeometries());

+    $wkb = pack('L', $geometry->numGeometries());

 

     // Write the components

     foreach ($geometry->getComponents() as $component) {

Braces +4 added lines, -3 removed lines

@@ -94,7 +94,9 @@ 
     $line_length = unpack('L',fread($mem,4));

 

     // Return an empty linestring if there is no line-length

-    if (!$line_length[1]) return new LineString();

+    if (!$line_length[1]) {
+    	return new LineString();
+    }
 

     // Read the nubmer of points x2 (each point is two coords) into decimal-floats

     $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));

@@ -190,8 +192,7 @@ 
     if ($write_as_hex) {

       $unpacked = unpack('H*',$wkb);

       return $unpacked[1];

-    }

-    else {

+    } else {

       return $wkb;

     }

   }

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

Doc Comments +6 added lines, -1 removed lines

@@ -8,7 +8,6 @@ 
   /**
    * Read WKT string into geometry objects
    *
-   * @param string $WKT A WKT string
    *
    * @return Geometry
    */
@@ -184,11 +183,17 @@ 
     else return $str;
   }
   
+  /**
+   * @param string $char
+   */
   protected function beginsWith($str, $char) {
     if (substr($str,0,strlen($char)) == $char) return TRUE;
     else return FALSE;
   }
 
+  /**
+   * @param string $char
+   */
   protected function endsWith($str, $char) {
     if (substr($str,(0 - strlen($char))) == $char) return TRUE;
     else return FALSE;

Indentation +158 added lines, -158 removed lines

@@ -13,185 +13,185 @@ 
    * @return Geometry
    */
   public function read($wkt) {
-    $wkt = trim($wkt);
+	$wkt = trim($wkt);
     
-    // If it contains a ';', then it contains additional SRID data
-    if (strpos($wkt,';')) {
-      $parts = explode(';', $wkt);
-      $wkt = $parts[1];
-      $eparts = explode('=',$parts[0]);
-      $srid = $eparts[1];
-    }
-    else {
-      $srid = NULL;
-    }
+	// If it contains a ';', then it contains additional SRID data
+	if (strpos($wkt,';')) {
+	  $parts = explode(';', $wkt);
+	  $wkt = $parts[1];
+	  $eparts = explode('=',$parts[0]);
+	  $srid = $eparts[1];
+	}
+	else {
+	  $srid = NULL;
+	}
     
-    // If geos is installed, then we take a shortcut and let it parse the WKT
-    if (geoPHP::geosInstalled()) {
-      $reader = new GEOSWKTReader();
-      if ($srid) {
-        $geom = geoPHP::geosToGeometry($reader->read($wkt));
-        $geom->setSRID($srid);
-        return $geom;
-      }
-      else { 
-        return geoPHP::geosToGeometry($reader->read($wkt));
-      }
-    }
-    $wkt = str_replace(', ', ',', $wkt);
+	// If geos is installed, then we take a shortcut and let it parse the WKT
+	if (geoPHP::geosInstalled()) {
+	  $reader = new GEOSWKTReader();
+	  if ($srid) {
+		$geom = geoPHP::geosToGeometry($reader->read($wkt));
+		$geom->setSRID($srid);
+		return $geom;
+	  }
+	  else { 
+		return geoPHP::geosToGeometry($reader->read($wkt));
+	  }
+	}
+	$wkt = str_replace(', ', ',', $wkt);
     
-    // For each geometry type, check to see if we have a match at the
-    // beggining of the string. If we do, then parse using that type
-    foreach (geoPHP::geometryList() as $geom_type) {
-      $wkt_geom = strtoupper($geom_type);
-      if (strtoupper(substr($wkt, 0, strlen($wkt_geom))) == $wkt_geom) {
-        $data_string = $this->getDataString($wkt);
-        $method = 'parse'.$geom_type;
+	// For each geometry type, check to see if we have a match at the
+	// beggining of the string. If we do, then parse using that type
+	foreach (geoPHP::geometryList() as $geom_type) {
+	  $wkt_geom = strtoupper($geom_type);
+	  if (strtoupper(substr($wkt, 0, strlen($wkt_geom))) == $wkt_geom) {
+		$data_string = $this->getDataString($wkt);
+		$method = 'parse'.$geom_type;
         
-        if ($srid) {
-          $geom = $this->$method($data_string);
-          $geom->setSRID($srid);
-          return $geom;
-        }
-        else { 
-          return $this->$method($data_string);
-        }
+		if ($srid) {
+		  $geom = $this->$method($data_string);
+		  $geom->setSRID($srid);
+		  return $geom;
+		}
+		else { 
+		  return $this->$method($data_string);
+		}
         
-      }
-    }
+	  }
+	}
   }
   
   private function parsePoint($data_string) {
-    $data_string = $this->trimParens($data_string);
-    $parts = explode(' ',$data_string);
-    return new Point($parts[0], $parts[1]);
+	$data_string = $this->trimParens($data_string);
+	$parts = explode(' ',$data_string);
+	return new Point($parts[0], $parts[1]);
   }
 
   private function parseLineString($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty line
-    if ($data_string == 'EMPTY') return new LineString();
+	// If it's marked as empty, then return an empty line
+	if ($data_string == 'EMPTY') return new LineString();
     
-    $parts = explode(',',$data_string);
-    $points = array();
-    foreach ($parts as $part) {
-      $points[] = $this->parsePoint($part);
-    }
-    return new LineString($points);
+	$parts = explode(',',$data_string);
+	$points = array();
+	foreach ($parts as $part) {
+	  $points[] = $this->parsePoint($part);
+	}
+	return new LineString($points);
   }
 
   private function parsePolygon($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
     
-    // If it's marked as empty, then return an empty polygon
-    if ($data_string == 'EMPTY') return new Polygon();
+	// If it's marked as empty, then return an empty polygon
+	if ($data_string == 'EMPTY') return new Polygon();
     
-    $parts = explode('),(',$data_string);
-    $lines = array();
-    foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
-      $lines[] = $this->parseLineString($part);
-    }
-    return new Polygon($lines);
+	$parts = explode('),(',$data_string);
+	$lines = array();
+	foreach ($parts as $part) {
+	  if (!$this->beginsWith($part,'(')) $part = '(' . $part;
+	  if (!$this->endsWith($part,')'))   $part = $part . ')';
+	  $lines[] = $this->parseLineString($part);
+	}
+	return new Polygon($lines);
   }
 
   private function parseMultiPoint($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
     
-    // If it's marked as empty, then return an empty MutiPoint
-    if ($data_string == 'EMPTY') return new MultiPoint();
+	// If it's marked as empty, then return an empty MutiPoint
+	if ($data_string == 'EMPTY') return new MultiPoint();
     
-    $parts = explode(',',$data_string);
-    $points = array();
-    foreach ($parts as $part) {
-      $points[] = $this->parsePoint($part);
-    }
-    return new MultiPoint($points);
+	$parts = explode(',',$data_string);
+	$points = array();
+	foreach ($parts as $part) {
+	  $points[] = $this->parsePoint($part);
+	}
+	return new MultiPoint($points);
   }
   
   private function parseMultiLineString($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty multi-linestring
-    if ($data_string == 'EMPTY') return new MultiLineString();
+	// If it's marked as empty, then return an empty multi-linestring
+	if ($data_string == 'EMPTY') return new MultiLineString();
     
-    $parts = explode('),(',$data_string);
-    $lines = array();
-    foreach ($parts as $part) {
-      // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
-      $lines[] = $this->parseLineString($part);
-    }
-    return new MultiLineString($lines);
+	$parts = explode('),(',$data_string);
+	$lines = array();
+	foreach ($parts as $part) {
+	  // Repair the string if the explode broke it
+	  if (!$this->beginsWith($part,'(')) $part = '(' . $part;
+	  if (!$this->endsWith($part,')'))   $part = $part . ')';
+	  $lines[] = $this->parseLineString($part);
+	}
+	return new MultiLineString($lines);
   }
 
   private function parseMultiPolygon($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty multi-polygon
-    if ($data_string == 'EMPTY') return new MultiPolygon();
+	// If it's marked as empty, then return an empty multi-polygon
+	if ($data_string == 'EMPTY') return new MultiPolygon();
     
-    $parts = explode(')),((',$data_string);
-    $polys = array();
-    foreach ($parts as $part) {
-      // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
-      $polys[] = $this->parsePolygon($part);
-    }
-    return new MultiPolygon($polys);
+	$parts = explode(')),((',$data_string);
+	$polys = array();
+	foreach ($parts as $part) {
+	  // Repair the string if the explode broke it
+	  if (!$this->beginsWith($part,'((')) $part = '((' . $part;
+	  if (!$this->endsWith($part,'))'))   $part = $part . '))';
+	  $polys[] = $this->parsePolygon($part);
+	}
+	return new MultiPolygon($polys);
   }
 
   private function parseGeometryCollection($data_string) {
-    $data_string = $this->trimParens($data_string);
+	$data_string = $this->trimParens($data_string);
 
-    // If it's marked as empty, then return an empty geom-collection
-    if ($data_string == 'EMPTY') return new GeometryCollection();
+	// If it's marked as empty, then return an empty geom-collection
+	if ($data_string == 'EMPTY') return new GeometryCollection();
     
-    $geometries = array();
-    $matches = array();
-    $str = preg_replace('/,\s*([A-Za-z])/', '|$1', $data_string);
-    $components = explode('|', trim($str));
+	$geometries = array();
+	$matches = array();
+	$str = preg_replace('/,\s*([A-Za-z])/', '|$1', $data_string);
+	$components = explode('|', trim($str));
     
-    foreach ($components as $component) {
-      $geometries[] = $this->read($component);
-    }
-    return new GeometryCollection($geometries);
+	foreach ($components as $component) {
+	  $geometries[] = $this->read($component);
+	}
+	return new GeometryCollection($geometries);
   }
 
   protected function getDataString($wkt) {
-    $first_paren = strpos($wkt, '(');
+	$first_paren = strpos($wkt, '(');
 
-    if ($first_paren !== FALSE) {
-      return substr($wkt, $first_paren);
-    }
-    return FALSE;
+	if ($first_paren !== FALSE) {
+	  return substr($wkt, $first_paren);
+	}
+	return FALSE;
   }
   
   /**
    * Trim the parenthesis and spaces
    */
   protected function trimParens($str) {
-    $str = trim($str);
+	$str = trim($str);
     
-    // We want to only strip off one set of parenthesis
-    if ($this->beginsWith($str, '(')) {
-      return substr($str,1,-1);
-    }
-    else return $str;
+	// We want to only strip off one set of parenthesis
+	if ($this->beginsWith($str, '(')) {
+	  return substr($str,1,-1);
+	}
+	else return $str;
   }
   
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
-    else return FALSE;
+	if (substr($str,0,strlen($char)) == $char) return TRUE;
+	else return FALSE;
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
-    else return FALSE;
+	if (substr($str,(0 - strlen($char))) == $char) return TRUE;
+	else return FALSE;
   }
     
   /**
@@ -202,19 +202,19 @@ 
    * @return string The WKT string representation of the input geometries
    */
   public function write(Geometry $geometry) {
-    // If geos is installed, then we take a shortcut and let it write the WKT
-    if (geoPHP::geosInstalled()) {
-      $writer = new GEOSWKTWriter();
-      $writer->setTrim(TRUE);
-      return $writer->write($geometry->geos());
-    }
+	// If geos is installed, then we take a shortcut and let it write the WKT
+	if (geoPHP::geosInstalled()) {
+	  $writer = new GEOSWKTWriter();
+	  $writer->setTrim(TRUE);
+	  return $writer->write($geometry->geos());
+	}
     
-    if ($geometry->isEmpty()) {
-      return strtoupper($geometry->geometryType()).' EMPTY';
-    }
-    else if ($data = $this->extractData($geometry)) {
-      return strtoupper($geometry->geometryType()).' ('.$data.')';
-    }
+	if ($geometry->isEmpty()) {
+	  return strtoupper($geometry->geometryType()).' EMPTY';
+	}
+	else if ($data = $this->extractData($geometry)) {
+	  return strtoupper($geometry->geometryType()).' ('.$data.')';
+	}
   }
   
   /**
@@ -225,28 +225,28 @@ 
    * @return string
    */
   public function extractData($geometry) {
-    $parts = array();
-    switch ($geometry->geometryType()) {
-      case 'Point':
-        return $geometry->getX().' '.$geometry->getY();
-      case 'LineString':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = $this->extractData($component);
-        }
-        return implode(', ', $parts);
-      case 'Polygon':
-      case 'MultiPoint':
-      case 'MultiLineString':
-      case 'MultiPolygon':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = '('.$this->extractData($component).')';
-        }
-        return implode(', ', $parts);
-      case 'GeometryCollection':
-        foreach ($geometry->getComponents() as $component) {
-          $parts[] = strtoupper($component->geometryType()).' ('.$this->extractData($component).')';
-        }
-        return implode(', ', $parts);
-    }
+	$parts = array();
+	switch ($geometry->geometryType()) {
+	  case 'Point':
+		return $geometry->getX().' '.$geometry->getY();
+	  case 'LineString':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = $this->extractData($component);
+		}
+		return implode(', ', $parts);
+	  case 'Polygon':
+	  case 'MultiPoint':
+	  case 'MultiLineString':
+	  case 'MultiPolygon':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = '('.$this->extractData($component).')';
+		}
+		return implode(', ', $parts);
+	  case 'GeometryCollection':
+		foreach ($geometry->getComponents() as $component) {
+		  $parts[] = strtoupper($component->geometryType()).' ('.$this->extractData($component).')';
+		}
+		return implode(', ', $parts);
+	}
   }
 }

Spacing +17 added lines, -17 removed lines

@@ -16,10 +16,10 @@ 
     $wkt = trim($wkt);
     
     // If it contains a ';', then it contains additional SRID data
-    if (strpos($wkt,';')) {
+    if (strpos($wkt, ';')) {
       $parts = explode(';', $wkt);
       $wkt = $parts[1];
-      $eparts = explode('=',$parts[0]);
+      $eparts = explode('=', $parts[0]);
       $srid = $eparts[1];
     }
     else {
@@ -63,7 +63,7 @@ 
   
   private function parsePoint($data_string) {
     $data_string = $this->trimParens($data_string);
-    $parts = explode(' ',$data_string);
+    $parts = explode(' ', $data_string);
     return new Point($parts[0], $parts[1]);
   }
 
@@ -73,7 +73,7 @@ 
     // If it's marked as empty, then return an empty line
     if ($data_string == 'EMPTY') return new LineString();
     
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -87,11 +87,11 @@ 
     // If it's marked as empty, then return an empty polygon
     if ($data_string == 'EMPTY') return new Polygon();
     
-    $parts = explode('),(',$data_string);
+    $parts = explode('),(', $data_string);
     $lines = array();
     foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
       $lines[] = $this->parseLineString($part);
     }
     return new Polygon($lines);
@@ -103,7 +103,7 @@ 
     // If it's marked as empty, then return an empty MutiPoint
     if ($data_string == 'EMPTY') return new MultiPoint();
     
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -117,12 +117,12 @@ 
     // If it's marked as empty, then return an empty multi-linestring
     if ($data_string == 'EMPTY') return new MultiLineString();
     
-    $parts = explode('),(',$data_string);
+    $parts = explode('),(', $data_string);
     $lines = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
       $lines[] = $this->parseLineString($part);
     }
     return new MultiLineString($lines);
@@ -134,12 +134,12 @@ 
     // If it's marked as empty, then return an empty multi-polygon
     if ($data_string == 'EMPTY') return new MultiPolygon();
     
-    $parts = explode(')),((',$data_string);
+    $parts = explode(')),((', $data_string);
     $polys = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
+      if (!$this->beginsWith($part, '((')) $part = '(('.$part;
+      if (!$this->endsWith($part, '))'))   $part = $part.'))';
       $polys[] = $this->parsePolygon($part);
     }
     return new MultiPolygon($polys);
@@ -179,18 +179,18 @@ 
     
     // We want to only strip off one set of parenthesis
     if ($this->beginsWith($str, '(')) {
-      return substr($str,1,-1);
+      return substr($str, 1, -1);
     }
     else return $str;
   }
   
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
+    if (substr($str, 0, strlen($char)) == $char) return TRUE;
     else return FALSE;
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
+    if (substr($str, (0 - strlen($char))) == $char) return TRUE;
     else return FALSE;
   }
     

Braces +52 added lines, -25 removed lines

@@ -21,8 +21,7 @@ 
       $wkt = $parts[1];
       $eparts = explode('=',$parts[0]);
       $srid = $eparts[1];
-    }
-    else {
+    } else {
       $srid = NULL;
     }
     
@@ -33,8 +32,7 @@ 
         $geom = geoPHP::geosToGeometry($reader->read($wkt));
         $geom->setSRID($srid);
         return $geom;
-      }
-      else { 
+      } else { 
         return geoPHP::geosToGeometry($reader->read($wkt));
       }
     }
@@ -52,8 +50,7 @@ 
           $geom = $this->$method($data_string);
           $geom->setSRID($srid);
           return $geom;
-        }
-        else { 
+        } else { 
           return $this->$method($data_string);
         }
         
@@ -71,7 +68,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty line
-    if ($data_string == 'EMPTY') return new LineString();
+    if ($data_string == 'EMPTY') {
+    	return new LineString();
+    }
     
     $parts = explode(',',$data_string);
     $points = array();
@@ -85,13 +84,19 @@ 
     $data_string = $this->trimParens($data_string);
     
     // If it's marked as empty, then return an empty polygon
-    if ($data_string == 'EMPTY') return new Polygon();
+    if ($data_string == 'EMPTY') {
+    	return new Polygon();
+    }
     
     $parts = explode('),(',$data_string);
     $lines = array();
     foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part,'(')) {
+      	$part = '(' . $part;
+      }
+      if (!$this->endsWith($part,')')) {
+      	$part = $part . ')';
+      }
       $lines[] = $this->parseLineString($part);
     }
     return new Polygon($lines);
@@ -101,7 +106,9 @@ 
     $data_string = $this->trimParens($data_string);
     
     // If it's marked as empty, then return an empty MutiPoint
-    if ($data_string == 'EMPTY') return new MultiPoint();
+    if ($data_string == 'EMPTY') {
+    	return new MultiPoint();
+    }
     
     $parts = explode(',',$data_string);
     $points = array();
@@ -115,14 +122,20 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty multi-linestring
-    if ($data_string == 'EMPTY') return new MultiLineString();
+    if ($data_string == 'EMPTY') {
+    	return new MultiLineString();
+    }
     
     $parts = explode('),(',$data_string);
     $lines = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part,'(')) {
+      	$part = '(' . $part;
+      }
+      if (!$this->endsWith($part,')')) {
+      	$part = $part . ')';
+      }
       $lines[] = $this->parseLineString($part);
     }
     return new MultiLineString($lines);
@@ -132,14 +145,20 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty multi-polygon
-    if ($data_string == 'EMPTY') return new MultiPolygon();
+    if ($data_string == 'EMPTY') {
+    	return new MultiPolygon();
+    }
     
     $parts = explode(')),((',$data_string);
     $polys = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
+      if (!$this->beginsWith($part,'((')) {
+      	$part = '((' . $part;
+      }
+      if (!$this->endsWith($part,'))')) {
+      	$part = $part . '))';
+      }
       $polys[] = $this->parsePolygon($part);
     }
     return new MultiPolygon($polys);
@@ -149,7 +168,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty geom-collection
-    if ($data_string == 'EMPTY') return new GeometryCollection();
+    if ($data_string == 'EMPTY') {
+    	return new GeometryCollection();
+    }
     
     $geometries = array();
     $matches = array();
@@ -180,18 +201,25 @@ 
     // We want to only strip off one set of parenthesis
     if ($this->beginsWith($str, '(')) {
       return substr($str,1,-1);
+    } else {
+    	return $str;
     }
-    else return $str;
   }
   
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
-    else return FALSE;
+    if (substr($str,0,strlen($char)) == $char) {
+    	return TRUE;
+    } else {
+    	return FALSE;
+    }
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
-    else return FALSE;
+    if (substr($str,(0 - strlen($char))) == $char) {
+    	return TRUE;
+    } else {
+    	return FALSE;
+    }
   }
     
   /**
@@ -211,8 +239,7 @@ 
     
     if ($geometry->isEmpty()) {
       return strtoupper($geometry->geometryType()).' EMPTY';
-    }
-    else if ($data = $this->extractData($geometry)) {
+    } else if ($data = $this->extractData($geometry)) {
       return strtoupper($geometry->geometryType()).' ('.$data.')';
     }
   }

require/libs/geoPHP/lib/geometry/Polygon.class.php

Doc Comments +3 added lines

@@ -193,6 +193,9 @@
     }
   }
   
+  /**
+   * @param Point $point
+   */
   public function pointOnVertex($point) {
     foreach($this->getPoints() as $vertex) {
       if ($point->equals($vertex)) {

Indentation +117 added lines, -117 removed lines

@@ -9,70 +9,70 @@ 
   protected $geom_type = 'Polygon';
 
   public function area($exterior_only = FALSE, $signed = FALSE) {
-    if ($this->isEmpty()) return 0;
+	if ($this->isEmpty()) return 0;
     
-    if ($this->geos() && $exterior_only == FALSE) {
-      return $this->geos()->area();
-    }
+	if ($this->geos() && $exterior_only == FALSE) {
+	  return $this->geos()->area();
+	}
     
-    $exterior_ring = $this->components[0];
-    $pts = $exterior_ring->getComponents();
+	$exterior_ring = $this->components[0];
+	$pts = $exterior_ring->getComponents();
     
-    $c = count($pts);
-    if((int)$c == '0') return NULL;
-    $a = '0';
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-    }
+	$c = count($pts);
+	if((int)$c == '0') return NULL;
+	$a = '0';
+	foreach($pts as $k => $p){
+	  $j = ($k + 1) % $c;
+	  $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
+	}
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+	if ($signed) $area = ($a / 2);
+	else $area = abs(($a / 2));
     
-    if ($exterior_only == TRUE) {
-      return $area;
-    }
-    foreach ($this->components as $delta => $component) {
-      if ($delta != 0) {
-        $inner_poly = new Polygon(array($component));
-        $area -= $inner_poly->area();
-      }
-    }
-    return $area;
+	if ($exterior_only == TRUE) {
+	  return $area;
+	}
+	foreach ($this->components as $delta => $component) {
+	  if ($delta != 0) {
+		$inner_poly = new Polygon(array($component));
+		$area -= $inner_poly->area();
+	  }
+	}
+	return $area;
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+	if ($this->isEmpty()) return NULL;
     
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->centroid());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->centroid());
+	}
     
-    $exterior_ring = $this->components[0];
-    $pts = $exterior_ring->getComponents();
+	$exterior_ring = $this->components[0];
+	$pts = $exterior_ring->getComponents();
     
-    $c = count($pts);
-    if((int)$c == '0') return NULL;
-    $cn = array('x' => '0', 'y' => '0');
-    $a = $this->area(TRUE, TRUE);
+	$c = count($pts);
+	if((int)$c == '0') return NULL;
+	$cn = array('x' => '0', 'y' => '0');
+	$a = $this->area(TRUE, TRUE);
     
-    // If this is a polygon with no area. Just return the first point.
-    if ($a == 0) {
-      return $this->exteriorRing()->pointN(1);
-    }
+	// If this is a polygon with no area. Just return the first point.
+	if ($a == 0) {
+	  return $this->exteriorRing()->pointN(1);
+	}
     
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
-      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
-    }
+	foreach($pts as $k => $p){
+	  $j = ($k + 1) % $c;
+	  $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
+	  $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
+	  $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
+	}
     
-    $cn['x'] = $cn['x'] / ( 6 * $a);
-    $cn['y'] = $cn['y'] / ( 6 * $a);
+	$cn['x'] = $cn['x'] / ( 6 * $a);
+	$cn['y'] = $cn['y'] / ( 6 * $a);
     
-    $centroid = new Point($cn['x'], $cn['y']);
-    return $centroid;
+	$centroid = new Point($cn['x'], $cn['y']);
+	return $centroid;
   }
 
 	/**
@@ -98,41 +98,41 @@ 
   }
 
   public function exteriorRing() {
-    if ($this->isEmpty()) return new LineString();
-    return $this->components[0];
+	if ($this->isEmpty()) return new LineString();
+	return $this->components[0];
   }
   
   public function numInteriorRings() {
-    if ($this->isEmpty()) return 0;
-    return $this->numGeometries()-1;
+	if ($this->isEmpty()) return 0;
+	return $this->numGeometries()-1;
   }
   
   public function interiorRingN($n) {
-    return $this->geometryN($n+1);
+	return $this->geometryN($n+1);
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
-    return 2;
+	if ($this->isEmpty()) return 0;
+	return 2;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
     
-    $segments = $this->explode();
+	$segments = $this->explode();
     
-    foreach ($segments as $i => $segment) {
-      foreach ($segments as $j => $check_segment) {
-        if ($i != $j) {
-          if ($segment->lineSegmentIntersect($check_segment)) {
-            return FALSE;
-          }
-        }
-      }
-    }
-    return TRUE;
+	foreach ($segments as $i => $segment) {
+	  foreach ($segments as $j => $check_segment) {
+		if ($i != $j) {
+		  if ($segment->lineSegmentIntersect($check_segment)) {
+			return FALSE;
+		  }
+		}
+	  }
+	}
+	return TRUE;
   }
 
   /**
@@ -146,59 +146,59 @@ 
    * @return boolean
    */
   public function pointInPolygon($point, $pointOnBoundary = true, $pointOnVertex = true) {
-    $vertices = $this->getPoints();
+	$vertices = $this->getPoints();
 
-    // Check if the point sits exactly on a vertex
-    if ($this->pointOnVertex($point, $vertices)) {
-      return $pointOnVertex ? TRUE : FALSE;
-    }
+	// Check if the point sits exactly on a vertex
+	if ($this->pointOnVertex($point, $vertices)) {
+	  return $pointOnVertex ? TRUE : FALSE;
+	}
   
-    // Check if the point is inside the polygon or on the boundary
-    $intersections = 0; 
-    $vertices_count = count($vertices);
+	// Check if the point is inside the polygon or on the boundary
+	$intersections = 0; 
+	$vertices_count = count($vertices);
 
-    for ($i=1; $i < $vertices_count; $i++) {
-      $vertex1 = $vertices[$i-1]; 
-      $vertex2 = $vertices[$i];
-      if ($vertex1->y() == $vertex2->y() 
-      && $vertex1->y() == $point->y() 
-      && $point->x() > min($vertex1->x(), $vertex2->x()) 
-      && $point->x() < max($vertex1->x(), $vertex2->x())) {
-        // Check if point is on an horizontal polygon boundary
-        return $pointOnBoundary ? TRUE : FALSE;
-      }
-      if ($point->y() > min($vertex1->y(), $vertex2->y())
-      && $point->y() <= max($vertex1->y(), $vertex2->y())
-      && $point->x() <= max($vertex1->x(), $vertex2->x())
-      && $vertex1->y() != $vertex2->y()) {
-        $xinters = 
-          ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
-          / ($vertex2->y() - $vertex1->y()) 
-          + $vertex1->x();
-        if ($xinters == $point->x()) {
-          // Check if point is on the polygon boundary (other than horizontal)
-          return $pointOnBoundary ? TRUE : FALSE;
-        }
-        if ($vertex1->x() == $vertex2->x() || $point->x() <= $xinters) {
-          $intersections++;
-        }
-      } 
-    } 
-    // If the number of edges we passed through is even, then it's in the polygon.
-    if ($intersections % 2 != 0) {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
+	for ($i=1; $i < $vertices_count; $i++) {
+	  $vertex1 = $vertices[$i-1]; 
+	  $vertex2 = $vertices[$i];
+	  if ($vertex1->y() == $vertex2->y() 
+	  && $vertex1->y() == $point->y() 
+	  && $point->x() > min($vertex1->x(), $vertex2->x()) 
+	  && $point->x() < max($vertex1->x(), $vertex2->x())) {
+		// Check if point is on an horizontal polygon boundary
+		return $pointOnBoundary ? TRUE : FALSE;
+	  }
+	  if ($point->y() > min($vertex1->y(), $vertex2->y())
+	  && $point->y() <= max($vertex1->y(), $vertex2->y())
+	  && $point->x() <= max($vertex1->x(), $vertex2->x())
+	  && $vertex1->y() != $vertex2->y()) {
+		$xinters = 
+		  ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
+		  / ($vertex2->y() - $vertex1->y()) 
+		  + $vertex1->x();
+		if ($xinters == $point->x()) {
+		  // Check if point is on the polygon boundary (other than horizontal)
+		  return $pointOnBoundary ? TRUE : FALSE;
+		}
+		if ($vertex1->x() == $vertex2->x() || $point->x() <= $xinters) {
+		  $intersections++;
+		}
+	  } 
+	} 
+	// If the number of edges we passed through is even, then it's in the polygon.
+	if ($intersections % 2 != 0) {
+	  return TRUE;
+	}
+	else {
+	  return FALSE;
+	}
   }
   
   public function pointOnVertex($point) {
-    foreach($this->getPoints() as $vertex) {
-      if ($point->equals($vertex)) {
-        return true;
-      }
-    }
+	foreach($this->getPoints() as $vertex) {
+	  if ($point->equals($vertex)) {
+		return true;
+	  }
+	}
   }
 
 

Spacing +23 added lines, -23 removed lines

@@ -19,15 +19,15 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if ((int) $c == '0') return NULL;
     $a = '0';
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
+    foreach ($pts as $k => $p) {
+      $j = ($k + 1)%$c;
+      $a = $a + ($p->getX()*$pts[$j]->getY()) - ($p->getY()*$pts[$j]->getX());
     }
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+    if ($signed) $area = ($a/2);
+    else $area = abs(($a/2));
     
     if ($exterior_only == TRUE) {
       return $area;
@@ -52,7 +52,7 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if ((int) $c == '0') return NULL;
     $cn = array('x' => '0', 'y' => '0');
     $a = $this->area(TRUE, TRUE);
     
@@ -61,15 +61,15 @@ 
       return $this->exteriorRing()->pointN(1);
     }
     
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
-      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
+    foreach ($pts as $k => $p) {
+      $j = ($k + 1)%$c;
+      $P = ($p->getX()*$pts[$j]->getY()) - ($p->getY()*$pts[$j]->getX());
+      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX())*$P;
+      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY())*$P;
     }
     
-    $cn['x'] = $cn['x'] / ( 6 * $a);
-    $cn['y'] = $cn['y'] / ( 6 * $a);
+    $cn['x'] = $cn['x']/(6*$a);
+    $cn['y'] = $cn['y']/(6*$a);
     
     $centroid = new Point($cn['x'], $cn['y']);
     return $centroid;
@@ -85,10 +85,10 @@ 
 
 		$max = array('length' => 0, 'point' => null);
 
-		foreach($this->getPoints() as $point) {
+		foreach ($this->getPoints() as $point) {
 			$lineString = new LineString(array($centroid, $point));
 
-			if($lineString->length() > $max['length']) {
+			if ($lineString->length() > $max['length']) {
 				$max['length'] = $lineString->length();
 				$max['point'] = $point;
 			}
@@ -104,11 +104,11 @@ 
   
   public function numInteriorRings() {
     if ($this->isEmpty()) return 0;
-    return $this->numGeometries()-1;
+    return $this->numGeometries() - 1;
   }
   
   public function interiorRingN($n) {
-    return $this->geometryN($n+1);
+    return $this->geometryN($n + 1);
   }
   
   public function dimension() {
@@ -157,8 +157,8 @@ 
     $intersections = 0; 
     $vertices_count = count($vertices);
 
-    for ($i=1; $i < $vertices_count; $i++) {
-      $vertex1 = $vertices[$i-1]; 
+    for ($i = 1; $i < $vertices_count; $i++) {
+      $vertex1 = $vertices[$i - 1]; 
       $vertex2 = $vertices[$i];
       if ($vertex1->y() == $vertex2->y() 
       && $vertex1->y() == $point->y() 
@@ -172,7 +172,7 @@ 
       && $point->x() <= max($vertex1->x(), $vertex2->x())
       && $vertex1->y() != $vertex2->y()) {
         $xinters = 
-          ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
+          ($point->y() - $vertex1->y())*($vertex2->x() - $vertex1->x())
           / ($vertex2->y() - $vertex1->y()) 
           + $vertex1->x();
         if ($xinters == $point->x()) {
@@ -185,7 +185,7 @@ 
       } 
     } 
     // If the number of edges we passed through is even, then it's in the polygon.
-    if ($intersections % 2 != 0) {
+    if ($intersections%2 != 0) {
       return TRUE;
     }
     else {
@@ -194,7 +194,7 @@ 
   }
   
   public function pointOnVertex($point) {
-    foreach($this->getPoints() as $vertex) {
+    foreach ($this->getPoints() as $vertex) {
       if ($point->equals($vertex)) {
         return true;
       }

Braces +27 added lines, -11 removed lines

@@ -9,7 +9,9 @@ 
   protected $geom_type = 'Polygon';
 
   public function area($exterior_only = FALSE, $signed = FALSE) {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     
     if ($this->geos() && $exterior_only == FALSE) {
       return $this->geos()->area();
@@ -19,15 +21,20 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $a = '0';
     foreach($pts as $k => $p){
       $j = ($k + 1) % $c;
       $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
     }
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+    if ($signed) {
+    	$area = ($a / 2);
+    } else {
+    	$area = abs(($a / 2));
+    }
     
     if ($exterior_only == TRUE) {
       return $area;
@@ -42,7 +49,9 @@ 
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
     
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -52,7 +61,9 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $cn = array('x' => '0', 'y' => '0');
     $a = $this->area(TRUE, TRUE);
     
@@ -98,12 +109,16 @@ 
   }
 
   public function exteriorRing() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+    	return new LineString();
+    }
     return $this->components[0];
   }
   
   public function numInteriorRings() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return $this->numGeometries()-1;
   }
   
@@ -112,7 +127,9 @@ 
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return 2;
   }
 
@@ -187,8 +204,7 @@ 
     // If the number of edges we passed through is even, then it's in the polygon.
     if ($intersections % 2 != 0) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }

require/libs/geoPHP/tests/postgis.php

Doc Comments +4 added lines

@@ -41,6 +41,10 @@
   print "Testing Done!";
 }
 
+/**
+ * @param resource $connection
+ * @param string $format
+ */
 function test_postgis($name, $type, $geom, $connection, $format) {
   global $table;
   

Indentation +26 added lines, -26 removed lines

@@ -25,18 +25,18 @@ 
   // ----------------------------
   
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
-    if ($parts[0]) {
-      $name = $parts[0];
-      $format = $parts[1];
-      $value = file_get_contents('./input/'.$file);
-      print '---- Testing '.$file."\n";
-      flush();
-      $geometry = geoPHP::load($value, $format);
-      test_postgis($name, $format, $geometry, $connection, 'wkb');
-      $geometry->setSRID(4326);
-      test_postgis($name, $format, $geometry, $connection, 'ewkb');
-    }
+	$parts = explode('.',$file);
+	if ($parts[0]) {
+	  $name = $parts[0];
+	  $format = $parts[1];
+	  $value = file_get_contents('./input/'.$file);
+	  print '---- Testing '.$file."\n";
+	  flush();
+	  $geometry = geoPHP::load($value, $format);
+	  test_postgis($name, $format, $geometry, $connection, 'wkb');
+	  $geometry->setSRID(4326);
+	  test_postgis($name, $format, $geometry, $connection, 'ewkb');
+	}
   }
   print "Testing Done!";
 }
@@ -51,32 +51,32 @@ 
   // SELECT using asBinary PostGIS
   $result = pg_fetch_all(pg_query($connection, "SELECT asBinary(geom) as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
-    $geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
+	$wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
+	$geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
   }
   
   // SELECT and INSERT directly, with no wrapping functions
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
-    $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
+	$wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
+	$geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
   
-    // Let's re-insert directly into postGIS
-    // We need to unpack the WKB
-    $unpacked = unpack('H*', $geom->out($format));
-    $insert_string = $unpacked[1];
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
+	// Let's re-insert directly into postGIS
+	// We need to unpack the WKB
+	$unpacked = unpack('H*', $geom->out($format));
+	$insert_string = $unpacked[1];
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
   }
 
   // SELECT and INSERT using as EWKT (ST_GeomFromEWKT and ST_AsEWKT)
   $result = pg_fetch_all(pg_query($connection, "SELECT ST_AsEWKT(geom) as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkt = $item['geom']; // Make sure to unescape the hex blob
-    $geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
+	$wkt = $item['geom']; // Make sure to unescape the hex blob
+	$geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
 
-    // Let's re-insert directly into postGIS
-    $insert_string = $geom->out('ewkt');
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
+	// Let's re-insert directly into postGIS
+	$insert_string = $geom->out('ewkt');
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
   }
 }
 

Spacing +7 added lines, -7 removed lines

@@ -9,12 +9,12 @@ 
   include_once('../geoPHP.inc');
   
   // Your database test table should contain 3 columns: name (text), type (text), geom (geometry)
-  $host =     'localhost';
+  $host = 'localhost';
   $database = 'phayes';
-  $table =    'test';
-  $column =   'geom';
-  $user =     'phayes';
-  $pass =     'supersecret';
+  $table = 'test';
+  $column = 'geom';
+  $user = 'phayes';
+  $pass = 'supersecret';
   
   $connection = pg_connect("host=$host dbname=$database user=$user password=$pass");
   
@@ -25,7 +25,7 @@ 
   // ----------------------------
   
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $name = $parts[0];
       $format = $parts[1];
@@ -58,7 +58,7 @@ 
   // SELECT and INSERT directly, with no wrapping functions
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
+    $wkb = pack('H*', $item['geom']); // Unpacking the hex blob
     $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
   
     // Let's re-insert directly into postGIS

require/libs/geoPHP/tests/test.php

Doc Comments +6 added lines

@@ -112,6 +112,9 @@ 
   $geometry->m();
 }
 
+/**
+ * @param string $input
+ */
 function test_adapters($geometry, $format, $input) {
   // Test adapter output and input. Do a round-trip and re-test
   foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
@@ -234,6 +237,9 @@ 
   }
 }
 
+/**
+ * @param string $value
+ */
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {

Indentation +106 added lines, -106 removed lines

@@ -11,24 +11,24 @@ 
   include_once('../geoPHP.inc');
 
   if (geoPHP::geosInstalled()) {
-    print "GEOS is installed.\n";
+	print "GEOS is installed.\n";
   }
   else {
-    print "GEOS is not installed.\n";
+	print "GEOS is not installed.\n";
   }
 
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
-    if ($parts[0]) {
-      $format = $parts[1];
-      $value = file_get_contents('./input/'.$file);
-      print '---- Testing '.$file."\n";
-      $geometry = geoPHP::load($value, $format);
-      test_adapters($geometry, $format, $value);
-      test_methods($geometry);
-      test_geometry($geometry);
-      test_detection($value, $format, $file);
-    }
+	$parts = explode('.',$file);
+	if ($parts[0]) {
+	  $format = $parts[1];
+	  $value = file_get_contents('./input/'.$file);
+	  print '---- Testing '.$file."\n";
+	  $geometry = geoPHP::load($value, $format);
+	  test_adapters($geometry, $format, $value);
+	  test_methods($geometry);
+	  test_geometry($geometry);
+	  test_detection($value, $format, $file);
+	}
   }
   print "Testing Done!";
 }
@@ -115,21 +115,21 @@ 
 function test_adapters($geometry, $format, $input) {
   // 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);
-      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));
-
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
-          print "Mismatched adapter output in ".$adapter_class."\n";
-        }
-      }
-      else {
-        print "Empty output on "  . $adapter_key . "\n";
-      }
-    }
+	if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
+	  $output = $geometry->out($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));
+
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
+		  print "Mismatched adapter output in ".$adapter_class."\n";
+		}
+	  }
+	  else {
+		print "Empty output on "  . $adapter_key . "\n";
+	  }
+	}
   }
 
   // Test to make sure adapter work the same wether GEOS is ON or OFF
@@ -137,30 +137,30 @@ 
   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);
+	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
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
-          print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
-        }
-      }
-    }
+		// Check to make sure a both are the same with geos and without
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
+		  print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
+		}
+	  }
+	}
   }
 }
 
@@ -170,75 +170,75 @@ 
   if (!geoPHP::geosInstalled()) return;
 
   $methods = array(
-    //'boundary', //@@TODO: Uncomment this and fix errors
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
-    'getBBox',
-    'x',
-    'y',
-    'startPoint',
-    'endPoint',
-    'isRing',
-    'isClosed',
-    'numPoints',
+	//'boundary', //@@TODO: Uncomment this and fix errors
+	'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+	'getBBox',
+	'x',
+	'y',
+	'startPoint',
+	'endPoint',
+	'isRing',
+	'isClosed',
+	'numPoints',
   );
 
   foreach ($methods as $method) {
-    // Turn GEOS on
-    geoPHP::geosInstalled(TRUE);
-    $geos_result = $geometry->$method();
-
-    // Turn GEOS off
-    geoPHP::geosInstalled(FALSE);
-    $norm_result = $geometry->$method();
-
-    // Turn GEOS back On
-    geoPHP::geosInstalled(TRUE);
-
-    $geos_type = gettype($geos_result);
-    $norm_type = gettype($norm_result);
-
-    if ($geos_type != $norm_type) {
-      print 'Type mismatch on '.$method."\n";
-      continue;
-    }
-
-    // Now check base on type
-    if ($geos_type == 'object') {
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
-
-      // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
-      // Using Pythagorean theorem
-      $bb = $geos_result->getBBox();
-      $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
-
-      // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-      if ($haus_dist / $scale > 0.5) {
-        print 'Output mismatch on '.$method.":\n";
-        print 'GEOS : '.$geos_result->out('wkt')."\n";
-        print 'NORM : '.$norm_result->out('wkt')."\n";
-        continue;
-      }
-    }
-
-    if ($geos_type == 'boolean' || $geos_type == 'string') {
-      if ($geos_result !== $norm_result) {
-        print 'Output mismatch on '.$method.":\n";
-        print 'GEOS : '.(string) $geos_result."\n";
-        print 'NORM : '.(string) $norm_result."\n";
-        continue;
-      }
-    }
-
-    //@@TODO: Run tests for output of types arrays and float
-    //@@TODO: centroid function is non-compliant for collections and strings
+	// Turn GEOS on
+	geoPHP::geosInstalled(TRUE);
+	$geos_result = $geometry->$method();
+
+	// Turn GEOS off
+	geoPHP::geosInstalled(FALSE);
+	$norm_result = $geometry->$method();
+
+	// Turn GEOS back On
+	geoPHP::geosInstalled(TRUE);
+
+	$geos_type = gettype($geos_result);
+	$norm_type = gettype($norm_result);
+
+	if ($geos_type != $norm_type) {
+	  print 'Type mismatch on '.$method."\n";
+	  continue;
+	}
+
+	// Now check base on type
+	if ($geos_type == 'object') {
+	  $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+
+	  // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
+	  // Using Pythagorean theorem
+	  $bb = $geos_result->getBBox();
+	  $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
+
+	  // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
+	  if ($haus_dist / $scale > 0.5) {
+		print 'Output mismatch on '.$method.":\n";
+		print 'GEOS : '.$geos_result->out('wkt')."\n";
+		print 'NORM : '.$norm_result->out('wkt')."\n";
+		continue;
+	  }
+	}
+
+	if ($geos_type == 'boolean' || $geos_type == 'string') {
+	  if ($geos_result !== $norm_result) {
+		print 'Output mismatch on '.$method.":\n";
+		print 'GEOS : '.(string) $geos_result."\n";
+		print 'NORM : '.(string) $norm_result."\n";
+		continue;
+	  }
+	}
+
+	//@@TODO: Run tests for output of types arrays and float
+	//@@TODO: centroid function is non-compliant for collections and strings
   }
 }
 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
-    else print "not detected\n";
+	if ($detected) print 'detected as ' . $detected . "\n";
+	else print "not detected\n";
   }
   // Make sure it loads using auto-detect
   geoPHP::load($value);

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
   }
 
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $format = $parts[1];
       $value = file_get_contents('./input/'.$file);
@@ -88,7 +88,7 @@ 
   $geometry->difference($geometry);
   $geometry->symDifference($geometry);
   $geometry->union($geometry);
-  $geometry->simplify(0);// @@TODO: Adjust this once we can deal with empty geometries
+  $geometry->simplify(0); // @@TODO: Adjust this once we can deal with empty geometries
   $geometry->disjoint($geometry);
   $geometry->touches($geometry);
   $geometry->intersects($geometry);
@@ -127,7 +127,7 @@ 
         }
       }
       else {
-        print "Empty output on "  . $adapter_key . "\n";
+        print "Empty output on ".$adapter_key."\n";
       }
     }
   }
@@ -171,7 +171,7 @@ 
 
   $methods = array(
     //'boundary', //@@TODO: Uncomment this and fix errors
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+    'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
     'getBBox',
     'x',
     'y',
@@ -204,7 +204,7 @@ 
 
     // Now check base on type
     if ($geos_type == 'object') {
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
 
       // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
       // Using Pythagorean theorem
@@ -212,7 +212,7 @@ 
       $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
       // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-      if ($haus_dist / $scale > 0.5) {
+      if ($haus_dist/$scale > 0.5) {
         print 'Output mismatch on '.$method.":\n";
         print 'GEOS : '.$geos_result->out('wkt')."\n";
         print 'NORM : '.$norm_result->out('wkt')."\n";
@@ -237,7 +237,7 @@ 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
+    if ($detected) print 'detected as '.$detected."\n";
     else print "not detected\n";
   }
   // Make sure it loads using auto-detect

Braces +13 added lines, -8 removed lines

@@ -12,8 +12,7 @@ 
 
   if (geoPHP::geosInstalled()) {
     print "GEOS is installed.\n";
-  }
-  else {
+  } else {
     print "GEOS is not installed.\n";
   }
 
@@ -125,8 +124,7 @@ 
         if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
           print "Mismatched adapter output in ".$adapter_class."\n";
         }
-      }
-      else {
+      } else {
         print "Empty output on "  . $adapter_key . "\n";
       }
     }
@@ -134,7 +132,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
@@ -167,7 +167,9 @@ 
 
 function test_methods($geometry) {
   // Cannot test methods if GEOS is not intstalled
-  if (!geoPHP::geosInstalled()) return;
+  if (!geoPHP::geosInstalled()) {
+  	return;
+  }
 
   $methods = array(
     //'boundary', //@@TODO: Uncomment this and fix errors
@@ -237,8 +239,11 @@ 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
-    else print "not detected\n";
+    if ($detected) {
+    	print 'detected as ' . $detected . "\n";
+    } else {
+    	print "not detected\n";
+    }
   }
   // Make sure it loads using auto-detect
   geoPHP::load($value);

require/libs/geoPHP/tests/tests/methodsTest.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
     }
   }
 
+  /**
+   * @param string $method_name
+   * @param string|null $argument
+   */
   function _methods_tester($geometry, $method_name, $argument) {
 
     if (!method_exists($geometry, $method_name)) {

Indentation +328 added lines, -328 removed lines

@@ -9,357 +9,357 @@
   }
 
   function testMethods() {
-    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);
 
-        $methods = array(
-          array('name' => 'area'),
-          array('name' => 'boundary'),
-          array('name' => 'getBBox'),
-          array('name' => 'centroid'),
-          array('name' => 'length'),
-          array('name' => 'greatCircleLength'),
-          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'),
+		  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'];
-          }
+		foreach($methods as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          $this->_methods_tester($geometry, $method_name, $argument);
-        }
+		  $this->_methods_tester($geometry, $method_name, $argument);
+		}
 
-        $this->_methods_tester_with_geos($geometry);
-      }
-    }
+		$this->_methods_tester_with_geos($geometry);
+	  }
+	}
   }
 
   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 '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->assertNotNull($geometry->$method_name($argument), '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 'haversineLength':
-        //TODO: Check if output is a float >= 0.
-        //TODO: Sometimes haversineLength() returns NAN, needs to check why.
-        break;
-      case 'greatCircleLength':
-      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;
-      case 'setSRID':
-        //TODO: The method setSRID() should return TRUE.
-        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 '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->assertNotNull($geometry->$method_name($argument), '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 'haversineLength':
+		//TODO: Check if output is a float >= 0.
+		//TODO: Sometimes haversineLength() returns NAN, needs to check why.
+		break;
+	  case 'greatCircleLength':
+	  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;
+	  case 'setSRID':
+		//TODO: The method setSRID() should return TRUE.
+		break;
+	  default:
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+	}
 
   }
 
   function _methods_tester_with_geos($geometry) {
-    // Cannot test methods if GEOS is not intstalled
-    if (!geoPHP::geosInstalled()) return;
+	// Cannot test methods if GEOS is not intstalled
+	if (!geoPHP::geosInstalled()) return;
 
-    $methods = array(
-      //'boundary', //@@TODO: Uncomment this and fix errors
-      'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
-      'getBBox',
-      'x',
-      'y',
-      'startPoint',
-      'endPoint',
-      'isRing',
-      'isClosed',
-      'numPoints',
-    );
+	$methods = array(
+	  //'boundary', //@@TODO: Uncomment this and fix errors
+	  'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+	  'getBBox',
+	  'x',
+	  'y',
+	  'startPoint',
+	  'endPoint',
+	  'isRing',
+	  'isClosed',
+	  'numPoints',
+	);
 
-    foreach ($methods as $method) {
-      // Turn GEOS on
-      geoPHP::geosInstalled(TRUE);
-      $geos_result = $geometry->$method();
+	foreach ($methods as $method) {
+	  // Turn GEOS on
+	  geoPHP::geosInstalled(TRUE);
+	  $geos_result = $geometry->$method();
 
-      // Turn GEOS off
-      geoPHP::geosInstalled(FALSE);
-      $norm_result = $geometry->$method();
+	  // Turn GEOS off
+	  geoPHP::geosInstalled(FALSE);
+	  $norm_result = $geometry->$method();
 
-      // Turn GEOS back On
-      geoPHP::geosInstalled(TRUE);
+	  // Turn GEOS back On
+	  geoPHP::geosInstalled(TRUE);
 
-      $geos_type = gettype($geos_result);
-      $norm_type = gettype($norm_result);
+	  $geos_type = gettype($geos_result);
+	  $norm_type = gettype($norm_result);
 
-      if ($geos_type != $norm_type) {
-        $this->fail('Type mismatch on '.$method);
-        $this->dump($geos_type);
-        $this->dump($norm_type);
-        continue;
-      }
+	  if ($geos_type != $norm_type) {
+		$this->fail('Type mismatch on '.$method);
+		$this->dump($geos_type);
+		$this->dump($norm_type);
+		continue;
+	  }
 
-      // Now check base on type
-      if ($geos_type == 'object') {
-        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+	  // Now check base on type
+	  if ($geos_type == 'object') {
+		$haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
 
-        // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
-        // Using Pythagorean theorem
-        $bb = $geos_result->getBBox();
-        $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
+		// Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
+		// Using Pythagorean theorem
+		$bb = $geos_result->getBBox();
+		$scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
-        // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-        if ($haus_dist / $scale > 0.5) {
-          $this->fail('Output mismatch on '.$method);
-          $this->dump('GEOS : ');
-          $this->dump($geos_result->out('wkt'));
-          $this->dump('NORM : ');
-          $this->dump($norm_result->out('wkt'));
-          continue;
-        }
-      }
+		// The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
+		if ($haus_dist / $scale > 0.5) {
+		  $this->fail('Output mismatch on '.$method);
+		  $this->dump('GEOS : ');
+		  $this->dump($geos_result->out('wkt'));
+		  $this->dump('NORM : ');
+		  $this->dump($norm_result->out('wkt'));
+		  continue;
+		}
+	  }
 
-      if ($geos_type == 'boolean' || $geos_type == 'string') {
-        if ($geos_result !== $norm_result) {
-          $this->fail('Output mismatch on '.$method);
-          $this->dump('GEOS : ');
-          $this->dump((string) $geos_result);
-          $this->dump('NORM : ');
-          $this->dump((string) $norm_result);
-          continue;
-        }
-      }
+	  if ($geos_type == 'boolean' || $geos_type == 'string') {
+		if ($geos_result !== $norm_result) {
+		  $this->fail('Output mismatch on '.$method);
+		  $this->dump('GEOS : ');
+		  $this->dump((string) $geos_result);
+		  $this->dump('NORM : ');
+		  $this->dump((string) $norm_result);
+		  continue;
+		}
+	  }
 
-      //@@TODO: Run tests for output of types arrays and float
-      //@@TODO: centroid function is non-compliant for collections and strings
-    }
+	  //@@TODO: Run tests for output of types arrays and float
+	  //@@TODO: centroid function is non-compliant for collections and strings
+	}
   }
 }

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
 
   function testMethods() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -43,7 +43,7 @@ 
           array('name' => 'setSRID', 'argument' => '4326'),
         );
 
-        foreach($methods as $method) {
+        foreach ($methods as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -69,32 +69,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.
@@ -103,10 +103,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.
@@ -115,32 +115,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.
@@ -149,123 +149,123 @@ 
         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 '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->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), '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 'haversineLength':
@@ -274,16 +274,16 @@ 
         break;
       case 'greatCircleLength':
       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;
       case 'setSRID':
         //TODO: The method setSRID() should return TRUE.
         break;
       default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
     }
 
   }
@@ -294,7 +294,7 @@ 
 
     $methods = array(
       //'boundary', //@@TODO: Uncomment this and fix errors
-      'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+      'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
       'getBBox',
       'x',
       'y',
@@ -329,7 +329,7 @@ 
 
       // Now check base on type
       if ($geos_type == 'object') {
-        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
 
         // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
         // Using Pythagorean theorem
@@ -337,7 +337,7 @@ 
         $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
         // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-        if ($haus_dist / $scale > 0.5) {
+        if ($haus_dist/$scale > 0.5) {
           $this->fail('Output mismatch on '.$method);
           $this->dump('GEOS : ');
           $this->dump($geos_result->out('wkt'));

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,9 @@
 
   function _methods_tester_with_geos($geometry) {
     // Cannot test methods if GEOS is not intstalled
-    if (!geoPHP::geosInstalled()) return;
+    if (!geoPHP::geosInstalled()) {
+    	return;
+    }
 
     $methods = array(
       //'boundary', //@@TODO: Uncomment this and fix errors

require/libs/simple_html_dom.php

Doc Comments +43 added lines

@@ -68,6 +68,9 @@ 
 // -----------------------------------------------------------------------------
 // get html dom from file
 // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
+/**
+ * @param string $url
+ */
 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.
@@ -125,6 +128,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1501,6 +1507,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 +1549,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 +1565,10 @@ 
 	}
 
 	// as a text node
+
+	/**
+	 * @param string $tag
+	 */
 	protected function as_text_node($tag)
 	{
 		$node = new simple_html_dom_node($this);
@@ -1559,12 +1579,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 +1601,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_until($chars)
 	{
 		$pos = $this->pos;
@@ -1584,6 +1613,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char($char)
 	{
 		if ($this->char===null) return '';
@@ -1602,6 +1634,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 +1668,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 +1697,10 @@ 
 	}
 
 	// restore noise to html content
+
+	/**
+	 * @param string|null $text
+	 */
 	function restore_noise($text)
 	{
 		global $debug_object;

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);

require/libs/uagent/uagent.php

Doc Comments +3 added lines

@@ -122,6 +122,9 @@
         return self::array_random( empty( $lang ) ? self::$languages : $lang );
     }
 
+    /**
+     * @param string $os
+     */
     private static function get_processor( $os )
     {
         return self::array_random( self::$processors[$os] );

Indentation +342 added lines, -342 removed lines

@@ -8,347 +8,347 @@
 
 class UAgent
 {
-    // General token that says the browser is Mozilla compatible, 
-    // and is common to almost every browser today.
-    const MOZILLA = 'Mozilla/5.0 ';
-
-    /**
-     * Processors by Arch.
-     */
-    public static $processors = array(
-        'lin' => array( 'i686', 'x86_64' ),
-        'mac' => array( 'Intel', 'PPC', 'U; Intel', 'U; PPC' ),
-        'win' => array( 'foo' )
-    );
-
-    /**
-     * Browsers
-     * 
-     * Weighting is based on market share to determine frequency.
-     */
-    public static $browsers = array(
-        34 => array(
-            89 => array( 'chrome', 'win' ),
-            9  => array( 'chrome', 'mac' ),
-            2  => array( 'chrome', 'lin' )
-        ),
-        32 => array(
-            100 => array( 'iexplorer', 'win' )
-        ),
-        25 => array(
-            83 => array( 'firefox', 'win' ),
-            16 => array( 'firefox', 'mac' ),
-            1  => array( 'firefox', 'lin' )
-        ),
-        7 => array(
-            95 => array( 'safari', 'mac' ),
-            4  => array( 'safari', 'win' ),
-            1  => array( 'safari', 'lin' )
-        ),
-        2 => array(
-            91 => array( 'opera', 'win' ),
-            6  => array( 'opera', 'lin' ),
-            3  => array( 'opera', 'mac' )
-        )
-    );
-
-    /**
-     * List of Lanuge Culture Codes (ISO 639-1)
-     *
-     * @see: http://msdn.microsoft.com/en-gb/library/ee825488(v=cs.20).aspx
-     */
-    public static $languages = array(
-        'af-ZA', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB',
-        'ar-LY', 'ar-MA', 'ar-OM', 'ar-QA', 'ar-SA', 'ar-SY', 'ar-TN', 'ar-YE', 'be-BY',
-        'bg-BG', 'ca-ES', 'cs-CZ', 'Cy-az-AZ', 'Cy-sr-SP', 'Cy-uz-UZ', 'da-DK', 'de-AT',
-        'de-CH', 'de-DE', 'de-LI', 'de-LU', 'div-MV', 'el-GR', 'en-AU', 'en-BZ', 'en-CA', 
-        'en-CB', 'en-GB', 'en-IE', 'en-JM', 'en-NZ', 'en-PH', 'en-TT', 'en-US', 'en-ZA', 
-        'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO',  'es-CR', 'es-DO', 'es-EC', 'es-ES',
-        'es-GT', 'es-HN', 'es-MX', 'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV',
-        'es-UY', 'es-VE', 'et-EE', 'eu-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-BE', 'fr-CA',
-        'fr-CH', 'fr-FR', 'fr-LU', 'fr-MC', 'gl-ES', 'gu-IN', 'he-IL', 'hi-IN', 'hr-HR', 
-        'hu-HU', 'hy-AM', 'id-ID', 'is-IS', 'it-CH', 'it-IT', 'ja-JP', 'ka-GE', 'kk-KZ',
-        'kn-IN', 'kok-IN', 'ko-KR', 'ky-KZ', 'Lt-az-AZ', 'lt-LT', 'Lt-sr-SP', 'Lt-uz-UZ', 
-        'lv-LV', 'mk-MK', 'mn-MN', 'mr-IN', 'ms-BN', 'ms-MY', 'nb-NO', 'nl-BE', 'nl-NL', 
-        'nn-NO', 'pa-IN', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sa-IN', 'sk-SK', 
-        'sl-SI', 'sq-AL', 'sv-FI', 'sv-SE', 'sw-KE', 'syr-SY', 'ta-IN', 'te-IN', 'th-TH', 
-        'tr-TR', 'tt-RU', 'uk-UA', 'ur-PK', 'vi-VN', 'zh-CHS', 'zh-CHT', 'zh-CN', 'zh-HK', 
-        'zh-MO', 'zh-SG', 'zh-TW',   
-    );    
-
-    /**
-     * Generate Device Platform
-     *
-     * Uses a random result with a weighting related to frequencies.
-     */
-    public static function generate_platform()
-    {
-        $rand = mt_rand( 1, 100 );
-        $sum = 0;
-
-        foreach ( self::$browsers as $share => $freq_os )
-        {
-            $sum += $share;
-
-            if ( $rand <= $sum )
-            {
-                $rand = mt_rand( 1, 100 );
-                $sum = 0;
-
-                foreach ( $freq_os as $share => $choice )
-                {
-                    $sum += $share;
-
-                    if ( $rand <= $sum )
-                    {
-                        return $choice;
-                    }
-                }
-            }
-        }
-
-        throw new Exception( 'Sum of $browsers frequency is not 100.' );
-    }
-
-    private static function array_random( $array )
-    {
-        $i = array_rand( $array, 1 );
-
-        return $array[$i];
-    }
-
-    private static function get_language( $lang = array() )
-    {
-        return self::array_random( empty( $lang ) ? self::$languages : $lang );
-    }
-
-    private static function get_processor( $os )
-    {
-        return self::array_random( self::$processors[$os] );
-    }
-
-    private static function get_version_nt()
-    {   
-        // Win2k (5.0) to Win 7 (6.1).
-        return mt_rand( 5, 6 ) . '.' . mt_rand( 0, 1 );
-    }
-
-    private static function get_version_osx()
-    {
-        return '10_' . mt_rand( 5, 7 ) . '_' . mt_rand( 0, 9 );
-    }
-
-    private static function get_version_webkit()
-    {
-        return mt_rand( 531, 536 ) . mt_rand( 0, 2 );
-    }
-
-    private static function get_verison_chrome()
-    {
-        return mt_rand( 13, 15 ) . '.0.' . mt_rand( 800, 899 ) . '.0';
-    }
-
-    private static function get_version_gecko()
-    {
-        return mt_rand( 17, 31 ) . '.0';
-    }
-
-    private static function get_version_ie()
-    {
-        return mt_rand( 7, 9 ) . '.0';
-    }
-
-    private static function get_version_trident()
-    {
-        // IE8 (4.0) to IE11 (7.0).
-        return mt_rand( 4, 7 ) . '.0';
-    }
-
-    private static function get_version_net()
-    {
-        // generic .NET Framework common language run time (CLR) version numbers.
-        $frameworks = array(
-            '2.0.50727',
-            '3.0.4506',
-            '3.5.30729',
-        );
-
-        $rev = '.' . mt_rand( 26, 648 );
-
-        return self::array_random( $frameworks ) . $rev;
-    }
-
-    private static function get_version_safari()
-    {
-        if ( mt_rand( 0, 1 ) == 0 )
-        {
-            $ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
-        }
-        else
-        {
-            $ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
-        }
-
-        return $ver;
-    }
-
-    private static function get_version_opera()
-    {
-        return mt_rand( 15, 19 ) . '.0.' . mt_rand( 1147, 1284 ) . mt_rand( 49, 100 );
-    }
-
-    /**
-     * Opera
-     * 
-     * @see: http://dev.opera.com/blog/opera-user-agent-strings-opera-15-and-beyond/
-     */
-    public static function opera( $arch )
-    {
-        $opera = ' OPR/' . self::get_version_opera();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $chrome = ' Chrome/' . self::get_verison_chrome();
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari . $opera;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari . $opera;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; WOW64) ' . $webkit . $chrome . $safari . $opera;
-        }
-    }    
-
-    /**
-     * Safari
-     *
-     */
-    public static function safari( $arch )
-    {
-        $version = ' Version/' . self::get_version_safari();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . '; {lang})' . $webkit . $version . $safari;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows; U; Windows NT ' . $nt . ')' . $webkit . $version . $safari;
-        }
-
-    }
-
-    /**
-     * Internet Explorer
-     * 
-     * @see: http://msdn.microsoft.com/en-gb/library/ms537503(v=vs.85).aspx
-     */
-    public static function iexplorer( $arch )
-    {
-        $nt = self::get_version_nt();
-        $ie = self::get_version_ie();
-        $trident = self::get_version_trident();
-        $net = self::get_version_net();
-
-        return '(compatible' 
-            . '; MSIE ' . $ie 
-            . '; Windows NT ' . $nt 
-            . '; WOW64' // A 32-bit version of Internet Explorer is running on a 64-bit processor.
-            . '; Trident/' . $trident 
-            . '; .NET CLR ' . $net
-            . ')';
-    }
-
-    /**
-     * Firefox User-Agent
-     *
-     * @see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference
-     */
-    public static function firefox( $arch )
-    {
-        // The release version of Gecko. 
-        $gecko = self::get_version_gecko();
-
-        // On desktop, the gecko trail is fixed.
-        $trail = '20100101';
-
-        $release = 'rv:' . $gecko;
-        $version = 'Gecko/' . $trail . ' Firefox/' . $gecko;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}; ' . $release . ') ' . $version;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; {proc} Mac OS X ' . $osx . '; ' . $release . ') ' . $version;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; {lang}; ' . $release . ') ' . $version;
-        }
-    }
-
-    public static function chrome( $arch )
-    {
-        $chrome = ' Chrome/' . self::get_verison_chrome();
-
-        // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
-        $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
-
-        switch ( $arch )
-        {
-            case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari;
-            case 'mac':
-                $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari;
-            case 'win':
-                // fall through.
-            default:
-                $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . ') ' . $webkit . $chrome . $safari;
-        }
-    }
-
-    public static function random( $lang = array( 'en-US' ) )
-    {
-        list( $browser, $os ) = self::generate_platform();
-
-        return self::generate( $browser, $os, $lang );
-    }
-
-    public static function generate( $browser = 'chrome', $os = 'win', $lang = array( 'en-US' ) )
-    {
-        $ua = self::MOZILLA . call_user_func( 'UAgent::' . $browser, $os );
-
-        $tags = array(
-            '{proc}' => self::get_processor( $os ),
-            '{lang}' => self::get_language( $lang ),
-        );
-
-        $ua = str_replace( array_keys( $tags ), array_values( $tags ), $ua );
-
-        return $ua;
-    }
+	// General token that says the browser is Mozilla compatible, 
+	// and is common to almost every browser today.
+	const MOZILLA = 'Mozilla/5.0 ';
+
+	/**
+	 * Processors by Arch.
+	 */
+	public static $processors = array(
+		'lin' => array( 'i686', 'x86_64' ),
+		'mac' => array( 'Intel', 'PPC', 'U; Intel', 'U; PPC' ),
+		'win' => array( 'foo' )
+	);
+
+	/**
+	 * Browsers
+	 * 
+	 * Weighting is based on market share to determine frequency.
+	 */
+	public static $browsers = array(
+		34 => array(
+			89 => array( 'chrome', 'win' ),
+			9  => array( 'chrome', 'mac' ),
+			2  => array( 'chrome', 'lin' )
+		),
+		32 => array(
+			100 => array( 'iexplorer', 'win' )
+		),
+		25 => array(
+			83 => array( 'firefox', 'win' ),
+			16 => array( 'firefox', 'mac' ),
+			1  => array( 'firefox', 'lin' )
+		),
+		7 => array(
+			95 => array( 'safari', 'mac' ),
+			4  => array( 'safari', 'win' ),
+			1  => array( 'safari', 'lin' )
+		),
+		2 => array(
+			91 => array( 'opera', 'win' ),
+			6  => array( 'opera', 'lin' ),
+			3  => array( 'opera', 'mac' )
+		)
+	);
+
+	/**
+	 * List of Lanuge Culture Codes (ISO 639-1)
+	 *
+	 * @see: http://msdn.microsoft.com/en-gb/library/ee825488(v=cs.20).aspx
+	 */
+	public static $languages = array(
+		'af-ZA', 'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IQ', 'ar-JO', 'ar-KW', 'ar-LB',
+		'ar-LY', 'ar-MA', 'ar-OM', 'ar-QA', 'ar-SA', 'ar-SY', 'ar-TN', 'ar-YE', 'be-BY',
+		'bg-BG', 'ca-ES', 'cs-CZ', 'Cy-az-AZ', 'Cy-sr-SP', 'Cy-uz-UZ', 'da-DK', 'de-AT',
+		'de-CH', 'de-DE', 'de-LI', 'de-LU', 'div-MV', 'el-GR', 'en-AU', 'en-BZ', 'en-CA', 
+		'en-CB', 'en-GB', 'en-IE', 'en-JM', 'en-NZ', 'en-PH', 'en-TT', 'en-US', 'en-ZA', 
+		'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO',  'es-CR', 'es-DO', 'es-EC', 'es-ES',
+		'es-GT', 'es-HN', 'es-MX', 'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV',
+		'es-UY', 'es-VE', 'et-EE', 'eu-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-BE', 'fr-CA',
+		'fr-CH', 'fr-FR', 'fr-LU', 'fr-MC', 'gl-ES', 'gu-IN', 'he-IL', 'hi-IN', 'hr-HR', 
+		'hu-HU', 'hy-AM', 'id-ID', 'is-IS', 'it-CH', 'it-IT', 'ja-JP', 'ka-GE', 'kk-KZ',
+		'kn-IN', 'kok-IN', 'ko-KR', 'ky-KZ', 'Lt-az-AZ', 'lt-LT', 'Lt-sr-SP', 'Lt-uz-UZ', 
+		'lv-LV', 'mk-MK', 'mn-MN', 'mr-IN', 'ms-BN', 'ms-MY', 'nb-NO', 'nl-BE', 'nl-NL', 
+		'nn-NO', 'pa-IN', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sa-IN', 'sk-SK', 
+		'sl-SI', 'sq-AL', 'sv-FI', 'sv-SE', 'sw-KE', 'syr-SY', 'ta-IN', 'te-IN', 'th-TH', 
+		'tr-TR', 'tt-RU', 'uk-UA', 'ur-PK', 'vi-VN', 'zh-CHS', 'zh-CHT', 'zh-CN', 'zh-HK', 
+		'zh-MO', 'zh-SG', 'zh-TW',   
+	);    
+
+	/**
+	 * Generate Device Platform
+	 *
+	 * Uses a random result with a weighting related to frequencies.
+	 */
+	public static function generate_platform()
+	{
+		$rand = mt_rand( 1, 100 );
+		$sum = 0;
+
+		foreach ( self::$browsers as $share => $freq_os )
+		{
+			$sum += $share;
+
+			if ( $rand <= $sum )
+			{
+				$rand = mt_rand( 1, 100 );
+				$sum = 0;
+
+				foreach ( $freq_os as $share => $choice )
+				{
+					$sum += $share;
+
+					if ( $rand <= $sum )
+					{
+						return $choice;
+					}
+				}
+			}
+		}
+
+		throw new Exception( 'Sum of $browsers frequency is not 100.' );
+	}
+
+	private static function array_random( $array )
+	{
+		$i = array_rand( $array, 1 );
+
+		return $array[$i];
+	}
+
+	private static function get_language( $lang = array() )
+	{
+		return self::array_random( empty( $lang ) ? self::$languages : $lang );
+	}
+
+	private static function get_processor( $os )
+	{
+		return self::array_random( self::$processors[$os] );
+	}
+
+	private static function get_version_nt()
+	{   
+		// Win2k (5.0) to Win 7 (6.1).
+		return mt_rand( 5, 6 ) . '.' . mt_rand( 0, 1 );
+	}
+
+	private static function get_version_osx()
+	{
+		return '10_' . mt_rand( 5, 7 ) . '_' . mt_rand( 0, 9 );
+	}
+
+	private static function get_version_webkit()
+	{
+		return mt_rand( 531, 536 ) . mt_rand( 0, 2 );
+	}
+
+	private static function get_verison_chrome()
+	{
+		return mt_rand( 13, 15 ) . '.0.' . mt_rand( 800, 899 ) . '.0';
+	}
+
+	private static function get_version_gecko()
+	{
+		return mt_rand( 17, 31 ) . '.0';
+	}
+
+	private static function get_version_ie()
+	{
+		return mt_rand( 7, 9 ) . '.0';
+	}
+
+	private static function get_version_trident()
+	{
+		// IE8 (4.0) to IE11 (7.0).
+		return mt_rand( 4, 7 ) . '.0';
+	}
+
+	private static function get_version_net()
+	{
+		// generic .NET Framework common language run time (CLR) version numbers.
+		$frameworks = array(
+			'2.0.50727',
+			'3.0.4506',
+			'3.5.30729',
+		);
+
+		$rev = '.' . mt_rand( 26, 648 );
+
+		return self::array_random( $frameworks ) . $rev;
+	}
+
+	private static function get_version_safari()
+	{
+		if ( mt_rand( 0, 1 ) == 0 )
+		{
+			$ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
+		}
+		else
+		{
+			$ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
+		}
+
+		return $ver;
+	}
+
+	private static function get_version_opera()
+	{
+		return mt_rand( 15, 19 ) . '.0.' . mt_rand( 1147, 1284 ) . mt_rand( 49, 100 );
+	}
+
+	/**
+	 * Opera
+	 * 
+	 * @see: http://dev.opera.com/blog/opera-user-agent-strings-opera-15-and-beyond/
+	 */
+	public static function opera( $arch )
+	{
+		$opera = ' OPR/' . self::get_version_opera();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$chrome = ' Chrome/' . self::get_verison_chrome();
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari . $opera;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari . $opera;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . '; WOW64) ' . $webkit . $chrome . $safari . $opera;
+		}
+	}    
+
+	/**
+	 * Safari
+	 *
+	 */
+	public static function safari( $arch )
+	{
+		$version = ' Version/' . self::get_version_safari();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . '; {lang})' . $webkit . $version . $safari;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows; U; Windows NT ' . $nt . ')' . $webkit . $version . $safari;
+		}
+
+	}
+
+	/**
+	 * Internet Explorer
+	 * 
+	 * @see: http://msdn.microsoft.com/en-gb/library/ms537503(v=vs.85).aspx
+	 */
+	public static function iexplorer( $arch )
+	{
+		$nt = self::get_version_nt();
+		$ie = self::get_version_ie();
+		$trident = self::get_version_trident();
+		$net = self::get_version_net();
+
+		return '(compatible' 
+			. '; MSIE ' . $ie 
+			. '; Windows NT ' . $nt 
+			. '; WOW64' // A 32-bit version of Internet Explorer is running on a 64-bit processor.
+			. '; Trident/' . $trident 
+			. '; .NET CLR ' . $net
+			. ')';
+	}
+
+	/**
+	 * Firefox User-Agent
+	 *
+	 * @see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference
+	 */
+	public static function firefox( $arch )
+	{
+		// The release version of Gecko. 
+		$gecko = self::get_version_gecko();
+
+		// On desktop, the gecko trail is fixed.
+		$trail = '20100101';
+
+		$release = 'rv:' . $gecko;
+		$version = 'Gecko/' . $trail . ' Firefox/' . $gecko;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}; ' . $release . ') ' . $version;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; {proc} Mac OS X ' . $osx . '; ' . $release . ') ' . $version;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . '; {lang}; ' . $release . ') ' . $version;
+		}
+	}
+
+	public static function chrome( $arch )
+	{
+		$chrome = ' Chrome/' . self::get_verison_chrome();
+
+		// WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
+		$engine = self::get_version_webkit();
+		$webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
+		$safari = ' Safari/' . $engine;
+
+		switch ( $arch )
+		{
+			case 'lin':
+				return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari;
+			case 'mac':
+				$osx = self::get_version_osx();
+				return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari;
+			case 'win':
+				// fall through.
+			default:
+				$nt = self::get_version_nt();
+				return '(Windows NT ' . $nt . ') ' . $webkit . $chrome . $safari;
+		}
+	}
+
+	public static function random( $lang = array( 'en-US' ) )
+	{
+		list( $browser, $os ) = self::generate_platform();
+
+		return self::generate( $browser, $os, $lang );
+	}
+
+	public static function generate( $browser = 'chrome', $os = 'win', $lang = array( 'en-US' ) )
+	{
+		$ua = self::MOZILLA . call_user_func( 'UAgent::' . $browser, $os );
+
+		$tags = array(
+			'{proc}' => self::get_processor( $os ),
+			'{lang}' => self::get_language( $lang ),
+		);
+
+		$ua = str_replace( array_keys( $tags ), array_values( $tags ), $ua );
+
+		return $ua;
+	}
 }
 ?>

Spacing +87 added lines, -87 removed lines

@@ -16,9 +16,9 @@ 
      * Processors by Arch.
      */
     public static $processors = array(
-        'lin' => array( 'i686', 'x86_64' ),
-        'mac' => array( 'Intel', 'PPC', 'U; Intel', 'U; PPC' ),
-        'win' => array( 'foo' )
+        'lin' => array('i686', 'x86_64'),
+        'mac' => array('Intel', 'PPC', 'U; Intel', 'U; PPC'),
+        'win' => array('foo')
     );
 
     /**
@@ -28,27 +28,27 @@ 
      */
     public static $browsers = array(
         34 => array(
-            89 => array( 'chrome', 'win' ),
-            9  => array( 'chrome', 'mac' ),
-            2  => array( 'chrome', 'lin' )
+            89 => array('chrome', 'win'),
+            9  => array('chrome', 'mac'),
+            2  => array('chrome', 'lin')
         ),
         32 => array(
-            100 => array( 'iexplorer', 'win' )
+            100 => array('iexplorer', 'win')
         ),
         25 => array(
-            83 => array( 'firefox', 'win' ),
-            16 => array( 'firefox', 'mac' ),
-            1  => array( 'firefox', 'lin' )
+            83 => array('firefox', 'win'),
+            16 => array('firefox', 'mac'),
+            1  => array('firefox', 'lin')
         ),
         7 => array(
-            95 => array( 'safari', 'mac' ),
-            4  => array( 'safari', 'win' ),
-            1  => array( 'safari', 'lin' )
+            95 => array('safari', 'mac'),
+            4  => array('safari', 'win'),
+            1  => array('safari', 'lin')
         ),
         2 => array(
-            91 => array( 'opera', 'win' ),
-            6  => array( 'opera', 'lin' ),
-            3  => array( 'opera', 'mac' )
+            91 => array('opera', 'win'),
+            6  => array('opera', 'lin'),
+            3  => array('opera', 'mac')
         )
     );
 
@@ -63,7 +63,7 @@ 
         'bg-BG', 'ca-ES', 'cs-CZ', 'Cy-az-AZ', 'Cy-sr-SP', 'Cy-uz-UZ', 'da-DK', 'de-AT',
         'de-CH', 'de-DE', 'de-LI', 'de-LU', 'div-MV', 'el-GR', 'en-AU', 'en-BZ', 'en-CA', 
         'en-CB', 'en-GB', 'en-IE', 'en-JM', 'en-NZ', 'en-PH', 'en-TT', 'en-US', 'en-ZA', 
-        'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO',  'es-CR', 'es-DO', 'es-EC', 'es-ES',
+        'en-ZW', 'es-AR', 'es-BO', 'es-CL', 'es-CO', 'es-CR', 'es-DO', 'es-EC', 'es-ES',
         'es-GT', 'es-HN', 'es-MX', 'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV',
         'es-UY', 'es-VE', 'et-EE', 'eu-ES', 'fa-IR', 'fi-FI', 'fo-FO', 'fr-BE', 'fr-CA',
         'fr-CH', 'fr-FR', 'fr-LU', 'fr-MC', 'gl-ES', 'gu-IN', 'he-IL', 'hi-IN', 'hr-HR', 
@@ -83,23 +83,23 @@ 
      */
     public static function generate_platform()
     {
-        $rand = mt_rand( 1, 100 );
+        $rand = mt_rand(1, 100);
         $sum = 0;
 
-        foreach ( self::$browsers as $share => $freq_os )
+        foreach (self::$browsers as $share => $freq_os)
         {
             $sum += $share;
 
-            if ( $rand <= $sum )
+            if ($rand <= $sum)
             {
-                $rand = mt_rand( 1, 100 );
+                $rand = mt_rand(1, 100);
                 $sum = 0;
 
-                foreach ( $freq_os as $share => $choice )
+                foreach ($freq_os as $share => $choice)
                 {
                     $sum += $share;
 
-                    if ( $rand <= $sum )
+                    if ($rand <= $sum)
                     {
                         return $choice;
                     }
@@ -107,61 +107,61 @@ 
             }
         }
 
-        throw new Exception( 'Sum of $browsers frequency is not 100.' );
+        throw new Exception('Sum of $browsers frequency is not 100.');
     }
 
-    private static function array_random( $array )
+    private static function array_random($array)
     {
-        $i = array_rand( $array, 1 );
+        $i = array_rand($array, 1);
 
         return $array[$i];
     }
 
-    private static function get_language( $lang = array() )
+    private static function get_language($lang = array())
     {
-        return self::array_random( empty( $lang ) ? self::$languages : $lang );
+        return self::array_random(empty($lang) ? self::$languages : $lang);
     }
 
-    private static function get_processor( $os )
+    private static function get_processor($os)
     {
-        return self::array_random( self::$processors[$os] );
+        return self::array_random(self::$processors[$os]);
     }
 
     private static function get_version_nt()
     {   
         // Win2k (5.0) to Win 7 (6.1).
-        return mt_rand( 5, 6 ) . '.' . mt_rand( 0, 1 );
+        return mt_rand(5, 6).'.'.mt_rand(0, 1);
     }
 
     private static function get_version_osx()
     {
-        return '10_' . mt_rand( 5, 7 ) . '_' . mt_rand( 0, 9 );
+        return '10_'.mt_rand(5, 7).'_'.mt_rand(0, 9);
     }
 
     private static function get_version_webkit()
     {
-        return mt_rand( 531, 536 ) . mt_rand( 0, 2 );
+        return mt_rand(531, 536).mt_rand(0, 2);
     }
 
     private static function get_verison_chrome()
     {
-        return mt_rand( 13, 15 ) . '.0.' . mt_rand( 800, 899 ) . '.0';
+        return mt_rand(13, 15).'.0.'.mt_rand(800, 899).'.0';
     }
 
     private static function get_version_gecko()
     {
-        return mt_rand( 17, 31 ) . '.0';
+        return mt_rand(17, 31).'.0';
     }
 
     private static function get_version_ie()
     {
-        return mt_rand( 7, 9 ) . '.0';
+        return mt_rand(7, 9).'.0';
     }
 
     private static function get_version_trident()
     {
         // IE8 (4.0) to IE11 (7.0).
-        return mt_rand( 4, 7 ) . '.0';
+        return mt_rand(4, 7).'.0';
     }
 
     private static function get_version_net()
@@ -173,20 +173,20 @@ 
             '3.5.30729',
         );
 
-        $rev = '.' . mt_rand( 26, 648 );
+        $rev = '.'.mt_rand(26, 648);
 
-        return self::array_random( $frameworks ) . $rev;
+        return self::array_random($frameworks).$rev;
     }
 
     private static function get_version_safari()
     {
-        if ( mt_rand( 0, 1 ) == 0 )
+        if (mt_rand(0, 1) == 0)
         {
-            $ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
+            $ver = mt_rand(4, 5).'.'.mt_rand(0, 1);
         }
         else
         {
-            $ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
+            $ver = mt_rand(4, 5).'.0.'.mt_rand(1, 5);
         }
 
         return $ver;
@@ -194,7 +194,7 @@ 
 
     private static function get_version_opera()
     {
-        return mt_rand( 15, 19 ) . '.0.' . mt_rand( 1147, 1284 ) . mt_rand( 49, 100 );
+        return mt_rand(15, 19).'.0.'.mt_rand(1147, 1284).mt_rand(49, 100);
     }
 
     /**
@@ -202,28 +202,28 @@ 
      * 
      * @see: http://dev.opera.com/blog/opera-user-agent-strings-opera-15-and-beyond/
      */
-    public static function opera( $arch )
+    public static function opera($arch)
     {
-        $opera = ' OPR/' . self::get_version_opera();
+        $opera = ' OPR/'.self::get_version_opera();
 
         // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
         $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $chrome = ' Chrome/' . self::get_verison_chrome();
-        $safari = ' Safari/' . $engine;
+        $webkit = ' AppleWebKit/'.$engine.' (KHTML, like Gecko)';
+        $chrome = ' Chrome/'.self::get_verison_chrome();
+        $safari = ' Safari/'.$engine;
 
-        switch ( $arch )
+        switch ($arch)
         {
             case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari . $opera;
+                return '(X11; Linux {proc}) '.$webkit.$chrome.$safari.$opera;
             case 'mac':
                 $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari . $opera;
+                return '(Macintosh; U; {proc} Mac OS X '.$osx.')'.$webkit.$chrome.$safari.$opera;
             case 'win':
                 // fall through.
             default:
                 $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; WOW64) ' . $webkit . $chrome . $safari . $opera;
+                return '(Windows NT '.$nt.'; WOW64) '.$webkit.$chrome.$safari.$opera;
         }
     }    
 
@@ -231,25 +231,25 @@ 
      * Safari
      *
      */
-    public static function safari( $arch )
+    public static function safari($arch)
     {
-        $version = ' Version/' . self::get_version_safari();
+        $version = ' Version/'.self::get_version_safari();
 
         // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
         $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
+        $webkit = ' AppleWebKit/'.$engine.' (KHTML, like Gecko)';
+        $safari = ' Safari/'.$engine;
 
-        switch ( $arch )
+        switch ($arch)
         {
             case 'mac':
                 $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . '; {lang})' . $webkit . $version . $safari;
+                return '(Macintosh; U; {proc} Mac OS X '.$osx.'; {lang})'.$webkit.$version.$safari;
             case 'win':
                 // fall through.
             default:
                 $nt = self::get_version_nt();
-                return '(Windows; U; Windows NT ' . $nt . ')' . $webkit . $version . $safari;
+                return '(Windows; U; Windows NT '.$nt.')'.$webkit.$version.$safari;
         }
 
     }
@@ -259,7 +259,7 @@ 
      * 
      * @see: http://msdn.microsoft.com/en-gb/library/ms537503(v=vs.85).aspx
      */
-    public static function iexplorer( $arch )
+    public static function iexplorer($arch)
     {
         $nt = self::get_version_nt();
         $ie = self::get_version_ie();
@@ -267,11 +267,11 @@ 
         $net = self::get_version_net();
 
         return '(compatible' 
-            . '; MSIE ' . $ie 
-            . '; Windows NT ' . $nt 
+            . '; MSIE '.$ie 
+            . '; Windows NT '.$nt 
             . '; WOW64' // A 32-bit version of Internet Explorer is running on a 64-bit processor.
-            . '; Trident/' . $trident 
-            . '; .NET CLR ' . $net
+            . '; Trident/'.$trident 
+            . '; .NET CLR '.$net
             . ')';
     }
 
@@ -280,7 +280,7 @@ 
      *
      * @see: https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference
      */
-    public static function firefox( $arch )
+    public static function firefox($arch)
     {
         // The release version of Gecko. 
         $gecko = self::get_version_gecko();
@@ -288,65 +288,65 @@ 
         // On desktop, the gecko trail is fixed.
         $trail = '20100101';
 
-        $release = 'rv:' . $gecko;
-        $version = 'Gecko/' . $trail . ' Firefox/' . $gecko;
+        $release = 'rv:'.$gecko;
+        $version = 'Gecko/'.$trail.' Firefox/'.$gecko;
 
-        switch ( $arch )
+        switch ($arch)
         {
             case 'lin':
-                return '(X11; Linux {proc}; ' . $release . ') ' . $version;
+                return '(X11; Linux {proc}; '.$release.') '.$version;
             case 'mac':
                 $osx = self::get_version_osx();
-                return '(Macintosh; {proc} Mac OS X ' . $osx . '; ' . $release . ') ' . $version;
+                return '(Macintosh; {proc} Mac OS X '.$osx.'; '.$release.') '.$version;
             case 'win':
                 // fall through.
             default:
                 $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . '; {lang}; ' . $release . ') ' . $version;
+                return '(Windows NT '.$nt.'; {lang}; '.$release.') '.$version;
         }
     }
 
-    public static function chrome( $arch )
+    public static function chrome($arch)
     {
-        $chrome = ' Chrome/' . self::get_verison_chrome();
+        $chrome = ' Chrome/'.self::get_verison_chrome();
 
         // WebKit Rendering Engine (WebKit = Backend, Safari = Frontend).
         $engine = self::get_version_webkit();
-        $webkit = ' AppleWebKit/' . $engine . ' (KHTML, like Gecko)';
-        $safari = ' Safari/' . $engine;
+        $webkit = ' AppleWebKit/'.$engine.' (KHTML, like Gecko)';
+        $safari = ' Safari/'.$engine;
 
-        switch ( $arch )
+        switch ($arch)
         {
             case 'lin':
-                return '(X11; Linux {proc}) ' . $webkit . $chrome . $safari;
+                return '(X11; Linux {proc}) '.$webkit.$chrome.$safari;
             case 'mac':
                 $osx = self::get_version_osx();
-                return '(Macintosh; U; {proc} Mac OS X ' . $osx . ')' . $webkit . $chrome . $safari;
+                return '(Macintosh; U; {proc} Mac OS X '.$osx.')'.$webkit.$chrome.$safari;
             case 'win':
                 // fall through.
             default:
                 $nt = self::get_version_nt();
-                return '(Windows NT ' . $nt . ') ' . $webkit . $chrome . $safari;
+                return '(Windows NT '.$nt.') '.$webkit.$chrome.$safari;
         }
     }
 
-    public static function random( $lang = array( 'en-US' ) )
+    public static function random($lang = array('en-US'))
     {
-        list( $browser, $os ) = self::generate_platform();
+        list($browser, $os) = self::generate_platform();
 
-        return self::generate( $browser, $os, $lang );
+        return self::generate($browser, $os, $lang);
     }
 
-    public static function generate( $browser = 'chrome', $os = 'win', $lang = array( 'en-US' ) )
+    public static function generate($browser = 'chrome', $os = 'win', $lang = array('en-US'))
     {
-        $ua = self::MOZILLA . call_user_func( 'UAgent::' . $browser, $os );
+        $ua = self::MOZILLA.call_user_func('UAgent::'.$browser, $os);
 
         $tags = array(
-            '{proc}' => self::get_processor( $os ),
-            '{lang}' => self::get_language( $lang ),
+            '{proc}' => self::get_processor($os),
+            '{lang}' => self::get_language($lang),
         );
 
-        $ua = str_replace( array_keys( $tags ), array_values( $tags ), $ua );
+        $ua = str_replace(array_keys($tags), array_values($tags), $ua);
 
         return $ua;
     }

Braces +1 added lines, -2 removed lines

@@ -183,8 +183,7 @@
         if ( mt_rand( 0, 1 ) == 0 )
         {
             $ver = mt_rand( 4, 5 ) . '.' . mt_rand( 0, 1 );
-        }
-        else
+        } else
         {
             $ver = mt_rand( 4, 5 ) . '.0.' . mt_rand( 1, 5 );
         }

date-detailed.php

Spacing +10 added lines, -10 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 require_once('require/class.Connection.php');
-require_once('require/class.Spotter.php');;
+require_once('require/class.Spotter.php'); ;
 require_once('require/class.Language.php');
 
-if (!isset($_GET['date'])){
+if (!isset($_GET['date'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -30,19 +30,19 @@ 
 	
 	$page_url = $globalURL.'/date/'.$_GET['date'];
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if (isset($_GET['sort'])) 
 	{
-		$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], $limit_start.",".$absolute_difference, $sort);
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],$limit_start.",".$absolute_difference);
+		$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], $limit_start.",".$absolute_difference);
 	}
 	
 	
 	if (!empty($spotter_array))
 	{
 		date_default_timezone_set($globalTimezone);
-		$title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		$title = sprintf(_("Detailed View for flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -54,12 +54,12 @@ 
 		print '</div>';
 
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+		print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 		print '</div>';
 
 		include('date-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
  
 		include('table-output.php');
 		print '<div class="pagination">';

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	  $limit_start = 0;
 	  $limit_end = 25;
 	  $absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];