From 464634d4b32700910fad158fea15d1c20c766cc9 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 20 Feb 2024 19:59:03 +0100 Subject: [PATCH 01/14] feat: support symfony 7 --- composer.json | 24 +++++++++---------- doc/installation.md | 4 ++-- doc/service/direction/direction.md | 6 ++--- .../distance_matrix/distance_matrix.md | 6 ++--- doc/service/elevation/elevation.md | 6 ++--- doc/service/geocoder/geocoder.md | 6 ++--- .../place/autocomplete/place_autocomplete.md | 6 ++--- doc/service/place/detail/place_detail.md | 6 ++--- doc/service/place/search/place_search.md | 6 ++--- doc/service/service.md | 8 +++---- doc/service/timezone/timezone.md | 6 ++--- src/Base/Coordinate.php | 12 +--------- src/Base/Point.php | 17 +++---------- src/Service/Direction/DirectionService.php | 4 ++++ src/Service/Plugin/ErrorPlugin.php | 2 +- .../Serializer/GoogleDateTimeNormalizer.php | 20 ++++++++-------- src/Service/Serializer/SerializerBuilder.php | 4 ++-- tests/Base/BoundTest.php | 5 +--- tests/Base/CoordinateTest.php | 5 +--- tests/Base/PointTest.php | 5 +--- tests/Base/SizeTest.php | 5 +--- tests/Event/EventManagerTest.php | 5 +--- .../Functional/StaticMapFunctionalTest.php | 2 +- .../Service/AbstractFunctionalServiceTest.php | 2 +- 24 files changed, 70 insertions(+), 102 deletions(-) diff --git a/composer.json b/composer.json index 290e6c22..26da0ccc 100644 --- a/composer.json +++ b/composer.json @@ -17,20 +17,20 @@ ], "require": { "php": "^8.0", - "doctrine/annotations": "^1.13 || ^2.0", - "symfony/event-dispatcher": "^5.0 || ^6.0 || ^7.0", - "symfony/serializer": "^5.0 || ^6.0 || ^7.0", - "symfony/property-access": "^5.0 || ^6.0 || ^7.0", - "phpdocumentor/reflection-docblock": "^5.3" + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/serializer": "^5.4 || ^6.0 || ^7.0", + "symfony/property-access": "^5.4 || ^6.0 || ^7.0", + "phpdocumentor/reflection-docblock": "^5.3", + "php-http/message-factory": "^1.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "php-http/cache-plugin": "^1.4", - "php-http/guzzle6-adapter": "^2.0", - "phpunit/phpunit": "^8.5 || ^9.6", - "phpunit/phpunit-selenium": "^8.0 || ^9.0", - "symfony/cache": "^5.0 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^5.0 || ^6.0 || ^7.0", + "friendsofphp/php-cs-fixer": "^3.49", + "php-http/cache-plugin": "^2.0", + "php-http/guzzle7-adapter": "^1.0", + "phpunit/phpunit": "^9.6.16", + "phpunit/phpunit-selenium": "^9.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0", "ext-json": "*" }, "suggest": { diff --git a/doc/installation.md b/doc/installation.md index 735ac082..78278270 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -29,11 +29,11 @@ If you want to use a service (geocoder, direction, ...), you will need an http c [Httplug](http://httplug.io/) which is an http client abstraction library: ``` bash -$ composer require php-http/guzzle6-adapter +$ composer require php-http/guzzle7-adapter $ composer require php-http/message ``` -Here, I have chosen to use [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) but since Httplug supports the +Here, I have chosen to use [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) but since Httplug supports the most popular http clients, you can install your preferred one instead. ### Ivory Serializer diff --git a/doc/service/direction/direction.md b/doc/service/direction/direction.md index c3987e18..037e8ad5 100644 --- a/doc/service/direction/direction.md +++ b/doc/service/direction/direction.md @@ -17,14 +17,14 @@ First of all, if you want to route a direction, you will need to build a directi ``` php use Ivory\GoogleMap\Service\Direction\DirectionService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $direction = new DirectionService(new Client(), new GuzzleMessageFactory()); ``` The direction constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. Here, -I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message +I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The direction constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to use it @@ -33,7 +33,7 @@ in order to configure a PSR-6 cache pool and so avoid parsing the built-in metad ``` php use Ivory\GoogleMap\Service\Direction\DirectionService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $direction = new DirectionService( diff --git a/doc/service/distance_matrix/distance_matrix.md b/doc/service/distance_matrix/distance_matrix.md index 6fc18932..56bf0a02 100644 --- a/doc/service/distance_matrix/distance_matrix.md +++ b/doc/service/distance_matrix/distance_matrix.md @@ -19,14 +19,14 @@ First of all, if you want to process a distance matrix, you will need to build a ``` php use Ivory\GoogleMap\Service\DistanceMatrix\DistanceMatrixService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $distanceMatrix = new DistanceMatrixService(new Client(), new GuzzleMessageFactory()); ``` The distance matrix constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The distance matrix constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to @@ -35,7 +35,7 @@ use it in order to configure a PSR-6 cache pool and so avoid parsing the built-i ``` php use Ivory\GoogleMap\Service\DistanceMatrix\DistanceMatrixService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $distanceMatrix = new DistanceMatrixService( diff --git a/doc/service/elevation/elevation.md b/doc/service/elevation/elevation.md index cce4528f..287cb926 100644 --- a/doc/service/elevation/elevation.md +++ b/doc/service/elevation/elevation.md @@ -16,14 +16,14 @@ First of all, if you want to process an elevation, you will need to build an ele ``` php use Ivory\GoogleMap\Service\Elevation\ElevationService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $elevation = new ElevationService(new Client(), new GuzzleMessageFactory()); ``` The elevation constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The elevation constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to use it in @@ -32,7 +32,7 @@ order to configure a PSR-6 cache pool and so avoid parsing the built-in metadata ``` php use Ivory\GoogleMap\Service\Elevation\ElevationService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $elevation = new ElevationService( diff --git a/doc/service/geocoder/geocoder.md b/doc/service/geocoder/geocoder.md index 8bafe6fe..d48250fc 100644 --- a/doc/service/geocoder/geocoder.md +++ b/doc/service/geocoder/geocoder.md @@ -17,14 +17,14 @@ First of all, if you want to geocode a position, you will need to build a geocod ``` php use Ivory\GoogleMap\Service\Geocoder\GeocoderService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $geocoder = new GeocoderService(new Client(), new GuzzleMessageFactory()); ``` The geocoder constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. Here, -I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message +I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The geocoder constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to use it in @@ -33,7 +33,7 @@ order to configure a PSR-6 cache pool and so avoid parsing the built-in metadata ``` php use Ivory\GoogleMap\Service\Geocoder\GeocoderService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $geocoder = new GeocoderService( diff --git a/doc/service/place/autocomplete/place_autocomplete.md b/doc/service/place/autocomplete/place_autocomplete.md index 0ebe2131..85d2cd17 100644 --- a/doc/service/place/autocomplete/place_autocomplete.md +++ b/doc/service/place/autocomplete/place_autocomplete.md @@ -23,14 +23,14 @@ let's go: ``` php use Ivory\GoogleMap\Service\Direction\Place\Autocomplete\PlaceAutocompleteService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $autocomplete = new PlaceAutocompleteService(new Client(), new GuzzleMessageFactory()); ``` The Place Autocomplete constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The Place Autocomplete constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to @@ -39,7 +39,7 @@ use it in order to configure a PSR-6 cache pool and so avoid parsing the built-i ``` php use Ivory\GoogleMap\Service\Place\Autocomplete\PlaceAutocompleteService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $autocomplete = new PlaceAutocompleteService( diff --git a/doc/service/place/detail/place_detail.md b/doc/service/place/detail/place_detail.md index fb0d2ff3..2ccc04c5 100644 --- a/doc/service/place/detail/place_detail.md +++ b/doc/service/place/detail/place_detail.md @@ -17,14 +17,14 @@ First of all, if you want to process a place detail, you will need to build a pl ``` php use Ivory\GoogleMap\Service\Place\Detail\PlaceDetailService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $detail = new PlaceDetailService(new Client(), new GuzzleMessageFactory()); ``` The Place Detail constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The Place Detail constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to @@ -33,7 +33,7 @@ use it in order to configure a PSR-6 cache pool and so avoid parsing the built-i ``` php use Ivory\GoogleMap\Service\Place\Detail\PlaceDetailService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $detail = new PlaceDetailService( diff --git a/doc/service/place/search/place_search.md b/doc/service/place/search/place_search.md index 7ae05b64..6201720a 100644 --- a/doc/service/place/search/place_search.md +++ b/doc/service/place/search/place_search.md @@ -16,14 +16,14 @@ First of all, if you want to process a place search, you will need to build a pl ``` php use Ivory\GoogleMap\Service\Place\Search\PlaceSearchService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $search = new PlaceSearchService(new Client(), new GuzzleMessageFactory()); ``` The Place Search constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The Place Detail constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to @@ -32,7 +32,7 @@ use it in order to configure a PSR-6 cache pool and so avoid parsing the built-i ``` php use Ivory\GoogleMap\Service\Place\Search\PlaceSearchService; use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $search = new PlaceSearchService( diff --git a/doc/service/service.md b/doc/service/service.md index 5c8eadf9..71727af7 100644 --- a/doc/service/service.md +++ b/doc/service/service.md @@ -7,12 +7,12 @@ All services (direction, distance matrix, geocoder, ...) share common features. If you want to update the service http client, you can use: ``` php -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; $service->setClient(new Client()); ``` -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client but since +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client but since [Httplug](http://httplug.io/) supports the most popular http clients, you can choose you preferred one instead. ## Configure http plugins @@ -37,7 +37,7 @@ Here, I have chosen to use the Symfony Cache PSR-6 component but you can choose Then, create a plugin client: ``` php -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Client\Common\Plugin\CachePlugin; use Http\Client\Common\Plugin\ErrorPlugin as HttpErrorPlugin; use Http\Client\Common\Plugin\RetryPlugin; @@ -74,7 +74,7 @@ use Http\Message\MessageFactory\GuzzleMessageFactory; $service->setMessageFactory(new GuzzleMessageFactory()); ``` -Here, I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) message factory but since +Here, I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) message factory but since [Httplug](http://httplug.io/) supports the most popular http clients, you can choose you preferred one instead. ## Configure serializer diff --git a/doc/service/timezone/timezone.md b/doc/service/timezone/timezone.md index d389e70d..3f3b6745 100644 --- a/doc/service/timezone/timezone.md +++ b/doc/service/timezone/timezone.md @@ -15,14 +15,14 @@ First of all, if you want to process a timezone, you will need to build a timezo ``` php use Ivory\GoogleMap\Service\TimeZone\TimeZoneService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $timeZone = new TimeZoneService(new Client(), new GuzzleMessageFactory()); ``` The timezone constructor requires an `HttpClient` as first argument and a `MessageFactory` as second argument. Here, -I have chosen to use the [Guzzle6](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message +I have chosen to use the [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) client as well as the Guzzle message factory. Httplug supports the most popular http clients, so, you can choose you preferred one instead. The timezone constructor also accepts a `SerializerInterface` as third argument. It is highly recommended to use it in @@ -31,7 +31,7 @@ order to configure a PSR-6 cache pool and so avoid parsing the built-in metadata ``` php use Ivory\GoogleMap\Service\Serializer\SerializerBuilder; use Ivory\GoogleMap\Service\TimeZone\TimeZoneService; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Message\MessageFactory\GuzzleMessageFactory; $timeZone = new TimeZoneService( diff --git a/src/Base/Coordinate.php b/src/Base/Coordinate.php index 2559b144..f4902eb4 100644 --- a/src/Base/Coordinate.php +++ b/src/Base/Coordinate.php @@ -24,15 +24,12 @@ class Coordinate implements VariableAwareInterface { use VariableAwareTrait; - /** @var float */ #[SerializedName('lat')] private float $latitude; - /** @var float */ #[SerializedName('lng')] private float $longitude; - /** @var bool */ private bool $noWrap; public function __construct(float $latitude = 0.0, float $longitude = 0.0, bool $noWrap = true) @@ -42,15 +39,11 @@ public function __construct(float $latitude = 0.0, float $longitude = 0.0, bool $this->setNoWrap($noWrap); } - /** - * @return float - */ - public function getLatitude() + public function getLatitude(): float { return $this->latitude; } - /** @param float $latitude */ public function setLatitude(float $latitude): void { $this->latitude = $latitude; @@ -61,19 +54,16 @@ public function getLongitude(): float return $this->longitude; } - /** @param float $longitude */ public function setLongitude(float $longitude): void { $this->longitude = $longitude; } - /** @return bool */ public function isNoWrap(): bool { return $this->noWrap; } - /** @param bool $noWrap */ public function setNoWrap(bool $noWrap): void { $this->noWrap = $noWrap; diff --git a/src/Base/Point.php b/src/Base/Point.php index 40a4d4da..f18ae8dc 100644 --- a/src/Base/Point.php +++ b/src/Base/Point.php @@ -23,21 +23,10 @@ class Point implements VariableAwareInterface { use VariableAwareTrait; - /** - * @var float - */ - private $x; - - /** - * @var float - */ - private $y; + private float $x; + private float $y; - /** - * @param float $x - * @param float $y - */ - public function __construct($x = 0.0, $y = 0.0) + public function __construct(float $x = 0.0, float $y = 0.0) { $this->setX($x); $this->setY($y); diff --git a/src/Service/Direction/DirectionService.php b/src/Service/Direction/DirectionService.php index 45138d2e..8e84fa36 100644 --- a/src/Service/Direction/DirectionService.php +++ b/src/Service/Direction/DirectionService.php @@ -16,6 +16,7 @@ use Ivory\GoogleMap\Service\AbstractSerializableService; use Ivory\GoogleMap\Service\Direction\Request\DirectionRequestInterface; use Ivory\GoogleMap\Service\Direction\Response\DirectionResponse; +use Psr\Http\Client\ClientExceptionInterface; use Symfony\Component\Serializer\SerializerInterface; /** @@ -31,6 +32,9 @@ public function __construct( parent::__construct('https://maps.googleapis.com/maps/api/directions', $client, $messageFactory, $serializer); } + /** + * @throws ClientExceptionInterface + */ public function route(DirectionRequestInterface $request): DirectionResponse { $httpRequest = $this->createRequest($request); diff --git a/src/Service/Plugin/ErrorPlugin.php b/src/Service/Plugin/ErrorPlugin.php index 9dffd8b2..d6da1e78 100644 --- a/src/Service/Plugin/ErrorPlugin.php +++ b/src/Service/Plugin/ErrorPlugin.php @@ -60,7 +60,7 @@ protected function transformResponseToException(RequestInterface $request, Respo foreach (self::$errors as $error => $exception) { foreach (self::$placeholders as $placeholder) { - if (false !== strpos($body, sprintf($placeholder, $error))) { + if (str_contains($body, sprintf($placeholder, $error))) { throw new $exception($error, $request, $response); } } diff --git a/src/Service/Serializer/GoogleDateTimeNormalizer.php b/src/Service/Serializer/GoogleDateTimeNormalizer.php index a8f1a6e8..d282eb06 100644 --- a/src/Service/Serializer/GoogleDateTimeNormalizer.php +++ b/src/Service/Serializer/GoogleDateTimeNormalizer.php @@ -7,11 +7,10 @@ use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\Exception\InvalidArgumentException; use Symfony\Component\Serializer\Exception\NotNormalizableValueException; -use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -class GoogleDateTimeNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface +class GoogleDateTimeNormalizer implements NormalizerInterface, DenormalizerInterface { public const FORMAT_KEY = 'datetime_format'; public const TIMEZONE_KEY = 'datetime_timezone'; @@ -39,12 +38,8 @@ public function setDefaultContext(array $defaultContext): void /** * {@inheritdoc} - * - * @return string - * - * @throws InvalidArgumentException */ - public function normalize($object, string $format = null, array $context = []) + public function normalize(mixed $object, string $format = null, array $context = []): float|int|bool|\ArrayObject|array|string|null { if (!$object instanceof \DateTimeInterface) { throw new InvalidArgumentException('The object must implement the "\DateTimeInterface".'); @@ -64,7 +59,7 @@ public function normalize($object, string $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, string $format = null) + public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool { return $data instanceof \DateTimeInterface; } @@ -76,7 +71,7 @@ public function supportsNormalization($data, string $format = null) * * @throws NotNormalizableValueException */ - public function denormalize($data, string $type, string $format = null, array $context = []) + public function denormalize($data, string $type, string $format = null, array $context = []): mixed { $dateTimeFormat = $context[self::FORMAT_KEY] ?? null; $timezone = $this->getTimezone($context); @@ -119,7 +114,7 @@ public function denormalize($data, string $type, string $format = null, array $c /** * {@inheritdoc} */ - public function supportsDenormalization($data, string $type, string $format = null) + public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool { return isset(self::SUPPORTED_TYPES[$type]); } @@ -158,4 +153,9 @@ private function getTimezone(array $context): ?\DateTimeZone return $dateTimeZone instanceof \DateTimeZone ? $dateTimeZone : new \DateTimeZone($dateTimeZone); } + + public function getSupportedTypes(?string $format): array + { + // TODO: Implement getSupportedTypes() method. + } } \ No newline at end of file diff --git a/src/Service/Serializer/SerializerBuilder.php b/src/Service/Serializer/SerializerBuilder.php index e6a031ad..b8c32dac 100644 --- a/src/Service/Serializer/SerializerBuilder.php +++ b/src/Service/Serializer/SerializerBuilder.php @@ -18,7 +18,7 @@ use Symfony\Component\Serializer\Encoder\JsonEncoder; use Symfony\Component\Serializer\Encoder\XmlEncoder; use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory; -use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader; +use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader; use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter; use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer; use Symfony\Component\Serializer\Normalizer\ObjectNormalizer; @@ -31,7 +31,7 @@ class SerializerBuilder { public static function create(): Serializer { - $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader())); + $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader()); $metadataAwareNameConverter = new MetadataAwareNameConverter($classMetadataFactory); $extractor = new PropertyInfoExtractor([], [ new PhpDocExtractor(), diff --git a/tests/Base/BoundTest.php b/tests/Base/BoundTest.php index 447e9144..e4d124cb 100644 --- a/tests/Base/BoundTest.php +++ b/tests/Base/BoundTest.php @@ -23,10 +23,7 @@ */ class BoundTest extends TestCase { - /** - * @var Bound - */ - private $bound; + private Bound $bound; /** * {@inheritdoc} diff --git a/tests/Base/CoordinateTest.php b/tests/Base/CoordinateTest.php index 089d5dd5..2ff960aa 100644 --- a/tests/Base/CoordinateTest.php +++ b/tests/Base/CoordinateTest.php @@ -20,10 +20,7 @@ */ class CoordinateTest extends TestCase { - /** - * @var Coordinate - */ - private $coordinate; + private Coordinate $coordinate; /** * {@inheritdoc} diff --git a/tests/Base/PointTest.php b/tests/Base/PointTest.php index 88ca9f04..bbb882fd 100644 --- a/tests/Base/PointTest.php +++ b/tests/Base/PointTest.php @@ -20,10 +20,7 @@ */ class PointTest extends TestCase { - /** - * @var Point - */ - private $point; + private Point $point; /** * {@inheritdoc} diff --git a/tests/Base/SizeTest.php b/tests/Base/SizeTest.php index cb0ea1de..8b2ba305 100644 --- a/tests/Base/SizeTest.php +++ b/tests/Base/SizeTest.php @@ -20,10 +20,7 @@ */ class SizeTest extends TestCase { - /** - * @var Size - */ - private $size; + private Size $size; /** * {@inheritdoc} diff --git a/tests/Event/EventManagerTest.php b/tests/Event/EventManagerTest.php index 18244a95..59c0c16b 100644 --- a/tests/Event/EventManagerTest.php +++ b/tests/Event/EventManagerTest.php @@ -21,10 +21,7 @@ */ class EventManagerTest extends TestCase { - /** - * @var EventManager - */ - private $eventManager; + private EventManager $eventManager; /** * {@inheritdoc} diff --git a/tests/Helper/Functional/StaticMapFunctionalTest.php b/tests/Helper/Functional/StaticMapFunctionalTest.php index af581698..3c54d5fd 100644 --- a/tests/Helper/Functional/StaticMapFunctionalTest.php +++ b/tests/Helper/Functional/StaticMapFunctionalTest.php @@ -11,7 +11,7 @@ namespace Ivory\Tests\GoogleMap\Helper\Functional; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Client\Common\Plugin\CachePlugin; use Http\Client\Common\PluginClient; use Http\Client\HttpClient; diff --git a/tests/Service/AbstractFunctionalServiceTest.php b/tests/Service/AbstractFunctionalServiceTest.php index 0666fcba..aeccbe9a 100644 --- a/tests/Service/AbstractFunctionalServiceTest.php +++ b/tests/Service/AbstractFunctionalServiceTest.php @@ -11,7 +11,7 @@ namespace Ivory\Tests\GoogleMap\Service; -use Http\Adapter\Guzzle6\Client; +use Http\Adapter\Guzzle7\Client; use Http\Client\Common\Plugin\ErrorPlugin as HttpErrorPlugin; use Http\Client\Common\Plugin\HistoryPlugin; use Http\Client\Common\Plugin\RetryPlugin; From 310305f5dc2a67b83f91c7092ed043cffdd69d45 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 20 Feb 2024 20:10:17 +0100 Subject: [PATCH 02/14] chore: remove travis replace ci badge with github actions --- .gitattributes | 2 -- .travis.yml | 25 ------------------------- README.md | 5 ++--- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.gitattributes b/.gitattributes index aa6d4bbd..8cb9b55e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,12 +1,10 @@ /docker export-ignore -/travis export-ignore /tests/.cache export-ignore .env.dist export-ignore .gitattributes export-ignore .gitignore export-ignore .php_cs export-ignore .scrutinizer.yml export-ignore -.travis.yml export-ignore CONTRIBUTING.md export-ignore docker-compose.yml export-ignore phpunit.ci.xml export-ignore diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 88a8cf6c..00000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: php - -os: linux -dist: xenial - -php: - - '7.1' - - '7.2' - - '7.3' - - '7.4' - - '8.0' - -branches: - only: - - master - -install: travis/install.sh -script: travis/script.sh -after_success: travis/success.sh - -git: - submodules: false - -notifications: - email: samuel.breu@bresam.ch diff --git a/README.md b/README.md index 80fc385b..4c4d1cc8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # README -[![Travis Build Status](https://api.travis-ci.com/bresam/ivory-google-map.svg?branch=master)](https://travis-ci.com/github/bresam/ivory-google-map) +[![Build](https://github.com/bresam/ivory-google-map/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bresam/ivory-google-map/actions/workflows/build.yml) [![Code Coverage](https://scrutinizer-ci.com/g/bresam/ivory-google-map/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/bresam/ivory-google-map/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bresam/ivory-google-map/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bresam/ivory-google-map/?branch=master) @@ -94,8 +94,7 @@ echo $apiHelper->render([$map]); ## Testing -The library is fully unit tested by [PHPUnit](http://www.phpunit.de/) with a code coverage close to **100%**. To -execute the test suite, check the travis [configuration](/.travis.yml). +The library is fully unit tested by [PHPUnit](http://www.phpunit.de/) with a code coverage close to **100%**. ## Contribute From 3962c9f943f9b53b4a8e2252b5ce537e37c247a2 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 20 Feb 2024 20:13:07 +0100 Subject: [PATCH 03/14] chore: deactivate Send coverage report to temp fix ci --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cf89e13..878f2128 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,9 +63,9 @@ jobs: name: Run PHPUnit run: vendor/bin/phpunit --configuration phpunit.ci.xml --coverage-clover clover.xml - - - name: Send coverage report - if: github.repository == 'bresam/ivory-google-map' - run: | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover clover.xml + #- + #name: Send coverage report + #if: github.repository == 'bresam/ivory-google-map' + #run: | + #wget https://scrutinizer-ci.com/ocular.phar + #php ocular.phar code-coverage:upload --format=php-clover clover.xml From 33b38263e8a7fe6aacb82b0c6db68d29a5943878 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 20 Feb 2024 20:14:07 +0100 Subject: [PATCH 04/14] chore: fix ci deprecations --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cf89e13..84fed5a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: steps: - - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP @@ -44,7 +44,7 @@ jobs: - name: Cache Composer - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }} From e169ed14c465a54f9f1c8f839f0e289fcab7a0de Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 08:08:56 +0100 Subject: [PATCH 05/14] chore: force symfony version in ci testruns --- .github/workflows/build.yml | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45910deb..4bc14797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,6 @@ on: pull_request: ~ release: types: [created] - schedule: - - - cron: "0 1 * * 6" # Run at 1am every Saturday workflow_dispatch: ~ jobs: @@ -19,7 +16,29 @@ jobs: strategy: fail-fast: false matrix: - php: [8.0, 8.1, 8.2, 8.3] + php: [8.3] + stability: [ prefer-stable ] + symfony-version: [ '7.0.*' ] + include: + - php: '8.0' + symfony-version: 5.4.* + stability: prefer-lowest + - php: '8.0' + symfony-version: 5.4.* + stability: prefer-stable + - php: '8.1' + symfony-version: 6.4.* + stability: prefer-stable + - php: '8.2' + symfony-version: 6.4.* + stability: prefer-stable + - php: '8.2' + symfony-version: 7.0.* + stability: prefer-stable + - php: '8.3' + symfony-version: 7.0.* + stability: prefer-stable + env: APP_ENV: test @@ -53,7 +72,12 @@ jobs: - name: Install PHP dependencies - run: composer install --no-interaction --prefer-source + env: + SYMFONY_REQUIRE: ${{ matrix.symfony-version }} + run: | + composer global config --no-plugins allow-plugins.symfony/flex true + composer global require --no-progress --no-scripts --no-plugins symfony/flex + composer update --no-interaction --prefer-dist - name: Run analysis From cfdc4d4f459972ab5bf940418f1e90b888c87b13 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 08:10:02 +0100 Subject: [PATCH 06/14] chore: force symfony version in ci testruns --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bc14797..0d23adf1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: tests: runs-on: ubuntu-latest - name: "PHP ${{ matrix.php }}" + name: PHP ${{ matrix.php }} - ${{ matrix.symfony-version }} - ${{ matrix.stability }} strategy: fail-fast: false From 909c86cecf2973bd9ac1ea8641bd3503c951ead3 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 08:59:12 +0100 Subject: [PATCH 07/14] feat: implement getSupportedTypes for GoogleDateTimeNormalizer --- .../Serializer/GoogleDateTimeNormalizer.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Service/Serializer/GoogleDateTimeNormalizer.php b/src/Service/Serializer/GoogleDateTimeNormalizer.php index d282eb06..d3c5de90 100644 --- a/src/Service/Serializer/GoogleDateTimeNormalizer.php +++ b/src/Service/Serializer/GoogleDateTimeNormalizer.php @@ -119,14 +119,6 @@ public function supportsDenormalization(mixed $data, string $type, string $forma return isset(self::SUPPORTED_TYPES[$type]); } - /** - * {@inheritdoc} - */ - public function hasCacheableSupportsMethod(): bool - { - return __CLASS__ === static::class; - } - /** * Formats datetime errors. * @@ -143,6 +135,9 @@ private function formatDateTimeErrors(array $errors): array return $formattedErrors; } + /** + * @throws \Exception + */ private function getTimezone(array $context): ?\DateTimeZone { $dateTimeZone = $context[self::TIMEZONE_KEY] ?? $this->defaultContext[self::TIMEZONE_KEY]; @@ -154,8 +149,11 @@ private function getTimezone(array $context): ?\DateTimeZone return $dateTimeZone instanceof \DateTimeZone ? $dateTimeZone : new \DateTimeZone($dateTimeZone); } + /** + * {@inheritdoc} + */ public function getSupportedTypes(?string $format): array { - // TODO: Implement getSupportedTypes() method. + return self::SUPPORTED_TYPES; } } \ No newline at end of file From f57a11497689d69a745eb44805ff72075335e121 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 16:25:02 +0100 Subject: [PATCH 08/14] feat: drop support for php < 8,1 drop support for symfony < 6.4 --- .github/workflows/build.yml | 7 ++----- composer.json | 14 +++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d23adf1..389d3a89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,12 +20,9 @@ jobs: stability: [ prefer-stable ] symfony-version: [ '7.0.*' ] include: - - php: '8.0' - symfony-version: 5.4.* + - php: '8.1' + symfony-version: 6.4.* stability: prefer-lowest - - php: '8.0' - symfony-version: 5.4.* - stability: prefer-stable - php: '8.1' symfony-version: 6.4.* stability: prefer-stable diff --git a/composer.json b/composer.json index 26da0ccc..48bd6b0a 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ivory/google-map", - "description": "Google Map API v3 integration for PHP ^8.0", + "description": "Google Map API v3 integration for PHP", "keywords": [ "google", "map"], "license": "MIT", "authors": [ @@ -16,10 +16,10 @@ } ], "require": { - "php": "^8.0", - "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", - "symfony/serializer": "^5.4 || ^6.0 || ^7.0", - "symfony/property-access": "^5.4 || ^6.0 || ^7.0", + "php": "^8.1", + "symfony/event-dispatcher": "^6.4 || ^7.0", + "symfony/serializer": "^6.4 || ^7.0", + "symfony/property-access": "^6.4 || ^7.0", "phpdocumentor/reflection-docblock": "^5.3", "php-http/message-factory": "^1.1" }, @@ -29,8 +29,8 @@ "php-http/guzzle7-adapter": "^1.0", "phpunit/phpunit": "^9.6.16", "phpunit/phpunit-selenium": "^9.0", - "symfony/cache": "^5.4 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/cache": "^6.4 || ^7.0", + "symfony/phpunit-bridge": "^6.4 || ^7.0", "ext-json": "*" }, "suggest": { From d0fbb08fbb1fea3a97a42b4a6a3b19ae790667a5 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 16:26:05 +0100 Subject: [PATCH 09/14] chore: remove travis --- travis/install.sh | 8 -------- travis/script.sh | 5 ----- travis/success.sh | 6 ------ 3 files changed, 19 deletions(-) delete mode 100755 travis/install.sh delete mode 100755 travis/script.sh delete mode 100755 travis/success.sh diff --git a/travis/install.sh b/travis/install.sh deleted file mode 100755 index 0a22d5ec..00000000 --- a/travis/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -composer self-update -composer remove --no-update --dev friendsofphp/php-cs-fixer - -composer update --prefer-source diff --git a/travis/script.sh b/travis/script.sh deleted file mode 100755 index 34890d22..00000000 --- a/travis/script.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -e - -vendor/bin/phpunit --configuration phpunit.ci.xml --coverage-clover clover.xml diff --git a/travis/success.sh b/travis/success.sh deleted file mode 100755 index fc78324f..00000000 --- a/travis/success.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -e - -wget https://scrutinizer-ci.com/ocular.phar -php ocular.phar code-coverage:upload --format=php-clover clover.xml From ffa4a4af2a06e17a7d2f273500b2532c3a145289 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 16:29:59 +0100 Subject: [PATCH 10/14] docs: make commands executable --- CONTRIBUTING.md | 16 ++++++++-------- README.md | 8 ++++++-- doc/development_environment.md | 12 ++++++------ doc/installation.md | 15 +++++---------- doc/service/service.md | 8 ++++---- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15fcb7e9..83181498 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,8 +27,8 @@ If you're here, you are going to fix a bug and you're the best! To do it, first create a new branch with the following commands: ``` bash -$ git clone git@github.com:your-name/ivory-google-map.git -$ git checkout -b bug-fix-description +git clone git@github.com:your-name/ivory-google-map.git +git checkout -b bug-fix-description ``` Then, we recommend to use [Docker](https://www.docker.com) and follow this [instructions](/doc/development_environment.md) in order to @@ -41,21 +41,21 @@ it immediately. Before, you will need to add tests and update the doc. For the t When you have fixed the bug, tested it and documented it, you can commit and push it with the following commands: ``` bash -$ git commit -m "Bug fix description" -$ git push origin bug-fix-description +git commit -m "Bug fix description" +git push origin bug-fix-description ``` If you have reworked you patch, please squash all your commits in a single one with the following commands (here, we will assume you would like to squash 3 commits in a single one): ``` bash -$ git rebase -i HEAD~3 +git rebase -i HEAD~3 ``` If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands: ``` bash -$ git remote add upstream git@github.com:bresam/ivory-google-map.git -$ git pull --rebase upstream master -$ git push origin bug-fix-description -f +git remote add upstream git@github.com:bresam/ivory-google-map.git +git pull --rebase upstream master +git push origin bug-fix-description -f ``` diff --git a/README.md b/README.md index 4c4d1cc8..3113c953 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,18 @@ ## Quickstart [Packagist: ivory/google-map](https://packagist.org/packages/ivory/google-map) -```composer require ivory/google-map``` +``` bash +composer require ivory/google-map +``` ### Symfony Bundle [Github: ivory/google-map-bundle](https://github.com/bresam/ivory-google-map-bundle) [Packagist: ivory/google-map-bundle](https://packagist.org/packages/ivory/google-map-bundle) -```composer require ivory/google-map-bundle``` +``` bash +composer require ivory/google-map-bundle +``` ### Contao Bundle diff --git a/doc/development_environment.md b/doc/development_environment.md index 6671eb8e..814aa73c 100644 --- a/doc/development_environment.md +++ b/doc/development_environment.md @@ -6,8 +6,8 @@ The most easy way to set up the project is to install [Docker](https://www.docke ## Configure ``` bash -$ cp .env.dist .env -$ cp phpunit.xml.dist phpunit.xml +cp .env.dist .env +cp phpunit.xml.dist phpunit.xml ``` Add proper credentials in `phpunit.xml` @@ -27,7 +27,7 @@ These Endpoints are used: Once you have configured your environment, you can build the project: ``` bash -$ docker-compose build +docker-compose build ``` ## Composer @@ -35,7 +35,7 @@ $ docker-compose build Install the dependencies via [Composer](https://getcomposer.org/): ``` bash -$ docker-compose run --rm php composer install +docker-compose run --rm php composer install ``` ## Tests @@ -43,13 +43,13 @@ $ docker-compose run --rm php composer install To start the test suite, you can use: ``` bash -$ docker-compose up -d +docker-compose up -d ``` To run phpunit: ``` bash -$ docker exec ivory-google-map_php_1 vendor/bin/phpunit +docker exec ivory-google-map_php_1 vendor/bin/phpunit ``` ## Tests with PHP Storm integration diff --git a/doc/installation.md b/doc/installation.md index 78278270..9b673e7d 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -6,19 +6,14 @@ you. ## Set up Composer -Composer comes with a simple phar file. To easily access it from anywhere on your system, you can execute: - -``` bash -$ curl -s https://getcomposer.org/installer | php -$ sudo mv composer.phar /usr/local/bin/composer -``` +[Install Composer](https://getcomposer.org/) ## Download the library Require the library in your `composer.json` file: ``` bash -$ composer require ivory/google-map +composer require ivory/google-map ``` ## Download additional libraries @@ -29,8 +24,8 @@ If you want to use a service (geocoder, direction, ...), you will need an http c [Httplug](http://httplug.io/) which is an http client abstraction library: ``` bash -$ composer require php-http/guzzle7-adapter -$ composer require php-http/message +composer require php-http/guzzle7-adapter +composer require php-http/message ``` Here, I have chosen to use [Guzzle7](http://docs.guzzlephp.org/en/latest/psr7.html) but since Httplug supports the @@ -42,7 +37,7 @@ If you want to use a service (geocoder, direction, ...), you will need the [Ivory Serializer](https://github.com/egeloen/ivory-serializer) in order to deserialize the http response: ``` bash -$ composer require egeloen/serializer +composer require egeloen/serializer ``` ## Autoload diff --git a/doc/service/service.md b/doc/service/service.md index 71727af7..4a864106 100644 --- a/doc/service/service.md +++ b/doc/service/service.md @@ -25,12 +25,12 @@ as a better experience with the library. The following are the most interesting - Retry Plugin: Retry an error responses (exceptions). - Cache Plugin: Cache responses using a [PSR-6](http://www.php-fig.org/psr/psr-6/) compliant cache system. -To use theses plugins, first install them: +To use these plugins, first install them: ``` bash -$ composer require php-http/client-common -$ composer require php-http/cache-plugin -$ composer require symfony/cache +composer require php-http/client-common +composer require php-http/cache-plugin +composer require symfony/cache ``` Here, I have chosen to use the Symfony Cache PSR-6 component but you can choose your preferred one instead. From b84dd9e308e555e3564f86fe2c96a89b64fd903c Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 16:33:12 +0100 Subject: [PATCH 11/14] chore: migrate PHPUnit config-files --- phpunit.ci.xml | 25 ++++++++++----------- phpunit.xml.dist | 56 +++++++++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/phpunit.ci.xml b/phpunit.ci.xml index c83687e8..0cc97aa8 100644 --- a/phpunit.ci.xml +++ b/phpunit.ci.xml @@ -1,10 +1,14 @@ - + + + ./tests/ + + @@ -12,17 +16,11 @@ - - - ./tests/ - - - - - + + ./src/ - - + + @@ -30,5 +28,4 @@ functional - - + \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 550f921d..2b6e5172 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,28 +1,34 @@ + + + + ./tests/ + + - - - - ./tests/ - - - - - - - - - - - - - ./src/ - - - - - - functional - - + + + + + + + + + + + + ./src/ + + + + + + + functional + + From bafc7e514bdc905e28d0fd44114062bcf2973da5 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Wed, 21 Feb 2024 21:32:47 +0100 Subject: [PATCH 12/14] feat: fix test deprecations add php strong types to fix deprecations for iterable --- .../Response/PlaceSearchResponseIterator.php | 14 ++++++++------ tests/Service/AbstractFunctionalServiceTest.php | 10 ++-------- .../DistanceMatrixServiceUnitTest.php | 1 - .../Service/Elevation/ElevationServiceUnitTest.php | 1 - tests/Service/Geocoder/GeocoderServiceUnitTest.php | 1 - .../PlaceAutocompleteServiceUnitTest.php | 1 - .../Place/Detail/PlaceDetailServiceUnitTest.php | 1 - .../Place/Search/PlaceSearchServiceTest.php | 7 ------- .../Place/Search/PlaceSearchServiceUnitTest.php | 1 - tests/Service/SerializableServiceTest.php | 1 - tests/Service/TimeZone/TimeZoneServiceUnitTest.php | 3 +-- 11 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/Service/Place/Search/Response/PlaceSearchResponseIterator.php b/src/Service/Place/Search/Response/PlaceSearchResponseIterator.php index f1749a18..7e1f4ba8 100644 --- a/src/Service/Place/Search/Response/PlaceSearchResponseIterator.php +++ b/src/Service/Place/Search/Response/PlaceSearchResponseIterator.php @@ -43,17 +43,19 @@ public function __construct(PlaceSearchService $service, PlaceSearchResponse $re /** * {@inheritdoc} */ - public function current() + public function current(): mixed { if ($this->valid()) { return $this->responses[$this->position]; } + + return null; } - /** + /**s * {@inheritdoc} */ - public function next() + public function next(): void { if (!$this->valid()) { return; @@ -78,7 +80,7 @@ public function next() /** * {@inheritdoc} */ - public function key() + public function key(): mixed { return $this->position; } @@ -86,7 +88,7 @@ public function key() /** * {@inheritdoc} */ - public function valid() + public function valid(): bool { return $this->position < count($this->responses); } @@ -94,7 +96,7 @@ public function valid() /** * {@inheritdoc} */ - public function rewind() + public function rewind(): void { $this->position = 0; } diff --git a/tests/Service/AbstractFunctionalServiceTest.php b/tests/Service/AbstractFunctionalServiceTest.php index aeccbe9a..f9900722 100644 --- a/tests/Service/AbstractFunctionalServiceTest.php +++ b/tests/Service/AbstractFunctionalServiceTest.php @@ -89,15 +89,9 @@ protected function setUp(): void ]); } - /** - * @param string $key - * @param string $value - * - * @return \DateTime - */ - protected function getDateTime($key, $value = 'now') + protected function getDateTime(string $key, string $value = 'now'): \DateTime { - $item = $this->pool->getItem(sha1(get_class().'::'.$key)); + $item = $this->pool->getItem(sha1(__CLASS__ .'::'.$key)); if (!$item->isHit()) { $item->set(new \DateTime($value)); diff --git a/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php b/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php index b8d8765e..37e930df 100644 --- a/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php +++ b/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php @@ -82,7 +82,6 @@ public function testGeocodeWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(DistanceMatrixResponse::class), - $this->identicalTo($this->service->getFormat()), ) ->willReturn($response = $this->createDistanceMatrixResponseMock()); diff --git a/tests/Service/Elevation/ElevationServiceUnitTest.php b/tests/Service/Elevation/ElevationServiceUnitTest.php index af6b7a81..d989caf8 100644 --- a/tests/Service/Elevation/ElevationServiceUnitTest.php +++ b/tests/Service/Elevation/ElevationServiceUnitTest.php @@ -82,7 +82,6 @@ public function testGeocodeWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(ElevationResponse::class), - $this->identicalTo($this->service->getFormat()) ) ->willReturn($response = $this->createElevationResponseMock()); diff --git a/tests/Service/Geocoder/GeocoderServiceUnitTest.php b/tests/Service/Geocoder/GeocoderServiceUnitTest.php index 2e88f69c..124b2892 100644 --- a/tests/Service/Geocoder/GeocoderServiceUnitTest.php +++ b/tests/Service/Geocoder/GeocoderServiceUnitTest.php @@ -82,7 +82,6 @@ public function testGeocodeWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(GeocoderResponse::class), - $this->identicalTo($this->service->getFormat()), ) ->willReturn($response = $this->createGeocoderResponseMock()); diff --git a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php index d49970c1..a6e3f52b 100644 --- a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php +++ b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php @@ -87,7 +87,6 @@ public function testProcessWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(PlaceAutocompleteResponse::class), - $this->identicalTo($this->service->getFormat()), ) ->willReturn($response = $this->createPlaceAutocompleteResponseMock()); diff --git a/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php b/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php index 8ff1a640..e6d3cd01 100644 --- a/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php +++ b/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php @@ -82,7 +82,6 @@ public function testProcessWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(PlaceDetailResponse::class), - $this->identicalTo($this->service->getFormat()), ) ->willReturn($response = $this->createPlaceDetailResponseMock()); diff --git a/tests/Service/Place/Search/PlaceSearchServiceTest.php b/tests/Service/Place/Search/PlaceSearchServiceTest.php index 26b4ae4d..51359a5b 100644 --- a/tests/Service/Place/Search/PlaceSearchServiceTest.php +++ b/tests/Service/Place/Search/PlaceSearchServiceTest.php @@ -128,7 +128,6 @@ public function testProcessWithTextRequest() { $request = $this->createTextRequest(); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -139,7 +138,6 @@ public function testProcessWithTextRequestWithLocation() $request = $this->createTextRequest(); $request->setLocation(new Coordinate(50.637133, 3.063657)); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -151,7 +149,6 @@ public function testProcessWithTextRequestWithRadius() $request->setLocation(new Coordinate(50.637133, 3.063657)); $request->setRadius(1000); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -172,7 +169,6 @@ public function testProcessWithTextRequestWithMaxPrice() $request = $this->createTextRequest('Pizza in Lille'); $request->setMaxPrice(PriceLevel::MODERATE); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -183,7 +179,6 @@ public function testProcessWithTextRequestWithOpenNow() $request = $this->createTextRequest(); $request->setOpenNow(true); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -204,7 +199,6 @@ public function testProcessWithTextRequestWithLanguage() $request = $this->createTextRequest(); $request->setLanguage('fr'); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); @@ -224,7 +218,6 @@ public function testIteratorWithTextRequest() { $request = $this->createTextRequest('Church in Lille'); - $this->service->setFormat('json'); $iterator = $this->service->process($request); $this->assertPlaceSearchIterator($iterator, $request); diff --git a/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php b/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php index 57f61123..0ef359ea 100644 --- a/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php +++ b/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php @@ -87,7 +87,6 @@ public function testProcessWithBusinessAccount() ->with( $this->identicalTo($result), $this->identicalTo(PlaceSearchResponse::class), - $this->identicalTo($this->service->getFormat()) ) ->willReturn($response = $this->createPlaceSearchResponseMock()); diff --git a/tests/Service/SerializableServiceTest.php b/tests/Service/SerializableServiceTest.php index 39d8e795..3ea72862 100644 --- a/tests/Service/SerializableServiceTest.php +++ b/tests/Service/SerializableServiceTest.php @@ -76,7 +76,6 @@ public function testDefaultState() $this->assertSame($this->client, $this->service->getClient()); $this->assertSame($this->messageFactory, $this->service->getMessageFactory()); $this->assertSame($this->serializer, $this->service->getSerializer()); - $this->assertSame(AbstractSerializableService::FORMAT_JSON, $this->service->getFormat()); $this->assertFalse($this->service->hasKey()); $this->assertNull($this->service->getKey()); $this->assertFalse($this->service->hasBusinessAccount()); diff --git a/tests/Service/TimeZone/TimeZoneServiceUnitTest.php b/tests/Service/TimeZone/TimeZoneServiceUnitTest.php index c7b8ea84..88270dee 100644 --- a/tests/Service/TimeZone/TimeZoneServiceUnitTest.php +++ b/tests/Service/TimeZone/TimeZoneServiceUnitTest.php @@ -81,8 +81,7 @@ public function testProcessWithBusinessAccount() ->method('deserialize') ->with( $this->identicalTo($result), - $this->identicalTo(TimeZoneResponse::class), - $this->identicalTo($this->service->getFormat()) + $this->identicalTo(TimeZoneResponse::class) ) ->willReturn($response = $this->createTimeZoneResponseMock()); From e1b312005f8025b2d190a566fde58fcbd8a5588c Mon Sep 17 00:00:00 2001 From: Samuel Breu Date: Thu, 22 Feb 2024 15:04:16 +0100 Subject: [PATCH 13/14] test: fixed last failing unit test due to outdated placeIDs in tests --- .../DistanceMatrix/DistanceMatrixServiceApiKeyTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Service/DistanceMatrix/DistanceMatrixServiceApiKeyTest.php b/tests/Service/DistanceMatrix/DistanceMatrixServiceApiKeyTest.php index 67d204b7..264239c6 100644 --- a/tests/Service/DistanceMatrix/DistanceMatrixServiceApiKeyTest.php +++ b/tests/Service/DistanceMatrix/DistanceMatrixServiceApiKeyTest.php @@ -37,8 +37,8 @@ protected function setUp(): void public function testProcessWithPlaceIds() { $request = new DistanceMatrixRequest( - [new PlaceIdLocation('ChIJtdVv8-Fv5kcRV7t53Y2Ao3c')], - [new PlaceIdLocation('ChIJC_jkvdJv5kcRNX4NW3iuID8')] + [new PlaceIdLocation('ChIJAVkDPzdOqEcRcDteW0YgIQQ')], + [new PlaceIdLocation('ChIJGaK-SZcLkEcRA9wf5_GNbuY')] ); $response = $this->service->process($request); From 7f12b150ddfb032839bd2b52dfca78919d6cc864 Mon Sep 17 00:00:00 2001 From: Samuel Breu Date: Thu, 22 Feb 2024 15:34:13 +0100 Subject: [PATCH 14/14] test: fixed phpunit abstract tests naming deprecations --- ...bstractApiFunctionalTest.php => AbstractApiFunctional.php} | 2 +- .../{AbstractFunctionalTest.php => AbstractFunctional.php} | 2 +- ...bstractMapFunctionalTest.php => AbstractMapFunctional.php} | 2 +- tests/Helper/Functional/CompoundFunctionalTest.php | 2 +- .../Helper/Functional/Control/CustomControlFunctionalTest.php | 4 ++-- .../Functional/Control/FullscreenControlFunctionalTest.php | 4 ++-- .../Functional/Control/MapTypeControlFunctionalTest.php | 4 ++-- .../Helper/Functional/Control/RotateControlFunctionalTest.php | 4 ++-- .../Helper/Functional/Control/ScaleControlFunctionalTest.php | 4 ++-- .../Functional/Control/StreetViewControlFunctionalTest.php | 4 ++-- tests/Helper/Functional/Control/ZoomControlFunctionalTest.php | 4 ++-- ...EventFunctionalTest.php => AbstractDomEventFunctional.php} | 2 +- ...actEventFunctionalTest.php => AbstractEventFunctional.php} | 4 ++-- tests/Helper/Functional/Event/DomEventFunctionalTest.php | 2 +- tests/Helper/Functional/Event/DomEventOnceFunctionalTest.php | 2 +- tests/Helper/Functional/Event/EventFunctionalTest.php | 2 +- tests/Helper/Functional/Event/EventOnceFunctionalTest.php | 2 +- tests/Helper/Functional/Layer/GeoJsonLayerFunctionalTest.php | 4 ++-- tests/Helper/Functional/Layer/HeatmapLayerFunctionalTest.php | 4 ++-- tests/Helper/Functional/Layer/KmlLayerFunctionalTest.php | 4 ++-- tests/Helper/Functional/MapFunctionalTest.php | 2 +- ...ctionalTest.php => AbstractMarkerInfoWindowFunctional.php} | 4 ++-- tests/Helper/Functional/Overlay/CircleFunctionalTest.php | 4 ++-- .../Functional/Overlay/EncodedPolylineFunctionalTest.php | 4 ++-- .../Helper/Functional/Overlay/GroundOverlayFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/InfoBoxFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/InfoWindowFunctionalTest.php | 4 ++-- .../Functional/Overlay/MarkerClustererFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/MarkerFunctionalTest.php | 4 ++-- .../Helper/Functional/Overlay/MarkerInfoBoxFunctionalTest.php | 2 +- .../Functional/Overlay/MarkerInfoWindowFunctionalTest.php | 2 +- .../Functional/Overlay/MixedInfoWindowFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/PolygonFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/PolylineFunctionalTest.php | 4 ++-- tests/Helper/Functional/Overlay/RectangleFunctionalTest.php | 4 ++-- ...eFunctionalTest.php => AbstractAutocompleteFunctional.php} | 4 ++-- tests/Helper/Functional/Place/AutocompleteFunctionalTest.php | 2 +- ...EventFunctionalTest.php => AbstractDomEventFunctional.php} | 2 +- ...actEventFunctionalTest.php => AbstractEventFunctional.php} | 4 ++-- .../Place/Event/AutocompleteDomEventFunctionalTest.php | 2 +- .../Place/Event/AutocompleteDomEventOnceFunctionalTest.php | 2 +- .../Place/Event/AutocompleteEventFunctionalTest.php | 2 +- .../Place/Event/AutocompleteEventOnceFunctionalTest.php | 2 +- ...unctionalServiceTest.php => AbstractFunctionalService.php} | 2 +- ...lizableServiceTest.php => AbstractSerializableService.php} | 2 +- .../{AbstractUnitServiceTest.php => AbstractUnitService.php} | 2 +- tests/Service/Direction/DirectionServiceTest.php | 4 ++-- tests/Service/DistanceMatrix/DistanceMatrixServiceTest.php | 4 ++-- .../Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php | 4 ++-- tests/Service/Elevation/ElevationServiceTest.php | 4 ++-- tests/Service/Elevation/ElevationServiceUnitTest.php | 4 ++-- tests/Service/Geocoder/GeocoderServiceTest.php | 4 ++-- tests/Service/Geocoder/GeocoderServiceUnitTest.php | 4 ++-- ...leServiceTest.php => AbstractPlaceSerializableService.php} | 4 ++-- .../Place/Autocomplete/PlaceAutocompleteServiceTest.php | 4 ++-- .../Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php | 4 ++-- tests/Service/Place/Detail/PlaceDetailServiceTest.php | 4 ++-- tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php | 4 ++-- tests/Service/Place/Search/PlaceSearchServiceTest.php | 4 ++-- tests/Service/Place/Search/PlaceSearchServiceUnitTest.php | 4 ++-- tests/Service/TimeZone/TimeZoneServiceApiKeyTest.php | 4 ++-- tests/Service/TimeZone/TimeZoneServiceUnitTest.php | 4 ++-- 62 files changed, 103 insertions(+), 103 deletions(-) rename tests/Helper/Functional/{AbstractApiFunctionalTest.php => AbstractApiFunctional.php} (98%) rename tests/Helper/Functional/{AbstractFunctionalTest.php => AbstractFunctional.php} (98%) rename tests/Helper/Functional/{AbstractMapFunctionalTest.php => AbstractMapFunctional.php} (99%) rename tests/Helper/Functional/Event/{AbstractDomEventFunctionalTest.php => AbstractDomEventFunctional.php} (93%) rename tests/Helper/Functional/Event/{AbstractEventFunctionalTest.php => AbstractEventFunctional.php} (93%) rename tests/Helper/Functional/Overlay/{AbstractMarkerInfoWindowFunctionalTest.php => AbstractMarkerInfoWindowFunctional.php} (93%) rename tests/Helper/Functional/Place/{AbstractAutocompleteFunctionalTest.php => AbstractAutocompleteFunctional.php} (97%) rename tests/Helper/Functional/Place/Event/{AbstractDomEventFunctionalTest.php => AbstractDomEventFunctional.php} (93%) rename tests/Helper/Functional/Place/Event/{AbstractEventFunctionalTest.php => AbstractEventFunctional.php} (93%) rename tests/Service/{AbstractFunctionalServiceTest.php => AbstractFunctionalService.php} (97%) rename tests/Service/{AbstractSerializableServiceTest.php => AbstractSerializableService.php} (98%) rename tests/Service/{AbstractUnitServiceTest.php => AbstractUnitService.php} (97%) rename tests/Service/Place/{AbstractPlaceSerializableServiceTest.php => AbstractPlaceSerializableService.php} (98%) diff --git a/tests/Helper/Functional/AbstractApiFunctionalTest.php b/tests/Helper/Functional/AbstractApiFunctional.php similarity index 98% rename from tests/Helper/Functional/AbstractApiFunctionalTest.php rename to tests/Helper/Functional/AbstractApiFunctional.php index f92e03b4..48e860aa 100644 --- a/tests/Helper/Functional/AbstractApiFunctionalTest.php +++ b/tests/Helper/Functional/AbstractApiFunctional.php @@ -23,7 +23,7 @@ /** * @author GeLo */ -abstract class AbstractApiFunctionalTest extends AbstractFunctionalTest +abstract class AbstractApiFunctional extends AbstractFunctional { /** * @var ApiHelper diff --git a/tests/Helper/Functional/AbstractFunctionalTest.php b/tests/Helper/Functional/AbstractFunctional.php similarity index 98% rename from tests/Helper/Functional/AbstractFunctionalTest.php rename to tests/Helper/Functional/AbstractFunctional.php index 190cc9bb..89581da5 100644 --- a/tests/Helper/Functional/AbstractFunctionalTest.php +++ b/tests/Helper/Functional/AbstractFunctional.php @@ -16,7 +16,7 @@ /** * @author GeLo */ -abstract class AbstractFunctionalTest extends Selenium2TestCase +abstract class AbstractFunctional extends Selenium2TestCase { /** * @var string diff --git a/tests/Helper/Functional/AbstractMapFunctionalTest.php b/tests/Helper/Functional/AbstractMapFunctional.php similarity index 99% rename from tests/Helper/Functional/AbstractMapFunctionalTest.php rename to tests/Helper/Functional/AbstractMapFunctional.php index e8217e9f..d1a16f3e 100644 --- a/tests/Helper/Functional/AbstractMapFunctionalTest.php +++ b/tests/Helper/Functional/AbstractMapFunctional.php @@ -40,7 +40,7 @@ /** * @author GeLo */ -abstract class AbstractMapFunctionalTest extends AbstractApiFunctionalTest +abstract class AbstractMapFunctional extends AbstractApiFunctional { /** * @var MapHelper diff --git a/tests/Helper/Functional/CompoundFunctionalTest.php b/tests/Helper/Functional/CompoundFunctionalTest.php index 8f4963ae..bdbb6cd8 100644 --- a/tests/Helper/Functional/CompoundFunctionalTest.php +++ b/tests/Helper/Functional/CompoundFunctionalTest.php @@ -25,7 +25,7 @@ * * @group functional */ -class CompoundFunctionalTest extends AbstractApiFunctionalTest +class CompoundFunctionalTest extends AbstractApiFunctional { /** * @var PlaceAutocompleteHelper diff --git a/tests/Helper/Functional/Control/CustomControlFunctionalTest.php b/tests/Helper/Functional/Control/CustomControlFunctionalTest.php index a5906292..24623442 100644 --- a/tests/Helper/Functional/Control/CustomControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/CustomControlFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Control\ControlPosition; use Ivory\GoogleMap\Control\CustomControl; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class CustomControlFunctionalTest extends AbstractMapFunctionalTest +class CustomControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/FullscreenControlFunctionalTest.php b/tests/Helper/Functional/Control/FullscreenControlFunctionalTest.php index dd94fb4f..35f7207b 100644 --- a/tests/Helper/Functional/Control/FullscreenControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/FullscreenControlFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Control\ControlPosition; use Ivory\GoogleMap\Control\FullscreenControl; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class FullscreenControlFunctionalTest extends AbstractMapFunctionalTest +class FullscreenControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/MapTypeControlFunctionalTest.php b/tests/Helper/Functional/Control/MapTypeControlFunctionalTest.php index 640d4ecb..3d0fe323 100644 --- a/tests/Helper/Functional/Control/MapTypeControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/MapTypeControlFunctionalTest.php @@ -16,14 +16,14 @@ use Ivory\GoogleMap\Control\MapTypeControlStyle; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\MapTypeId; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class MapTypeControlFunctionalTest extends AbstractMapFunctionalTest +class MapTypeControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/RotateControlFunctionalTest.php b/tests/Helper/Functional/Control/RotateControlFunctionalTest.php index 9fa7fc58..d8f16691 100644 --- a/tests/Helper/Functional/Control/RotateControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/RotateControlFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Control\ControlPosition; use Ivory\GoogleMap\Control\RotateControl; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class RotateControlFunctionalTest extends AbstractMapFunctionalTest +class RotateControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/ScaleControlFunctionalTest.php b/tests/Helper/Functional/Control/ScaleControlFunctionalTest.php index 8846a2d0..59e6365d 100644 --- a/tests/Helper/Functional/Control/ScaleControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/ScaleControlFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Control\ScaleControl; use Ivory\GoogleMap\Control\ScaleControlStyle; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class ScaleControlFunctionalTest extends AbstractMapFunctionalTest +class ScaleControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/StreetViewControlFunctionalTest.php b/tests/Helper/Functional/Control/StreetViewControlFunctionalTest.php index c0232239..8cafb6e0 100644 --- a/tests/Helper/Functional/Control/StreetViewControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/StreetViewControlFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Control\ControlPosition; use Ivory\GoogleMap\Control\StreetViewControl; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class StreetViewControlFunctionalTest extends AbstractMapFunctionalTest +class StreetViewControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Control/ZoomControlFunctionalTest.php b/tests/Helper/Functional/Control/ZoomControlFunctionalTest.php index 54b91d28..35f26899 100644 --- a/tests/Helper/Functional/Control/ZoomControlFunctionalTest.php +++ b/tests/Helper/Functional/Control/ZoomControlFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Control\ZoomControl; use Ivory\GoogleMap\Control\ZoomControlStyle; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class ZoomControlFunctionalTest extends AbstractMapFunctionalTest +class ZoomControlFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Event/AbstractDomEventFunctionalTest.php b/tests/Helper/Functional/Event/AbstractDomEventFunctional.php similarity index 93% rename from tests/Helper/Functional/Event/AbstractDomEventFunctionalTest.php rename to tests/Helper/Functional/Event/AbstractDomEventFunctional.php index 7235074f..51f2af89 100644 --- a/tests/Helper/Functional/Event/AbstractDomEventFunctionalTest.php +++ b/tests/Helper/Functional/Event/AbstractDomEventFunctional.php @@ -16,7 +16,7 @@ /** * @author GeLo */ -abstract class AbstractDomEventFunctionalTest extends AbstractEventFunctionalTest +abstract class AbstractDomEventFunctional extends AbstractEventFunctional { /** * @var string diff --git a/tests/Helper/Functional/Event/AbstractEventFunctionalTest.php b/tests/Helper/Functional/Event/AbstractEventFunctional.php similarity index 93% rename from tests/Helper/Functional/Event/AbstractEventFunctionalTest.php rename to tests/Helper/Functional/Event/AbstractEventFunctional.php index f58667eb..63164aa5 100644 --- a/tests/Helper/Functional/Event/AbstractEventFunctionalTest.php +++ b/tests/Helper/Functional/Event/AbstractEventFunctional.php @@ -13,12 +13,12 @@ use Ivory\GoogleMap\Event\Event; use Ivory\GoogleMap\Event\MouseEvent; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo */ -abstract class AbstractEventFunctionalTest extends AbstractMapFunctionalTest +abstract class AbstractEventFunctional extends AbstractMapFunctional { /** * @var string diff --git a/tests/Helper/Functional/Event/DomEventFunctionalTest.php b/tests/Helper/Functional/Event/DomEventFunctionalTest.php index 571279d9..71208eda 100644 --- a/tests/Helper/Functional/Event/DomEventFunctionalTest.php +++ b/tests/Helper/Functional/Event/DomEventFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class DomEventFunctionalTest extends AbstractDomEventFunctionalTest +class DomEventFunctionalTest extends AbstractDomEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Event/DomEventOnceFunctionalTest.php b/tests/Helper/Functional/Event/DomEventOnceFunctionalTest.php index 17b667d6..62390f4e 100644 --- a/tests/Helper/Functional/Event/DomEventOnceFunctionalTest.php +++ b/tests/Helper/Functional/Event/DomEventOnceFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class DomEventOnceFunctionalTest extends AbstractDomEventFunctionalTest +class DomEventOnceFunctionalTest extends AbstractDomEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Event/EventFunctionalTest.php b/tests/Helper/Functional/Event/EventFunctionalTest.php index 2ef354b5..5bd2891f 100644 --- a/tests/Helper/Functional/Event/EventFunctionalTest.php +++ b/tests/Helper/Functional/Event/EventFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class EventFunctionalTest extends AbstractEventFunctionalTest +class EventFunctionalTest extends AbstractEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Event/EventOnceFunctionalTest.php b/tests/Helper/Functional/Event/EventOnceFunctionalTest.php index 1946905f..0a2ea1a5 100644 --- a/tests/Helper/Functional/Event/EventOnceFunctionalTest.php +++ b/tests/Helper/Functional/Event/EventOnceFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class EventOnceFunctionalTest extends AbstractEventFunctionalTest +class EventOnceFunctionalTest extends AbstractEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Layer/GeoJsonLayerFunctionalTest.php b/tests/Helper/Functional/Layer/GeoJsonLayerFunctionalTest.php index 4f94f864..81fc0c4e 100644 --- a/tests/Helper/Functional/Layer/GeoJsonLayerFunctionalTest.php +++ b/tests/Helper/Functional/Layer/GeoJsonLayerFunctionalTest.php @@ -13,14 +13,14 @@ use Ivory\GoogleMap\Layer\GeoJsonLayer; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class GeoJsonLayerFunctionalTest extends AbstractMapFunctionalTest +class GeoJsonLayerFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Layer/HeatmapLayerFunctionalTest.php b/tests/Helper/Functional/Layer/HeatmapLayerFunctionalTest.php index 1b5e47e6..38a63518 100644 --- a/tests/Helper/Functional/Layer/HeatmapLayerFunctionalTest.php +++ b/tests/Helper/Functional/Layer/HeatmapLayerFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Base\Coordinate; use Ivory\GoogleMap\Layer\HeatmapLayer; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class HeatmapLayerFunctionalTest extends AbstractMapFunctionalTest +class HeatmapLayerFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Layer/KmlLayerFunctionalTest.php b/tests/Helper/Functional/Layer/KmlLayerFunctionalTest.php index ddf7ec6e..b13c002a 100644 --- a/tests/Helper/Functional/Layer/KmlLayerFunctionalTest.php +++ b/tests/Helper/Functional/Layer/KmlLayerFunctionalTest.php @@ -13,14 +13,14 @@ use Ivory\GoogleMap\Layer\KmlLayer; use Ivory\GoogleMap\Map; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class KmlLayerFunctionalTest extends AbstractMapFunctionalTest +class KmlLayerFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/MapFunctionalTest.php b/tests/Helper/Functional/MapFunctionalTest.php index 8b29a758..1c9cbe6b 100644 --- a/tests/Helper/Functional/MapFunctionalTest.php +++ b/tests/Helper/Functional/MapFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class MapFunctionalTest extends AbstractMapFunctionalTest +class MapFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctionalTest.php b/tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctional.php similarity index 93% rename from tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctionalTest.php rename to tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctional.php index ba2ba652..0bb4a68f 100644 --- a/tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/AbstractMarkerInfoWindowFunctional.php @@ -15,12 +15,12 @@ use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\InfoWindow; use Ivory\GoogleMap\Overlay\Marker; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo */ -abstract class AbstractMarkerInfoWindowFunctionalTest extends AbstractMapFunctionalTest +abstract class AbstractMarkerInfoWindowFunctional extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/CircleFunctionalTest.php b/tests/Helper/Functional/Overlay/CircleFunctionalTest.php index 4ebd6305..ac660338 100644 --- a/tests/Helper/Functional/Overlay/CircleFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/CircleFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Base\Coordinate; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\Circle; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class CircleFunctionalTest extends AbstractMapFunctionalTest +class CircleFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/EncodedPolylineFunctionalTest.php b/tests/Helper/Functional/Overlay/EncodedPolylineFunctionalTest.php index c6194724..6a328387 100644 --- a/tests/Helper/Functional/Overlay/EncodedPolylineFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/EncodedPolylineFunctionalTest.php @@ -13,14 +13,14 @@ use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\EncodedPolyline; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class EncodedPolylineFunctionalTest extends AbstractMapFunctionalTest +class EncodedPolylineFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/GroundOverlayFunctionalTest.php b/tests/Helper/Functional/Overlay/GroundOverlayFunctionalTest.php index e34fcfd3..76c7690e 100644 --- a/tests/Helper/Functional/Overlay/GroundOverlayFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/GroundOverlayFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Base\Coordinate; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\GroundOverlay; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class GroundOverlayFunctionalTest extends AbstractMapFunctionalTest +class GroundOverlayFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/InfoBoxFunctionalTest.php b/tests/Helper/Functional/Overlay/InfoBoxFunctionalTest.php index 0145c98c..85140df8 100644 --- a/tests/Helper/Functional/Overlay/InfoBoxFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/InfoBoxFunctionalTest.php @@ -16,14 +16,14 @@ use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\InfoWindow; use Ivory\GoogleMap\Overlay\InfoWindowType; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class InfoBoxFunctionalTest extends AbstractMapFunctionalTest +class InfoBoxFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/InfoWindowFunctionalTest.php b/tests/Helper/Functional/Overlay/InfoWindowFunctionalTest.php index d2eec397..03253ab0 100644 --- a/tests/Helper/Functional/Overlay/InfoWindowFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/InfoWindowFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Base\Size; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\InfoWindow; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class InfoWindowFunctionalTest extends AbstractMapFunctionalTest +class InfoWindowFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/MarkerClustererFunctionalTest.php b/tests/Helper/Functional/Overlay/MarkerClustererFunctionalTest.php index 1abd290f..6f22cdde 100644 --- a/tests/Helper/Functional/Overlay/MarkerClustererFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/MarkerClustererFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\Marker; use Ivory\GoogleMap\Overlay\MarkerClusterType; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class MarkerClustererFunctionalTest extends AbstractMapFunctionalTest +class MarkerClustererFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/MarkerFunctionalTest.php b/tests/Helper/Functional/Overlay/MarkerFunctionalTest.php index b90b58bd..8364f2a0 100644 --- a/tests/Helper/Functional/Overlay/MarkerFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/MarkerFunctionalTest.php @@ -20,14 +20,14 @@ use Ivory\GoogleMap\Overlay\MarkerShapeType; use Ivory\GoogleMap\Overlay\Symbol; use Ivory\GoogleMap\Overlay\SymbolPath; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class MarkerFunctionalTest extends AbstractMapFunctionalTest +class MarkerFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/MarkerInfoBoxFunctionalTest.php b/tests/Helper/Functional/Overlay/MarkerInfoBoxFunctionalTest.php index dcdf5e51..422a13ff 100644 --- a/tests/Helper/Functional/Overlay/MarkerInfoBoxFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/MarkerInfoBoxFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class MarkerInfoBoxFunctionalTest extends AbstractMarkerInfoWindowFunctionalTest +class MarkerInfoBoxFunctionalTest extends AbstractMarkerInfoWindowFunctional { /** * {@inheritdoc} diff --git a/tests/Helper/Functional/Overlay/MarkerInfoWindowFunctionalTest.php b/tests/Helper/Functional/Overlay/MarkerInfoWindowFunctionalTest.php index 7c30f932..8c032ad1 100644 --- a/tests/Helper/Functional/Overlay/MarkerInfoWindowFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/MarkerInfoWindowFunctionalTest.php @@ -16,6 +16,6 @@ * * @group functional */ -class MarkerInfoWindowFunctionalTest extends AbstractMarkerInfoWindowFunctionalTest +class MarkerInfoWindowFunctionalTest extends AbstractMarkerInfoWindowFunctional { } diff --git a/tests/Helper/Functional/Overlay/MixedInfoWindowFunctionalTest.php b/tests/Helper/Functional/Overlay/MixedInfoWindowFunctionalTest.php index aef32a73..fd533f91 100644 --- a/tests/Helper/Functional/Overlay/MixedInfoWindowFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/MixedInfoWindowFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\InfoWindow; use Ivory\GoogleMap\Overlay\InfoWindowType; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class MixedInfoWindowFunctionalTest extends AbstractMapFunctionalTest +class MixedInfoWindowFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/PolygonFunctionalTest.php b/tests/Helper/Functional/Overlay/PolygonFunctionalTest.php index 9fcbee78..0eb1bb84 100644 --- a/tests/Helper/Functional/Overlay/PolygonFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/PolygonFunctionalTest.php @@ -14,14 +14,14 @@ use Ivory\GoogleMap\Base\Coordinate; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\Polygon; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class PolygonFunctionalTest extends AbstractMapFunctionalTest +class PolygonFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/PolylineFunctionalTest.php b/tests/Helper/Functional/Overlay/PolylineFunctionalTest.php index 24d37473..a5ee2ba2 100644 --- a/tests/Helper/Functional/Overlay/PolylineFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/PolylineFunctionalTest.php @@ -17,14 +17,14 @@ use Ivory\GoogleMap\Overlay\Polyline; use Ivory\GoogleMap\Overlay\Symbol; use Ivory\GoogleMap\Overlay\SymbolPath; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class PolylineFunctionalTest extends AbstractMapFunctionalTest +class PolylineFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Overlay/RectangleFunctionalTest.php b/tests/Helper/Functional/Overlay/RectangleFunctionalTest.php index cab1a5b0..c5882795 100644 --- a/tests/Helper/Functional/Overlay/RectangleFunctionalTest.php +++ b/tests/Helper/Functional/Overlay/RectangleFunctionalTest.php @@ -15,14 +15,14 @@ use Ivory\GoogleMap\Base\Coordinate; use Ivory\GoogleMap\Map; use Ivory\GoogleMap\Overlay\Rectangle; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractMapFunctional; /** * @author GeLo * * @group functional */ -class RectangleFunctionalTest extends AbstractMapFunctionalTest +class RectangleFunctionalTest extends AbstractMapFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Place/AbstractAutocompleteFunctionalTest.php b/tests/Helper/Functional/Place/AbstractAutocompleteFunctional.php similarity index 97% rename from tests/Helper/Functional/Place/AbstractAutocompleteFunctionalTest.php rename to tests/Helper/Functional/Place/AbstractAutocompleteFunctional.php index fe186224..4a31635d 100644 --- a/tests/Helper/Functional/Place/AbstractAutocompleteFunctionalTest.php +++ b/tests/Helper/Functional/Place/AbstractAutocompleteFunctional.php @@ -14,12 +14,12 @@ use Ivory\GoogleMap\Helper\Builder\PlaceAutocompleteHelperBuilder; use Ivory\GoogleMap\Helper\PlaceAutocompleteHelper; use Ivory\GoogleMap\Place\Autocomplete; -use Ivory\Tests\GoogleMap\Helper\Functional\AbstractApiFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\AbstractApiFunctional; /** * @author GeLo */ -abstract class AbstractAutocompleteFunctionalTest extends AbstractApiFunctionalTest +abstract class AbstractAutocompleteFunctional extends AbstractApiFunctional { /** * @var PlaceAutocompleteHelper diff --git a/tests/Helper/Functional/Place/AutocompleteFunctionalTest.php b/tests/Helper/Functional/Place/AutocompleteFunctionalTest.php index 7f5ca15b..27410baa 100644 --- a/tests/Helper/Functional/Place/AutocompleteFunctionalTest.php +++ b/tests/Helper/Functional/Place/AutocompleteFunctionalTest.php @@ -22,7 +22,7 @@ * * @group functional */ -class AutocompleteFunctionalTest extends AbstractAutocompleteFunctionalTest +class AutocompleteFunctionalTest extends AbstractAutocompleteFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Place/Event/AbstractDomEventFunctionalTest.php b/tests/Helper/Functional/Place/Event/AbstractDomEventFunctional.php similarity index 93% rename from tests/Helper/Functional/Place/Event/AbstractDomEventFunctionalTest.php rename to tests/Helper/Functional/Place/Event/AbstractDomEventFunctional.php index 1c67bcb3..c3ceba98 100644 --- a/tests/Helper/Functional/Place/Event/AbstractDomEventFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AbstractDomEventFunctional.php @@ -17,7 +17,7 @@ /** * @author GeLo */ -abstract class AbstractDomEventFunctionalTest extends AbstractEventFunctionalTest +abstract class AbstractDomEventFunctional extends AbstractEventFunctional { /** * @var string diff --git a/tests/Helper/Functional/Place/Event/AbstractEventFunctionalTest.php b/tests/Helper/Functional/Place/Event/AbstractEventFunctional.php similarity index 93% rename from tests/Helper/Functional/Place/Event/AbstractEventFunctionalTest.php rename to tests/Helper/Functional/Place/Event/AbstractEventFunctional.php index 0804646f..fdd6ffc6 100644 --- a/tests/Helper/Functional/Place/Event/AbstractEventFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AbstractEventFunctional.php @@ -12,12 +12,12 @@ namespace Ivory\Tests\GoogleMap\Helper\Functional\Place\Event; use Ivory\GoogleMap\Event\Event; -use Ivory\Tests\GoogleMap\Helper\Functional\Place\AbstractAutocompleteFunctionalTest; +use Ivory\Tests\GoogleMap\Helper\Functional\Place\AbstractAutocompleteFunctional; /** * @author GeLo */ -abstract class AbstractEventFunctionalTest extends AbstractAutocompleteFunctionalTest +abstract class AbstractEventFunctional extends AbstractAutocompleteFunctional { /** * @var string diff --git a/tests/Helper/Functional/Place/Event/AutocompleteDomEventFunctionalTest.php b/tests/Helper/Functional/Place/Event/AutocompleteDomEventFunctionalTest.php index 2d25d127..225ef1e1 100644 --- a/tests/Helper/Functional/Place/Event/AutocompleteDomEventFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AutocompleteDomEventFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class AutocompleteDomEventFunctionalTest extends AbstractDomEventFunctionalTest +class AutocompleteDomEventFunctionalTest extends AbstractDomEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Place/Event/AutocompleteDomEventOnceFunctionalTest.php b/tests/Helper/Functional/Place/Event/AutocompleteDomEventOnceFunctionalTest.php index aaed33f6..7cf4a548 100644 --- a/tests/Helper/Functional/Place/Event/AutocompleteDomEventOnceFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AutocompleteDomEventOnceFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class AutocompleteDomEventOnceFunctionalTest extends AbstractDomEventFunctionalTest +class AutocompleteDomEventOnceFunctionalTest extends AbstractDomEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Place/Event/AutocompleteEventFunctionalTest.php b/tests/Helper/Functional/Place/Event/AutocompleteEventFunctionalTest.php index ab48b6e0..381b4dba 100644 --- a/tests/Helper/Functional/Place/Event/AutocompleteEventFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AutocompleteEventFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class AutocompleteEventFunctionalTest extends AbstractEventFunctionalTest +class AutocompleteEventFunctionalTest extends AbstractEventFunctional { public function testRender() { diff --git a/tests/Helper/Functional/Place/Event/AutocompleteEventOnceFunctionalTest.php b/tests/Helper/Functional/Place/Event/AutocompleteEventOnceFunctionalTest.php index ab39ec79..d90fcce7 100644 --- a/tests/Helper/Functional/Place/Event/AutocompleteEventOnceFunctionalTest.php +++ b/tests/Helper/Functional/Place/Event/AutocompleteEventOnceFunctionalTest.php @@ -18,7 +18,7 @@ * * @group functional */ -class AutocompleteEventOnceFunctionalTest extends AbstractEventFunctionalTest +class AutocompleteEventOnceFunctionalTest extends AbstractEventFunctional { public function testRender() { diff --git a/tests/Service/AbstractFunctionalServiceTest.php b/tests/Service/AbstractFunctionalService.php similarity index 97% rename from tests/Service/AbstractFunctionalServiceTest.php rename to tests/Service/AbstractFunctionalService.php index f9900722..805876a2 100644 --- a/tests/Service/AbstractFunctionalServiceTest.php +++ b/tests/Service/AbstractFunctionalService.php @@ -29,7 +29,7 @@ /** * @author GeLo */ -abstract class AbstractFunctionalServiceTest extends TestCase +abstract class AbstractFunctionalService extends TestCase { /** * @var Journal diff --git a/tests/Service/AbstractSerializableServiceTest.php b/tests/Service/AbstractSerializableService.php similarity index 98% rename from tests/Service/AbstractSerializableServiceTest.php rename to tests/Service/AbstractSerializableService.php index 9c42c6b8..7be8c857 100644 --- a/tests/Service/AbstractSerializableServiceTest.php +++ b/tests/Service/AbstractSerializableService.php @@ -23,7 +23,7 @@ /** * @author GeLo */ -abstract class AbstractSerializableServiceTest extends AbstractFunctionalServiceTest +abstract class AbstractSerializableService extends AbstractFunctionalService { /** * @param AddressComponent $addressComponent diff --git a/tests/Service/AbstractUnitServiceTest.php b/tests/Service/AbstractUnitService.php similarity index 97% rename from tests/Service/AbstractUnitServiceTest.php rename to tests/Service/AbstractUnitService.php index 5c8d440e..bc239f1e 100644 --- a/tests/Service/AbstractUnitServiceTest.php +++ b/tests/Service/AbstractUnitService.php @@ -24,7 +24,7 @@ /** * @author GeLo */ -abstract class AbstractUnitServiceTest extends TestCase +abstract class AbstractUnitService extends TestCase { /** * @var HttpClient|MockObject diff --git a/tests/Service/Direction/DirectionServiceTest.php b/tests/Service/Direction/DirectionServiceTest.php index 464933fd..7c051f69 100644 --- a/tests/Service/Direction/DirectionServiceTest.php +++ b/tests/Service/Direction/DirectionServiceTest.php @@ -36,12 +36,12 @@ use Ivory\GoogleMap\Service\Direction\Response\Transit\DirectionTransitLine; use Ivory\GoogleMap\Service\Direction\Response\Transit\DirectionTransitStop; use Ivory\GoogleMap\Service\Direction\Response\Transit\DirectionTransitVehicle; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -class DirectionServiceTest extends AbstractSerializableServiceTest +class DirectionServiceTest extends AbstractSerializableService { protected ?DirectionService $service = null; diff --git a/tests/Service/DistanceMatrix/DistanceMatrixServiceTest.php b/tests/Service/DistanceMatrix/DistanceMatrixServiceTest.php index 6721dd58..13efe0bc 100644 --- a/tests/Service/DistanceMatrix/DistanceMatrixServiceTest.php +++ b/tests/Service/DistanceMatrix/DistanceMatrixServiceTest.php @@ -26,12 +26,12 @@ use Ivory\GoogleMap\Service\DistanceMatrix\Response\DistanceMatrixResponse; use Ivory\GoogleMap\Service\DistanceMatrix\Response\DistanceMatrixRow; use Ivory\GoogleMap\Service\DistanceMatrix\Response\DistanceMatrixStatus; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -class DistanceMatrixServiceTest extends AbstractSerializableServiceTest +class DistanceMatrixServiceTest extends AbstractSerializableService { /** * @var DistanceMatrixService diff --git a/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php b/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php index 37e930df..bed316f2 100644 --- a/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php +++ b/tests/Service/DistanceMatrix/DistanceMatrixServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\DistanceMatrix\DistanceMatrixService; use Ivory\GoogleMap\Service\DistanceMatrix\Request\DistanceMatrixRequestInterface; use Ivory\GoogleMap\Service\DistanceMatrix\Response\DistanceMatrixResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class DistanceMatrixServiceUnitTest extends AbstractUnitServiceTest +class DistanceMatrixServiceUnitTest extends AbstractUnitService { /** * @var DistanceMatrixService diff --git a/tests/Service/Elevation/ElevationServiceTest.php b/tests/Service/Elevation/ElevationServiceTest.php index ba39544e..855d1bb3 100644 --- a/tests/Service/Elevation/ElevationServiceTest.php +++ b/tests/Service/Elevation/ElevationServiceTest.php @@ -22,12 +22,12 @@ use Ivory\GoogleMap\Service\Elevation\Response\ElevationResponse; use Ivory\GoogleMap\Service\Elevation\Response\ElevationResult; use Ivory\GoogleMap\Service\Elevation\Response\ElevationStatus; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -class ElevationServiceTest extends AbstractSerializableServiceTest +class ElevationServiceTest extends AbstractSerializableService { /** * @var ElevationService diff --git a/tests/Service/Elevation/ElevationServiceUnitTest.php b/tests/Service/Elevation/ElevationServiceUnitTest.php index d989caf8..9eae314a 100644 --- a/tests/Service/Elevation/ElevationServiceUnitTest.php +++ b/tests/Service/Elevation/ElevationServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\Elevation\ElevationService; use Ivory\GoogleMap\Service\Elevation\Request\ElevationRequestInterface; use Ivory\GoogleMap\Service\Elevation\Response\ElevationResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class ElevationServiceUnitTest extends AbstractUnitServiceTest +class ElevationServiceUnitTest extends AbstractUnitService { /** * @var ElevationService diff --git a/tests/Service/Geocoder/GeocoderServiceTest.php b/tests/Service/Geocoder/GeocoderServiceTest.php index bfee08af..f100926a 100644 --- a/tests/Service/Geocoder/GeocoderServiceTest.php +++ b/tests/Service/Geocoder/GeocoderServiceTest.php @@ -22,12 +22,12 @@ use Ivory\GoogleMap\Service\Geocoder\Response\GeocoderResponse; use Ivory\GoogleMap\Service\Geocoder\Response\GeocoderResult; use Ivory\GoogleMap\Service\Geocoder\Response\GeocoderStatus; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -class GeocoderServiceTest extends AbstractSerializableServiceTest +class GeocoderServiceTest extends AbstractSerializableService { /** * @var GeocoderService diff --git a/tests/Service/Geocoder/GeocoderServiceUnitTest.php b/tests/Service/Geocoder/GeocoderServiceUnitTest.php index 124b2892..a4991087 100644 --- a/tests/Service/Geocoder/GeocoderServiceUnitTest.php +++ b/tests/Service/Geocoder/GeocoderServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\Geocoder\GeocoderService; use Ivory\GoogleMap\Service\Geocoder\Request\AbstractGeocoderRequest; use Ivory\GoogleMap\Service\Geocoder\Response\GeocoderResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class GeocoderServiceUnitTest extends AbstractUnitServiceTest +class GeocoderServiceUnitTest extends AbstractUnitService { /** * @var GeocoderService diff --git a/tests/Service/Place/AbstractPlaceSerializableServiceTest.php b/tests/Service/Place/AbstractPlaceSerializableService.php similarity index 98% rename from tests/Service/Place/AbstractPlaceSerializableServiceTest.php rename to tests/Service/Place/AbstractPlaceSerializableService.php index 2243610d..dbbaaf8e 100644 --- a/tests/Service/Place/AbstractPlaceSerializableServiceTest.php +++ b/tests/Service/Place/AbstractPlaceSerializableService.php @@ -19,12 +19,12 @@ use Ivory\GoogleMap\Service\Place\Base\Photo; use Ivory\GoogleMap\Service\Place\Base\Place; use Ivory\GoogleMap\Service\Place\Base\Review; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -abstract class AbstractPlaceSerializableServiceTest extends AbstractSerializableServiceTest +abstract class AbstractPlaceSerializableService extends AbstractSerializableService { /** * @param Place $place diff --git a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceTest.php b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceTest.php index bbf2c3ca..44beb55a 100644 --- a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceTest.php +++ b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceTest.php @@ -24,12 +24,12 @@ use Ivory\GoogleMap\Service\Place\Autocomplete\Response\PlaceAutocompleteResponse; use Ivory\GoogleMap\Service\Place\Autocomplete\Response\PlaceAutocompleteStatus; use Ivory\GoogleMap\Service\Place\Autocomplete\Response\PlaceAutocompleteTerm; -use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableService; /** * @author GeLo */ -class PlaceAutocompleteServiceTest extends AbstractPlaceSerializableServiceTest +class PlaceAutocompleteServiceTest extends AbstractPlaceSerializableService { /** * @var PlaceAutocompleteService diff --git a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php index a6e3f52b..8e704dfd 100644 --- a/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php +++ b/tests/Service/Place/Autocomplete/PlaceAutocompleteServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\Place\Autocomplete\PlaceAutocompleteService; use Ivory\GoogleMap\Service\Place\Autocomplete\Request\PlaceAutocompleteRequestInterface; use Ivory\GoogleMap\Service\Place\Autocomplete\Response\PlaceAutocompleteResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class PlaceAutocompleteServiceUnitTest extends AbstractUnitServiceTest +class PlaceAutocompleteServiceUnitTest extends AbstractUnitService { /** * @var PlaceAutocompleteService diff --git a/tests/Service/Place/Detail/PlaceDetailServiceTest.php b/tests/Service/Place/Detail/PlaceDetailServiceTest.php index 54486ac8..8b26ef23 100644 --- a/tests/Service/Place/Detail/PlaceDetailServiceTest.php +++ b/tests/Service/Place/Detail/PlaceDetailServiceTest.php @@ -17,12 +17,12 @@ use Ivory\GoogleMap\Service\Place\Detail\Request\PlaceDetailRequestInterface; use Ivory\GoogleMap\Service\Place\Detail\Response\PlaceDetailResponse; use Ivory\GoogleMap\Service\Place\Detail\Response\PlaceDetailStatus; -use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableService; /** * @author GeLo */ -class PlaceDetailServiceTest extends AbstractPlaceSerializableServiceTest +class PlaceDetailServiceTest extends AbstractPlaceSerializableService { /** * @var PlaceDetailService diff --git a/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php b/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php index e6d3cd01..ab0d21ed 100644 --- a/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php +++ b/tests/Service/Place/Detail/PlaceDetailServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\Place\Detail\PlaceDetailService; use Ivory\GoogleMap\Service\Place\Detail\Request\PlaceDetailRequestInterface; use Ivory\GoogleMap\Service\Place\Detail\Response\PlaceDetailResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class PlaceDetailServiceUnitTest extends AbstractUnitServiceTest +class PlaceDetailServiceUnitTest extends AbstractUnitService { /** * @var PlaceDetailService diff --git a/tests/Service/Place/Search/PlaceSearchServiceTest.php b/tests/Service/Place/Search/PlaceSearchServiceTest.php index 51359a5b..f4591b9f 100644 --- a/tests/Service/Place/Search/PlaceSearchServiceTest.php +++ b/tests/Service/Place/Search/PlaceSearchServiceTest.php @@ -24,12 +24,12 @@ use Ivory\GoogleMap\Service\Place\Search\Response\PlaceSearchResponse; use Ivory\GoogleMap\Service\Place\Search\Response\PlaceSearchResponseIterator; use Ivory\GoogleMap\Service\Place\Search\Response\PlaceSearchStatus; -use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\Place\AbstractPlaceSerializableService; /** * @author GeLo */ -class PlaceSearchServiceTest extends AbstractPlaceSerializableServiceTest +class PlaceSearchServiceTest extends AbstractPlaceSerializableService { /** * @var PlaceSearchService diff --git a/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php b/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php index 0ef359ea..97cf13fa 100644 --- a/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php +++ b/tests/Service/Place/Search/PlaceSearchServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\Place\Search\PlaceSearchService; use Ivory\GoogleMap\Service\Place\Search\Request\PlaceSearchRequestInterface; use Ivory\GoogleMap\Service\Place\Search\Response\PlaceSearchResponse; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class PlaceSearchServiceUnitTest extends AbstractUnitServiceTest +class PlaceSearchServiceUnitTest extends AbstractUnitService { /** * @var PlaceSearchService diff --git a/tests/Service/TimeZone/TimeZoneServiceApiKeyTest.php b/tests/Service/TimeZone/TimeZoneServiceApiKeyTest.php index 4a1422a2..90ed2938 100644 --- a/tests/Service/TimeZone/TimeZoneServiceApiKeyTest.php +++ b/tests/Service/TimeZone/TimeZoneServiceApiKeyTest.php @@ -18,12 +18,12 @@ use Ivory\GoogleMap\Service\TimeZone\Response\TimeZoneResponse; use Ivory\GoogleMap\Service\TimeZone\Response\TimeZoneStatus; use Ivory\GoogleMap\Service\TimeZone\TimeZoneService; -use Ivory\Tests\GoogleMap\Service\AbstractSerializableServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractSerializableService; /** * @author GeLo */ -class TimeZoneServiceApiKeyTest extends AbstractSerializableServiceTest +class TimeZoneServiceApiKeyTest extends AbstractSerializableService { /** * @var TimeZoneService diff --git a/tests/Service/TimeZone/TimeZoneServiceUnitTest.php b/tests/Service/TimeZone/TimeZoneServiceUnitTest.php index 88270dee..2bb91384 100644 --- a/tests/Service/TimeZone/TimeZoneServiceUnitTest.php +++ b/tests/Service/TimeZone/TimeZoneServiceUnitTest.php @@ -14,13 +14,13 @@ use Ivory\GoogleMap\Service\TimeZone\Request\TimeZoneRequest; use Ivory\GoogleMap\Service\TimeZone\Response\TimeZoneResponse; use Ivory\GoogleMap\Service\TimeZone\TimeZoneService; -use Ivory\Tests\GoogleMap\Service\AbstractUnitServiceTest; +use Ivory\Tests\GoogleMap\Service\AbstractUnitService; use PHPUnit\Framework\MockObject\MockObject; /** * @author GeLo */ -class TimeZoneServiceUnitTest extends AbstractUnitServiceTest +class TimeZoneServiceUnitTest extends AbstractUnitService { /** * @var TimeZoneService