diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 39b3f9be..7082e1f8 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -197,7 +197,7 @@ and can easily be run from project's root: - Run the full test suite: ```bash - composer run-tests + composer run-all-tests ``` ## Coding practices @@ -253,3 +253,194 @@ class ArrayAppend extends BaseFunction ⚠️ **Beware:** you cannot use **?** (e.g. the `??` operator) as part of any function prototype in Doctrine. It causes query parsing failures. + + +## Testing: Patterns and Guidelines + +This project has a rich, well-structured test suite consisting of fast unit tests and database-backed integration tests. Please follow the conventions below when adding or modifying tests. + +### Tools and how to run tests +- Framework: PHPUnit 10 (PHP attributes like #[Test], #[DataProvider]) +- Static analysis: PHPStan (+ doctrine + phpunit extensions) +- Architecture checks: deptrac +- Code style and refactoring: PHP-CS-Fixer, Rector + +Composer scripts: +- Run unit tests: `composer run-unit-tests` (uses ci/phpunit/config-unit.xml) +- Run integration tests: `composer run-integration-tests` (uses ci/phpunit/config-integration.xml) +- Run both suites: `composer run-all-tests` +- Static analysis: `composer run-static-analysis` + +Integration tests require a PostgreSQL with PostGIS: +- Easiest: Docker Compose + - Start: `docker-compose up -d` + - Stop: `docker-compose down -v` +- Alternatively (dev shell): `devenv up` +- See tests/Integration/README.md for environment variables and details + +Coverage reports are written to var/logs/test-coverage/{unit|integration}/. + +### Choosing unit vs. integration tests +- Prefer unit tests for: + - Pure value objects and small utilities (no DB/ORM) + - Doctrine DBAL Type conversions (PHP <-> database string) using an AbstractPlatform mock + - DQL AST function SQL generation (no DB round-trip) +- Prefer integration tests for: + - Verifying DBAL types round-trip correctly against a real PostgreSQL + - DQL functions/operators evaluated end-to-end against PostgreSQL + - Scenarios relying on PostGIS or PostgreSQL-specific behavior + +Keep unit tests fast and deterministic; use integration tests to validate behavior against the real database. + +### Unit test patterns and conventions +- Location: tests/Unit/... +- Naming: + - Class names end with `Test` (e.g., `PointTest`, `CidrTest`) + - One file/class per subject + - Concrete tests may be `final` +- Structure: + - Extend `PHPUnit\Framework\TestCase` or an existing base test class in Unit when available + - Use `setUp()` to create an `AbstractPlatform` mock and the subject under test when testing DBAL Types + - Use `#[DataProvider]` for bidirectional transformation scenarios (one provider used for both PHP->DB and DB->PHP tests) +- Assertions: + - Use domain-specific exceptions in negative tests (e.g., `InvalidCidrForPHPException`, `InvalidRangeForDatabaseException`) + - Prefer dedicated assertion helpers provided by base classes (e.g., range equality helpers) when available +- Value Object Range tests: + - Reuse base classes: + - `tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/BaseRangeTestCase` + - `tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/BaseTimestampRangeTestCase` + - Implement the abstract factory/expectation methods and provide concise data providers +- DBAL Type unit tests: + - Follow patterns from `PointTest`, `CidrTest`, `JsonbTest` + - Test name retrieval (`getName()`), conversions in both directions, and invalid inputs +- DQL AST unit tests: + - Use `tests/Unit/.../ORM/Query/AST/Functions/TestCase` to assert DQL -> SQL transformation + +Anti-patterns to avoid in unit tests: +- No echo/print statements +- Avoid Reflection; test through public APIs +- Avoid raw/native SQL when verifying DBAL Types; prefer conversion tests with platform mock +- Avoid excessive PHPStan suppression; prefer PHPDoc over `@phpstan-ignore` + +### Integration test patterns and organization +- Location: tests/Integration/... +- Base infrastructure: + - Extend `tests/Integration/MartinGeorgiev/TestCase` + - Sets up Doctrine ORM config, connection, schema `test`, caches, and ensures PostGIS + - Provides helpers to create/drop tables, run DQL, and assert results + - Use specialized base classes based on what you test: + - Array types: `ArrayTypeTestCase` + - Scalar types: `ScalarTypeTestCase` + - Range types: `RangeTypeTestCase` (includes operator tests and `assertRangeEquals`) + - Spatial arrays: `SpatialArrayTypeTestCase` (ARRAY[...] insertion for WKT) +- Per-type organization: + - One integration test class per DBAL Type (e.g., `MacaddrTypeTest`, `JsonbTypeTest`, `IntegerArrayTypeTest`) + - Implement: + - `protected function getTypeName(): string` (Doctrine type name) + - `protected function getPostgresTypeName(): string` (column type) + - Data-driven tests: + - Provide a `provideValidTransformations()` where applicable + - Use `runDbalBindingRoundTrip($typeName, $columnType, $value)` for round-trips +- Range integration tests: + - Extend `RangeTypeTestCase` + - Provide a data provider for range values and add `#[DataProvider('provideValidTransformations')]` to `can_handle_range_values()` + - Optionally add operator scenarios via `provideOperatorScenarios()` returning [name, DQL, expectedIds] + +Anti-patterns to avoid in integration tests: +- Do not modify or rely on global/public schema; tests use the dedicated `test` schema created per test run +- Avoid changing existing shared fixtures/data unless strictly necessary; prefer adding new, focused fixtures +- No echo/print statements + +### Base test classes and shared utilities +Commonly used bases and what they provide: +- Unit (Value Objects): + - `BaseRangeTestCase`: creation/formatting/boundary tests with abstract factory methods + - `BaseTimestampRangeTestCase`: extends the above with timestamp-specific boundary and helpers +- Unit (DBAL Types): + - `tests/Unit/.../DBAL/Types/BaseRangeTestCase`: negative cases and conversions for range DBAL types +- Unit (ORM functions): + - `tests/Unit/.../ORM/Query/AST/Functions/TestCase`: DQL to SQL transformation checks +- Integration (DBAL Types): + - `TestCase`: connection/schema setup, round-trip helper, assertions + - `ArrayTypeTestCase`, `ScalarTypeTestCase`, `RangeTypeTestCase`, `SpatialArrayTypeTestCase` + +Prefer extending these base classes over duplicating setup/utility code. + +### Exception handling and error testing +- Use domain-specific exceptions consistently: + - `convertToPHPValue()` should throw `...ForPHPException` + - `convertToDatabaseValue()` should throw `...ForDatabaseException` +- In tests, assert the exact exception class and include `expectExceptionMessage()` when the message is part of the contract +- For range equality in integration, use the provided `assertRangeEquals()` which compares string representation and emptiness + +### Test data and fixtures +- Entities for integration live under `fixtures/MartinGeorgiev/Doctrine/Entity` and are registered via attributes +- If a new fixture is necessary, add it under the same namespace and keep it minimal and reusable +- Range/operator tests seed their own tables (see `RangeTypeTestCase`’s `createRangeOperatorsTable()` and insert helpers) + +### Code style in test files +- Use PHP attributes `#[Test]` and `#[DataProvider]` (PHPUnit 10) +- Descriptive dataset names in data providers improve failure readability +- Prefer clear method names starting with verbs: `can_...`, `throws_...`, `dql_is_...` +- Keep tests small and focused; avoid commentary that restates code; write comments only to explain intent or PostgreSQL-specific behavior +- Maintain alphabetical order in documentation blocks and lists when applicable + +### Minimal examples +Unit test for a DBAL Type (mock platform, bidirectional conversions): + +```php +final class InetTest extends TestCase +{ + /** + * @var AbstractPlatform&MockObject + */ + private MockObject $platform; + private Inet $fixture; + + protected function setUp(): void + { + $this->platform = $this->createMock(AbstractPlatform::class); + $this->fixture = new Inet(); + } + + #[DataProvider('provideValidTransformations')] + #[Test] + public function can_transform_from_php_value(?string $php, ?string $pg): void + { + $this->assertEquals($pg, $this->fixture->convertToDatabaseValue($php, $this->platform)); + } + + #[DataProvider('provideValidTransformations')] + #[Test] + public function can_transform_to_php_value(?string $php, ?string $pg): void + { + $this->assertEquals($php, $this->fixture->convertToPHPValue($pg, $this->platform)); + } +} +``` + +Integration test for an array type: + +```php +final class TextArrayTypeTest extends ArrayTypeTestCase +{ + protected function getTypeName(): string { return 'text[]'; } + protected function getPostgresTypeName(): string { return 'TEXT[]'; } + #[DataProvider('provideValidTransformations')] #[Test] + public function can_handle_array_values(string $name, array $value): void { parent::can_handle_array_values($name, $value); } +} +``` + +Range integration test: + +```php +final class Int4RangeTypeTest extends RangeTypeTestCase +{ + protected function getTypeName(): string { return 'int4range'; } + protected function getPostgresTypeName(): string { return 'INT4RANGE'; } + #[DataProvider('provideValidTransformations')] #[Test] + public function can_handle_range_values(string $name, RangeValueObject $range): void { parent::can_handle_range_values($name, $range); } +} +``` + +If unsure which base to extend or how to structure a new test, mirror a nearby, similar test and keep changes minimal and consistent with the patterns above. \ No newline at end of file diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistance.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistance.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistance.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistance.php index 4294028d..fb748e5e 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistance.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistance.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS 2D bounding box distance operator (using <#>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistance.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistance.php similarity index 89% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistance.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistance.php index 7858c6ac..4444fafb 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistance.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistance.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS 2D distance between geometries operator (using <->). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistance.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistance.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistance.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistance.php index e1b8b277..df098f2d 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistance.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistance.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS n-D bounding box distance operator (using <<#>>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistance.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistance.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistance.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistance.php index 5117abe5..7da3f342 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistance.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistance.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS n-D centroid distance operator (using <<->>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlaps.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlaps.php similarity index 86% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlaps.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlaps.php index 4a83d385..da665cd5 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlaps.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlaps.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS n-dimensional bounding box intersects operator (using &&&). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Overlaps.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/Overlaps.php similarity index 83% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Overlaps.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/Overlaps.php index a38d4cfc..f65af7eb 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Overlaps.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/Overlaps.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostgreSQL check if left side overlaps with right side (using &&). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAbove.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAbove.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAbove.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAbove.php index 9e080ff2..e9c2ca94 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAbove.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAbove.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box overlaps or is above operator (using |&>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelow.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelow.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelow.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelow.php index 724072b0..9d22fb04 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelow.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelow.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box overlaps or is below operator (using &<|). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeft.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeft.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeft.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeft.php index 24088c27..35295e4e 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeft.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeft.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box overlaps or is to the left operator (using &<). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRight.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRight.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRight.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRight.php index b94b89a9..3d3053c0 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRight.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRight.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box overlaps or is to the right operator (using &>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedBy.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedBy.php similarity index 86% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedBy.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedBy.php index 436aaf54..1cd3cf5b 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedBy.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedBy.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS spatial bounding box contained by operator (using @). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContains.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContains.php similarity index 86% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContains.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContains.php index 961386b5..f38338a9 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContains.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContains.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS spatial bounding box contains operator (using ~). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSame.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSame.php similarity index 84% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSame.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSame.php index 2fde3202..1952b8b0 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSame.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSame.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box same as operator (using ~=). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAbove.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAbove.php similarity index 84% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAbove.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAbove.php index 87fe177e..21868e7e 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAbove.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAbove.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box strictly above operator (using |>>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelow.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelow.php similarity index 84% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelow.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelow.php index 1a85522e..80388e23 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelow.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelow.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box strictly below operator (using <<|). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeft.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeft.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeft.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeft.php index 35172ad7..9f023b38 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeft.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeft.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box strictly to the left operator (using <<). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRight.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRight.php similarity index 85% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRight.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRight.php index 30a659db..9ba0aa28 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRight.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRight.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS bounding box strictly to the right operator (using >>). diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistance.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistance.php similarity index 86% rename from src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistance.php rename to src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistance.php index a7e3ab98..04edec8e 100644 --- a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistance.php +++ b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistance.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; + +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BaseFunction; /** * Implementation of PostGIS trajectory distance operator (using |=|). diff --git a/tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/RangeTypeTestCase.php b/tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/RangeTypeTestCase.php index 09c7fc8e..dd40f43e 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/RangeTypeTestCase.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/RangeTypeTestCase.php @@ -7,7 +7,7 @@ use MartinGeorgiev\Doctrine\DBAL\Types\ValueObject\Range as RangeValueObject; use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Contains; use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\IsContainedBy; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Overlaps; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\Overlaps; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php similarity index 95% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php index 7744c4e6..f58cd1f5 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BoundingBoxDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\BoundingBoxDistance; use PHPUnit\Framework\Attributes\Test; class BoundingBoxDistanceTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php similarity index 95% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php index 49006fc8..203d8226 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\GeometryDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\GeometryDistance; use PHPUnit\Framework\Attributes\Test; class GeometryDistanceTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php similarity index 93% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php index f232fd40..cbdb81d7 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\NDimensionalCentroidDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\NDimensionalCentroidDistance; use PHPUnit\Framework\Attributes\Test; class NDimensionalCentroidDistanceTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php similarity index 91% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php index 13301c4b..05d9b583 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\NDimensionalOverlaps; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\NDimensionalOverlaps; use PHPUnit\Framework\Attributes\Test; class NDimensionalOverlapsTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php index 48ed1adc..1e8b4731 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsAbove; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsAbove; use PHPUnit\Framework\Attributes\Test; class OverlapsAboveTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php index 107ca253..b8b862ca 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsBelow; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsBelow; use PHPUnit\Framework\Attributes\Test; class OverlapsBelowTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php similarity index 95% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php index 9b6f2603..70a24f50 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsLeft; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsLeft; use PHPUnit\Framework\Attributes\Test; class OverlapsLeftTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php similarity index 95% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php index c5c4dbe0..11f5ac4a 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsRight; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsRight; use PHPUnit\Framework\Attributes\Test; class OverlapsRightTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php similarity index 93% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php index 07deed42..d8d915e2 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialContainedBy; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialContainedBy; use PHPUnit\Framework\Attributes\Test; class SpatialContainedByTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php index f4f209e0..21f21c5a 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialContains; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialContains; use PHPUnit\Framework\Attributes\Test; class SpatialContainsTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialOperatorTestCase.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialOperatorTestCase.php similarity index 99% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialOperatorTestCase.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialOperatorTestCase.php index 9a00a0d4..4bc6bbf3 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialOperatorTestCase.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialOperatorTestCase.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Tests\Integration\MartinGeorgiev\TestCase as BaseTestCase; diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php index 7380fdd9..e12da756 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialSame; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialSame; use PHPUnit\Framework\Attributes\Test; class SpatialSameTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php similarity index 96% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php index 9c444971..08d3d9b9 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyAbove; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyAbove; use PHPUnit\Framework\Attributes\Test; class StrictlyAboveTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php similarity index 96% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php index 6ba9abd0..427b0828 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyBelow; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyBelow; use PHPUnit\Framework\Attributes\Test; class StrictlyBelowTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php similarity index 95% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php index 51b1dc58..b969e653 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyLeft; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyLeft; use PHPUnit\Framework\Attributes\Test; class StrictlyLeftTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php index 49e8270c..4e6472d3 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyRight; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyRight; use PHPUnit\Framework\Attributes\Test; class StrictlyRightTest extends SpatialOperatorTestCase diff --git a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php similarity index 94% rename from tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php rename to tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php index a405f3c0..0cfd83c0 100644 --- a/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php +++ b/tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TrajectoryDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\TrajectoryDistance; use PHPUnit\Framework\Attributes\Test; class TrajectoryDistanceTest extends SpatialOperatorTestCase diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php similarity index 84% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php index 01241195..501d51de 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BoundingBoxDistanceTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/BoundingBoxDistanceTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\BoundingBoxDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\BoundingBoxDistance; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class BoundingBoxDistanceTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php similarity index 87% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php index fbb6ac51..96f9cc3d 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/GeometryDistanceTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/GeometryDistanceTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\GeometryDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\GeometryDistance; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class GeometryDistanceTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistanceTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistanceTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistanceTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistanceTest.php index 5ed20bc3..68ceaace 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalBoundingBoxDistanceTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalBoundingBoxDistanceTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\NDimensionalBoundingBoxDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\NDimensionalBoundingBoxDistance; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class NDimensionalBoundingBoxDistanceTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php index b9082fcd..970d338a 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalCentroidDistanceTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalCentroidDistanceTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\NDimensionalCentroidDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\NDimensionalCentroidDistance; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class NDimensionalCentroidDistanceTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php similarity index 87% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php index 7bfedcfb..fc411f5a 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/NDimensionalOverlapsTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/NDimensionalOverlapsTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\NDimensionalOverlaps; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\NDimensionalOverlaps; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class NDimensionalOverlapsTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php index 205fdc42..c908681a 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsAboveTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsAboveTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsAbove; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsAbove; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class OverlapsAboveTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php index ca84001a..17d5a3fa 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsBelowTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsBelowTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsBelow; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsBelow; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class OverlapsBelowTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php similarity index 87% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php index 73a927c4..261eb847 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsLeftTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsLeftTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsLeft; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsLeft; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class OverlapsLeftTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php index dd0912bd..79c8624b 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsRightTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsRightTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\OverlapsRight; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\OverlapsRight; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class OverlapsRightTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsTest.php similarity index 90% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsTest.php index ffd77743..1c3a764d 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/OverlapsTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/OverlapsTest.php @@ -2,11 +2,12 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Overlaps; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\Overlaps; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class OverlapsTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php similarity index 84% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php index 2db82dac..460959dd 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainedByTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainedByTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialContainedBy; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialContainedBy; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class SpatialContainedByTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php similarity index 87% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php index 111067c7..cad3c3d7 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialContainsTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialContainsTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialContains; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialContains; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class SpatialContainsTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php index 70d2b1bc..7ba55dd1 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/SpatialSameTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/SpatialSameTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\SpatialSame; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\SpatialSame; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class SpatialSameTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php index 4c1166ce..962e38a0 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyAboveTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyAboveTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyAbove; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyAbove; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class StrictlyAboveTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php index 5edbd7ff..3cc5c239 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyBelowTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyBelowTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyBelow; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyBelow; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class StrictlyBelowTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php similarity index 87% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php index 0503b863..c4aadf70 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyLeftTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyLeftTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyLeft; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyLeft; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class StrictlyLeftTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php index 2db75b2b..6de151fd 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StrictlyRightTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/StrictlyRightTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\StrictlyRight; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\StrictlyRight; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class StrictlyRightTest extends TestCase { diff --git a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php similarity index 83% rename from tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php rename to tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php index c47ce2d7..632c04e0 100644 --- a/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TrajectoryDistanceTest.php +++ b/tests/Unit/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/PostGIS/TrajectoryDistanceTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions; +namespace Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS; use Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsGeometries; -use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TrajectoryDistance; +use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\PostGIS\TrajectoryDistance; +use Tests\Unit\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\TestCase; class TrajectoryDistanceTest extends TestCase {