Skip to content

Commit 1492a99

Browse files
jeromegamezjeromegamez
committed
Import names
1 parent 82062f6 commit 1492a99

39 files changed

+98
-56
lines changed

‎rector.php

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
phpunitCodeQuality: true,
2020
phpunit: true,
2121
)
22+
->withImportNames(removeUnusedImports: true)
2223
;

‎src/Firebase/Contract/AppCheck.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Kreait\Firebase\AppCheck\AppCheckTokenOptions;
99
use Kreait\Firebase\AppCheck\VerifyAppCheckTokenResponse;
1010
use Kreait\Firebase\Exception;
11+
use Kreait\Firebase\Exception\AppCheck\FailedToVerifyAppCheckToken;
12+
use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckToken;
13+
use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckTokenOptions;
1114

1215
/**
1316
* @phpstan-import-type AppCheckTokenOptionsShape from AppCheckTokenOptions
@@ -18,7 +21,7 @@ interface AppCheck
1821
* @param non-empty-string $appId
1922
* @param AppCheckTokenOptions|AppCheckTokenOptionsShape|null $options
2023
*
21-
* @throws Exception\AppCheck\InvalidAppCheckTokenOptions
24+
* @throws InvalidAppCheckTokenOptions
2225
* @throws Exception\AppCheckException
2326
* @throws Exception\FirebaseException
2427
*/
@@ -27,8 +30,8 @@ public function createToken(string $appId, $options = null): AppCheckToken;
2730
/**
2831
* @param non-empty-string $appCheckToken
2932
*
30-
* @throws Exception\AppCheck\InvalidAppCheckToken
31-
* @throws Exception\AppCheck\FailedToVerifyAppCheckToken
33+
* @throws InvalidAppCheckToken
34+
* @throws FailedToVerifyAppCheckToken
3235
* @throws Exception\AppCheckException
3336
* @throws Exception\FirebaseException
3437
*/

‎src/Firebase/Factory.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
use Kreait\Firebase\JWT\IdTokenVerifier;
3939
use Kreait\Firebase\JWT\SessionCookieVerifier;
4040
use Kreait\Firebase\Messaging\AppInstanceApiClient;
41+
use Kreait\Firebase\Messaging\RequestFactory;
4142
use Psr\Cache\CacheItemPoolInterface;
4243
use Psr\Clock\ClockInterface;
4344
use Psr\Http\Message\UriInterface;
@@ -406,7 +407,7 @@ public function createMessaging(): Contract\Messaging
406407
$projectId = $this->getProjectId();
407408

408409
$errorHandler = new MessagingApiExceptionConverter($this->clock);
409-
$requestFactory = new Messaging\RequestFactory(
410+
$requestFactory = new RequestFactory(
410411
requestFactory: $this->httpFactory,
411412
streamFactory: $this->httpFactory,
412413
);

‎tests/Integration/Database/ReferenceTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Kreait\Firebase\Tests\Integration\Database;
66

7+
use Iterator;
78
use Kreait\Firebase\Contract\Database;
89
use Kreait\Firebase\Database\Reference;
910
use Kreait\Firebase\Tests\Integration\DatabaseTestCase;
@@ -150,7 +151,7 @@ public function setServerTimestamp(): void
150151
$this->assertIsInt($value['updatedAt']);
151152
}
152153

153-
public static function validValues(): \Iterator
154+
public static function validValues(): Iterator
154155
{
155156
yield 'string' => ['string', 'value'];
156157
yield 'int' => ['int', 1];

‎tests/Integration/MessagingTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Kreait\Firebase\Tests\Integration;
66

7+
use Iterator;
78
use Kreait\Firebase\Contract\Messaging;
89
use Kreait\Firebase\Exception\Messaging\InvalidArgument;
910
use Kreait\Firebase\Exception\Messaging\InvalidMessage;
@@ -154,7 +155,7 @@ public function sendMessageWithReservedKeywordInMessageDataThatIsStillAccepted(s
154155
$this->addToAssertionCount(1);
155156
}
156157

157-
public static function reservedKeywordsThatStillAreAccepted(): \Iterator
158+
public static function reservedKeywordsThatStillAreAccepted(): Iterator
158159
{
159160
yield 'notification' => ['notification'];
160161
}

‎tests/Unit/AppCheck/AppCheckTokenOptionsTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Kreait\Firebase\Tests\Unit\AppCheck;
66

7+
use Iterator;
78
use Kreait\Firebase\AppCheck\AppCheckTokenOptions;
89
use Kreait\Firebase\Exception\AppCheck\InvalidAppCheckTokenOptions;
910
use Kreait\Firebase\Tests\UnitTestCase;
@@ -45,15 +46,15 @@ public function fromArrayWithInvalidOptions(int $ttl): void
4546
]);
4647
}
4748

48-
public static function validOptions(): \Iterator
49+
public static function validOptions(): Iterator
4950
{
5051
yield 'null' => [null];
5152
yield 'min-boundary' => [1800];
5253
yield 'mid-range' => [30240];
5354
yield 'max-boundary' => [60480];
5455
}
5556

56-
public static function invalidOptions(): \Iterator
57+
public static function invalidOptions(): Iterator
5758
{
5859
yield 'too-small' => [1799];
5960
yield 'too-large' => [604801];

‎tests/Unit/Auth/ActionCodeSettings/ValidatedActionSettingsTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Auth\ActionCodeSettings;
66

77
use InvalidArgumentException;
8+
use Iterator;
89
use Kreait\Firebase\Auth\ActionCodeSettings\ValidatedActionCodeSettings;
910
use PHPUnit\Framework\Attributes\DataProvider;
1011
use PHPUnit\Framework\Attributes\Test;
@@ -39,7 +40,7 @@ public function itCanBeEmpty(): void
3940
$this->assertEmpty(ValidatedActionCodeSettings::empty()->toArray());
4041
}
4142

42-
public static function validInputs(): \Iterator
43+
public static function validInputs(): Iterator
4344
{
4445
$continueUrl = 'https://example.com';
4546
yield 'full' => [

‎tests/Unit/Auth/SignInResultTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Kreait\Firebase\Tests\Unit\Auth;
66

7+
use Iterator;
78
use Kreait\Firebase\Auth\SignInResult;
89
use Kreait\Firebase\Tests\UnitTestCase;
910
use PHPUnit\Framework\Attributes\DataProvider;
@@ -47,7 +48,7 @@ public function itUsesTheLocalIdWhenTheFirebaseUidIsNotPresent(): void
4748
$this->assertSame('some-id', $result->firebaseUserId());
4849
}
4950

50-
public static function fullResponse(): \Iterator
51+
public static function fullResponse(): Iterator
5152
{
5253
yield 'snake_cased' => [[
5354
'idToken' => 'idToken',

‎tests/Unit/Database/Query/Filter/EndAtTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Filter\EndAt;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void
2425
$this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com')));
2526
}
2627

27-
public static function valueProvider(): \Iterator
28+
public static function valueProvider(): Iterator
2829
{
2930
yield 'int' => [1, 'endAt=1'];
3031
yield 'string' => ['value', 'endAt=%22value%22'];

‎tests/Unit/Database/Query/Filter/EndBeforeTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Filter\EndBefore;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void
2425
$this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com')));
2526
}
2627

27-
public static function valueProvider(): \Iterator
28+
public static function valueProvider(): Iterator
2829
{
2930
yield 'int' => [1, 'endBefore=1'];
3031
yield 'string' => ['value', 'endBefore=%22value%22'];

‎tests/Unit/Database/Query/Filter/EqualToTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Filter\EqualTo;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void
2425
$this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com')));
2526
}
2627

27-
public static function valueProvider(): \Iterator
28+
public static function valueProvider(): Iterator
2829
{
2930
yield 'int' => [1, 'equalTo=1'];
3031
yield 'string' => ['value', 'equalTo=%22value%22'];

‎tests/Unit/Database/Query/Filter/StartAfterTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Filter\StartAfter;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -24,7 +25,7 @@ public function modifyUri(mixed $given, mixed $expected): void
2425
$this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com')));
2526
}
2627

27-
public static function valueProvider(): \Iterator
28+
public static function valueProvider(): Iterator
2829
{
2930
yield 'int' => [1, 'startAfter=1'];
3031
yield 'string' => ['value', 'startAfter=%22value%22'];

‎tests/Unit/Database/Query/Filter/StartAtTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Filter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Filter\StartAt;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -24,7 +25,7 @@ public function modifyUri(mixed $given, string $expected): void
2425
$this->assertStringContainsString($expected, (string) $filter->modifyUri(new Uri('http://example.com')));
2526
}
2627

27-
public static function valueProvider(): \Iterator
28+
public static function valueProvider(): Iterator
2829
{
2930
yield 'int' => [1, 'startAt=1'];
3031
yield 'string' => ['value', 'startAt=%22value%22'];

‎tests/Unit/Database/Query/Sorter/OrderByChildTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Sorter\OrderByChild;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -32,7 +33,7 @@ public function orderByChild(string $childKey, mixed $expected, mixed $given): v
3233
$this->assertSame($expected, $sut->modifyValue($given));
3334
}
3435

35-
public static function valueProvider(): \Iterator
36+
public static function valueProvider(): Iterator
3637
{
3738
yield 'scalar' => [
3839
'childKey' => 'key',

‎tests/Unit/Database/Query/Sorter/OrderByKeyTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Sorter\OrderByKey;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -40,7 +41,7 @@ public function modifyValue(mixed $expected, mixed $given): void
4041
$this->assertSame($expected, $this->sorter->modifyValue($given));
4142
}
4243

43-
public static function valueProvider(): \Iterator
44+
public static function valueProvider(): Iterator
4445
{
4546
yield 'scalar' => [
4647
'expected' => 'scalar',

‎tests/Unit/Database/Query/Sorter/OrderByValueTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Query\Sorter;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Query\Sorter\OrderByValue;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use PHPUnit\Framework\Attributes\DataProvider;
@@ -40,7 +41,7 @@ public function modifyValue(mixed $expected, mixed $given): void
4041
$this->assertSame($expected, $this->sorter->modifyValue($given));
4142
}
4243

43-
public static function valueProvider(): \Iterator
44+
public static function valueProvider(): Iterator
4445
{
4546
yield 'scalar' => [
4647
'expected' => 'scalar',

‎tests/Unit/Database/Reference/ValidatorTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database\Reference;
66

77
use GuzzleHttp\Psr7\Uri;
8+
use Iterator;
89
use Kreait\Firebase\Database\Reference\Validator;
910
use Kreait\Firebase\Exception\InvalidArgumentException;
1011
use Kreait\Firebase\Tests\UnitTestCase;
@@ -59,7 +60,7 @@ public function validateChars(string $value): void
5960
$this->validator->validateUri($uri);
6061
}
6162

62-
public static function invalidChars(): \Iterator
63+
public static function invalidChars(): Iterator
6364
{
6465
yield '.' => ['.'];
6566
yield '$' => ['$'];

‎tests/Unit/Database/UrlBuilderTest.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Kreait\Firebase\Tests\Unit\Database;
66

77
use InvalidArgumentException;
8+
use Iterator;
89
use Kreait\Firebase\Database\UrlBuilder;
910
use Kreait\Firebase\Tests\UnitTestCase;
1011
use Kreait\Firebase\Util;
@@ -32,7 +33,7 @@ public function withInvalidUrl(string $url): void
3233
UrlBuilder::create($url);
3334
}
3435

35-
public static function invalidUrls(): \Iterator
36+
public static function invalidUrls(): Iterator
3637
{
3738
yield 'wrong scheme' => ['http://example.com'];
3839
yield 'no scheme' => ['example.com'];
@@ -67,7 +68,7 @@ public function emulated(string $emulatorHost, string $baseUrl, string $path, ar
6768
$this->assertSame($expected, $url);
6869
}
6970

70-
public static function realUrls(): \Iterator
71+
public static function realUrls(): Iterator
7172
{
7273
$baseUrl = 'https://project.region.example.com';
7374
yield 'empty path, empty query' => [
@@ -108,7 +109,7 @@ public static function realUrls(): \Iterator
108109
];
109110
}
110111

111-
public static function emulatedUrls(): \Iterator
112+
public static function emulatedUrls(): Iterator
112113
{
113114
$namespace = 'namespace';
114115
$baseUrl = 'https://'.$namespace.'.example.com';

‎tests/Unit/Exception/AppCheckApiExceptionConverterTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use GuzzleHttp\Exception\RequestException;
1010
use GuzzleHttp\Psr7\Request;
1111
use GuzzleHttp\Psr7\Response;
12+
use Iterator;
1213
use Kreait\Firebase\Exception\AppCheck\ApiConnectionFailed;
1314
use Kreait\Firebase\Exception\AppCheck\AppCheckError;
1415
use Kreait\Firebase\Exception\AppCheck\PermissionDenied;
@@ -55,7 +56,7 @@ public function itConvertsExceptions(Throwable $e, string $expectedClass): void
5556
$this->assertInstanceOf($expectedClass, $converted);
5657
}
5758

58-
public static function exceptions(): \Iterator
59+
public static function exceptions(): Iterator
5960
{
6061
yield 'connection error' => [new ConnectException('Connection Failed', new Request('GET', 'https://example.com')), ApiConnectionFailed::class];
6162
yield '401' => [self::createRequestException(401, 'Unauthenticated'), PermissionDenied::class];

‎tests/Unit/Exception/AuthApiExceptionConverterTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use GuzzleHttp\Exception\RequestException;
1010
use GuzzleHttp\Psr7\Request;
1111
use GuzzleHttp\Psr7\Response;
12+
use Iterator;
1213
use Kreait\Firebase\Exception\Auth\ApiConnectionFailed;
1314
use Kreait\Firebase\Exception\Auth\AuthError;
1415
use Kreait\Firebase\Exception\Auth\CredentialsMismatch;
@@ -104,7 +105,7 @@ public function itConvertsRequestExceptionsBecause(string $identifier, string $e
104105
$this->assertInstanceOf($expectedClass, $convertedError);
105106
}
106107

107-
public static function requestErrors(): \Iterator
108+
public static function requestErrors(): Iterator
108109
{
109110
yield 'credentials mismatch' => ['CREDENTIALS_MISMATCH', CredentialsMismatch::class];
110111
yield 'an email already exists' => ['EMAIL_EXISTS', EmailExists::class];

‎tests/Unit/Exception/MessagingApiExceptionConverterTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use GuzzleHttp\Exception\RequestException;
1212
use GuzzleHttp\Psr7\Request;
1313
use GuzzleHttp\Psr7\Response;
14+
use Iterator;
1415
use Kreait\Firebase\Exception\Messaging\ApiConnectionFailed;
1516
use Kreait\Firebase\Exception\Messaging\AuthenticationError;
1617
use Kreait\Firebase\Exception\Messaging\InvalidMessage;
@@ -66,7 +67,7 @@ public function itConvertsExceptions(Throwable $e, string $expectedClass): void
6667
$this->assertInstanceOf($expectedClass, $converted);
6768
}
6869

69-
public static function exceptions(): \Iterator
70+
public static function exceptions(): Iterator
7071
{
7172
yield 'connection error' => [new ConnectException('Connection Failed', new Request('GET', 'https://example.com')), ApiConnectionFailed::class];
7273
yield '400' => [self::createRequestException(400, 'Bad request'), InvalidMessage::class];

0 commit comments

Comments
 (0)