Skip to content

Commit f3448ee

Browse files
mbabkermbabker
committed
Automated fixes
1 parent e45fe2b commit f3448ee

13 files changed

Lines changed: 94 additions & 101 deletions

‎config/services.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php declare(strict_types=1);
22

33
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
44

‎rector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php declare(strict_types=1);
22

33
use Rector\Config\RectorConfig;
4-
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
4+
use Rector\Php81\Rector\Array_\ArrayToFirstClassCallableRector;
55
use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
66

77
return RectorConfig::configure()
@@ -21,7 +21,7 @@
2121
* Skip selected rules in selected files
2222
*/
2323

24-
FirstClassCallableRector::class => [
24+
ArrayToFirstClassCallableRector::class => [
2525
// Do not change callables in config
2626
__DIR__.'/config/*',
2727
],

‎tests/Authentication/Provider/SessionAuthenticationProviderTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use PHPUnit\Framework\TestCase;
1212
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1313
use Symfony\Component\Security\Core\Authentication\Token\NullToken;
14-
use Symfony\Component\Security\Core\Authentication\Token\OfflineTokenInterface;
1514
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1615
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
1716
use Symfony\Component\Security\Core\User\InMemoryUser;
@@ -36,7 +35,7 @@ protected function setUp(): void
3635
public function testTheProviderSupportsAConnectionWhenItHasASession(): void
3736
{
3837
$attributeStore = new ArrayAttributeStore();
39-
$attributeStore->set('session', $this->createMock(SessionInterface::class));
38+
$attributeStore->set('session', self::createStub(SessionInterface::class));
4039

4140
/** @var MockObject&Connection $connection */
4241
$connection = $this->createMock(Connection::class);

‎tests/Authentication/ProviderBackedAuthenticatorTest.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
namespace BabDev\WebSocketBundle\Tests\Authentication;
44

55
use BabDev\WebSocket\Server\Connection;
6-
use BabDev\WebSocketBundle\Authentication\ProviderBackedAuthenticator;
76
use BabDev\WebSocketBundle\Authentication\Provider\AuthenticationProvider;
7+
use BabDev\WebSocketBundle\Authentication\ProviderBackedAuthenticator;
88
use BabDev\WebSocketBundle\Authentication\Storage\TokenStorage;
99
use PHPUnit\Framework\MockObject\MockObject;
10+
use PHPUnit\Framework\MockObject\Stub;
1011
use PHPUnit\Framework\TestCase;
1112
use Symfony\Component\Security\Core\Authentication\Token\NullToken;
1213
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -15,8 +16,8 @@ final class ProviderBackedAuthenticatorTest extends TestCase
1516
{
1617
public function testTheAuthenticatorDoesNotAuthenticateAConnectionWhenItHasNoProviders(): void
1718
{
18-
/** @var MockObject&Connection $connection */
19-
$connection = $this->createMock(Connection::class);
19+
/** @var Stub&Connection $connection */
20+
$connection = self::createStub(Connection::class);
2021

2122
/** @var MockObject&TokenStorage $tokenStorage */
2223
$tokenStorage = $this->createMock(TokenStorage::class);
@@ -33,11 +34,11 @@ public function testTheAuthenticatorDoesNotAuthenticateAConnectionWhenItHasNoPro
3334

3435
public function testTheAuthenticatorAuthenticatesAConnectionWhenItHasOneProvider(): void
3536
{
36-
/** @var MockObject&Connection $connection */
37-
$connection = $this->createMock(Connection::class);
37+
/** @var Stub&Connection $connection */
38+
$connection = self::createStub(Connection::class);
3839

39-
/** @var MockObject&TokenInterface $token */
40-
$token = $this->createMock(TokenInterface::class);
40+
/** @var Stub&TokenInterface $token */
41+
$token = self::createStub(TokenInterface::class);
4142

4243
/** @var MockObject&TokenStorage $tokenStorage */
4344
$tokenStorage = $this->createMock(TokenStorage::class);
@@ -67,11 +68,11 @@ public function testTheAuthenticatorAuthenticatesAConnectionWhenItHasOneProvider
6768

6869
public function testTheAuthenticatorAuthenticatesAConnectionUsingTheFirstSupportedProvider(): void
6970
{
70-
/** @var MockObject&Connection $connection */
71-
$connection = $this->createMock(Connection::class);
71+
/** @var Stub&Connection $connection */
72+
$connection = self::createStub(Connection::class);
7273

73-
/** @var MockObject&TokenInterface $token */
74-
$token = $this->createMock(TokenInterface::class);
74+
/** @var Stub&TokenInterface $token */
75+
$token = self::createStub(TokenInterface::class);
7576

7677
/** @var MockObject&TokenStorage $tokenStorage */
7778
$tokenStorage = $this->createMock(TokenStorage::class);

‎tests/Authentication/Storage/Driver/InMemoryStorageDriverTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
use BabDev\WebSocketBundle\Authentication\Storage\Driver\InMemoryStorageDriver;
66
use BabDev\WebSocketBundle\Authentication\Storage\Exception\TokenNotFound;
7-
use PHPUnit\Framework\MockObject\MockObject;
7+
use PHPUnit\Framework\MockObject\Stub;
88
use PHPUnit\Framework\TestCase;
99
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1010

1111
final class InMemoryStorageDriverTest extends TestCase
1212
{
1313
public function testTokenIsManagedInStorage(): void
1414
{
15-
/** @var MockObject&TokenInterface $token */
16-
$token = $this->createMock(TokenInterface::class);
15+
/** @var Stub&TokenInterface $token */
16+
$token = self::createStub(TokenInterface::class);
1717

1818
$driver = new InMemoryStorageDriver();
1919

‎tests/Authentication/Storage/DriverBackedTokenStorageTest.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use BabDev\WebSocketBundle\Authentication\Storage\DriverBackedTokenStorage;
99
use BabDev\WebSocketBundle\Authentication\Storage\Exception\StorageError;
1010
use PHPUnit\Framework\MockObject\MockObject;
11+
use PHPUnit\Framework\MockObject\Stub;
1112
use PHPUnit\Framework\TestCase;
1213
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1314

@@ -47,8 +48,8 @@ public function testAStorageIdentifierForAConnectionIsGenerated(): void
4748

4849
public function testTheTokenIsAddedToStorage(): void
4950
{
50-
/** @var MockObject&TokenInterface $token */
51-
$token = $this->createMock(TokenInterface::class);
51+
/** @var Stub&TokenInterface $token */
52+
$token = self::createStub(TokenInterface::class);
5253

5354
$this->driver->expects(self::once())
5455
->method('store')
@@ -79,8 +80,8 @@ public function testTheTokenIsRetrieved(): void
7980
{
8081
$storageId = '42';
8182

82-
/** @var MockObject&TokenInterface $token */
83-
$token = $this->createMock(TokenInterface::class);
83+
/** @var Stub&TokenInterface $token */
84+
$token = self::createStub(TokenInterface::class);
8485

8586
$this->driver->expects(self::once())
8687
->method('get')

‎tests/Authentication/StorageBackedConnectionRepositoryTest.php‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use BabDev\WebSocketBundle\Authentication\StorageBackedConnectionRepository;
1212
use BabDev\WebSocketBundle\Authentication\TokenConnection;
1313
use PHPUnit\Framework\MockObject\MockObject;
14+
use PHPUnit\Framework\MockObject\Stub;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1617
use Symfony\Component\Security\Core\User\UserInterface;
@@ -35,13 +36,13 @@ protected function setUp(): void
3536

3637
public function testFindTokenForConnection(): void
3738
{
38-
/** @var MockObject&Connection $connection */
39-
$connection = $this->createMock(Connection::class);
39+
/** @var Stub&Connection $connection */
40+
$connection = self::createStub(Connection::class);
4041

4142
$storageId = 42;
4243

43-
/** @var MockObject&TokenInterface $token */
44-
$token = $this->createMock(TokenInterface::class);
44+
/** @var Stub&TokenInterface $token */
45+
$token = self::createStub(TokenInterface::class);
4546

4647
$this->tokenStorage->expects(self::once())
4748
->method('generateStorageId')
@@ -58,13 +59,13 @@ public function testFindTokenForConnection(): void
5859

5960
public function testFindTokenForConnectionAfterReauthenticating(): void
6061
{
61-
/** @var MockObject&Connection $connection */
62-
$connection = $this->createMock(Connection::class);
62+
/** @var Stub&Connection $connection */
63+
$connection = self::createStub(Connection::class);
6364

6465
$storageId = 42;
6566

66-
/** @var MockObject&TokenInterface $token */
67-
$token = $this->createMock(TokenInterface::class);
67+
/** @var Stub&TokenInterface $token */
68+
$token = self::createStub(TokenInterface::class);
6869

6970
$this->tokenStorage->expects(self::once())
7071
->method('generateStorageId')
@@ -88,14 +89,14 @@ public function testFindTokenForConnectionAfterReauthenticating(): void
8889

8990
public function testAllConnectionsForAUserCanBeFoundByUsername(): void
9091
{
91-
/** @var MockObject&WAMPConnection $connection1 */
92-
$connection1 = $this->createMock(WAMPConnection::class);
92+
/** @var Stub&WAMPConnection $connection1 */
93+
$connection1 = self::createStub(WAMPConnection::class);
9394

94-
/** @var MockObject&WAMPConnection $connection2 */
95-
$connection2 = $this->createMock(WAMPConnection::class);
95+
/** @var Stub&WAMPConnection $connection2 */
96+
$connection2 = self::createStub(WAMPConnection::class);
9697

97-
/** @var MockObject&WAMPConnection $connection3 */
98-
$connection3 = $this->createMock(WAMPConnection::class);
98+
/** @var Stub&WAMPConnection $connection3 */
99+
$connection3 = self::createStub(WAMPConnection::class);
99100

100101
$storageId1 = 42;
101102
$storageId2 = 43;
@@ -167,22 +168,22 @@ public function testAllConnectionsForAUserCanBeFoundByUsername(): void
167168

168169
public function testFetchingAllConnectionsByDefaultOnlyReturnsAuthenticatedUsers(): void
169170
{
170-
/** @var MockObject&WAMPConnection $connection1 */
171-
$connection1 = $this->createMock(WAMPConnection::class);
171+
/** @var Stub&WAMPConnection $connection1 */
172+
$connection1 = self::createStub(WAMPConnection::class);
172173

173-
/** @var MockObject&WAMPConnection $connection2 */
174-
$connection2 = $this->createMock(WAMPConnection::class);
174+
/** @var Stub&WAMPConnection $connection2 */
175+
$connection2 = self::createStub(WAMPConnection::class);
175176

176177
$storageId1 = 42;
177178
$storageId2 = 84;
178179

179-
/** @var MockObject&TokenInterface $authenticatedToken */
180+
/** @var Stub&TokenInterface $authenticatedToken */
180181
$authenticatedToken = $this->createMock(TokenInterface::class);
181182
$authenticatedToken->expects(self::once())
182183
->method('getUser')
183-
->willReturn($this->createMock(UserInterface::class));
184+
->willReturn(self::createStub(UserInterface::class));
184185

185-
/** @var MockObject&TokenInterface $guestToken */
186+
/** @var Stub&TokenInterface $guestToken */
186187
$guestToken = $this->createMock(TokenInterface::class);
187188
$guestToken->expects(self::once())
188189
->method('getUser')
@@ -229,11 +230,11 @@ public function testFetchingAllConnectionsByDefaultOnlyReturnsAuthenticatedUsers
229230

230231
public function testFetchingAllConnectionsWithAnonymousFlagReturnsAllConnectedUsers(): void
231232
{
232-
/** @var MockObject&WAMPConnection $connection1 */
233-
$connection1 = $this->createMock(WAMPConnection::class);
233+
/** @var Stub&WAMPConnection $connection1 */
234+
$connection1 = self::createStub(WAMPConnection::class);
234235

235-
/** @var MockObject&WAMPConnection $connection2 */
236-
$connection2 = $this->createMock(WAMPConnection::class);
236+
/** @var Stub&WAMPConnection $connection2 */
237+
$connection2 = self::createStub(WAMPConnection::class);
237238

238239
$storageId1 = 42;
239240
$storageId2 = 84;
@@ -290,14 +291,14 @@ public function testFetchingAllConnectionsWithAnonymousFlagReturnsAllConnectedUs
290291

291292
public function testFetchingAllUsersWithDefinedRolesOnlyReturnsMatchingUsers(): void
292293
{
293-
/** @var MockObject&WAMPConnection $connection1 */
294-
$connection1 = $this->createMock(WAMPConnection::class);
294+
/** @var Stub&WAMPConnection $connection1 */
295+
$connection1 = self::createStub(WAMPConnection::class);
295296

296-
/** @var MockObject&WAMPConnection $connection2 */
297-
$connection2 = $this->createMock(WAMPConnection::class);
297+
/** @var Stub&WAMPConnection $connection2 */
298+
$connection2 = self::createStub(WAMPConnection::class);
298299

299-
/** @var MockObject&WAMPConnection $connection3 */
300-
$connection3 = $this->createMock(WAMPConnection::class);
300+
/** @var Stub&WAMPConnection $connection3 */
301+
$connection3 = self::createStub(WAMPConnection::class);
301302

302303
$storageId1 = 42;
303304
$storageId2 = 84;
@@ -365,14 +366,14 @@ public function testFetchingAllUsersWithDefinedRolesOnlyReturnsMatchingUsers():
365366

366367
public function testReportsWhetherAUserWithTheGivenUsernameHasAConnection(): void
367368
{
368-
/** @var MockObject&WAMPConnection $connection1 */
369-
$connection1 = $this->createMock(WAMPConnection::class);
369+
/** @var Stub&WAMPConnection $connection1 */
370+
$connection1 = self::createStub(WAMPConnection::class);
370371

371-
/** @var MockObject&WAMPConnection $connection2 */
372-
$connection2 = $this->createMock(WAMPConnection::class);
372+
/** @var Stub&WAMPConnection $connection2 */
373+
$connection2 = self::createStub(WAMPConnection::class);
373374

374-
/** @var MockObject&WAMPConnection $connection3 */
375-
$connection3 = $this->createMock(WAMPConnection::class);
375+
/** @var Stub&WAMPConnection $connection3 */
376+
$connection3 = self::createStub(WAMPConnection::class);
376377

377378
$storageId1 = 42;
378379
$storageId2 = 43;

‎tests/Command/RunWebSocketServerCommandTest.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use BabDev\WebSocketBundle\Server\ServerFactory;
99
use BabDev\WebSocketBundle\Server\SocketServerFactory;
1010
use PHPUnit\Framework\MockObject\MockObject;
11+
use PHPUnit\Framework\MockObject\Stub;
1112
use PHPUnit\Framework\TestCase;
1213
use React\EventLoop\LoopInterface;
1314
use React\Socket\ServerInterface;
@@ -27,8 +28,8 @@ public function testCommandLaunchesWebSocketServerWithUriFromConfiguration(): vo
2728
->with(self::isInstanceOf(BeforeRunServer::class))
2829
->willReturnArgument(0);
2930

30-
/** @var MockObject&ServerInterface $socketServer */
31-
$socketServer = $this->createMock(ServerInterface::class);
31+
/** @var Stub&ServerInterface $socketServer */
32+
$socketServer = self::createStub(ServerInterface::class);
3233

3334
/** @var MockObject&Server $server */
3435
$server = $this->createMock(Server::class);
@@ -49,7 +50,7 @@ public function testCommandLaunchesWebSocketServerWithUriFromConfiguration(): vo
4950
->with($socketServer)
5051
->willReturn($server);
5152

52-
$command = new RunWebSocketServerCommand($eventDispatcher, $socketServerFactory, $serverFactory, $this->createMock(LoopInterface::class), $uri);
53+
$command = new RunWebSocketServerCommand($eventDispatcher, $socketServerFactory, $serverFactory, self::createStub(LoopInterface::class), $uri);
5354

5455
$commandTester = new CommandTester($command);
5556
$commandTester->execute([]);
@@ -66,8 +67,8 @@ public function testCommandLaunchesWebSocketServerWithUriFromArguments(): void
6667
->with(self::isInstanceOf(BeforeRunServer::class))
6768
->willReturnArgument(0);
6869

69-
/** @var MockObject&ServerInterface $socketServer */
70-
$socketServer = $this->createMock(ServerInterface::class);
70+
/** @var Stub&ServerInterface $socketServer */
71+
$socketServer = self::createStub(ServerInterface::class);
7172

7273
/** @var MockObject&Server $server */
7374
$server = $this->createMock(Server::class);
@@ -88,7 +89,7 @@ public function testCommandLaunchesWebSocketServerWithUriFromArguments(): void
8889
->with($socketServer)
8990
->willReturn($server);
9091

91-
$command = new RunWebSocketServerCommand($eventDispatcher, $socketServerFactory, $serverFactory, $this->createMock(LoopInterface::class), 'tcp://127.0.0.1:8080');
92+
$command = new RunWebSocketServerCommand($eventDispatcher, $socketServerFactory, $serverFactory, self::createStub(LoopInterface::class), 'tcp://127.0.0.1:8080');
9293

9394
$commandTester = new CommandTester($command);
9495
$commandTester->execute(['uri' => $uri]);

‎tests/EventListener/PeriodicManagerSubscriberTest.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use BabDev\WebSocketBundle\PeriodicManager\PeriodicManager;
99
use BabDev\WebSocketBundle\PeriodicManager\PeriodicManagerRegistry;
1010
use PHPUnit\Framework\MockObject\MockObject;
11+
use PHPUnit\Framework\MockObject\Stub;
1112
use PHPUnit\Framework\TestCase;
1213
use React\EventLoop\LoopInterface;
1314
use React\Socket\ServerInterface;
@@ -29,11 +30,11 @@ protected function setUp(): void
2930

3031
public function testCancelsPeriodicManagers(): void
3132
{
32-
/** @var MockObject&LoopInterface $loop */
33-
$loop = $this->createMock(LoopInterface::class);
33+
/** @var Stub&LoopInterface $loop */
34+
$loop = self::createStub(LoopInterface::class);
3435

35-
/** @var MockObject&ServerInterface $server */
36-
$server = $this->createMock(ServerInterface::class);
36+
/** @var Stub&ServerInterface $server */
37+
$server = self::createStub(ServerInterface::class);
3738

3839
/** @var MockObject&PeriodicManager $manager */
3940
$manager = $this->createMock(PeriodicManager::class);
@@ -48,11 +49,11 @@ public function testCancelsPeriodicManagers(): void
4849

4950
public function testInitializesPeriodicManagers(): void
5051
{
51-
/** @var MockObject&LoopInterface $loop */
52-
$loop = $this->createMock(LoopInterface::class);
52+
/** @var Stub&LoopInterface $loop */
53+
$loop = self::createStub(LoopInterface::class);
5354

54-
/** @var MockObject&ServerInterface $server */
55-
$server = $this->createMock(ServerInterface::class);
55+
/** @var Stub&ServerInterface $server */
56+
$server = self::createStub(ServerInterface::class);
5657

5758
/** @var MockObject&PeriodicManager $manager */
5859
$manager = $this->createMock(PeriodicManager::class);

‎tests/PeriodicManager/PingDoctrineDBALConnectionsPeriodicManagerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testTheManagerIsRegistered(): void
4646

4747
$loop->expects(self::once())
4848
->method('addPeriodicTimer')
49-
->willReturn($this->createMock(TimerInterface::class));
49+
->willReturn(self::createStub(TimerInterface::class));
5050

5151
$this->manager->register($loop);
5252
}

0 commit comments

Comments
 (0)