Skip to content

Commit 3575004

Browse files
Merge branch '4.4' into 5.0
* 4.4: (25 commits) [DoctrineBridge] Use new Types::* constants and support new json type [Debug][ErrorHandler] improved deprecation notices for methods new args and return type [BrowserKit] Nested file array prevents uploading file [ExpressionLanguage] Fixed collisions of character operators with object properties [Validator] Remove specific check for Valid targets [PhpUnitBridge] Use trait instead of extending deprecated class Fix versioned namespace clears fix remember me Use strict assertion in asset tests [DoctrineBridge][DoctrineExtractor] Fix indexBy with custom and some core types Do not rely on the current locale when dumping a Graphviz object fix typo [Ldap] force default network timeout [Config] don't throw on missing excluded paths Docs: Typo, grammar [Validator] Add the missing translations for the Polish ("pl") locale [PhpUnitBridge] Add compatibility to PHPUnit 9 #35662 [Routing] Add locale requirement for localized routes [Console] Inline exact-match handling with 4.4 Set previous exception when rethrown from controller resolver ...
2 parents 515fd07 + 95c0cab commit 3575004

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

Dumper/GraphvizDumper.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ class GraphvizDumper extends Dumper
3232
{
3333
private $nodes;
3434
private $edges;
35+
// All values should be strings
3536
private $options = [
3637
'graph' => ['ratio' => 'compress'],
37-
'node' => ['fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'],
38-
'edge' => ['fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5],
38+
'node' => ['fontsize' => '11', 'fontname' => 'Arial', 'shape' => 'record'],
39+
'edge' => ['fontsize' => '9', 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => '0.5'],
3940
'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
4041
'node.definition' => ['fillcolor' => '#eeeeee'],
4142
'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],

Loader/FileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
159159
$excludePrefix = null;
160160
$excludePatterns = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePatterns));
161161
foreach ($excludePatterns as $excludePattern) {
162-
foreach ($this->glob($excludePattern, true, $resource, false, true) as $path => $info) {
162+
foreach ($this->glob($excludePattern, true, $resource, true, true) as $path => $info) {
163163
if (null === $excludePrefix) {
164164
$excludePrefix = $resource->getPrefix();
165165
}

Tests/Loader/FileLoaderTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,13 @@ public function testRegisterClassesWithExclude()
136136
],
137137
array_keys($container->getAliases())
138138
);
139+
140+
$loader->registerClasses(
141+
new Definition(),
142+
'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
143+
'Prototype/*',
144+
'Prototype/NotExistingDir'
145+
);
139146
}
140147

141148
public function testRegisterClassesWithExcludeAsArray()

0 commit comments

Comments
 (0)