8000 Merge branch '4.3' into 4.4 · symfony/symfony@05f7f4e · GitHub
[go: up one dir, main page]
Skip to content

Commit 05f7f4e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: [OptionsResolve] Revert change in tests for a not-merged change in code [HttpClient] fix handling of 3xx with no Location header - ignore Content-Length when no body is expected [Workflow] Made the configuration more robust for the 'property' key [Security/Core] make NativePasswordEncoder use sodium to validate passwords when possible #30432 fix an error message fix paths to detect code owners [HttpClient] ignore the body of responses to HEAD requests [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 [SecurityBundle] Fix wrong assertion Remove unused local variables in tests [Yaml][Parser] Remove the getLastLineNumberBeforeDeprecation() internal unused method Make sure to collect child forms created on *_SET_DATA events [WebProfilerBundle] Improve display in Email panel for dark theme do not render errors for checkboxes twice
2 parents 0472dbf + 15f0855 commit 05f7f4e

File tree

87 files changed

+304
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+304
-168
lines changed

‎.github/CODEOWNERS

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/src/Symfony/Component/ErrorRenderer/* @yceruto
77
# Form
88
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
9-
/src/Symfony/Bridge/Twig/Form/* @xabbuh
9+
/src/Symfony/Bridge/Twig/Form/ @xabbuh
1010
/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @xabbuh
1111
/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php @xabbuh
1212
/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php @xabbuh
@@ -15,36 +15,36 @@
1515
/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php @xabbuh
1616
/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @xabbuh
1717
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php @xabbuh
18-
/src/Symfony/Bundle/FrameworkBundle/Resources/views/* @xabbuh
18+
/src/Symfony/Bundle/FrameworkBundle/Resources/views/ @xabbuh
1919
/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @xabbuh
2020
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
2121
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
2222
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
23-
/src/Symfony/Component/Form/* @xabbuh
23+
/src/Symfony/Component/Form/ @xabbuh
2424
# HttpKernel
2525
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
2626
# LDAP
27-
/src/Symfony/Component/Ldap/* @csarrazi
27+
/src/Symfony/Component/Ldap/ @csarrazi
2828
# Lock
29-
/src/Symfony/Component/Lock/* @jderusse
29+
/src/Symfony/Component/Lock/ @jderusse
3030
# Messenger
31-
/src/Symfony/Bridge/Doctrine/Messenger/* @sroze
32-
/src/Symfony/Component/Messenger/* @sroze
31+
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
32+
/src/Symfony/Component/Messenger/ @sroze
3333
# PropertyInfo
34-
/src/Symfony/Component/PropertyInfo/* @dunglas
35-
/src/Symfony/Bridge/Doctrine/PropertyInfo/* @dunglas
34+
/src/Symfony/Component/PropertyInfo/ @dunglas
35+
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
3636
# Serializer
37-
/src/Symfony/Component/Serializer/* @dunglas
37+
/src/Symfony/Component/Serializer/ @dunglas
3838
# TwigBundle
3939
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
4040
# WebLink
41-
/src/Symfony/Component/WebLink/* @dunglas
41+
/src/Symfony/Component/WebLink/ @dunglas
4242
# Workflow
4343
/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @lyrixx
4444
/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php @lyrixx
4545
/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php @lyrixx
4646
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
4747
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
48-
/src/Symfony/Component/Workflow/* @lyrixx
48+
/src/Symfony/Component/Workflow/ @lyrixx
4949
# Yaml
50-
/src/Symfony/Component/Yaml/* @xabbuh
50+
/src/Symfony/Component/Yaml/ @xabbuh

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
187187
public function testConfigureQueryBuilderWithNonQueryBuilderAndNonClosure()
188188
{
189189
$this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
190-
$field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
190+
$this->factory->createNamed('name', static::TESTED_TYPE, null, [
191191
'em' => 'default',
192192
'class' => self::SINGLE_IDENT_CLASS,
193193
'query_builder' => new \stdClass(),

‎src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function compile(Compiler $compiler)
3333

3434
preg_match('/_([^_]+)$/', $this->getAttribute('name'), $matches);
3535

36-
$label = null;
3736
$arguments = iterator_to_array($this->getNode('arguments'));
3837
$blockNameSuffix = $matches[1];
3938

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ col-sm-10
8282
<div class="{{ block('form_group_class') }}">
8383
{{- form_widget(form) -}}
8484
{{- form_help(form) -}}
85-
{{- form_errors(form) -}}
8685
</div>{#--#}
8786
</div>
8887
{%- endblock checkbox_row %}

‎src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ public function testGetFlashes()
180180
$flashMessages = $this->setFlashMessages();
181181
$this->assertEquals($flashMessages, $this->appVariable->getFlashes([]));
182182

183-
$flashMessages = $this->setFlashMessages();
183+
$this->setFlashMessages();
184184
$this->assertEquals([], $this->appVariable->getFlashes('this-does-not-exist'));
185185

186-
$flashMessages = $this->setFlashMessages();
186+
$this->setFlashMessages();
187187
$this->assertEquals(
188188
['this-does-not-exist' => []],
189189
$this->appVariable->getFlashes(['this-does-not-exist'])

‎src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testLintFileNotReadable()
5252
$filename = $this->createFile('');
5353
unlink($filename);
5454

55-
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
55+
$tester->execute(['filename' => [$filename]], ['decorated' => false]);
5656
}
5757

5858
public function testLintFileCompileTimeException()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testTiming($template, $events)
3434
$twig->addExtension(new StopwatchExtension($this->getStopwatch($events)));
3535

3636
try {
37-
$nodes = $twig->render('template');
37+
$twig->render('template');
3838
} catch (RuntimeError $e) {
3939
throw $e->getPrevious();
4040
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ public function testTransUnknownKeyword()
6060
{
6161
$this->expectException('Twig\Error\SyntaxError');
6262
$this->expectExceptionMessage('Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.');
63-
$output = $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
63+
$this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
6464
}
6565

6666
public function testTransComplexBody()
6767
{
6868
$this->expectException('Twig\Error\SyntaxError');
6969
$this->expectExceptionMessage('A message inside a trans tag must be a simple text in "index" at line 2.');
70-
$output = $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
70+
$this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
7171
}
7272

7373
/**
@@ -77,7 +77,7 @@ public function testTransChoiceComplexBody()
7777
{
7878
$this->expectException('Twig\Error\SyntaxError');
7979
$this->expectExceptionMessage('A message inside a transchoice tag must be a simple text in "index" at line 2.');
80-
$output = $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
80+
$this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
8181
}
8282

8383
public function getTransTests()

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,6 @@ private function renderEventListenerTable(EventDispatcherInterface $eventDispatc
510510
$tableHeaders = ['Order', 'Callable', 'Priority'];
511511
$tableRows = [];
512512

513-
$order = 1;
514513
foreach ($eventListeners as $order => $listener) {
515514
$tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
516515
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
322322
->end()
323323
->end()
324324
->scalarNode('property')
325-
->defaultValue('marking')
325+
->defaultNull() // In Symfony 5.0, set "marking" as default property
326326
->end()
327327
->scalarNode('service')
328328
->cannotBeEmpty()
@@ -500,6 +500,14 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
500500
return $v;
501501
})
502502
->end()
503+
->validate()
504+
->ifTrue(function ($v) {
505+
return isset($v['marking_store']['property'])
506+
&& (!isset($v['marking_store']['type']) || 'method' !== $v['marking_store']['type'])
507+
;
508+
})
509+
->thenInvalid('"property" option is only supported by the "method" marking store.')
510+
->end()
503511
->end()
504512
->end()
505513
->end()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
697697
if ('method' === $workflow['marking_store']['type']) {
698698
$markingStoreDefinition->setArguments([
699699
'state_machine' === $type, //single state
700-
$workflow['marking_store']['property'],
700+
$workflow['marking_store']['property'] ?? 'marking',
701701
]);
702702
} else {
703703
foreach ($workflow['marking_store']['arguments'] as $argument) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ public function testFileWhichDoesNotExist()
272272
$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
273273
$controller = $this->createController();
274274

275-
/* @var BinaryFileResponse $response */
276-
$response = $controller->file('some-file.txt', 'test.php');
275+
$controller->file('some-file.txt', 'test.php');
277276
}
278277

279278
public function testIsGranted()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TestExtension extends Extension implements PrependExtensionInterface
2727
public function load(array $configs, ContainerBuilder $container)
2828
{
2929
$configuration = $this->getConfiguration($configs, $container);
30-
$config = $this->processConfiguration($configuration, $configs);
30+
$this->processConfiguration($configuration, $configs);
3131

3232
$container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
3333
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testFlash($config, $insulate)
5959
}
6060

6161
// set flash
62-
$crawler = $client->request('GET', '/session_setflash/Hello%20world.');
62+
$client->request('GET', '/session_setflash/Hello%20world.');
6363

6464
// check flash displays on redirect
6565
$this->assertStringContainsString('Hello world.', $client->followRedirect()->text());

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function testDefaultFailureHandler($serviceId, $defaultHandlerInjection)
6161
$options['failure_handler'] = $serviceId;
6262
}
6363

64-
list($container, $authProviderId, $listenerId, $entryPointId) = $this->callFactory('foo', $options, 'user_provider', 'entry_point');
64+
list($container) = $this->callFactory('foo', $options, 'user_provider', 'entry_point');
6565

6666
$definition = $container->getDefinition('abstract_listener.foo');
6767
$arguments = $definition->getArguments();
@@ -99,7 +99,7 @@ public function testDefaultSuccessHandler($serviceId, $defaultHandlerInjection)
9999
$options['success_handler'] = $serviceId;
100100
}
101101

102-
list($container, $authProviderId, $listenerId, $entryPointId) = $this->callFactory('foo', $options, 'user_provider', 'entry_point');
102+
list($container) = $this->callFactory('foo', $options, 'user_provider', 'entry_point');
103103

104104
$definition = $container->getDefinition('abstract_listener.foo');
105105
$arguments = $definition->getArguments();

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function testCreateWithEntryPoint()
159159
'authenticators' => ['authenticator123', 'authenticatorABC'],
160160
'entry_point' => 'authenticatorABC',
161161
];
162-
list($container, $entryPointId) = $this->executeCreate($config, null);
162+
list(, $entryPointId) = $this->executeCreate($config, null);
163163
$this->assertEquals('authenticatorABC', $entryPointId);
164164
}
165165

@@ -172,7 +172,7 @@ private function executeCreate(array $config, $defaultEntryPointId)
172172
$userProviderId = 'my_user_provider';
173173

174174
$factory = new GuardAuthenticationFactory();
175-
list($providerId, $listenerId, $entryPointId) = $factory->create($container, $id, $config, $userProviderId, $defaultEntryPointId);
175+
list(, , $entryPointId) = $factory->create($container, $id, $config, $userProviderId, $defaultEntryPointId);
176176

177177
return [$container, $entryPointId];
178178
}

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/MissingUserProviderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testUserProviderIsNeeded()
2424

2525
$response = $client->getResponse();
2626
$this->assertSame(500, $response->getStatusCode());
27-
$this->stringContains('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException', $response->getContent());
28-
$this->stringContains('"default" firewall requires a user provider but none was defined.', $response->getContent());
27+
$this->assertStringContainsString('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException', $response->getContent());
28+
$this->assertStringContainsString('"default" firewall requires a user provider but none was defined', html_entity_decode($response->getContent()));
2929
}
3030
}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
--base-4: #666;
4747
--base-5: #444;
4848
--base-6: #222;
49+
--card-label-background: #eee;
50+
--card-label-color: var(--base-6);
4951
}
5052

5153
.theme-dark {
@@ -85,6 +87,8 @@
8587
--base-4: #666;
8688
--base-5: #e0e0e0;
8789
--base-6: #f5f5f5;
90+
--card-label-background: var(--tab-active-background);
91+
--card-label-color: var(--tab-active-color);
8892
}
8993

9094
{# Basic styles
@@ -436,8 +440,8 @@ table tbody td.num-col {
436440
margin-top: 0;
437441
}
438442
.card .label {
439-
background-color: #EEE;
440-
color: var(--base-6);
443+
background-color: var(--card-label-background);
444+
color: var(--card-label-color);
441445
}
442446

443447
{# Status

‎src/Symfony/Component/BrowserKit/Tests/CookieTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public function testConstructException()
201201
{
202202
$this->expectException('UnexpectedValueException');
203203
$this->expectExceptionMessage('The cookie expiration time "string" is not valid.');
204-
$cookie = new Cookie('foo', 'bar', 'string');
204+
new Cookie('foo', 'bar', 'string');
205205
}
206206

207207
public function testSameSite()

‎src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testTooLongNamespace()
7070
{
7171
$this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
7272
$this->expectExceptionMessage('Namespace must be 26 chars max, 40 given ("----------------------------------------")');
73-
$cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
73+
$this->getMockBuilder(MaxIdLengthAdapter::class)
7474
->setConstructorArgs([str_repeat('-', 40)])
7575
->getMock();
7676
}

‎src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DelegatingLoaderTest extends TestCase
1919
{
2020
public function testConstructor()
2121
{
22-
$loader = new DelegatingLoader($resolver = new LoaderResolver());
22+
new DelegatingLoader($resolver = new LoaderResolver());
2323
$this->assertTrue(true, '__construct() takes a loader resolver as its first argument');
2424
}
2525

‎src/Symfony/Component/Config/Tests/Resource/ClassExistenceResourceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function testExistsKo()
6767

6868
$loadedClass = 123;
6969

70-
$res = new ClassExistenceResource('MissingFooClass', false);
70+
new ClassExistenceResource('MissingFooClass', false);
7171

7272
$this->assertSame(123, $loadedClass);
7373
} finally {

‎src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function testResourceDoesNotExist()
6767
{
6868
$this->expectException('InvalidArgumentException');
6969
$this->expectExceptionMessageRegExp('/The directory ".*" does not exist./');
70-
$resource = new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
70+
new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
7171
}
7272

7373
public function testIsFresh()
@@ -165,7 +165,7 @@ public function testSerializeUnserialize()
165165
{
166166
$resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
167167

168-
$unserialized = unserialize(serialize($resource));
168+
unserialize(serialize($resource));
169169

170170
$this->assertSame(realpath($this->directory), $resource->getResource());
171171
$this->assertSame('/\.(foo|xml)$/', $resource->getPattern());

‎src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testResourceDoesNotExist()
5757
{
5858
$this->expectException('InvalidArgumentException');
5959
$this->expectExceptionMessageRegExp('/The file ".*" does not exist./');
60-
$resource = new FileResource('/____foo/foobar'.mt_rand(1, 999999));
60+
new FileResource('/____foo/foobar'.mt_rand(1, 999999));
6161
}
6262

6363
public function testIsFresh()
@@ -76,7 +76,7 @@ public function testIsFreshForDeletedResources()
7676

7777
public function testSerializeUnserialize()
7878
{
79-
$unserialized = unserialize(serialize($this->resource));
79+
unserialize(serialize($this->resource));
8080

8181
$this->assertSame(realpath($this->file), $this->resource->getResource());
8282
}

‎src/Symfony/Component/Console/Tests/ApplicationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ public function testFindAlternativeExceptionMessageMultiple()
579579

580580
// Subnamespace + plural
581581
try {
582-
$a = $application->find('foo3:');
582+
$application->find('foo3:');
583583
$this->fail('->find() should throw an Symfony\Component\Console\Exception\CommandNotFoundException if a command is ambiguous because of a subnamespace, with alternatives');
584584
} catch (\Exception $e) {
585585
$this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function testCannotSetInvalidIndicatorCharacters()
104104
{
105105
$this->expectException('InvalidArgumentException');
106106
$this->expectExceptionMessage('Must have at least 2 indicator value characters.');
107-
$bar = new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);
107+
new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);
108108
}
109109

110110
public function testCannotStartAlreadyStartedIndicator()

‎src/Symfony/Component/Debug/DebugClassLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ private function darwinRealpath(string $real): string
486486
}
487487

488488
if (isset($dirFiles[$file])) {
489-
return $real .= $dirFiles[$file];
489+
return $real.$dirFiles[$file];
490490
}
491491

492492
$kFile = strtolower($file);
@@ -505,7 +505,7 @@ private function darwinRealpath(string $real): string
505505
self::$darwinCache[$kDir][1] = $dirFiles;
506506
}
507507

508-
return $real .= $dirFiles[$kFile];
508+
retu 4844 rn $real.$dirFiles[$kFile];
509509
}
510510

511511
/**

0 commit comments

Comments
 (0)
0