Merge pull request #145 from djlambert/develop

Additional Point test and minor tweaks
creof · Apr 7, 2016 · 40bc131 · 40bc131
2 parents dad1285 + a23d299
commit 40bc131
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/lib/CrEOF/Spatial/PHP/Types/AbstractPoint.php b/lib/CrEOF/Spatial/PHP/Types/AbstractPoint.php
@@ -64,7 +64,7 @@ public function __construct()
      */
     public function setX($x)
     {
-        if (!is_numeric($x)) {
+        if (! is_numeric($x)) {
             $parser = new Parser($x);
 
             try {
@@ -97,7 +97,7 @@ public function getX()
      */
     public function setY($y)
     {
-        if (!is_numeric($y)) {
+        if (! is_numeric($y)) {
             $parser = new Parser($y);
 
             try {
@@ -185,12 +185,12 @@ protected function validateArguments(array $argv = null)
     {
         $argc = count($argv);
 
-        if (1 == $argc && is_array($argv[0])) {
+        if (1 === $argc && is_array($argv[0])) {
             return $argv[0];
         }
 
-        if (2 == $argc) {
-            if (is_array($argv[0]) && (is_numeric($argv[1]) || is_null($argv[1]) || is_string($argv[1]))) {
+        if (2 === $argc) {
+            if (is_array($argv[0]) && (is_numeric($argv[1]) || null === $argv[1] || is_string($argv[1]))) {
                 $argv[0][] = $argv[1];
 
                 return $argv[0];
@@ -201,10 +201,8 @@ protected function validateArguments(array $argv = null)
             }
         }
 
-        if (3 == $argc) {
-            if ((is_numeric($argv[0]) || is_string($argv[0])) && (is_numeric($argv[1]) || is_string($argv[1])) && (is_numeric($argv[2]) || is_null($argv[2]) || is_string($argv[2]))) {
-                return $argv;
-            }
+        if (3 === $argc && ((is_numeric($argv[0]) || is_string($argv[0])) && (is_numeric($argv[1]) || is_string($argv[1])) && (is_numeric($argv[2]) || null === $argv[2] || is_string($argv[2])))) {
+            return $argv;
         }
 
         array_walk($argv, function (&$value) {

diff --git a/tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/PointTest.php b/tests/CrEOF/Spatial/Tests/PHP/Types/Geometry/PointTest.php
@@ -35,12 +35,17 @@
  */
 class PointTest extends \PHPUnit_Framework_TestCase
 {
-    public function testGoodNumericPoint()
+    public function testGoodNumericPoints()
     {
         $point1 = new Point(-73.7562317, 42.6525793);
 
         $this->assertEquals(42.6525793, $point1->getLatitude());
         $this->assertEquals(-73.7562317, $point1->getLongitude());
+
+        $point2 = new Point(0.00001, 0.00003);
+
+        $this->assertEquals(0.00003, $point2->getLatitude());
+        $this->assertEquals(0.00001, $point2->getLongitude());
     }
 
     public function testGoodStringPoints()