projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
symfony
/
routing
/
Loader
/
XmlFileLoader.php
diff --git
a/vendor/symfony/routing/Loader/XmlFileLoader.php
b/vendor/symfony/routing/Loader/XmlFileLoader.php
index f3f66055e675af9b675629307a2c6a19156b2064..689245b5ac40e7d2b7826ac130114734f54d149b 100644
(file)
--- a/
vendor/symfony/routing/Loader/XmlFileLoader.php
+++ b/
vendor/symfony/routing/Loader/XmlFileLoader.php
@@
-11,11
+11,11
@@
namespace Symfony\Component\Routing\Loader;
namespace Symfony\Component\Routing\Loader;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Config\Loader\FileLoader;
use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Config\Util\XmlUtils;
use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
/**
* XmlFileLoader loads XML routing files.
/**
* XmlFileLoader loads XML routing files.
@@
-93,7
+93,7
@@
class XmlFileLoader extends FileLoader
*/
public function supports($resource, $type = null)
{
*/
public function supports($resource, $type = null)
{
- return is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
+ return
\
is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
}
/**
}
/**
@@
-144,11
+144,11
@@
class XmlFileLoader extends FileLoader
list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
- $this->setCurrentDir(dirname($path));
+ $this->setCurrentDir(
\
dirname($path));
$imported = $this->import($resource, ('' !== $type ? $type : null), false, $file);
$imported = $this->import($resource, ('' !== $type ? $type : null), false, $file);
- if (!is_array($imported)) {
+ if (!
\
is_array($imported)) {
$imported = array($imported);
}
$imported = array($imported);
}