~ adding dangling semicolon for multi-line chained statements to phpcs

dinamic · dkarlovi · commit d8b9d5e39551 · 2018-01-12T13:49:01.000+01:00
diff --git a/.php_cs b/.php_cs
@@ -40,7 +40,7 @@ return PhpCsFixer\Config::create()
             'modernize_types_casting' => true,
             // 'native_function_invocation' => true,
             'no_extra_consecutive_blank_lines' => ['continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
-            'no_multiline_whitespace_before_semicolons' => true,
+            'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
             'no_php4_constructor' => true,
             'no_short_echo_tag' => true,
             'no_unreachable_default_argument_value' => true,
diff --git a/Command/CleanCommand.php b/Command/CleanCommand.php
@@ -34,7 +34,8 @@ protected function configure()
 
   <info>php %command.full_name%</info>
 EOT
-        );
+            )
+        ;
     }
 
     /**
diff --git a/Command/CreateClientCommand.php b/Command/CreateClientCommand.php
@@ -49,7 +49,8 @@ protected function configure()
 <info>php %command.full_name% [--redirect-uri=...] [--grant-type=...]</info>
 
 EOT
-            );
+            )
+        ;
     }
 
     /**
diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php
@@ -228,7 +228,8 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for
 
         try {
             return $this->oAuth2Server
-                ->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope());
+                ->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope())
+            ;
         } catch (OAuth2ServerException $e) {
             return $e->getHttpResponse();
         }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -49,7 +49,8 @@ public function getConfigTreeBuilder()
                 ->scalarNode('refresh_token_class')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('auth_code_class')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('model_manager_name')->defaultNull()->end()
-            ->end();
+            ->end()
+        ;
 
         $this->addAuthorizeSection($rootNode);
         $this->addServiceSection($rootNode);
@@ -80,7 +81,8 @@ private function addAuthorizeSection(ArrayNodeDefinition $node)
                         ->end()
                     ->end()
                 ->end()
-            ->end();
+            ->end()
+        ;
     }
 
     private function addServiceSection(ArrayNodeDefinition $node)
@@ -105,7 +107,8 @@ private function addServiceSection(ArrayNodeDefinition $node)
                         ->end()
                     ->end()
                 ->end()
-            ->end();
+            ->end()
+        ;
     }
 
     private function addTemplateSection(ArrayNodeDefinition $node)
@@ -118,6 +121,7 @@ private function addTemplateSection(ArrayNodeDefinition $node)
                         ->scalarNode('engine')->defaultValue('twig')->end()
                     ->end()
                 ->end()
-            ->end();
+            ->end()
+        ;
     }
 }
diff --git a/DependencyInjection/Security/Factory/OAuthFactory.php b/DependencyInjection/Security/Factory/OAuthFactory.php
@@ -41,7 +41,8 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $providerId = 'security.authentication.provider.fos_oauth_server.'.$id;
         $container
             ->setDefinition($providerId, new $definitionClass('fos_oauth_server.security.authentication.provider'))
-            ->replaceArgument(0, new Reference($userProvider));
+            ->replaceArgument(0, new Reference($userProvider))
+        ;
 
         $listenerId = 'security.authentication.listener.fos_oauth_server.'.$id;
         $container->setDefinition($listenerId, new $definitionClass('fos_oauth_server.security.authentication.listener'));
diff --git a/Document/AuthCodeManager.php b/Document/AuthCodeManager.php
@@ -87,7 +87,8 @@ public function deleteExpired()
             ->remove()
             ->field('expiresAt')->lt(time())
             ->getQuery(['safe' => true])
-            ->execute();
+            ->execute()
+        ;
 
         return $result['n'];
     }
diff --git a/Document/TokenManager.php b/Document/TokenManager.php
@@ -87,7 +87,8 @@ public function deleteExpired()
             ->remove()
             ->field('expiresAt')->lt(time())
             ->getQuery(['safe' => true])
-            ->execute();
+            ->execute()
+        ;
 
         return $result['n'];
     }
diff --git a/Entity/AuthCodeManager.php b/Entity/AuthCodeManager.php
@@ -83,7 +83,8 @@ public function deleteExpired()
         $qb
             ->delete()
             ->where('a.expiresAt < ?1')
-            ->setParameters([1 => time()]);
+            ->setParameters([1 => time()])
+        ;
 
         return $qb->getQuery()->execute();
     }
diff --git a/Entity/TokenManager.php b/Entity/TokenManager.php
@@ -86,7 +86,8 @@ public function deleteExpired()
         $qb
             ->delete()
             ->where('t.expiresAt < ?1')
-            ->setParameters([1 => time()]);
+            ->setParameters([1 => time()])
+        ;
 
         return $qb->getQuery()->execute();
     }
diff --git a/Propel/AuthCodeManager.php b/Propel/AuthCodeManager.php
@@ -52,7 +52,8 @@ public function findAuthCodeBy(array $criteria)
 
         return $queryClass::create()
             ->filterByToken($criteria['token'])
-            ->findOne();
+            ->findOne()
+        ;
     }
 
     /**
@@ -80,6 +81,7 @@ public function deleteExpired()
 
         return $queryClass::create()
             ->filterByExpiresAt(time(), \Criteria::LESS_THAN)
-            ->delete();
+            ->delete()
+        ;
     }
 }
diff --git a/Propel/ClientManager.php b/Propel/ClientManager.php
@@ -50,7 +50,8 @@ public function findClientBy(array $criteria)
         return $queryClass::create()
             ->filterById($criteria['id'])
             ->filterByRandomId($criteria['randomId'])
-            ->findOne();
+            ->findOne()
+        ;
     }
 
     /**
diff --git a/Propel/TokenManager.php b/Propel/TokenManager.php
@@ -52,7 +52,8 @@ public function findTokenBy(array $criteria)
 
         return $queryClass::create()
             ->filterByToken($criteria['token'])
-            ->findOne();
+            ->findOne()
+        ;
     }
 
     /**
@@ -80,6 +81,7 @@ public function deleteExpired()
 
         return $queryClass::create()
             ->filterByExpiresAt(time(), \Criteria::LESS_THAN)
-            ->delete();
+            ->delete()
+        ;
     }
 }
diff --git a/Tests/Command/CleanCommandTest.php b/Tests/Command/CleanCommandTest.php
@@ -60,21 +60,24 @@ public function testItShouldRemoveExpiredToken($class)
         $accessTokenManager
             ->expects($this->once())
             ->method('deleteExpired')
-            ->will($this->returnValue($expiredAccessTokens));
+            ->will($this->returnValue($expiredAccessTokens))
+        ;
 
         $expiredRefreshTokens = 183;
         $refreshTokenManager = $this->getMockBuilder($class)->disableOriginalConstructor()->getMock();
         $refreshTokenManager
             ->expects($this->once())
             ->method('deleteExpired')
-            ->will($this->returnValue($expiredRefreshTokens));
+            ->will($this->returnValue($expiredRefreshTokens))
+        ;
 
         $expiredAuthCodes = 0;
         $authCodeManager = $this->getMockBuilder($class)->disableOriginalConstructor()->getMock();
         $authCodeManager
             ->expects($this->once())
             ->method('deleteExpired')
-            ->will($this->returnValue($expiredAuthCodes));
+            ->will($this->returnValue($expiredAuthCodes))
+        ;
 
         $this->container->set('fos_oauth_server.access_token_manager', $accessTokenManager);
         $this->container->set('fos_oauth_server.refresh_token_manager', $refreshTokenManager);
diff --git a/Tests/Command/CreateClientCommandTest.php b/Tests/Command/CreateClientCommandTest.php
@@ -59,12 +59,14 @@ public function testItShouldCreateClient($clientManager, $client)
         $clientManager = $this
             ->getMockBuilder($clientManager)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
 
         $clientManager
             ->expects($this->any())
             ->method('createClient')
-            ->will($this->returnValue(new $client()));
+            ->will($this->returnValue(new $client()))
+        ;
 
         $this->container->set('fos_oauth_server.client_manager.default', $clientManager);
 
diff --git a/Tests/Document/TokenManagerTest.php b/Tests/Document/TokenManagerTest.php
@@ -32,14 +32,17 @@ public function setUp()
         $this->class = 'FOS\OAuthServerBundle\Document\AccessToken';
         $this->repository = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentRepository')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $this->dm = $this->getMockBuilder('Doctrine\ODM\MongoDB\DocumentManager')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $this->dm->expects($this->once())
             ->method('getRepository')
             ->with($this->class)
-            ->will($this->returnValue($this->repository));
+            ->will($this->returnValue($this->repository))
+        ;
 
         $this->manager = new TokenManager($this->dm, $this->class);
     }
@@ -49,11 +52,13 @@ public function testFindTokenByToken()
         $manager = $this->getMockBuilder('FOS\OAuthServerBundle\Document\TokenManager')
             ->disableOriginalConstructor()
             ->setMethods(['findTokenBy'])
-            ->getMock();
+            ->getMock()
+        ;
 
         $manager->expects($this->once())
             ->method('findTokenBy')
-            ->with($this->equalTo(['token' => '1234']));
+            ->with($this->equalTo(['token' => '1234']))
+        ;
 
         $manager->findTokenByToken('1234');
     }
@@ -64,10 +69,12 @@ public function testUpdateTokenPersistsAndFlushes()
 
         $this->dm->expects($this->once())
             ->method('persist')
-            ->with($token);
+            ->with($token)
+        ;
         $this->dm->expects($this->once())
             ->method('flush')
-            ->with();
+            ->with()
+        ;
 
         $this->manager->updateToken($token);
     }
diff --git a/Tests/Entity/TokenManagerTest.php b/Tests/Entity/TokenManagerTest.php
@@ -31,14 +31,17 @@ public function setUp()
         $this->class = 'FOS\OAuthServerBundle\Entity\AccessToken';
         $this->repository = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $this->em->expects($this->once())
             ->method('getRepository')
             ->with($this->class)
-            ->will($this->returnValue($this->repository));
+            ->will($this->returnValue($this->repository))
+        ;
 
         $this->manager = new TokenManager($this->em, $this->class);
     }
@@ -49,10 +52,12 @@ public function testUpdateTokenPersistsAndFlushes()
 
         $this->em->expects($this->once())
             ->method('persist')
-            ->with($token);
+            ->with($token)
+        ;
         $this->em->expects($this->once())
             ->method('flush')
-            ->with();
+            ->with()
+        ;
 
         $this->manager->updateToken($token);
     }
diff --git a/Tests/Form/Type/AuthorizeFormTypeTest.php b/Tests/Form/Type/AuthorizeFormTypeTest.php
@@ -28,7 +28,8 @@ protected function setUp()
 
         $this->factory = Forms::createFormFactoryBuilder()
         ->addTypes($this->getTypes())
-        ->getFormFactory();
+        ->getFormFactory()
+        ;
 
         $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
     }
diff --git a/Tests/Propel/AuthCodeManagerTest.php b/Tests/Propel/AuthCodeManagerTest.php
@@ -45,10 +45,12 @@ public function testUpdate()
     {
         $authCode = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\AuthCode')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $authCode
             ->expects($this->once())
-            ->method('save');
+            ->method('save')
+        ;
 
         $this->manager->updateAuthCode($authCode);
     }
@@ -57,10 +59,12 @@ public function testDelete()
     {
         $authCode = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\AuthCode')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $authCode
             ->expects($this->once())
-            ->method('delete');
+            ->method('delete')
+        ;
 
         $this->manager->deleteAuthCode($authCode);
     }
diff --git a/Tests/Propel/ClientManagerTest.php b/Tests/Propel/ClientManagerTest.php
@@ -45,10 +45,12 @@ public function testUpdate()
     {
         $client = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\Client')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $client
             ->expects($this->once())
-            ->method('save');
+            ->method('save')
+        ;
 
         $this->manager->updateClient($client);
     }
@@ -57,10 +59,12 @@ public function testDelete()
     {
         $client = $this->getMockBuilder('FOS\OAuthServerBundle\Propel\Client')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMock()
+        ;
         $client
             ->expects($this->once())
-            ->method('delete');
+            ->method('delete')
+        ;
 
         $this->manager->deleteClient($client);
     }
diff --git a/Tests/Propel/TokenManagerTest.php b/Tests/Propel/TokenManagerTest.php
diff --git a/Tests/Security/Authentication/Provider/OAuthProviderTest.php b/Tests/Security/Authentication/Provider/OAuthProviderTest.php
diff --git a/Tests/Security/Firewall/OAuthListenerTest.php b/Tests/Security/Firewall/OAuthListenerTest.php
diff --git a/Tests/Storage/OAuthStorageTest.php b/Tests/Storage/OAuthStorageTest.php

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ protected function configure()`
`34`	`34`
`35`	`35`	`<info>php %command.full_name%</info>`
`36`	`36`	`EOT`
`37`		`- );`
	`37`	`+ )`
	`38`	`+ ;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ protected function configure()`
`49`	`49`	`<info>php %command.full_name% [--redirect-uri=...] [--grant-type=...]</info>`
`50`	`50`
`51`	`51`	`EOT`
`52`		`- );`
	`52`	`+ )`
	`53`	`+ ;`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,8 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for`
`228`	`228`
`229`	`229`	`try {`
`230`	`230`	`return $this->oAuth2Server`
`231`		`- ->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope());`
	`231`	`+ ->finishClientAuthorization($formHandler->isAccepted(), $user, $request, $formHandler->getScope())`
	`232`	`+ ;`
`232`	`233`	`} catch (OAuth2ServerException $e) {`
`233`	`234`	`return $e->getHttpResponse();`
`234`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ public function deleteExpired()`
`87`	`87`	`->remove()`
`88`	`88`	`->field('expiresAt')->lt(time())`
`89`	`89`	`->getQuery(['safe' => true])`
`90`		`- ->execute();`
	`90`	`+ ->execute()`
	`91`	`+ ;`
`91`	`92`
`92`	`93`	`return $result['n'];`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ public function deleteExpired()`
`83`	`83`	`$qb`
`84`	`84`	`->delete()`
`85`	`85`	`->where('a.expiresAt < ?1')`
`86`		`- ->setParameters([1 => time()]);`
	`86`	`+ ->setParameters([1 => time()])`
	`87`	`+ ;`
`87`	`88`
`88`	`89`	`return $qb->getQuery()->execute();`
`89`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public function deleteExpired()`
`86`	`86`	`$qb`
`87`	`87`	`->delete()`
`88`	`88`	`->where('t.expiresAt < ?1')`
`89`		`- ->setParameters([1 => time()]);`
	`89`	`+ ->setParameters([1 => time()])`
	`90`	`+ ;`
`90`	`91`
`91`	`92`	`return $qb->getQuery()->execute();`
`92`	`93`	`}`