Get tests pass in php7

.travis.yml

@@ -10,4 +10,4 @@ before_install:
 install:
   - composer install
 script: 
-  - ./vendor/bin/phpunit --colors --bootstrap tests/bootstrap.php --coverage-text tests
+  - ./vendor/bin/phpunit --coverage-text

phpunit.xml

@@ -0,0 +1,12 @@
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         bootstrap="tests/bootstrap.php"
+         cacheTokens="false"
+         colors="true">
+    <testsuites>
+        <testsuite name="Navigator Test Suite">
+            <directory suffix="Test.php">tests</directory>
+            <directory suffix="TestUnder7.php" phpVersion="6" phpVersionOperator="&lt;=">tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

tests/Treffynnon/Navigator/CoordinateTest.php

@@ -18,14 +18,6 @@ public function testCorrectParser() {
         $this->assertInstanceOf('Treffynnon\Navigator\Coordinate\DecimalParser', $Coordinate->getParser());
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testIncorrectParser() {
-        $Coordinate = new N\Coordinate;
-        $Coordinate->setParser(new stdClass());
-    }
-
     public function testDefaultParser() {
         $Coordinate = new N\Coordinate;
         $this->assertInstanceOf('Treffynnon\Navigator\Coordinate\DecimalParser', $Coordinate->getParser());

tests/Treffynnon/Navigator/CoordinateTestUnder7.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Coordinate as C;
+
+class CoordinateTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testIncorrectParser() {
+        $Coordinate = new N\Coordinate;
+        $Coordinate->setParser(new stdClass());
+    }
+
+}

tests/Treffynnon/Navigator/Distance/Calculator/CosineLawTest.php

@@ -12,14 +12,6 @@
 
 class CosineLawTest extends PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedCalculator() {
-        $CosineLaw = new C\CosineLaw;
-        $CosineLaw->calculate(new stdClass, new stdClass);
-    }
-
     public function testCalculate() {
         $CosineLaw = new C\CosineLaw;
         $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));

tests/Treffynnon/Navigator/Distance/Calculator/CosineLawTestUnder7.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Distance\Calculator as C;
+
+class CosineLawTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedCalculator() {
+        $CosineLaw = new C\CosineLaw;
+        $CosineLaw->calculate(new stdClass, new stdClass);
+    }
+
+}

tests/Treffynnon/Navigator/Distance/Calculator/GreatCircleTest.php

@@ -12,14 +12,6 @@
 
 class GreatCircleTest extends PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedCalculator() {
-        $GreatCircle = new C\GreatCircle;
-        $GreatCircle->calculate(new stdClass, new stdClass);
-    }
-
     public function testCalculate() {
         $GreatCircle = new C\GreatCircle;
         $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));

tests/Treffynnon/Navigator/Distance/Calculator/GreatCircleTestUnder7.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Distance\Calculator as C;
+
+class GreatCircleTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedCalculator() {
+        $GreatCircle = new C\GreatCircle;
+        $GreatCircle->calculate(new stdClass, new stdClass);
+    }
+
+}

tests/Treffynnon/Navigator/Distance/Calculator/HaversineTest.php

@@ -12,14 +12,6 @@
 
 class HaversineTest extends PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedCalculator() {
-        $Haversine = new C\Haversine;
-        $Haversine->calculate(new stdClass, new stdClass);
-    }
-
     public function testCalculate() {
         $Haversine = new C\Haversine;
         $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));

tests/Treffynnon/Navigator/Distance/Calculator/HaversineTestUnder7.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Distance\Calculator as C;
+
+class HaversineTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedCalculator() {
+        $Haversine = new C\Haversine;
+        $Haversine->calculate(new stdClass, new stdClass);
+    }
+
+}

tests/Treffynnon/Navigator/Distance/Calculator/VincentyTest.php

@@ -12,14 +12,6 @@
 
 class VincentyTest extends PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedCalculator() {
-        $Vincenty = new C\Vincenty;
-        $Vincenty->calculate(new stdClass, new stdClass);
-    }
-
     public function testCalculate() {
         $Vincenty = new C\Vincenty;
         $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));

tests/Treffynnon/Navigator/Distance/Calculator/VincentyTestUnder7.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Distance\Calculator as C;
+
+class VincentyTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedCalculator() {
+        $Vincenty = new C\Vincenty;
+        $Vincenty->calculate(new stdClass, new stdClass);
+    }
+
+}

tests/Treffynnon/Navigator/DistanceTest.php

@@ -11,16 +11,6 @@
 
 class DistanceTest extends PHPUnit_Framework_TestCase {
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedGet() {
-        $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));
-        $point2 = new N\LatLong(new N\Coordinate(20.1), new N\Coordinate(80.9));
-        $Distance = new N\Distance($point1, $point2);
-        $metres = $Distance->get(new stdClass, new stdClass);
-    }
-
     public function testGet() {
         $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));
         $point2 = new N\LatLong(new N\Coordinate(20.1), new N\Coordinate(80.9));
@@ -48,13 +38,6 @@ public function testConstructorWithProvider($coord) {
         $this->assertGreaterThan(20, $metres);
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testFailedConstructor() {
-        $Distance = new N\Distance(new stdClass, new stdClass);
-    }
-
     public function coordValidProvider() {
         return NavigatorTestData::coordData_decimal_valid();
     }

tests/Treffynnon/Navigator/DistanceTestUnder7.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon\Navigator as N;
+
+class DistanceTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedGet() {
+        $point1 = new N\LatLong(new N\Coordinate(80.9), new N\Coordinate(20.1));
+        $point2 = new N\LatLong(new N\Coordinate(20.1), new N\Coordinate(80.9));
+        $Distance = new N\Distance($point1, $point2);
+        $metres = $Distance->get(new stdClass, new stdClass);
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_Error
+     */
+    public function testFailedConstructor() {
+        $Distance = new N\Distance(new stdClass, new stdClass);
+    }
+
+}

tests/Treffynnon/Navigator/LatLongTest.php

@@ -19,13 +19,6 @@ public function testConstructor() {
         $LatLong = new N\LatLong($latitude, $longitude);
     }
 
-    /**
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testInvalidConstructor() {
-        $LatLong = new N\LatLong('test', 'test');
-    }
-
     public function testPrimeCoordinateParsers() {
         $latitude = new N\Coordinate(10.03);
         $longitude = new N\Coordinate('10 10 1.2S', new C\DmsParser);

tests/Treffynnon/Navigator/LatLongTestUnder7.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Navigator: a geographic calculation library for PHP
+ * @link http://navigator.simonholywell.com
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause License 
+ * @copyright 2012, Simon Holywell
+ * @author Simon Holywell <treffynnon@php.net>
+ */
+use Treffynnon as T;
+use Treffynnon\Navigator as N;
+use Treffynnon\Navigator\Coordinate as C;
+
+class LatLongTestUnder7 extends PHPUnit_Framework_TestCase {
+
+    public function testConstructor() {
+        $latitude = new N\Coordinate(10.03);
+        $longitude = new N\Coordinate('10 10 1.2S', new C\DmsParser);
+        $LatLong = new N\LatLong($latitude, $longitude);
+    }
+
+    public function testPrimeCoordinateParsers() {
+        $latitude = new N\Coordinate(10.03);
+        $longitude = new N\Coordinate('10 10 1.2S', new C\DmsParser);
+        $LatLong = new N\LatLong($latitude, $longitude);
+
+        $this->assertEquals(
+            $LatLong->getLongitude()->getParser()->getDirection(), T\Navigator::LONG
+        );
+        $this->assertEquals(
+            $LatLong->getLatitude()->getParser()->getDirection(), T\Navigator::LAT
+        );
+    }
+
+    public function testToString() {
+        $latitude = new N\Coordinate(42.77);
+        $longitude = new N\Coordinate(-2.86844);
+        $LatLong = new N\LatLong($latitude, $longitude);
+        $this->assertEquals($latitude . ',' . $longitude, (string) $LatLong);
+    }
+
+    public function testFromString() {
+        $latitude = '42.77';
+        $longitude = '-2.86844';
+        $LatLong = N\LatLong::createFromString($latitude . ',' . $longitude);
+        $this->assertInstanceOf('Treffynnon\Navigator\LatLong', $LatLong);
+        $this->assertEquals($latitude, (string) $LatLong->getLatitude());
+        $this->assertEquals($longitude, (string) $LatLong->getLongitude());
+    }
+
+}