8000 minor #19466 Minor fixes (zomberg) · symfony/symfony@2075d31 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2075d31

Browse files
fabpotfabpot
committed
minor #19466 Minor fixes (zomberg)
This PR was squashed before being merged into the 2.7 branch (closes #19466). Discussion ---------- Minor fixes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Commits ------- 774c984 Minor fixes
2 parents bdfc2aa + 774c984 commit 2075d31

File tree

24 files changed

+15
-42
lines changed

24 files changed

+15
-42
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Twig\Tests\Extension;
1313

1414
use Symfony\Bridge\Twig\Extension\ExpressionExtension;
15-
use Symfony\Component\ExpressionLanguage\Expression;
1615

1716
class ExpressionExtensionTest extends \PHPUnit_Framework_TestCase
1817
{

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Symfony\Component\Finder\Finder;
2424
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
2525
use Symfony\Component\Config\FileLocator;
26-
use Symfony\Component\Validator\Validation;
2726

2827
/**
2928
* FrameworkExtension.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
1919
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
2020
use Symfony\Component\DependencyInjection\Reference;
21-
use Symfony\Component\Validator\Validation;
2221

2322
abstract class FrameworkExtensionTest extends TestCase
2423
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function welcomeAction(Request $request, $name = null)
4242

4343
public function logoutAction(Request $request)
4444
{
45-
$request->getSession('session')->invalidate();
45+
$request->getSession()->invalidate();
4646

4747
return new Response('Session cleared.');
4848
}

‎src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
105105

106106
return 1;
107107
}
108-
$passwordQuestion = $this->createPasswordQuestion($input, $output);
108+
$passwordQuestion = $this->createPasswordQuestion();
109109
$password = $output->askQuestion($passwordQuestion);
110110
}
111111

‎src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,6 @@ protected function getConsoleOutput($stderr)
248248
return $output;
249249
}
250250

251-
private function hasStderrSupport()
252-
{
253-
return false === $this->isRunningOS400();
254-
}
255-
256251
private function hasSttyAvailable()
257252
{
258253
exec('stty 2>&1', $output, $exitcode);

‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Debug\DebugClassLoader;
1515
use Symfony\Component\Debug\ErrorHandler;
16-
use Symfony\Component\Debug\Exception\ContextErrorException;
1716

1817
class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
1918
{

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Alias;
15-
use Symfony\Component\DependencyInjection\Definition;
1615
use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
1716
use Symfony\Component\DependencyInjection\Reference;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testProcess()
5151
$this->assertSame('b_alias', $aDefinition->getFactoryService(false));
5252
$this->assertTrue($container->has('container'));
5353

54-
$resolvedFactory = $aDefinition->getFactory(false);
54+
$resolvedFactory = $aDefinition->getFactory();
5555
$this->assertSame('b_alias', (string) $resolvedFactory[0]);
5656
}
5757

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function testGet()
100100
try {
101101
@$builder->get('baz');
102102
$this->fail('->get() throws a ServiceCircularReferenceException if the service has a circular reference to itself');
103-
} catch (\Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException $e) {
103+
} catch (ServiceCircularReferenceException $e) {
104104
$this->assertEquals('Circular reference detected for service "baz", path: "baz".', $e->getMessage(), '->get() throws a LogicException if the service has a circular reference to itself');
105105
}
106106

0 commit comments

Comments
 (0)
0