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

Commit 77cdbff

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: updated VERSION for 3.4.40 update CONTRIBUTORS for 3.4.40 updated CHANGELOG for 3.4.40 [WebProfilerBundle] changed label of peak memory usage in the time & memory panels (MB into MiB) add tests for the ConstraintViolationBuilder class Improve dirname usage [PhpUnitBridge] Use COMPOSER_BINARY env var if available Allow invalidateTags calls to be traced by data collector [YAML] escape DEL(\x7f) fix compatibility with phpunit 9 [Cache] skip APCu in chains when the backend is disabled [Mailer] Add a comment to avoid more wrong PRs on this piece of code [Form] apply automatically step=1 for datetime-local input Fixing a bug where class_alias would cause incorrect items in debug:autowiring [DependencyInjection][ServiceSubscriber] Support late aliases
2 parents a2f0bf8 + 49b74ba commit 77cdbff

File tree

26 files changed

+346
-69
lines changed

26 files changed

+346
-69
lines changed

‎CONTRIBUTORS.md‎

Lines changed: 47 additions & 30 deletions
Large diffs are not rendered by default.

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ class SymfonyTestsListenerTrait
4848
*/
4949
public function __construct(array $mockedNamespaces = [])
5050
{
51-
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
51+
if (method_exists(Blacklist::class, 'addDirectory')) {
52+
(new BlackList())->getBlacklistedDirectories();
53+
Blacklist::addDirectory(\dirname((new \ReflectionClass(__CLASS__))->getFileName(), 2));
54+
} else {
55+
Blacklist::$blacklistedClassNames[__CLASS__] = 2;
56+
}
5257

5358
$enableDebugClassLoader = class_exists(DebugClassLoader::class) || class_exists(LegacyDebugClassLoader::class);
5459

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,10 @@
215215
if (!class_exists('SymfonyBlacklistPhpunit', false)) {
216216
class SymfonyBlacklistPhpunit {}
217217
}
218-
if (class_exists('PHPUnit_Util_Blacklist')) {
219-
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
220-
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
218+
if (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
219+
(new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
220+
PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyBlacklistPhpunit'))->getFileName()));
221+
PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyBlacklistSimplePhpunit'))->getFileName()));
221222
} else {
222223
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
223224
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;

‎src/Symfony/Bridge/PhpUnit/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
2525
},
2626
"conflict": {
27-
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0"
27+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2"
2828
},
2929
"autoload": {
3030
"files": [ "bootstrap.php" ],

‎src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
103103
$serviceIdsNb = 0;
104104
foreach ($serviceIds as $serviceId) {
105105
$text = [];
106+
$resolvedServiceId = $serviceId;
106107
if (0 !== strpos($serviceId, $previousId)) {
107108
$text[] = '';
108-
if ('' !== $description = Descriptor::getClassDescription($serviceId, $serviceId)) {
109+
if ('' !== $description = Descriptor::getClassDescription($serviceId, $resolvedServiceId)) {
109110
if (isset($hasAlias[$serviceId])) {
110111
continue;
111112
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ClassAliasExampleClass.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
4+
5+
class_alias(
6+
ClassAliasTargetClass::class,
7+
__NAMESPACE__ . '\ClassAliasExampleClass'
8+
);
9+
10+
if (false) {
11+
class ClassAliasExampleClass
12+
{
13+
}
14+
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ClassAliasTargetClass.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
4+
5+
class ClassAliasTargetClass
6+
{
7+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,16 @@ public function testSearchNotAliasedServiceWithAll()
9797
$tester->run(['command' => 'debug:autowiring', 'search' => 'redirect', '--all' => true]);
9898
$this->assertStringContainsString('Pro-tip: use interfaces in your type-hints instead of classes to benefit from the dependency inversion principle.', $tester->getDisplay());
9999
}
100+
101+
public function testNotConfusedByClassAliases()
102+
{
103+
static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
104+
105+
$application = new Application(static::$kernel);
106+
$application->setAutoExit(false);
107+
108+
$tester = new ApplicationTester($application);
109+
$tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias']);
110+
$this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass (public)', $tester->getDisplay());
111+
}
100112
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ services:
1313
public: false
1414
Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass:
1515
class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass
16+
Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass: '@public'
1617
env:
1718
class: stdClass
1819
arguments:

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
{% set status_color = (collector.memory / 1024 / 1024) > 50 ? 'y ADF4 ellow' : '' %}
66
{{ include('@WebProfiler/Icon/memory.svg') }}
77
<span class="sf-toolbar-value">{{ '%.1f'|format(collector.memory / 1024 / 1024) }}</span>
8-
<span class="sf-toolbar-label">MB</span>
8+
<span class="sf-toolbar-label">MiB</span>
99
{% endset %}
1010

1111
{% set text %}
1212
<div class="sf-toolbar-info-piece">
1313
<b>Peak memory usage</b>
14-
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
14+
<span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MiB</span>
1515
</div>
1616

1717
<div class="sf-toolbar-info-piece">
1818
<b>PHP memory limit</b>
19-
<span>{{ collector.memoryLimit == -1 ? 'Unlimited' : '%.0f MB'|format(collector.memoryLimit / 1024 / 1024) }}</span>
19+
<span>{{ collector.memoryLimit == -1 ? 'Unlimited' : '%.0f MiB'|format(collector.memoryLimit / 1024 / 1024) }}</span>
2020
</div>
2121
{% endset %}
2222

0 commit comments

Comments
 (0)
0