Skip to content

Commit 4e60b4a

Browse files
author
Max Staack
committed
cleanup and namespaces
1 parent 9c417da commit 4e60b4a

21 files changed

+108
-232
lines changed

‎composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
}
2020
},
2121
"autoload-dev": {
22-
"classmap": [
23-
"tests/BaseTestCase.php",
24-
"tests/Stubs/"
25-
]
22+
"psr-4": {
23+
"MStaack\\LaravelPostgis\\Tests\\": "tests/"
24+
}
2625
},
2726
"license": "MIT",
2827
"authors": [

‎config/postgis.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22

33
return [
4-
5-
'schema' => 'public' // Schema for the Postgis extension
6-
7-
];
4+
'schema' => 'public' // Schema for the Postgis extension
5+
];

‎src/Schema/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Builder extends \Bosnadev\Database\Schema\Builder
1111
* @param Closure $callback
1212
* @return Blueprint
1313
*/
14-
protected function createBlueprint($table, Closure $callback = null)
14+
public function createBlueprint($table, Closure $callback = null)
1515
{
1616
return new Blueprint($table, $callback);
1717
}

‎tests/BaseTestCase.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests;
4+
5+
use Mockery;
36
use PHPUnit\Framework\TestCase;
47

58
abstract class BaseTestCase extends TestCase

‎tests/Connectors/ConnectionFactoryTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests;
4+
35
use Illuminate\Container\Container;
6+
use Mockery;
47
use MStaack\LaravelPostgis\Connectors\ConnectionFactory;
58
use MStaack\LaravelPostgis\PostgisConnection;
6-
use Stubs\PDOStub;
9+
use MStaack\LaravelPostgis\Tests\Stubs\PDOStub;
710

8-
class ConnectionFactoryBaseTest extends BaseTestCase
11+
class ConnectionFactoryTest extends BaseTestCase
912
{
1013
public function testMakeCallsCreateConnection()
1114
{

‎tests/Eloquent/BuilderTest.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<?php namespace Eloquent;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Tests\Eloquent;
24

3-
use BaseTestCase;
45
use Illuminate\Database\Eloquent\Model;
56
use Illuminate\Database\Query\Builder as QueryBuilder;
67
use Illuminate\Database\Query\Expression;
@@ -10,6 +11,7 @@
1011
use MStaack\LaravelPostgis\Geometries\LineString;
1112
use MStaack\LaravelPostgis\Geometries\Point;
1213
use MStaack\LaravelPostgis\Geometries\Polygon;
14+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
1315

1416
class BuilderTest extends BaseTestCase
1517
{
@@ -39,7 +41,14 @@ protected function setUp(): void
3941
->andReturn([]);
4042

4143
$this->builder = new Builder($this->queryBuilder);
42-
$this->builder->setModel(new TestBuilderModel());
44+
$this->builder->setModel(new class extends Model {
45+
use PostgisTrait;
46+
protected $postgisFields = [
47+
'point' => Point::class,
48+
'linestring' => LineString::class,
49+
'polygon' => Polygon::class
50+
];
51+
});
4352
}
4453

4554
public function testUpdate()
@@ -132,14 +141,3 @@ public function testUpdateLinestring3d()
132141
$builder->update(['linestring' => $linestring]);
133142
}
134143
}
135-
136-
class TestBuilderModel extends Model
137-
{
138-
use PostgisTrait;
139-
140-
protected $postgisFields = [
141-
'point' => Point::class,
142-
'linestring' => LineString::class,
143-
'polygon' => Polygon::class
144-
];
145-
}

‎tests/Eloquent/PostgisTraitTest.php

Lines changed: 0 additions & 164 deletions
This file was deleted.

‎tests/Geometries/GeometryCollectionTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
35
use MStaack\LaravelPostgis\Geometries\GeometryCollection;
46
use MStaack\LaravelPostgis\Geometries\LineString;
57
use MStaack\LaravelPostgis\Geometries\Point;
8+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
69

710
class GeometryCollectionTest extends BaseTestCase
811
{

‎tests/Geometries/GeometryTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
35
use MStaack\LaravelPostgis\Geometries\Geometry;
46
use MStaack\LaravelPostgis\Geometries\GeometryCollection;
57
use MStaack\LaravelPostgis\Geometries\LineString;
@@ -8,6 +10,7 @@
810
use MStaack\LaravelPostgis\Geometries\MultiPolygon;
911
use MStaack\LaravelPostgis\Geometries\Point;
1012
use MStaack\LaravelPostgis\Geometries\Polygon;
13+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
1114

1215
class GeometryTest extends BaseTestCase
1316
{

‎tests/Geometries/LineStringTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
35
use MStaack\LaravelPostgis\Geometries\LineString;
46
use MStaack\LaravelPostgis\Geometries\Point;
7+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
58

69
class LineStringTest extends BaseTestCase
710
{

‎tests/Geometries/MultiLineStringTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
35
use MStaack\LaravelPostgis\Geometries\LineString;
4-
use MStaack\LaravelPostgis\Geometries\Point;
56
use MStaack\LaravelPostgis\Geometries\MultiLineString;
7+
use MStaack\LaravelPostgis\Geometries\Point;
8+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
69

710
class MultiLineStringTest extends BaseTestCase
811
{

‎tests/Geometries/MultiPointTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?php
22

3-
use MStaack\LaravelPostgis\Geometries\Point;
3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
45
use MStaack\LaravelPostgis\Geometries\MultiPoint;
6+
use MStaack\LaravelPostgis\Geometries\Point;
7+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
58

69
class MultiPointTest extends BaseTestCase
710
{
@@ -12,6 +15,7 @@ public function testFromWKT()
1215

1316
$this->assertEquals(3, $multipoint->count());
1417
}
18+
1519
public function testFromWKT3d()
1620
{
1721
$multipoint = MultiPoint::fromWKT('MULTIPOINT Z((1 1 1),(2 1 3),(2 2 2))');

‎tests/Geometries/MultiPolygonTest.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?php
22

3+
namespace MStaack\LaravelPostgis\Tests\Geometries;
4+
35
use MStaack\LaravelPostgis\Geometries\LineString;
46
use MStaack\LaravelPostgis\Geometries\MultiPolygon;
57
use MStaack\LaravelPostgis\Geometries\Point;
68
use MStaack\LaravelPostgis\Geometries\Polygon;
9+
use MStaack\LaravelPostgis\Tests\BaseTestCase;
710

811
class MultiPolygonTest extends BaseTestCase
912
{
@@ -129,7 +132,7 @@ public function testToWKT3d()
129132
public function testGetPolygons()
130133
{
131134
$polygon = MultiPolygon::fromWKT(
132-
'MULTIPOLYGON(((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))'
135+
'MULTIPOLYGON(((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))'
133136
);
134137

135138
$this->assertInstanceOf(Polygon::class, $polygon->getPolygons()[0]);
@@ -138,7 +141,7 @@ public function testGetPolygons()
138141
public function testGetPolygons3d()
139142
{
140143
$polygon = MultiPolygon::fromWKT(
141-
'MULTIPOLYGON Z(((0 0 0,4 0 0,4 4 4,0 4 0,0 0 0),(1 1 1,2 1 3,2 2 2,1 2 0,1 1 1)), ((-1 -1 -1,-1 -2 0,-2 -2 -2,-2 -1 -3,-1 -1 -1)))'
144+
'MULTIPOLYGON Z(((0 0 0,4 0 0,4 4 4,0 4 0,0 0 0),(1 1 1,2 1 3,2 2 2,1 2 0,1 1 1)), ((-1 -1 -1,-1 -2 0,-2 -2 -2,-2 -1 -3,-1 -1 -1)))'
142145
);
143146

144147
$this->assertInstanceOf(Polygon::class, $polygon->getPolygons()[0]);
@@ -147,7 +150,7 @@ public function testGetPolygons3d()
147150
public function testIssue12()
148151
{
149152
$polygon = MultiPolygon::fromWKT(
150-
'MULTIPOLYGON(((-80.214554 25.769598 0 0,-80.2147 25.774514 0 0,-80.212983 25.77456 0 0,-80.212977 25.773597 0 0,-80.211448 25.773655 0 0,-80.211498 25.774579 0 0,-80.209432 25.774665 0 0,-80.209392 25.773667 0 0,-80.204387 25.773834 0 0,-80.199383 25.774324 0 0,-80.197718 25.774031 0 0,-80.197757 25.774975 0 0,-80.193655 25.775108 0 0,-80.193623 25.774134 0 0,-80.191855 25.772551 0 0,-80.193442 25.76969 0 0,-80.192231 25.768345 0 0,-80.192879 25.758009 0 0,-80.196301 25.759985 0 0,-80.195608 25.76152 0 0,-80.198856 25.761454 0 0,-80.200646 25.763287 0 0,-80.20401 25.763164 0 0,-80.204023 25.76367 0 0,-80.205673 25.763141 0 0,-80.214326 25.762935 0 0,-80.214451 25.765883 0 0,-80.214539 25.768649 0 0,-80.216203 25.76858 0 0,-80.214554 25.769598 0 0)))'
153+
'MULTIPOLYGON(((-80.214554 25.769598 0 0,-80.2147 25.774514 0 0,-80.212983 25.77456 0 0,-80.212977 25.773597 0 0,-80.211448 25.773655 0 0,-80.211498 25.774579 0 0,-80.209432 25.774665 0 0,-80.209392 25.773667 0 0,-80.204387 25.773834 0 0,-80.199383 25.774324 0 0,-80.197718 25.774031 0 0,-80.197757 25.774975 0 0,-80.193655 25.775108 0 0,-80.193623 25.774134 0 0,-80.191855 25.772551 0 0,-80.193442 25.76969 0 0,-80.192231 25.768345 0 0,-80.192879 25.758009 0 0,-80.196301 25.759985 0 0,-80.195608 25.76152 0 0,-80.198856 25.761454 0 0,-80.200646 25.763287 0 0,-80.20401 25.763164 0 0,-80.204023 25.76367 0 0,-80.205673 25.763141 0 0,-80.214326 25.762935 0 0,-80.214451 25.765883 0 0,-80.214539 25.768649 0 0,-80.216203 25.76858 0 0,-80.214554 25.769598 0 0)))'
151154
);
152155

153156
$this->assertInstanceOf(MultiPolygon::class, $polygon);
@@ -156,7 +159,7 @@ public function testIssue12()
156159
public function testIssue123d()
157160
{
158161
$polygon = MultiPolygon::fromWKT(
159-
'MULTIPOLYGON Z(((-80.214554 25.769598 0 0,-80.2147 25.774514 0 0,-80.212983 25.77456 0 0,-80.212977 25.773597 0 0,-80.211448 25.773655 0 0,-80.211498 25.774579 0 0,-80.209432 25.774665 0 0,-80.209392 25.773667 0 0,-80.204387 25.773834 0 0,-80.199383 25.774324 0 0,-80.197718 25.774031 0 0,-80.197757 25.774975 0 0,-80.193655 25.775108 0 0,-80.193623 25.774134 0 0,-80.191855 25.772551 0 0,-80.193442 25.76969 0 0,-80.192231 25.768345 0 0,-80.192879 25.758009 0 0,-80.196301 25.759985 0 0,-80.195608 25.76152 0 0,-80.198856 25.761454 0 0,-80.200646 25.763287 0 0,-80.20401 25.763164 0 0,-80.204023 25.76367 0 0,-80.205673 25.763141 0 0,-80.214326 25.762935 0 0,-80.214451 25.765883 0 0,-80.214539 25.768649 0 0,-80.216203 25.76858 0 0,-80.214554 25.769598 0 0)))'
162+
'MULTIPOLYGON Z(((-80.214554 25.769598 0 0,-80.2147 25.774514 0 0,-80.212983 25.77456 0 0,-80.212977 25.773597 0 0,-80.211448 25.773655 0 0,-80.211498 25.774579 0 0,-80.209432 25.774665 0 0,-80.209392 25.773667 0 0,-80.204387 25.773834 0 0,-80.199383 25.774324 0 0,-80.197718 25.774031 0 0,-80.197757 25.774975 0 0,-80.193655 25.775108 0 0,-80.193623 25.774134 0 0,-80.191855 25.772551 0 0,-80.193442 25.76969 0 0,-80.192231 25.768345 0 0,-80.192879 25.758009 0 0,-80.196301 25.759985 0 0,-80.195608 25.76152 0 0,-80.198856 25.761454 0 0,-80.200646 25.763287 0 0,-80.20401 25.763164 0 0,-80.204023 25.76367 0 0,-80.205673 25.763141 0 0,-80.214326 25.762935 0 0,-80.214451 25.765883 0 0,-80.214539 25.768649 0 0,-80.216203 25.76858 0 0,-80.214554 25.769598 0 0)))'
160163
);
161164

162165
$this->assertInstanceOf(MultiPolygon::class, $polygon);

0 commit comments

Comments
 (0)