Fixed exception check for PhpUnit 4.8

(cherry picked from commit abb6d2a)

Author: grimzy

tests/Integration/SpatialTest.php

@@ -65,6 +65,15 @@ protected function assertDatabaseHas($table, array $data, $connection = null)
         }
     }
 
+    protected function assertException($exceptionName) {
+        if(method_exists(parent::class, 'expectException')) {
+            parent::expectException($exceptionName);
+        }
+        else {
+            $this->setExpectedException($exceptionName);
+        }
+    }
+
     private function onMigrations(\Closure $closure, $reverse_sort = false)
     {
         $fileSystem = new Filesystem();
@@ -87,7 +96,7 @@ public function testSpatialFieldsNotDefinedException()
         $geo->geometry = new Point(1, 2);
         $geo->save();
 
-        $this->expectException(\Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException::class);
+        $this->assertException(\Grimzy\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException::class);
         NoSpatialFieldsModel::all();
     }
 

tests/Unit/BaseTestCase.php

@@ -6,4 +6,13 @@ public function tearDown()
     {
         Mockery::close();
     }
+    
+    protected function assertException($exceptionName) {
+        if(method_exists(parent::class, 'expectException')) {
+            parent::expectException($exceptionName);
+        }
+        else {
+            $this->setExpectedException($exceptionName);
+        }
+    }
 }

tests/Unit/Types/GeometryCollectionTest.php

@@ -41,7 +41,7 @@ public function testJsonSerialize()
     }
 
     public function testInvalidArgumentExceptionNotArrayGeometries() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $geometrycollection = new GeometryCollection([
             $this->getPoint(),
             1

tests/Unit/Types/GeometryTest.php

@@ -74,7 +74,7 @@ public function testGetWKTClass()
             GeometryCollection::class,
             Geometry::getWKTClass('GEOMETRYCOLLECTION(POINT(2 3),LINESTRING(2 3,3 4))')
         );
-        $this->expectException(UnknownWKTTypeException::class);
+        $this->assertException(UnknownWKTTypeException::class);
         Geometry::getWKTClass('TRIANGLE((0 0, 0 9, 9 0, 0 0))');
     }
 

tests/Unit/Types/MultiLineStringTest.php

@@ -43,12 +43,12 @@ public function testJsonSerialize()
     }
 
     public function testInvalidArgumentExceptionAtLeastOneEntry() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multilinestring = new MultiLineString([]);
     }
 
     public function testInvalidArgumentExceptionNotArrayOfLineString() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multilinestring = new MultiLineString([
             new LineString([new Point(0, 0), new Point(1, 1)]),
             new Point(0,1)

tests/Unit/Types/MultiPointTest.php

@@ -65,7 +65,7 @@ public function testArrayAccess() {
         $multipoint[100] = $point100;
         $this->assertEquals($point100, $multipoint[100]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multipoint[] = 1;
 
     }
@@ -108,7 +108,7 @@ public function testInsertPoint() {
         $this->assertEquals($point2, $multipoint->getPoints()[1]);
         $this->assertEquals($point3, $multipoint->getPoints()[2]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multipoint->insertPoint(100, new Point(100,100));
     }
 
@@ -123,12 +123,12 @@ public function testJsonSerialize()
     }
 
     public function testInvalidArgumentExceptionAtLeastOneEntry() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multipoint = new MultiPoint([]);
     }
 
     public function testInvalidArgumentExceptionNotArrayOfLineString() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multipoint = new MultiPoint([
             new Point(0, 0),
             1

tests/Unit/Types/MultiPolygonTest.php

@@ -53,7 +53,7 @@ public function testJsonSerialize()
     }
 
     public function testInvalidArgumentExceptionNotArrayOfLineString() {
-        $this->expectException(InvalidArgumentException::class);
+        $this->assertException(InvalidArgumentException::class);
         $multipolygon = new MultiPolygon([
             $this->getPolygon1(),
             $this->getLineString1()