Merge pull request phayes#93 from mprins/travis-ci

Add a Travis-ci configuration

.gitignore

@@ -0,0 +1 @@
+/vendor

.travis.yml

@@ -0,0 +1,27 @@
+# docs available at http://docs.travis-ci.com/user/languages/php/
+# example available at https://github.com/travis-ci/travis-ci-php-example
+language: php
+
+before_script:
+  - composer self-update
+
+install:
+  - composer install
+  # TODO optionally install geos library
+  # TODO optionally set up a postgis database for testing
+
+script: cd tests && phpunit --verbose --colors --stderr tests
+
+# run tests on the following versions
+php:
+  - 5.6
+  - 5.5
+  - 5.4
+  - 5.3
+  - hhvm
+
+matrix:
+  fast_finish: false
+  allow_failures:
+    # php 5.3 does not support random file list as an argument to scandir
+    - php: 5.3

composer.json

@@ -11,5 +11,8 @@
         {
             "name":"Patrick Hayes"
         }
-    ]
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "4.1.*"
+    }
 }

lib/adapters/KML.class.php

@@ -50,12 +50,11 @@ public function write(Geometry $geometry, $namespace = FALSE) {
   }
 
   public function geomFromText($text) {
-
     // Change to lower-case and strip all CDATA
     $text = mb_strtolower($text, mb_detect_encoding($text));
     $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
 
-    // Load into DOMDOcument
+    // Load into DOMDocument
     $xmlobj = new DOMDocument();
     @$xmlobj->loadXML($text);
     if ($xmlobj === false) {
@@ -235,6 +234,7 @@ private function linestringToKML($geom, $type = FALSE) {
 
   public function polygonToKML($geom) {
     $components = $geom->getComponents();
+    $str = '';
     if (!empty($components)) {
       $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';
       foreach (array_slice($components, 1) as $comp) {

lib/adapters/WKT.class.php

@@ -4,7 +4,7 @@
  */
 class WKT extends GeoAdapter
 {
-  
+
   /**
    * Read WKT string into geometry objects
    *
@@ -14,7 +14,7 @@ class WKT extends GeoAdapter
    */
   public function read($wkt) {
     $wkt = trim($wkt);
-    
+
     // If it contains a ';', then it contains additional SRID data
     if (strpos($wkt,';')) {
       $parts = explode(';', $wkt);
@@ -25,7 +25,7 @@ public function read($wkt) {
     else {
       $srid = NULL;
     }
-    
+
     // If geos is installed, then we take a shortcut and let it parse the WKT
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKTReader();
@@ -34,35 +34,39 @@ public function read($wkt) {
         $geom->setSRID($srid);
         return $geom;
       }
-      else { 
+      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
+    // beginning 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 { 
+        else {
           return $this->$method($data_string);
         }
-        
+
       }
     }
   }
-  
+
   private function parsePoint($data_string) {
     $data_string = $this->trimParens($data_string);
+
+    // If it's marked as empty, then return an empty point
+    if ($data_string == 'EMPTY') return new Point();
+
     $parts = explode(' ',$data_string);
     return new Point($parts[0], $parts[1]);
   }
@@ -72,7 +76,7 @@ private function parseLineString($data_string) {
 
     // 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) {
@@ -83,10 +87,10 @@ private function parseLineString($data_string) {
 
   private function parsePolygon($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();
-    
+
     $parts = explode('),(',$data_string);
     $lines = array();
     foreach ($parts as $part) {
@@ -99,24 +103,24 @@ private function parsePolygon($data_string) {
 
   private function parseMultiPoint($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();
-    
+
     $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);
 
     // 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) {
@@ -133,7 +137,7 @@ private function parseMultiPolygon($data_string) {
 
     // 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) {
@@ -150,12 +154,12 @@ private function parseGeometryCollection($data_string) {
 
     // 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));
-    
+
     foreach ($components as $component) {
       $geometries[] = $this->read($component);
     }
@@ -167,23 +171,25 @@ protected function getDataString($wkt) {
 
     if ($first_paren !== FALSE) {
       return substr($wkt, $first_paren);
-    }
-    return FALSE;
+    } elseif (strstr($wkt,'EMPTY')) {
+      return 'EMPTY';
+    } else
+      return FALSE;
   }
-  
+
   /**
    * Trim the parenthesis and spaces
    */
   protected function trimParens($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;
   }
-  
+
   protected function beginsWith($str, $char) {
     if (substr($str,0,strlen($char)) == $char) return TRUE;
     else return FALSE;
@@ -193,7 +199,7 @@ protected function endsWith($str, $char) {
     if (substr($str,(0 - strlen($char))) == $char) return TRUE;
     else return FALSE;
   }
-    
+
   /**
    * Serialize geometries into a WKT string.
    *
@@ -208,15 +214,15 @@ public function write(Geometry $geometry) {
       $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.')';
     }
   }
-  
+
   /**
    * Extract geometry to a WKT string
    *

lib/geometry/Geometry.class.php

@@ -330,17 +330,17 @@ public function isMeasured() {
   }
 
   public function coordinateDimension() {
-    // geoPHP only supports 2-dimentional space
+    // geoPHP only supports 2-dimensional space
     return 2;
   }
 
   public function z() {
-    // geoPHP only supports 2-dimentional space
+    // geoPHP only supports 2-dimensional space
     return NULL;
   }
 
   public function m() {
-    // geoPHP only supports 2-dimentional space
+    // geoPHP only supports 2-dimensional space
     return NULL;
   }
 

lib/geometry/Point.class.php

@@ -8,7 +8,7 @@ class Point extends Geometry
 {
   public $coords = array(2);
   protected $geom_type = 'Point';
-  protected $dimention = 2;
+  protected $dimension = 2;
 
   /**
    * Constructor
@@ -28,7 +28,7 @@ public function __construct($x, $y, $z = NULL) {
       if (!is_numeric($z)) {
        throw new Exception("Cannot construct Point. z should be numeric");
       }
-      $this->dimention = 3;
+      $this->dimension = 3;
     }
 
     // Convert to floatval in case they are passed in as a string or integer etc.
@@ -37,10 +37,10 @@ public function __construct($x, $y, $z = NULL) {
     $z = floatval($z);
 
     // Add poitional elements
-    if ($this->dimention == 2) {
+    if ($this->dimension == 2) {
       $this->coords = array($x, $y);
     }
-    if ($this->dimention == 3) {
+    if ($this->dimension == 3) {
       $this->coords = array($x, $y, $z);
     }
   }
@@ -69,7 +69,7 @@ public function y() {
    * @return float The Z coordinate or NULL is not a 3D point
    */
   public function z() {
-    if ($this->dimention == 3) {
+    if ($this->dimension == 3) {
       return $this->coords[2];
     }
     else return NULL;

tests/input/an_empty_polygon.wkt

@@ -1 +1 @@
-POLYGON EMPTY
+POLYGON EMPTY

tests/input/empty_point.wkt

@@ -0,0 +1 @@
+POINT EMPTY

tests/postgis.php

@@ -24,7 +24,7 @@ function run_test() {
   // Working with PostGIS and EWKB
   // ----------------------------
 
-  foreach (scandir('./input') as $file) {
+  foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
     $parts = explode('.',$file);
     if ($parts[0]) {
       $name = $parts[0];

tests/test.php

@@ -17,7 +17,7 @@ function run_test() {
     print "GEOS is not installed.\n";
   }
 
-  foreach (scandir('./input') as $file) {
+  foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
     $parts = explode('.',$file);
     if ($parts[0]) {
       $format = $parts[1];

tests/tests/20120702Test.php

@@ -1,7 +1,5 @@
 <?php
 require_once('../geoPHP.inc');
-require_once('PHPUnit/Autoload.php');
-
 class Tests_20120702 extends PHPUnit_Framework_TestCase {
 
   function setUp() {