Merge branch 'develop' into release/1.0.0

Author: ssfinney

.travis.yml

@@ -1,26 +1,23 @@
 language: php
 
 php:
-  - 5.5.9
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
     - setup=basic
 
 matrix:
   include:
-    - php: 7.0
-      env: setup=lowest
-    - php: 7.0
-      env: setup=stable
     - php: 7.1
       env: setup=lowest
     - php: 7.1
       env: setup=stable
+    - php: 7.2
+      env: setup=lowest
+    - php: 7.2
+      env: setup=stable
 
 sudo: false
 

composer.json

@@ -26,11 +26,12 @@
         "phayes/geophp": "~1.2"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.1",
-        "phpunit/phpunit": "~4.0|~5.0",
+        "mockery/mockery": "^1",
+        "phpunit/phpunit": "~7.0",
         "psy/psysh": "^0.5.1",
-        "satooshi/php-coveralls": "^0.6.1|^1",
-        "symfony/var-dumper": "~2.7|~3.0"
+        "satooshi/php-coveralls": "^1",
+        "symfony/thanks": "^1.0",
+        "symfony/var-dumper": "~3.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -22,7 +22,7 @@
          verbose="true">
 
     <testsuites>
-        <testsuite name="Garbage Man Test Suite">
+        <testsuite name="Geometry Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
@@ -41,10 +41,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
-    </listeners>
-
     <logging>
         <log type="coverage-html"
              target="./build/coverage"

tests/GeometryFacadeTest.php

@@ -28,7 +28,6 @@ private function setUpMocks()
 
     /**
      * @test
-     * @group unit
      */
     public function it_can_be_constructed()
     {
@@ -37,7 +36,6 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @group
      */
     public function it_returns_the_correct_aliase_for_the_facade()
     {

tests/GeometryServiceProviderTest.php

@@ -71,17 +71,15 @@ private function setUpMocks()
     }
 
     /**
-     * @tests
-     * @group unit
+     * @test
      */
     public function it_can_be_constructed()
     {
         $this->assertInstanceOf(GeometryServiceProvider::class, $this->service_provider);
     }
 
     /**
-     * @tests
-     * @group unit
+     * @test
      */
     public function it_registers_the_geometry_mock()
     {
@@ -113,8 +111,7 @@ public function it_registers_the_geometry_mock()
     }
 
     /**
-     * @tests
-     * @group unit
+     * @test
      */
     public function it_boots_the_service()
     {

tests/GeometryTest.php

@@ -49,7 +49,6 @@ protected function setUpMocks()
 
     /**
      * @test
-     * @group unit
      */
     public function it_can_be_constructed()
     {
@@ -58,7 +57,6 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @group unit
      */
     public function it_calls_load_on_geoPHP_with_the_correct_type_for_the_dynamic_parse_methods()
     {
@@ -98,7 +96,6 @@ public function it_calls_load_on_geoPHP_with_the_correct_type_for_the_dynamic_pa
 
     /**
      * @test
-     * @group unit
      */
     public function it_parses_data_without_a_type()
     {
@@ -118,7 +115,6 @@ public function it_parses_data_without_a_type()
 
     /**
      * @test
-     * @group unit
      */
     public function it_uses_laravel_to_resolve_classes_if_was_provided()
     {
@@ -157,7 +153,6 @@ public function it_uses_laravel_to_resolve_classes_if_was_provided()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_linestring_class_for_geoPHPs_linestring()
     {
@@ -181,7 +176,6 @@ public function it_returns_the_wrapped_linestring_class_for_geoPHPs_linestring()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_multilinestring_class_for_geoPHPs_multilinestring()
     {
@@ -205,7 +199,6 @@ public function it_returns_the_wrapped_multilinestring_class_for_geoPHPs_multili
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_multipoint_class_for_geoPHPs_multipoint()
     {
@@ -229,7 +222,6 @@ public function it_returns_the_wrapped_multipoint_class_for_geoPHPs_multipoint()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_multipolygon_class_for_geoPHPs_multipolygon()
     {
@@ -253,7 +245,6 @@ public function it_returns_the_wrapped_multipolygon_class_for_geoPHPs_multipolyg
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_polygon_class_for_geoPHPs_polygon()
     {
@@ -277,7 +268,6 @@ public function it_returns_the_wrapped_polygon_class_for_geoPHPs_polygon()
 
     /**
      * @test
-     * @group unit
      */
     public function it_returns_the_wrapped_point_class_for_geoPHPs_point()
     {
@@ -312,7 +302,6 @@ public function it_raises_exception_for_undefined_method()
 
     /**
      * @test
-     * @group unit
      * @expectedException InvalidArgumentException
      */
     public function it_raises_exception_when_the_data_cannot_be_converted()
@@ -335,7 +324,6 @@ public function it_raises_exception_when_the_data_cannot_be_converted()
 
     /**
      * @test
-     * @group unit
      * @expectedException InvalidArgumentException
      */
     public function it_raises_exception_when_building_name_to_proxy_class_for_null_geometry()
@@ -345,7 +333,6 @@ public function it_raises_exception_when_building_name_to_proxy_class_for_null_g
 
     /**
      * @test
-     * @group unit
      * @expectedException RuntimeException
      */
     public function it_raises_exception_when_building_name_to_proxy_class_that_does_not_exist()

tests/TestCase.php

@@ -5,33 +5,26 @@
 use ArrayAccess;
 use Countable;
 use Iterator;
-use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery\MockInterface;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 /**
  * Class TestCase
  *
  * @package Tests\Spinen\BrowserFilter
  */
-abstract class TestCase extends PHPUnit_Framework_TestCase
+abstract class TestCase extends PHPUnitTestCase
 {
-    public function tearDown()
-    {
-        if (class_exists('Mockery')) {
-            Mockery::close();
-        }
-
-        parent::tearDown();
-    }
+    use MockeryPHPUnitIntegration;
 
     /**
      * Helper to allow mocking of iterator classes.
      *
      * @link https://gist.github.com/VladaHejda/8299871
      *
      * @param MockInterface $mock
-     * @param array         $items
+     * @param array $items
      *
      * @return void
      */
@@ -80,7 +73,7 @@ protected function mockArrayIterator(MockInterface $mock, array $items)
 
             $mock->shouldReceive('next')
                  ->andReturnUsing(function () use (& $counter) {
-                     ++ $counter;
+                     ++$counter;
                  });
         }