Skip to content

Commit b182932

Browse files
simonschaufisimonschaufi
committed
Use psr-4 autoloading
1 parent 4b10235 commit b182932

40 files changed

+39
-41
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea
12
.phpcs-cache
23
.phpunit.result.cache
34
composer.lock

Diff for: ‎composer.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@
2020
"slevomat/coding-standard": "^7.0"
2121
},
2222
"autoload": {
23-
"psr-0": { "GeoJson\\": "src/" }
23+
"psr-4": {
24+
"GeoJson\\": "src"
25+
}
26+
},
27+
"autoload-dev": {
28+
"psr-4": {
29+
"GeoJson\\Tests\\": "tests"
30+
}
2431
},
2532
"extra": {
2633
"branch-alias": {

Diff for: ‎phpunit.xml.dist

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
>
88
<testsuites>
99
<testsuite name="GeoJson Test Suite">
10-
<directory>./tests/GeoJson/</directory>
10+
<directory>./tests/</directory>
1111
</testsuite>
1212
</testsuites>
1313

1414
<coverage ignoreDeprecatedCodeUnits="true" processUncoveredFiles="true">
1515
<include>
16-
<directory suffix=".php">./src/GeoJson</directory>
16+
<directory suffix=".php">./src/</directory>
1717
</include>
1818
</coverage>
1919
</phpunit>

Diff for: ‎src/GeoJson/BoundingBox.php renamed to ‎src/BoundingBox.php

File renamed without changes.

Diff for: ‎src/GeoJson/CoordinateReferenceSystem/CoordinateReferenceSystem.php renamed to ‎src/CoordinateReferenceSystem/CoordinateReferenceSystem.php

File renamed without changes.

Diff for: ‎src/GeoJson/CoordinateReferenceSystem/Linked.php renamed to ‎src/CoordinateReferenceSystem/Linked.php

File renamed without changes.

Diff for: ‎src/GeoJson/CoordinateReferenceSystem/Named.php renamed to ‎src/CoordinateReferenceSystem/Named.php

File renamed without changes.

Diff for: ‎src/GeoJson/Exception/Exception.php renamed to ‎src/Exception/Exception.php

File renamed without changes.

Diff for: ‎src/GeoJson/Exception/UnserializationException.php renamed to ‎src/Exception/UnserializationException.php

File renamed without changes.

Diff for: ‎src/GeoJson/Feature/Feature.php renamed to ‎src/Feature/Feature.php

File renamed without changes.

Diff for: ‎src/GeoJson/Feature/FeatureCollection.php renamed to ‎src/Feature/FeatureCollection.php

File renamed without changes.

Diff for: ‎src/GeoJson/GeoJson.php renamed to ‎src/GeoJson.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/Geometry.php renamed to ‎src/Geometry/Geometry.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/GeometryCollection.php renamed to ‎src/Geometry/GeometryCollection.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/LineString.php renamed to ‎src/Geometry/LineString.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/LinearRing.php renamed to ‎src/Geometry/LinearRing.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/MultiLineString.php renamed to ‎src/Geometry/MultiLineString.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/MultiPoint.php renamed to ‎src/Geometry/MultiPoint.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/MultiPolygon.php renamed to ‎src/Geometry/MultiPolygon.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/Point.php renamed to ‎src/Geometry/Point.php

File renamed without changes.

Diff for: ‎src/GeoJson/Geometry/Polygon.php renamed to ‎src/Geometry/Polygon.php

File renamed without changes.

Diff for: ‎src/GeoJson/JsonUnserializable.php renamed to ‎src/JsonUnserializable.php

File renamed without changes.

Diff for: ‎tests/GeoJson/Tests/BaseGeoJsonTest.php renamed to ‎tests/Unit/BaseGeoJsonTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests;
5+
namespace GeoJson\Tests\Unit;
66

77
use GeoJson\BoundingBox;
88
use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;

Diff for: ‎tests/GeoJson/Tests/BoundingBoxTest.php renamed to ‎tests/Unit/BoundingBoxTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests;
5+
namespace GeoJson\Tests\Unit;
66

77
use GeoJson\BoundingBox;
88
use GeoJson\Exception\UnserializationException;

Diff for: ‎tests/GeoJson/Tests/CoordinateReferenceSystem/CoordinateReferenceSystemTest.php renamed to ‎tests/Unit/CoordinateReferenceSystem/CoordinateReferenceSystemTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\CoordinateReferenceSystem;
5+
namespace GeoJson\Tests\Unit\CoordinateReferenceSystem;
66

77
use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
88
use GeoJson\Exception\UnserializationException;

Diff for: ‎tests/GeoJson/Tests/CoordinateReferenceSystem/LinkedTest.php renamed to ‎tests/Unit/CoordinateReferenceSystem/LinkedTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\CoordinateReferenceSystem;
5+
namespace GeoJson\Tests\Unit\CoordinateReferenceSystem;
66

77
use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
88
use GeoJson\CoordinateReferenceSystem\Linked;

Diff for: ‎tests/GeoJson/Tests/CoordinateReferenceSystem/NamedTest.php renamed to ‎tests/Unit/CoordinateReferenceSystem/NamedTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\CoordinateReferenceSystem;
5+
namespace GeoJson\Tests\Unit\CoordinateReferenceSystem;
66

77
use GeoJson\CoordinateReferenceSystem\CoordinateReferenceSystem;
88
use GeoJson\CoordinateReferenceSystem\Named;

Diff for: ‎tests/GeoJson/Tests/Feature/FeatureCollectionTest.php renamed to ‎tests/Unit/Feature/FeatureCollectionTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Feature;
5+
namespace GeoJson\Tests\Unit\Feature;
66

77
use GeoJson\Exception\UnserializationException;
88
use GeoJson\Feature\Feature;
99
use GeoJson\Feature\FeatureCollection;
1010
use GeoJson\GeoJson;
1111
use GeoJson\Geometry\Point;
12-
use GeoJson\Tests\BaseGeoJsonTest;
12+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1313
use InvalidArgumentException;
1414
use stdClass;
15-
1615
use function is_subclass_of;
1716
use function iterator_to_array;
1817
use function json_decode;

Diff for: ‎tests/GeoJson/Tests/Feature/FeatureTest.php renamed to ‎tests/Unit/Feature/FeatureTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Feature;
5+
namespace GeoJson\Tests\Unit\Feature;
66

77
use GeoJson\Feature\Feature;
88
use GeoJson\GeoJson;
99
use GeoJson\Geometry\Point;
10-
use GeoJson\Tests\BaseGeoJsonTest;
10+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1111
use stdClass;
12-
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/GeoJson/Tests/GeoJsonTest.php renamed to ‎tests/Unit/GeoJsonTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests;
5+
namespace GeoJson\Tests\Unit;
66

77
use GeoJson\BoundingBox;
88
use GeoJson\CoordinateReferenceSystem\Named;

Diff for: ‎tests/GeoJson/Tests/Geometry/GeometryCollectionTest.php renamed to ‎tests/Unit/Geometry/GeometryCollectionTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\Exception\UnserializationException;
88
use GeoJson\GeoJson;
99
use GeoJson\Geometry\Geometry;
1010
use GeoJson\Geometry\GeometryCollection;
1111
use GeoJson\Geometry\Point;
12-
use GeoJson\Tests\BaseGeoJsonTest;
12+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1313
use InvalidArgumentException;
1414
use stdClass;
15-
1615
use function is_subclass_of;
1716
use function iterator_to_array;
1817
use function json_decode;

Diff for: ‎tests/GeoJson/Tests/Geometry/GeometryTest.php renamed to ‎tests/Unit/Geometry/GeometryTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;

Diff for: ‎tests/GeoJson/Tests/Geometry/LineStringTest.php renamed to ‎tests/Unit/Geometry/LineStringTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\LineString;
99
use GeoJson\Geometry\MultiPoint;
10-
use GeoJson\Tests\BaseGeoJsonTest;
10+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1111
use InvalidArgumentException;
12-
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/GeoJson/Tests/Geometry/LinearRingTest.php renamed to ‎tests/Unit/Geometry/LinearRingTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\Geometry\LinearRing;
88
use GeoJson\Geometry\LineString;
99
use GeoJson\Geometry\Point;
10-
use GeoJson\Tests\BaseGeoJsonTest;
10+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1111
use InvalidArgumentException;
12-
1312
use function is_subclass_of;
1413

1514
class LinearRingTest extends BaseGeoJsonTest

Diff for: ‎tests/GeoJson/Tests/Geometry/MultiLineStringTest.php renamed to ‎tests/Unit/Geometry/MultiLineStringTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;
99
use GeoJson\Geometry\LineString;
1010
use GeoJson\Geometry\MultiLineString;
11-
use GeoJson\Tests\BaseGeoJsonTest;
12-
11+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/GeoJson/Tests/Geometry/MultiPointTest.php renamed to ‎tests/Unit/Geometry/MultiPointTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;
99
use GeoJson\Geometry\MultiPoint;
1010
use GeoJson\Geometry\Point;
11-
use GeoJson\Tests\BaseGeoJsonTest;
12-
11+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/GeoJson/Tests/Geometry/MultiPolygonTest.php renamed to ‎tests/Unit/Geometry/MultiPolygonTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;
99
use GeoJson\Geometry\MultiPolygon;
1010
use GeoJson\Geometry\Polygon;
11-
use GeoJson\Tests\BaseGeoJsonTest;
12-
11+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/GeoJson/Tests/Geometry/PointTest.php renamed to ‎tests/Unit/Geometry/PointTest.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;
99
use GeoJson\Geometry\Point;
10-
use GeoJson\Tests\BaseGeoJsonTest;
10+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1111
use InvalidArgumentException;
1212
use stdClass;
13-
14-
use function is_subclass_of;
1513
use function func_get_args;
14+
use function is_subclass_of;
1615
use function json_decode;
1716

1817
class PointTest extends BaseGeoJsonTest

Diff for: ‎tests/GeoJson/Tests/Geometry/PolygonTest.php renamed to ‎tests/Unit/Geometry/PolygonTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
declare(strict_types=1);
44

5-
namespace GeoJson\Tests\Geometry;
5+
namespace GeoJson\Tests\Unit\Geometry;
66

77
use GeoJson\GeoJson;
88
use GeoJson\Geometry\Geometry;
99
use GeoJson\Geometry\LinearRing;
1010
use GeoJson\Geometry\Polygon;
11-
use GeoJson\Tests\BaseGeoJsonTest;
12-
11+
use GeoJson\Tests\Unit\BaseGeoJsonTest;
1312
use function is_subclass_of;
1413
use function json_decode;
1514

Diff for: ‎tests/bootstrap.php

Whitespace-only changes.

0 commit comments

Comments
 (0)