Skip to content

Commit d8b9d5e

Browse files
dinamicdkarlovi
dinamic
authored and
dkarlovi
committed
~ adding dangling semicolon for multi-line chained statements to phpcs
1 parent 9b5bf8a commit d8b9d5e

24 files changed

+245
-123
lines changed

Diff for: ‎.php_cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ return PhpCsFixer\Config::create()
4040
'modernize_types_casting' => true,
4141
// 'native_function_invocation' => true,
4242
'no_extra_consecutive_blank_lines' => ['continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
43-
'no_multiline_whitespace_before_semicolons' => true,
43+
'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
4444
'no_php4_constructor' => true,
4545
'no_short_echo_tag' => true,
4646
'no_unreachable_default_argument_value' => true,

Diff for: ‎Command/CleanCommand.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ protected function configure()
3434
3535
<info>php %command.full_name%</info>
3636
EOT
37-
);
37+
)
38+
;
3839
}
3940

4041
/**

Diff for: ‎Command/CreateClientCommand.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ protected function configure()
4949
<info>php %command.full_name% [--redirect-uri=...] [--grant-type=...]</info>
5050
5151
EOT
52-
);
52+
)
53+
;
5354
}
5455

5556
/**

Diff for: ‎Controller/AuthorizeController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for
228228

229229
try {
230230
return $this->oAuth2Server
231-
->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope());
231+
->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope())
232+
;
232233
} catch (OAuth2ServerException $e) {
233234
return $e->getHttpResponse();
234235
}

Diff for: ‎DependencyInjection/Configuration.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public function getConfigTreeBuilder()
4949
->scalarNode('refresh_token_class')->isRequired()->cannotBeEmpty()->end()
5050
->scalarNode('auth_code_class')->isRequired()->cannotBeEmpty()->end()
5151
->scalarNode('model_manager_name')->defaultNull()->end()
52-
->end();
52+
->end()
53+
;
5354

5455
$this->addAuthorizeSection($rootNode);
5556
$this->addServiceSection($rootNode);
@@ -80,7 +81,8 @@ private function addAuthorizeSection(ArrayNodeDefinition $node)
8081
->end()
8182
->end()
8283
->end()
83-
->end();
84+
->end()
85+
;
8486
}
8587

8688
private function addServiceSection(ArrayNodeDefinition $node)
@@ -105,7 +107,8 @@ private function addServiceSection(ArrayNodeDefinition $node)
105107
->end()
106108
->end()
107109
->end()
108-
->end();
110+
->end()
111+
;
109112
}
110113

111114
private function addTemplateSection(ArrayNodeDefinition $node)
@@ -118,6 +121,7 @@ private function addTemplateSection(ArrayNodeDefinition $node)
118121
->scalarNode('engine')->defaultValue('twig')->end()
119122
->end()
120123
->end()
121-
->end();
124+
->end()
125+
;
122126
}
123127
}

Diff for: ‎DependencyInjection/Security/Factory/OAuthFactory.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
4141
$providerId = 'security.authentication.provider.fos_oauth_server.'.$id;
4242
$container
4343
->setDefinition($providerId, new $definitionClass('fos_oauth_server.security.authentication.provider'))
44-
->replaceArgument(0, new Reference($userProvider));
44+
->replaceArgument(0, new Reference($userProvider))
45+
;
4546

4647
$listenerId = 'security.authentication.listener.fos_oauth_server.'.$id;
4748
$container->setDefinition($listenerId, new $definitionClass('fos_oauth_server.security.authentication.listener'));

Diff for: ‎Document/AuthCodeManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public function deleteExpired()
8787
->remove()
8888
->field('expiresAt')->lt(time())
8989
->getQuery(['safe' => true])
90-
->execute();
90+
->execute()
91+
;
9192

9293
return $result['n'];
9394
}

Diff for: ‎Document/TokenManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public function deleteExpired()
8787
->remove()
8888
->field('expiresAt')->lt(time())
8989
->getQuery(['safe' => true])
90-
->execute();
90+
->execute()
91+
;
9192

9293
return $result['n'];
9394
}

Diff for: ‎Entity/AuthCodeManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public function deleteExpired()
8383
$qb
8484
->delete()
8585
->where('a.expiresAt < ?1')
86-
->setParameters([1 => time()]);
86+
->setParameters([1 => time()])
87+
;
8788

8889
return $qb->getQuery()->execute();
8990
}

Diff for: ‎Entity/TokenManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public function deleteExpired()
8686
$qb
8787
->delete()
8888
->where('t.expiresAt < ?1')
89-
->setParameters([1 => time()]);
89+
->setParameters([1 => time()])
90+
;
9091

9192
return $qb->getQuery()->execute();
9293
}

Diff for: ‎Propel/AuthCodeManager.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public function findAuthCodeBy(array $criteria)
5252

5353
return $queryClass::create()
5454
->filterByToken($criteria['token'])
55-
->findOne();
55+
->findOne()
56+
;
5657
}
5758

5859
/**
@@ -80,6 +81,7 @@ public function deleteExpired()
8081

8182
return $queryClass::create()
8283
->filterByExpiresAt(time(), \Criteria::LESS_THAN)
83-
->delete();
84+
->delete()
85+
;
8486
}
8587
}

Diff for: ‎Propel/ClientManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ public function findClientBy(array $criteria)
5050
return $queryClass::create()
5151
->filterById($criteria['id'])
5252
->filterByRandomId($criteria['randomId'])
53-
->findOne();
53+
->findOne()
54+
;
5455
}
5556

5657
/**

Diff for: ‎Propel/TokenManager.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public function findTokenBy(array $criteria)
5252

5353
return $queryClass::create()
5454
->filterByToken($criteria['token'])
55-
->findOne();
55+
->findOne()
56+
;
5657
}
5758

5859
/**
@@ -80,6 +81,7 @@ public function deleteExpired()
8081

8182
return $queryClass::create()
8283
->filterByExpiresAt(time(), \Criteria::LESS_THAN)
83-
->delete();
84+
->delete()
85+
;
8486
}
8587
}

Diff for: ‎Tests/Command/CleanCommandTest.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,24 @@ public function testItShouldRemoveExpiredToken($class)
6060
$accessTokenManager
6161
->expects($this->once())
6262
->method('deleteExpired')
63-
->will($this->returnValue($expiredAccessTokens));
63+
->will($this->returnValue($expiredAccessTokens))
64+
;
6465

6566
$expiredRefreshTokens = 183;
6667
$refreshTokenManager = $this->getMockBuilder($class)->disableOriginalConstructor()->getMock();
6768
$refreshTokenManager
6869
->expects($this->once())
6970
->method('deleteExpired')
70-
->will($this->returnValue($expiredRefreshTokens));
71+
->will($this->returnValue($expiredRefreshTokens))
72+
;
7173

7274
$expiredAuthCodes = 0;
7375
$authCodeManager = $this->getMockBuilder($class)->disableOriginalConstructor()->getMock();
7476
$authCodeManager
7577
->expects($this->once())
7678
->method('deleteExpired')
77-
->will($this->returnValue($expiredAuthCodes));
79+
->will($this->returnValue($expiredAuthCodes))
80+
;
7881

7982
$this->container->set('fos_oauth_server.access_token_manager', $accessTokenManager);
8083
$this->container->set('fos_oauth_server.refresh_token_manager', $refreshTokenManager);

Diff for: ‎Tests/Command/CreateClientCommandTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@ public function testItShouldCreateClient($clientManager, $client)
5959
$clientManager = $this
6060
->getMockBuilder($clientManager)
6161
->disableOriginalConstructor()
62-
->getMock();
62+
->getMock()
63+
;
6364

6465
$clientManager
6566
->expects($this->any())
6667
->method('createClient')
67-
->will($this->returnValue(new $client()));
68+
->will($this->returnValue(new $client()))
69+
;
6870

6971
$this->container->set('fos_oauth_server.client_manager.default', $clientManager);
7072

Diff for: ‎Tests/Document/TokenManagerTest.php

+14-7
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ public function setUp()
3232
$this->class = 'FOS\OAuthServerBundle\Document\AccessToken';
3333
$this->repository = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentRepository')
3434
->disableOriginalConstructor()
35-
->getMock();
35+
->getMock()
36+
;
3637
$this->dm = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentManager')
3738
->disableOriginalConstructor()
38-
->getMock();
39+
->getMock()
40+
;
3941
$this->dm->expects($this->once())
4042
->method('getRepository')
4143
->with($this->class)
42-
->will($this->returnValue($this->repository));
44+
->will($this->returnValue($this->repository))
45+
;
4346

4447
$this->manager = new TokenManager($this->dm, $this->class);
4548
}
@@ -49,11 +52,13 @@ public function testFindTokenByToken()
4952
$manager = $this->getMockBuilder('FOS\OAuthServerBundle\Document\TokenManager')
5053
->disableOriginalConstructor()
5154
->setMethods(['findTokenBy'])
52-
->getMock();
55+
->getMock()
56+
;
5357

5458
$manager->expects($this->once())
5559
->method('findTokenBy')
56-
->with($this->equalTo(['token' => '1234']));
60+
->with($this->equalTo(['token' => '1234']))
61+
;
5762

5863
$manager->findTokenByToken('1234');
5964
}
@@ -64,10 +69,12 @@ public function testUpdateTokenPersistsAndFlushes()
6469

6570
$this->dm->expects($this->once())
6671
->method('persist')
67-
->with($token);
72+
->with($token)
73+
;
6874
$this->dm->expects($this->once())
6975
->method('flush')
70-
->with();
76+
->with()
77+
;
7178

7279
$this->manager->updateToken($token);
7380
}

Diff for: ‎Tests/Entity/TokenManagerTest.php

+10-5
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ public function setUp()
3131
$this->class = 'FOS\OAuthServerBundle\Entity\AccessToken';
3232
$this->repository = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
3333
->disableOriginalConstructor()
34-
->getMock();
34+
->getMock()
35+
;
3536
$this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
3637
->disableOriginalConstructor()
37-
->getMock();
38+
->getMock()
39+
;
3840
$this->em->expects($this->once())
3941
->method('getRepository')
4042
->with($this->class)
41-
->will($this->returnValue($this->repository));
43+
->will($this->returnValue($this->repository))
44+
;
4245

4346
$this->manager = new TokenManager($this->em, $this->class);
4447
}
@@ -49,10 +52,12 @@ public function testUpdateTokenPersistsAndFlushes()
4952

5053
$this->em->expects($this->once())
5154
->method('persist')
52-
->with($token);
55+
->with($token)
56+
;
5357
$this->em->expects($this->once())
5458
->method('flush')
55-
->with();
59+
->with()
60+
;
5661

5762
$this->manager->updateToken($token);
5863
}

Diff for: ‎Tests/Form/Type/AuthorizeFormTypeTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ protected function setUp()
2828

2929
$this->factory = Forms::createFormFactoryBuilder()
3030
->addTypes($this->getTypes())
31-
->getFormFactory();
31+
->getFormFactory()
32+
;
3233

3334
$this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
3435
}

Diff for: ‎Tests/Propel/AuthCodeManagerTest.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ public function testUpdate()
4545
{
4646
$authCode = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\AuthCode')
4747
->disableOriginalConstructor()
48-
->getMock();
48+
->getMock()
49+
;
4950
$authCode
5051
->expects($this->once())
51-
->method('save');
52+
->method('save')
53+
;
5254

5355
$this->manager->updateAuthCode($authCode);
5456
}
@@ -57,10 +59,12 @@ public function testDelete()
5759
{
5860
$authCode = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\AuthCode')
5961
->disableOriginalConstructor()
60-
->getMock();
62+
->getMock()
63+
;
6164
$authCode
6265
->expects($this->once())
63-
->method('delete');
66+
->method('delete')
67+
;
6468

6569
$this->manager->deleteAuthCode($authCode);
6670
}

Diff for: ‎Tests/Propel/ClientManagerTest.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ public function testUpdate()
4545
{
4646
$client = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\Client')
4747
->disableOriginalConstructor()
48-
->getMock();
48+
->getMock()
49+
;
4950
$client
5051
->expects($this->once())
51-
->method('save');
52+
->method('save')
53+
;
5254

5355
$this->manager->updateClient($client);
5456
}
@@ -57,10 +59,12 @@ public function testDelete()
5759
{
5860
$client = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\Client')
5961
->disableOriginalConstructor()
60-
->getMock();
62+
->getMock()
63+
;
6164
$client
6265
->expects($this->once())
63-
->method('delete');
66+
->method('delete')
67+
;
6468

6569
$this->manager->deleteClient($client);
6670
}

0 commit comments

Comments
 (0)