minor #32998 SCA: dropped unused mocks, duplicate import and a function alias usage (kalessil)

nicolas-grekas · nicolas-grekas · commit 6d2e3eeaa0ff · 2019-08-07T09:23:50.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #32998). Discussion ---------- SCA: dropped unused mocks, duplicate import and a function alias usage | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 484668f SCA: dropped unused mocks, duplicate import and a function alias usage
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
@@ -14,23 +14,22 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Builder\FloatNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition as NumericNodeDefinition;
 
 class NumericNodeDefinitionTest extends TestCase
 {
     public function testIncoherentMinAssertion()
     {
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('You cannot define a min(4) as you already have a max(3)');
-        $def = new NumericNodeDefinition('foo');
+        $def = new IntegerNodeDefinition('foo');
         $def->max(3)->min(4);
     }
 
     public function testIncoherentMaxAssertion()
     {
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('You cannot define a max(2) as you already have a min(3)');
-        $node = new NumericNodeDefinition('foo');
+        $node = new IntegerNodeDefinition('foo');
         $node->min(3)->max(2);
     }
 
@@ -84,7 +83,7 @@ public function testCannotBeEmptyThrowsAnException()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
         $this->expectExceptionMessage('->cannotBeEmpty() is not applicable to NumericNodeDefinition.');
-        $def = new NumericNodeDefinition('foo');
+        $def = new IntegerNodeDefinition('foo');
         $def->cannotBeEmpty();
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -70,7 +70,6 @@ public function testCachedParseWithDeprecatedParserCacheInterface()
     {
         $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
 
-        $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $savedParsedExpression = null;
         $expressionLanguage = new ExpressionLanguage($cacheMock);
 
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -14,7 +14,7 @@ protected function getLdapConfig()
             $this->markTestSkipped('No server is listening on LDAP_HOST:LDAP_PORT');
         }
 
-        ldap_close($h);
+        ldap_unbind($h);
 
         return [
             'host' => getenv('LDAP_HOST'),
diff --git a/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -85,13 +85,6 @@ public function testHandleAuthenticationFailure()
      */
     public function testHandleAuthenticationClearsToken($tokenClass, $tokenProviderKey, $actualProviderKey)
     {
-        $token = $this->getMockBuilder($tokenClass)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $token->expects($this->any())
-            ->method('getProviderKey')
-            ->willReturn($tokenProviderKey);
-
         $this->tokenStorage->expects($this->never())
             ->method('setToken')
             ->with(null);
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -74,8 +74,6 @@ public function testHandleWhenAuthenticationFails()
             'PHP_AUTH_PW' => 'ThePassword',
         ]);
 
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-
         $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
         $tokenStorage
             ->expects($this->any())
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -124,7 +124,6 @@ public function testLoginSuccessIsNotProcessedWhenTokenDoesNotContainUserInterfa
         $service = $this->getService(null, ['name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null]);
         $request = new Request();
         $response = new Response();
-        $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
         $token
             ->expects($this->once())
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -50,14 +50,11 @@ public function testProcessMissingAlias()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
         $this->expectExceptionMessage('The alias for the tag "translation.extractor" of service "foo.id" must be set.');
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();
         $container = new ContainerBuilder();
         $container->register('translation.extractor');
         $container->register('foo.id')
             ->addTag('translation.extractor', []);
 
-        $definition->expects($this->never())->method('addMethodCall');
-
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
     }

Original file line number	Diff line number	Diff line change
`@@ -14,23 +14,22 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Config\Definition\Builder\FloatNodeDefinition;`
`16`	`16`	`use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition;`
`17`		`-use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition as NumericNodeDefinition;`
`18`	`17`
`19`	`18`	`class NumericNodeDefinitionTest extends TestCase`
`20`	`19`	`{`
`21`	`20`	`public function testIncoherentMinAssertion()`
`22`	`21`	`{`
`23`	`22`	`$this->expectException('InvalidArgumentException');`
`24`	`23`	`$this->expectExceptionMessage('You cannot define a min(4) as you already have a max(3)');`
`25`		`- $def = new NumericNodeDefinition('foo');`
	`24`	`+ $def = new IntegerNodeDefinition('foo');`
`26`	`25`	`$def->max(3)->min(4);`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`public function testIncoherentMaxAssertion()`
`30`	`29`	`{`
`31`	`30`	`$this->expectException('InvalidArgumentException');`
`32`	`31`	`$this->expectExceptionMessage('You cannot define a max(2) as you already have a min(3)');`
`33`		`- $node = new NumericNodeDefinition('foo');`
	`32`	`+ $node = new IntegerNodeDefinition('foo');`
`34`	`33`	`$node->min(3)->max(2);`
`35`	`34`	`}`
`36`	`35`
`@@ -84,7 +83,7 @@ public function testCannotBeEmptyThrowsAnException()`
`84`	`83`	`{`
`85`	`84`	`$this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');`
`86`	`85`	`$this->expectExceptionMessage('->cannotBeEmpty() is not applicable to NumericNodeDefinition.');`
`87`		`- $def = new NumericNodeDefinition('foo');`
	`86`	`+ $def = new IntegerNodeDefinition('foo');`
`88`	`87`	`$def->cannotBeEmpty();`
`89`	`88`	`}`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ public function testCachedParseWithDeprecatedParserCacheInterface()`
`70`	`70`	`{`
`71`	`71`	`$cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();`
`72`	`72`
`73`		`- $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();`
`74`	`73`	`$savedParsedExpression = null;`
`75`	`74`	`$expressionLanguage = new ExpressionLanguage($cacheMock);`
`76`	`75`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ protected function getLdapConfig()`
`14`	`14`	`$this->markTestSkipped('No server is listening on LDAP_HOST:LDAP_PORT');`
`15`	`15`	`}`
`16`	`16`
`17`		`- ldap_close($h);`
	`17`	`+ ldap_unbind($h);`
`18`	`18`
`19`	`19`	`return [`
`20`	`20`	`'host' => getenv('LDAP_HOST'),`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,11 @@ public function testProcessMissingAlias()`
`50`	`50`	`{`
`51`	`51`	`$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');`
`52`	`52`	`$this->expectExceptionMessage('The alias for the tag "translation.extractor" of service "foo.id" must be set.');`
`53`		`- $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();`
`54`	`53`	`$container = new ContainerBuilder();`
`55`	`54`	`$container->register('translation.extractor');`
`56`	`55`	`$container->register('foo.id')`
`57`	`56`	`->addTag('translation.extractor', []);`
`58`	`57`
`59`		`- $definition->expects($this->never())->method('addMethodCall');`
`60`		`-`
`61`	`58`	`$translationDumperPass = new TranslationExtractorPass();`
`62`	`59`	`$translationDumperPass->process($container);`
`63`	`60`	`}`