8000 minor #33677 Various tweaks 3.4 (fabpot) · symfony/symfony@d273ee8 · GitHub
[go: up one dir, main page]
Skip to content

Commit d273ee8

Browse files
fabpotfabpot
committed
minor #33677 Various tweaks 3.4 (fabpot)
This PR was squashed before being merged into the 3.4 branch (closes #33677). Discussion ---------- Various tweaks 3.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | n/a | License | MIT | Doc PR | n/a <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Always add tests and ensure they pass. - Never break backward compatibility (see https://symfony.com/bc). - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too.) - Features and deprecations must be submitted against branch 4.4. - Legacy code removals go to the master branch. --> Commits ------- 47cb83a Various tweaks 3.4
2 parents 35b6701 + 47cb83a commit d273ee8

File tree

11 files changed

+12
-14
lines changed

11 files changed

+12
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ public function testAskThrowsExceptionOnMissingInputWithValidator()
960960
$dialog = new QuestionHelper();
961961

962962
$question = new Question('What\'s your name?');
963-
$question->setValidator(function () {
963+
$question->setValidator(function ($value) {
964964
if (!$value) {
965965
throw new \Exception('A value is required.');
966966
}

‎src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class InputDefinitionTest extends TestCase
2020
{
2121
protected static $fixtures;
2222

23+
protected $multi;
2324
protected $foo;
2425
protected $bar;
2526
protected $foo1;

‎src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public function testSymfonyStyleCommandWithInputs()
196196
];
197197

198198
$command = new Command('foo');
199-
$command->setCode(function ($input, $output) use ($questions, $command) {
199+
$command->setCode(function ($input, $output) use ($questions) {
200200
$io = new SymfonyStyle($input, $output);
201201
$io->ask($questions[0]);
202202
$io->ask($questions[1]);

‎src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Ldap\Tests;
12+
namespace Symfony\Component\Ldap\Tests\Adapter\ExtLdap;
1313

1414
use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
1515
use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
1616
use Symfony\Component\Ldap\Adapter\ExtLdap\Query;
1717
use Symfony\Component\Ldap\Entry;
1818
use Symfony\Component\Ldap\Exception\NotBoundException;
1919
use Symfony\Component\Ldap\LdapInterface;
20+
use Symfony\Component\Ldap\Tests\LdapTestCase;
2021

2122
/**
2223
* @requires extension ldap

‎src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Ldap\Tests;
12+
namespace Symfony\Component\Ldap\Tests\Adapter\ExtLdap;
1313

1414
use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
1515
use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
1616
use Symfony\Component\Ldap\Entry;
1717
use Symfony\Component\Ldap\Exception\LdapException;
1818
use Symfony\Component\Ldap\Exception\NotBoundException;
19+
use Symfony\Component\Ldap\Tests\LdapTestCase;
1920

2021
/**
2122
* @requires extension ldap

‎src/Symfony/Component/Routing/Loader/PhpFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function load($file, $type = null)
4040

4141
// the closure forbids access to the private scope in the included file
4242
$loader = $this;
43-
$load = \Closure::bind(static function ($file) use ($loader) {
43+
$load = \Closure::bind(static function ($file) {
4444
return include $file;
4545
}, null, ProtectedPhpFileLoader::class);
4646

‎src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function testNamespaced()
165165
$requestStack = new RequestStack();
166166
$requestStack->push(new Request([], [], [], [], [], ['HTTPS' => 'on']));
167167

168-
$manager = new CsrfTokenManager($generator, $storage, null, $requestStack);
168+
$manager = new CsrfTokenManager($generator, $storage);
169169

170170
$token = $manager->getToken('foo');
171171
$this->assertSame('foo', $token->getId());

‎src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Security\Tests\Http\Firewall;
12+
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\HttpFoundation\RedirectResponse;

‎src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Security\Tests\Http\Firewall;
12+
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\HttpFoundation\Request;

‎src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ public function getLogger()
3737
return $this->logger;
3838
}
3939

40-
public function getDebugger()
41-
{
42-
return $this->debugger;
43-
}
44-
4540
public function isFresh(TemplateReferenceInterface $template, $time)
4641
{
4742
return false;

0 commit comments

Comments
 (0)
0