Skip to content

Commit c125b83

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: fix code style [Uid] Hardcode UuidV3 & UuidV5 TYPE conditional constants [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version stop using void in test files parse cookie values containing the equal sign make some time dependent tests more resilient fix code style Remove full head content in HTML to text converter do not break when loading schemas from network paths on Windows apply the sort callback on the whole search result
2 parents 870df0a + ce7d9b3 commit c125b83

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Dumper/PhpDumper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
2222
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
2323
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
24-
use Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphEdge;
2524
use Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphNode;
2625
use Symfony\Component\DependencyInjection\Container;
2726
use Symfony\Component\DependencyInjection\ContainerBuilder;

Loader/XmlFileLoader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,8 @@ public function validateSchema(\DOMDocument $dom)
604604
array_shift($parts);
605605
$locationstart = 'phar:///';
606606
}
607+
} elseif ('\\' === \DIRECTORY_SEPARATOR && 0 === strpos($location, '\\\\')) {
608+
$locationstart = '';
607609
}
608610
$drive = '\\' === \DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
609611
$location = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));

0 commit comments

Comments
 (0)