From 1492a998d6c21e1780f4d387d22c0b12a519609b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gamez?= Date: Mon, 19 Aug 2024 18:20:56 +0200 Subject: [PATCH] Import names --- rector.php | 1 + src/Firebase/Contract/AppCheck.php | 9 ++++++--- src/Firebase/Factory.php | 3 ++- tests/Integration/Database/ReferenceTest.php | 3 ++- tests/Integration/MessagingTest.php | 3 ++- tests/Unit/AppCheck/AppCheckTokenOptionsTest.php | 5 +++-- .../ActionCodeSettings/ValidatedActionSettingsTest.php | 3 ++- tests/Unit/Auth/SignInResultTest.php | 3 ++- tests/Unit/Database/Query/Filter/EndAtTest.php | 3 ++- tests/Unit/Database/Query/Filter/EndBeforeTest.php | 3 ++- tests/Unit/Database/Query/Filter/EqualToTest.php | 3 ++- tests/Unit/Database/Query/Filter/StartAfterTest.php | 3 ++- tests/Unit/Database/Query/Filter/StartAtTest.php | 3 ++- tests/Unit/Database/Query/Sorter/OrderByChildTest.php | 3 ++- tests/Unit/Database/Query/Sorter/OrderByKeyTest.php | 3 ++- tests/Unit/Database/Query/Sorter/OrderByValueTest.php | 3 ++- tests/Unit/Database/Reference/ValidatorTest.php | 3 ++- tests/Unit/Database/UrlBuilderTest.php | 7 ++++--- .../Unit/Exception/AppCheckApiExceptionConverterTest.php | 3 ++- tests/Unit/Exception/AuthApiExceptionConverterTest.php | 3 ++- .../Exception/MessagingApiExceptionConverterTest.php | 3 ++- tests/Unit/Messaging/AndroidConfigTest.php | 7 ++++--- tests/Unit/Messaging/ApnsConfigTest.php | 3 ++- tests/Unit/Messaging/CloudMessageTest.php | 3 ++- tests/Unit/Messaging/ConditionTest.php | 5 +++-- tests/Unit/Messaging/MessageDataTest.php | 5 +++-- tests/Unit/Messaging/NotificationTest.php | 3 ++- tests/Unit/Messaging/RegistrationTokenTest.php | 3 ++- tests/Unit/Messaging/RegistrationTokensTest.php | 5 +++-- tests/Unit/Messaging/TopicTest.php | 5 +++-- tests/Unit/Messaging/WebPushConfigTest.php | 5 +++-- tests/Unit/Request/CreateUserTest.php | 3 ++- tests/Unit/Request/UpdateUserTest.php | 3 ++- tests/Unit/Util/DTTest.php | 7 ++++--- tests/Unit/Value/ClearTextPasswordTest.php | 5 +++-- tests/Unit/Value/EmailTest.php | 5 +++-- tests/Unit/Value/UidTest.php | 5 +++-- tests/Unit/Value/UrlTest.php | 5 +++-- tests/bootstrap.php | 4 +++- 39 files changed, 98 insertions(+), 56 deletions(-) diff --git a/rector.php b/rector.php index 5415fdf6..029f20f8 100644 --- a/rector.php +++ b/rector.php @@ -19,4 +19,5 @@ phpunitCodeQuality: true, phpunit: true, ) + ->withImportNames(removeUnusedImports: true) ; diff --git a/src/Firebase/Contract/AppCheck.php b/src/Firebase/Contract/AppCheck.php index c28e939a..d6f4a929 100644 --- a/src/Firebase/Contract/AppCheck.php +++ b/src/Firebase/Contract/AppCheck.php @@ -8,6 +8,9 @@ use Kreait\Firebase\AppCheck\AppCheckTokenOptions; use Kreait\Firebase\AppCheck\VerifyAppCheckTokenResponse; use Kreait\Firebase\Exception; +use Kreait\Firebase\Exception\AppCheck\FailedToVerifyAppCheckToken; +use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckToken; +use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckTokenOptions; /** * @phpstan-import-type AppCheckTokenOptionsShape from AppCheckTokenOptions @@ -18,7 +21,7 @@ interface AppCheck * @param non-empty-string $appId * @param AppCheckTokenOptions|AppCheckTokenOptionsShape|null $options * - * @throws Exception\AppCheck\InvalidAppCheckTokenOptions + * @throws InvalidAppCheckTokenOptions * @throws Exception\AppCheckException * @throws Exception\FirebaseException */ @@ -27,8 +30,8 @@ public function createToken(string $appId, $options = null): AppCheckToken; /** * @param non-empty-string $appCheckToken * - * @throws Exception\AppCheck\InvalidAppCheckToken - * @throws Exception\AppCheck\FailedToVerifyAppCheckToken + * @throws InvalidAppCheckToken + * @throws FailedToVerifyAppCheckToken * @throws Exception\AppCheckException * @throws Exception\FirebaseException */ diff --git a/src/Firebase/Factory.php b/src/Firebase/Factory.php index eeea2021..38d13b44 100644 --- a/src/Firebase/Factory.php +++ b/src/Firebase/Factory.php @@ -38,6 +38,7 @@ use Kreait\Firebase\JWT\IdTokenVerifier; use Kreait\Firebase\JWT\SessionCookieVerifier; use Kreait\Firebase\Messaging\AppInstanceApiClient; +use Kreait\Firebase\Messaging\RequestFactory; use Psr\Cache\CacheItemPoolInterface; use Psr\Clock\ClockInterface; use Psr\Http\Message\UriInterface; @@ -406,7 +407,7 @@ public function createMessaging(): Contract\Messaging $projectId = $this->getProjectId(); $errorHandler = new MessagingApiExceptionConverter($this->clock); - $requestFactory = new Messaging\RequestFactory( + $requestFactory = new RequestFactory( requestFactory: $this->httpFactory, streamFactory: $this->httpFactory, ); diff --git a/tests/Integration/Database/ReferenceTest.php b/tests/Integration/Database/ReferenceTest.php index 9e20bc4e..0e32b8f0 100644 --- a/tests/Integration/Database/ReferenceTest.php +++ b/tests/Integration/Database/ReferenceTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Integration\Database; +use Iterator; use Kreait\Firebase\Contract\Database; use Kreait\Firebase\Database\Reference; use Kreait\Firebase\Tests\Integration\DatabaseTestCase; @@ -150,7 +151,7 @@ public function setServerTimestamp(): void $this->assertIsInt($value['updatedAt']); } - public static function validValues(): \Iterator + public static function validValues(): Iterator { yield 'string' => ['string', 'value']; yield 'int' => ['int', 1]; diff --git a/tests/Integration/MessagingTest.php b/tests/Integration/MessagingTest.php index 162c1e63..734ac3d3 100644 --- a/tests/Integration/MessagingTest.php +++ b/tests/Integration/MessagingTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Integration; +use Iterator; use Kreait\Firebase\Contract\Messaging; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Exception\Messaging\InvalidMessage; @@ -154,7 +155,7 @@ public function sendMessageWithReservedKeywordInMessageDataThatIsStillAccepted(s $this->addToAssertionCount(1); } - public static function reservedKeywordsThatStillAreAccepted(): \Iterator + public static function reservedKeywordsThatStillAreAccepted(): Iterator { yield 'notification' => ['notification']; } diff --git a/tests/Unit/AppCheck/AppCheckTokenOptionsTest.php b/tests/Unit/AppCheck/AppCheckTokenOptionsTest.php index 01e03ad5..0e780985 100644 --- a/tests/Unit/AppCheck/AppCheckTokenOptionsTest.php +++ b/tests/Unit/AppCheck/AppCheckTokenOptionsTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\AppCheck; +use Iterator; use Kreait\Firebase\AppCheck\AppCheckTokenOptions; use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckTokenOptions; use Kreait\Firebase\Tests\UnitTestCase; @@ -45,7 +46,7 @@ public function fromArrayWithInvalidOptions(int $ttl): void ]); } - public static function validOptions(): \Iterator + public static function validOptions(): Iterator { yield 'null' => [null]; yield 'min-boundary' => [1800]; @@ -53,7 +54,7 @@ public static function validOptions(): \Iterator yield 'max-boundary' => [60480]; } - public static function invalidOptions(): \Iterator + public static function invalidOptions(): Iterator { yield 'too-small' => [1799]; yield 'too-large' => [604801]; diff --git a/tests/Unit/Auth/ActionCodeSettings/ValidatedActionSettingsTest.php b/tests/Unit/Auth/ActionCodeSettings/ValidatedActionSettingsTest.php index c9f261f0..4eb837d1 100644 --- a/tests/Unit/Auth/ActionCodeSettings/ValidatedActionSettingsTest.php +++ b/tests/Unit/Auth/ActionCodeSettings/ValidatedActionSettingsTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Auth\ActionCodeSettings; use InvalidArgumentException; +use Iterator; use Kreait\Firebase\Auth\ActionCodeSettings\ValidatedActionCodeSettings; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -39,7 +40,7 @@ public function itCanBeEmpty(): void $this->assertEmpty(ValidatedActionCodeSettings::empty()->toArray()); } - public static function validInputs(): \Iterator + public static function validInputs(): Iterator { $continueUrl = 'https://example.com'; yield 'full' => [ diff --git a/tests/Unit/Auth/SignInResultTest.php b/tests/Unit/Auth/SignInResultTest.php index 10142576..8c4d3e2b 100644 --- a/tests/Unit/Auth/SignInResultTest.php +++ b/tests/Unit/Auth/SignInResultTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Auth; +use Iterator; use Kreait\Firebase\Auth\SignInResult; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -47,7 +48,7 @@ public function itUsesTheLocalIdWhenTheFirebaseUidIsNotPresent(): void $this->assertSame('some-id', $result->firebaseUserId()); } - public static function fullResponse(): \Iterator + public static function fullResponse(): Iterator { yield 'snake_cased' => [[ 'idToken' => 'idToken', diff --git a/tests/Unit/Database/Query/Filter/EndAtTest.php b/tests/Unit/Database/Query/Filter/EndAtTest.php index 644ce8f4..baa96de4 100644 --- a/tests/Unit/Database/Query/Filter/EndAtTest.php +++ b/tests/Unit/Database/Query/Filter/EndAtTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Filter\EndAt; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void $this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com'))); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'int' => [1, 'endAt=1']; yield 'string' => ['value', 'endAt=%22value%22']; diff --git a/tests/Unit/Database/Query/Filter/EndBeforeTest.php b/tests/Unit/Database/Query/Filter/EndBeforeTest.php index d8ce445c..6bebf27b 100644 --- a/tests/Unit/Database/Query/Filter/EndBeforeTest.php +++ b/tests/Unit/Database/Query/Filter/EndBeforeTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Filter\EndBefore; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void $this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com'))); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'int' => [1, 'endBefore=1']; yield 'string' => ['value', 'endBefore=%22value%22']; diff --git a/tests/Unit/Database/Query/Filter/EqualToTest.php b/tests/Unit/Database/Query/Filter/EqualToTest.php index 153983a9..959c2654 100644 --- a/tests/Unit/Database/Query/Filter/EqualToTest.php +++ b/tests/Unit/Database/Query/Filter/EqualToTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Filter\EqualTo; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void $this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com'))); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'int' => [1, 'equalTo=1']; yield 'string' => ['value', 'equalTo=%22value%22']; diff --git a/tests/Unit/Database/Query/Filter/StartAfterTest.php b/tests/Unit/Database/Query/Filter/StartAfterTest.php index 03c11763..319938f4 100644 --- a/tests/Unit/Database/Query/Filter/StartAfterTest.php +++ b/tests/Unit/Database/Query/Filter/StartAfterTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Filter\StartAfter; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -24,7 +25,7 @@ public function modifyUri(mixed $given, mixed $expected): void $this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com'))); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'int' => [1, 'startAfter=1']; yield 'string' => ['value', 'startAfter=%22value%22']; diff --git a/tests/Unit/Database/Query/Filter/StartAtTest.php b/tests/Unit/Database/Query/Filter/StartAtTest.php index fdf13625..84ac2ebd 100644 --- a/tests/Unit/Database/Query/Filter/StartAtTest.php +++ b/tests/Unit/Database/Query/Filter/StartAtTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Filter\StartAt; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void $this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com'))); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'int' => [1, 'startAt=1']; yield 'string' => ['value', 'startAt=%22value%22']; diff --git a/tests/Unit/Database/Query/Sorter/OrderByChildTest.php b/tests/Unit/Database/Query/Sorter/OrderByChildTest.php index acf92530..e9006cce 100644 --- a/tests/Unit/Database/Query/Sorter/OrderByChildTest.php +++ b/tests/Unit/Database/Query/Sorter/OrderByChildTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Sorter\OrderByChild; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -32,7 +33,7 @@ public function orderByChild(string $childKey, mixed $expected, mixed $given): v $this->assertSame($expected, $sut->modifyValue($given)); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'scalar' => [ 'childKey' => 'key', diff --git a/tests/Unit/Database/Query/Sorter/OrderByKeyTest.php b/tests/Unit/Database/Query/Sorter/OrderByKeyTest.php index 042b2757..d38f500c 100644 --- a/tests/Unit/Database/Query/Sorter/OrderByKeyTest.php +++ b/tests/Unit/Database/Query/Sorter/OrderByKeyTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Sorter\OrderByKey; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -40,7 +41,7 @@ public function modifyValue(mixed $expected, mixed $given): void $this->assertSame($expected, $this->sorter->modifyValue($given)); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'scalar' => [ 'expected' => 'scalar', diff --git a/tests/Unit/Database/Query/Sorter/OrderByValueTest.php b/tests/Unit/Database/Query/Sorter/OrderByValueTest.php index 96e9016f..3d578bcd 100644 --- a/tests/Unit/Database/Query/Sorter/OrderByValueTest.php +++ b/tests/Unit/Database/Query/Sorter/OrderByValueTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Query\Sorter\OrderByValue; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -40,7 +41,7 @@ public function modifyValue(mixed $expected, mixed $given): void $this->assertSame($expected, $this->sorter->modifyValue($given)); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'scalar' => [ 'expected' => 'scalar', diff --git a/tests/Unit/Database/Reference/ValidatorTest.php b/tests/Unit/Database/Reference/ValidatorTest.php index 36d8fe72..c9613509 100644 --- a/tests/Unit/Database/Reference/ValidatorTest.php +++ b/tests/Unit/Database/Reference/ValidatorTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database\Reference; use GuzzleHttp\Psr7\Uri; +use Iterator; use Kreait\Firebase\Database\Reference\Validator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Tests\UnitTestCase; @@ -59,7 +60,7 @@ public function validateChars(string $value): void $this->validator->validateUri($uri); } - public static function invalidChars(): \Iterator + public static function invalidChars(): Iterator { yield '.' => ['.']; yield '$' => ['$']; diff --git a/tests/Unit/Database/UrlBuilderTest.php b/tests/Unit/Database/UrlBuilderTest.php index 858fd662..a6fbaf01 100644 --- a/tests/Unit/Database/UrlBuilderTest.php +++ b/tests/Unit/Database/UrlBuilderTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Database; use InvalidArgumentException; +use Iterator; use Kreait\Firebase\Database\UrlBuilder; use Kreait\Firebase\Tests\UnitTestCase; use Kreait\Firebase\Util; @@ -32,7 +33,7 @@ public function withInvalidUrl(string $url): void UrlBuilder::create($url); } - public static function invalidUrls(): \Iterator + public static function invalidUrls(): Iterator { yield 'wrong scheme' => ['http://example.com']; yield 'no scheme' => ['example.com']; @@ -67,7 +68,7 @@ public function emulated(string $emulatorHost, string $baseUrl, string $path, ar $this->assertSame($expected, $url); } - public static function realUrls(): \Iterator + public static function realUrls(): Iterator { $baseUrl = 'https://project.region.example.com'; yield 'empty path, empty query' => [ @@ -108,7 +109,7 @@ public static function realUrls(): \Iterator ]; } - public static function emulatedUrls(): \Iterator + public static function emulatedUrls(): Iterator { $namespace = 'namespace'; $baseUrl = 'https://'.$namespace.'.example.com'; diff --git a/tests/Unit/Exception/AppCheckApiExceptionConverterTest.php b/tests/Unit/Exception/AppCheckApiExceptionConverterTest.php index 9b5e6f67..45733296 100644 --- a/tests/Unit/Exception/AppCheckApiExceptionConverterTest.php +++ b/tests/Unit/Exception/AppCheckApiExceptionConverterTest.php @@ -9,6 +9,7 @@ use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Response; +use Iterator; use Kreait\Firebase\Exception\AppCheck\ApiConnectionFailed; use Kreait\Firebase\Exception\AppCheck\AppCheckError; use Kreait\Firebase\Exception\AppCheck\PermissionDenied; @@ -55,7 +56,7 @@ public function itConvertsExceptions(Throwable $e, string $expectedClass): void $this->assertInstanceOf($expectedClass, $converted); } - public static function exceptions(): \Iterator + public static function exceptions(): Iterator { yield 'connection error' => [new ConnectException('Connection Failed', new Request('GET', 'https://example.com')), ApiConnectionFailed::class]; yield '401' => [self::createRequestException(401, 'Unauthenticated'), PermissionDenied::class]; diff --git a/tests/Unit/Exception/AuthApiExceptionConverterTest.php b/tests/Unit/Exception/AuthApiExceptionConverterTest.php index d9c28f21..882da03e 100644 --- a/tests/Unit/Exception/AuthApiExceptionConverterTest.php +++ b/tests/Unit/Exception/AuthApiExceptionConverterTest.php @@ -9,6 +9,7 @@ use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Response; +use Iterator; use Kreait\Firebase\Exception\Auth\ApiConnectionFailed; use Kreait\Firebase\Exception\Auth\AuthError; use Kreait\Firebase\Exception\Auth\CredentialsMismatch; @@ -104,7 +105,7 @@ public function itConvertsRequestExceptionsBecause(string $identifier, string $e $this->assertInstanceOf($expectedClass, $convertedError); } - public static function requestErrors(): \Iterator + public static function requestErrors(): Iterator { yield 'credentials mismatch' => ['CREDENTIALS_MISMATCH', CredentialsMismatch::class]; yield 'an email already exists' => ['EMAIL_EXISTS', EmailExists::class]; diff --git a/tests/Unit/Exception/MessagingApiExceptionConverterTest.php b/tests/Unit/Exception/MessagingApiExceptionConverterTest.php index 9278f12e..5b8cd2b2 100644 --- a/tests/Unit/Exception/MessagingApiExceptionConverterTest.php +++ b/tests/Unit/Exception/MessagingApiExceptionConverterTest.php @@ -11,6 +11,7 @@ use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Response; +use Iterator; use Kreait\Firebase\Exception\Messaging\ApiConnectionFailed; use Kreait\Firebase\Exception\Messaging\AuthenticationError; use Kreait\Firebase\Exception\Messaging\InvalidMessage; @@ -66,7 +67,7 @@ public function itConvertsExceptions(Throwable $e, string $expectedClass): void $this->assertInstanceOf($expectedClass, $converted); } - public static function exceptions(): \Iterator + public static function exceptions(): Iterator { yield 'connection error' => [new ConnectException('Connection Failed', new Request('GET', 'https://example.com')), ApiConnectionFailed::class]; yield '400' => [self::createRequestException(400, 'Bad request'), InvalidMessage::class]; diff --git a/tests/Unit/Messaging/AndroidConfigTest.php b/tests/Unit/Messaging/AndroidConfigTest.php index 563637b0..f81627ea 100644 --- a/tests/Unit/Messaging/AndroidConfigTest.php +++ b/tests/Unit/Messaging/AndroidConfigTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use Beste\Json; +use Iterator; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Messaging\AndroidConfig; use Kreait\Firebase\Tests\UnitTestCase; @@ -83,7 +84,7 @@ public function itRejectsInvalidTTLs(mixed $ttl): void ]); } - public static function validDataProvider(): \Iterator + public static function validDataProvider(): Iterator { yield 'full_config' => [[ // https://firebase.google.com/docs/cloud-messaging/admin/send-messages#android_specific_fields @@ -99,7 +100,7 @@ public static function validDataProvider(): \Iterator ]]; } - public static function validTtlValues(): \Iterator + public static function validTtlValues(): Iterator { yield 'positive int' => [1]; yield 'positive numeric string' => ['1']; @@ -110,7 +111,7 @@ public static function validTtlValues(): \Iterator yield 'null (#719)' => [null]; } - public static function invalidTtlValues(): \Iterator + public static function invalidTtlValues(): Iterator { yield 'float' => [1.2]; yield 'wrong suffix' => ['1m']; diff --git a/tests/Unit/Messaging/ApnsConfigTest.php b/tests/Unit/Messaging/ApnsConfigTest.php index d7cc80b7..fa0b8b64 100644 --- a/tests/Unit/Messaging/ApnsConfigTest.php +++ b/tests/Unit/Messaging/ApnsConfigTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use Beste\Json; +use Iterator; use Kreait\Firebase\Messaging\ApnsConfig; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\DataProvider; @@ -94,7 +95,7 @@ public function itHasASubtitle(): void ); } - public static function validDataProvider(): \Iterator + public static function validDataProvider(): Iterator { yield 'full_config' => [[ // https://firebase.google.com/docs/cloud-messaging/admin/send-messages#apns_specific_fields diff --git a/tests/Unit/Messaging/CloudMessageTest.php b/tests/Unit/Messaging/CloudMessageTest.php index 1c2e6efa..d111aaf8 100644 --- a/tests/Unit/Messaging/CloudMessageTest.php +++ b/tests/Unit/Messaging/CloudMessageTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use Beste\Json; +use Iterator; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Messaging\CloudMessage; use Kreait\Firebase\Messaging\FcmOptions; @@ -161,7 +162,7 @@ public function messageDataCanBeSetWithAnObjectOrAnArray(): void $this->assertSame($serializedFromObject, $serializedFromArray); } - public static function multipleTargets(): \Iterator + public static function multipleTargets(): Iterator { yield 'condition and token' => [[ MessageTarget::CONDITION => 'something', diff --git a/tests/Unit/Messaging/ConditionTest.php b/tests/Unit/Messaging/ConditionTest.php index 901ad5c5..05f23721 100644 --- a/tests/Unit/Messaging/ConditionTest.php +++ b/tests/Unit/Messaging/ConditionTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; +use Iterator; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Messaging\Condition; use PHPUnit\Framework\Attributes\DataProvider; @@ -43,13 +44,13 @@ public function noMoreThanFiveTopics(): void Condition::fromValue($invalid); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'single quotes' => ["'dogs' in topics || 'cats' in topics", "'dogs' in topics || 'cats' in topics"]; yield 'double quotes' => ["'dogs' in topics || 'cats' in topics", '"dogs" in topics || "cats" in topics']; } - public static function invalidValueProvider(): \Iterator + public static function invalidValueProvider(): Iterator { yield 'single quotes' => ["'dogs in Topics"]; yield 'double quotes' => ["'dogs in Topics || 'cats' in topics"]; diff --git a/tests/Unit/Messaging/MessageDataTest.php b/tests/Unit/Messaging/MessageDataTest.php index 67ed54f6..ceb36fed 100644 --- a/tests/Unit/Messaging/MessageDataTest.php +++ b/tests/Unit/Messaging/MessageDataTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use InvalidArgumentException; +use Iterator; use Kreait\Firebase\Messaging\MessageData; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -53,7 +54,7 @@ public function itDoesNotLowerCaseKeys(): void $this->assertSame($data->toArray(), $output); } - public static function validData(): \Iterator + public static function validData(): Iterator { yield 'integer' => [ ['key' => 1], @@ -83,7 +84,7 @@ public function __toString() ]; } - public static function invalidData(): \Iterator + public static function invalidData(): Iterator { // @see https://github.com/kreait/firebase-php/issues/441 yield 'binary data' => [ diff --git a/tests/Unit/Messaging/NotificationTest.php b/tests/Unit/Messaging/NotificationTest.php index c86cb41d..0ae4ba80 100644 --- a/tests/Unit/Messaging/NotificationTest.php +++ b/tests/Unit/Messaging/NotificationTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; +use Iterator; use Kreait\Firebase\Messaging\Notification; use Kreait\Firebase\Tests\UnitTestCase; use PHPUnit\Framework\Attributes\Test; @@ -52,7 +53,7 @@ public function createFromValidArray(): void $this->assertEqualsCanonicalizing($array, $notification->jsonSerialize()); } - public function invalidDataProvider(): \Iterator + public function invalidDataProvider(): Iterator { yield 'empty_title_and_body' => [['title' => null, 'body' => null]]; } diff --git a/tests/Unit/Messaging/RegistrationTokenTest.php b/tests/Unit/Messaging/RegistrationTokenTest.php index 729d9fb6..c770b9be 100644 --- a/tests/Unit/Messaging/RegistrationTokenTest.php +++ b/tests/Unit/Messaging/RegistrationTokenTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use Beste\Json; +use Iterator; use Kreait\Firebase\Messaging\RegistrationToken; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -25,7 +26,7 @@ public function fromValue(string $expected, string $value): void $this->assertSame('"'.$token.'"', Json::encode($token)); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'foo' => ['foo', 'foo']; } diff --git a/tests/Unit/Messaging/RegistrationTokensTest.php b/tests/Unit/Messaging/RegistrationTokensTest.php index 5791f384..e24658f3 100644 --- a/tests/Unit/Messaging/RegistrationTokensTest.php +++ b/tests/Unit/Messaging/RegistrationTokensTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; use InvalidArgumentException; +use Iterator; use Kreait\Firebase\Messaging\RegistrationToken; use Kreait\Firebase\Messaging\RegistrationTokens; use PHPUnit\Framework\Attributes\DataProvider; @@ -44,7 +45,7 @@ public function itReturnsStrings(): void $this->assertEqualsCanonicalizing(['foo', 'foo'], $tokens->asStrings()); } - public static function validValuesWithExpectedCounts(): \Iterator + public static function validValuesWithExpectedCounts(): Iterator { $foo = RegistrationToken::fromValue('foo'); yield 'string' => [1, 'foo']; @@ -53,7 +54,7 @@ public static function validValuesWithExpectedCounts(): \Iterator yield 'array with mixed values' => [2, [$foo, 'bar']]; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'invalid object' => [new stdClass()]; } diff --git a/tests/Unit/Messaging/TopicTest.php b/tests/Unit/Messaging/TopicTest.php index 251a3d05..54d7f5c4 100644 --- a/tests/Unit/Messaging/TopicTest.php +++ b/tests/Unit/Messaging/TopicTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; +use Iterator; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Messaging\Topic; use PHPUnit\Framework\Attributes\DataProvider; @@ -30,7 +31,7 @@ public function fromInvalidValue(string $value): void Topic::fromValue($value); } - public static function valueProvider(): \Iterator + public static function valueProvider(): Iterator { yield 'no slashes' => ['foo', 'foo']; yield 'leading slash' => ['foo', '/foo']; @@ -38,7 +39,7 @@ public static function valueProvider(): \Iterator yield 'with topic prefix' => ['foo', '/topic/foo']; } - public static function invalidValueProvider(): \Iterator + public static function invalidValueProvider(): Iterator { yield '$' => ['$']; yield 'ä' => ['ä']; diff --git a/tests/Unit/Messaging/WebPushConfigTest.php b/tests/Unit/Messaging/WebPushConfigTest.php index 0b148445..3ab141f0 100644 --- a/tests/Unit/Messaging/WebPushConfigTest.php +++ b/tests/Unit/Messaging/WebPushConfigTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Messaging; +use Iterator; use Kreait\Firebase\Exception\Messaging\InvalidArgument; use Kreait\Firebase\Messaging\WebPushConfig; use Kreait\Firebase\Tests\UnitTestCase; @@ -90,14 +91,14 @@ public static function validDataProvider(): iterable ]; } - public static function validHeaders(): \Iterator + public static function validHeaders(): Iterator { yield 'positive int ttl' => [['TTL' => 1]]; yield 'positive string ttl' => [['TTL' => '1']]; yield 'null (#719)' => [['TTL' => null]]; } - public static function invalidHeaders(): \Iterator + public static function invalidHeaders(): Iterator { yield 'negative int ttl' => [['TTL' => -1]]; yield 'negative string ttl' => [['TTL' => '-1']]; diff --git a/tests/Unit/Request/CreateUserTest.php b/tests/Unit/Request/CreateUserTest.php index ad52b621..a6538a3a 100644 --- a/tests/Unit/Request/CreateUserTest.php +++ b/tests/Unit/Request/CreateUserTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Request; +use Iterator; use Kreait\Firebase\Request\CreateUser; use Kreait\Firebase\Value\ClearTextPassword; use PHPUnit\Framework\Attributes\DataProvider; @@ -35,7 +36,7 @@ public function withProperties(array $properties, array $expected): void $this->assertEqualsCanonicalizing($expected, $request->jsonSerialize()); } - public static function propertiesProvider(): \Iterator + public static function propertiesProvider(): Iterator { $given = ['uid' => 'some-uid']; $expected = ['localId' => 'some-uid']; diff --git a/tests/Unit/Request/UpdateUserTest.php b/tests/Unit/Request/UpdateUserTest.php index 8c4e8b72..83df95cc 100644 --- a/tests/Unit/Request/UpdateUserTest.php +++ b/tests/Unit/Request/UpdateUserTest.php @@ -5,6 +5,7 @@ namespace Kreait\Firebase\Tests\Unit\Request; use Beste\Json; +use Iterator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Request\UpdateUser; use PHPUnit\Framework\Attributes\DataProvider; @@ -36,7 +37,7 @@ public function withMissingUid(): void UpdateUser::withProperties([])->jsonSerialize(); } - public static function propertiesProvider(): \Iterator + public static function propertiesProvider(): Iterator { // All non-mentioned attributes are already tested through the CreateUserTest $given = ['uid' => 'some-uid']; diff --git a/tests/Unit/Util/DTTest.php b/tests/Unit/Util/DTTest.php index 1c956fcb..391af9ac 100644 --- a/tests/Unit/Util/DTTest.php +++ b/tests/Unit/Util/DTTest.php @@ -7,6 +7,7 @@ use DateTimeImmutable; use DateTimeZone; use InvalidArgumentException; +use Iterator; use Kreait\Firebase\Util\DT; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; @@ -49,7 +50,7 @@ public function convertInvalid(mixed $value): void DT::toUTCDateTimeImmutable($value); } - public static function validFixedValues(): \Iterator + public static function validFixedValues(): Iterator { yield 'seconds' => ['1234567890.000000', 1_234_567_890]; yield 'milliseconds_1' => ['1234567890.000000', 1_234_567_890_000]; @@ -59,7 +60,7 @@ public static function validFixedValues(): \Iterator yield 'timezone_2' => ['345328496.789012', new DateTimeImmutable('10.12.1980 12:34:56.789012', new DateTimeZone('America/Los_Angeles'))]; } - public static function validVariableValues(): \Iterator + public static function validVariableValues(): Iterator { yield 'null' => [null]; yield 'zero' => [0]; @@ -72,7 +73,7 @@ public static function validVariableValues(): \Iterator yield 'now in Bangkok' => [new DateTimeImmutable('now', new DateTimeZone('Asia/Bangkok'))]; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'string' => ['foo']; yield 'object' => [new stdClass()]; diff --git a/tests/Unit/Value/ClearTextPasswordTest.php b/tests/Unit/Value/ClearTextPasswordTest.php index f9b4dd4d..0ae6b988 100644 --- a/tests/Unit/Value/ClearTextPasswordTest.php +++ b/tests/Unit/Value/ClearTextPasswordTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Value; +use Iterator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Value\ClearTextPassword; use PHPUnit\Framework\Attributes\DataProvider; @@ -32,12 +33,12 @@ public function withInvalidValue(mixed $value): void ClearTextPassword::fromString($value); } - public static function validValues(): \Iterator + public static function validValues(): Iterator { yield 'long enough' => ['long enough']; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'empty string' => ['']; yield 'less than 6 chars' => ['short']; diff --git a/tests/Unit/Value/EmailTest.php b/tests/Unit/Value/EmailTest.php index 78201981..16eeeff2 100644 --- a/tests/Unit/Value/EmailTest.php +++ b/tests/Unit/Value/EmailTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Value; +use Iterator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Value\Email; use PHPUnit\Framework\Attributes\DataProvider; @@ -32,12 +33,12 @@ public function withInvalidValue(string $value): void Email::fromString($value); } - public static function validValues(): \Iterator + public static function validValues(): Iterator { yield 'user@example.com' => ['user@example.com']; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'empty string' => ['']; yield 'invalid' => ['invalid']; diff --git a/tests/Unit/Value/UidTest.php b/tests/Unit/Value/UidTest.php index 67167042..56d88f4c 100644 --- a/tests/Unit/Value/UidTest.php +++ b/tests/Unit/Value/UidTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Value; +use Iterator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Value\Uid; use PHPUnit\Framework\Attributes\DataProvider; @@ -32,12 +33,12 @@ public function withInvalidValue(string $uid): void Uid::fromString($uid); } - public static function validValues(): \Iterator + public static function validValues(): Iterator { yield 'uid' => ['uid']; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'empty string' => ['']; yield 'too long' => [str_repeat('x', 129)]; diff --git a/tests/Unit/Value/UrlTest.php b/tests/Unit/Value/UrlTest.php index c6c4078c..4424f8c1 100644 --- a/tests/Unit/Value/UrlTest.php +++ b/tests/Unit/Value/UrlTest.php @@ -4,6 +4,7 @@ namespace Kreait\Firebase\Tests\Unit\Value; +use Iterator; use Kreait\Firebase\Exception\InvalidArgumentException; use Kreait\Firebase\Value\Url; use PHPUnit\Framework\Attributes\DataProvider; @@ -35,12 +36,12 @@ public function withInvalidValue(string $value): void Url::fromString($value); } - public static function validValues(): \Iterator + public static function validValues(): Iterator { yield 'string' => ['https://example.com']; } - public static function invalidValues(): \Iterator + public static function invalidValues(): Iterator { yield 'https:///example.com' => ['https:///example.com']; yield 'http://:80' => ['http://:80']; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 466f80aa..274be3e1 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,8 +2,10 @@ declare(strict_types=1); +use Dotenv\Dotenv; + require_once __DIR__.'/../vendor/autoload.php'; // Unsafe is needed because google/auth uses getenv/putenv to determine the Application Credentials -$dotenv = Dotenv\Dotenv::createUnsafeImmutable(__DIR__); +$dotenv = Dotenv::createUnsafeImmutable(__DIR__); $dotenv->safeLoad();