fixup

HeahDude · HeahDude · commit d1f6608385c1 · 2020-02-14T20:16:16.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Loader/XmlFileLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Loader/XmlFileLoader.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
+use Symfony\Component\Config\Util\Exception\XmlParsingException;
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\Routing\Loader\XmlFileLoader as BaseXmlFileLoader;
 use Symfony\Component\Routing\RouteCollection;
@@ -26,6 +27,10 @@ class XmlFileLoader extends BaseXmlFileLoader
 
     private const REDEFINED_SCHEME_URI = 'https://symfony.com/schema/routing/routing-1.0.xsd';
     private const SCHEME_URI = 'https://symfony.com/schema/routing/framework-routing-1.0.xsd';
+    private const SCHEMA_LOCATIONS = [
+        self::REDEFINED_SCHEME_URI => parent::SCHEME_PATH,
+        self::SCHEME_URI => self::SCHEME_PATH,
+    ];
 
     /** @var \DOMDocument */
     private $document;
@@ -35,8 +40,14 @@ class XmlFileLoader extends BaseXmlFileLoader
     protected function loadFile(string $file)
     {
         try {
+            foreach (self::SCHEMA_LOCATIONS as $uri => $path) {
+                if (false !== strpos($file, $uri)) {
+                    $file = str_replace([$uri, '\\'], ['file:///'.realpath($path), '/'], $file);
+                }
+            }
+
             return $this->document = parent::loadFile($file);
-        } catch (\Exception $e) {
+        } catch (XmlParsingException $e) {
             if (0 === strpos($e->getMessage(), sprintf('[WARNING 1549] failed to load external entity "%s"', self::REDEFINED_SCHEME_URI))) {
                 if (!is_writable(self::SCHEME_PATH)) {
                     throw new \RuntimeException(sprintf('"%s" is not writeable.', self::SCHEME_PATH), 0, $e);
@@ -54,12 +65,6 @@ protected function loadFile(string $file)
 
                 return $this->loadFile($file);
             }
-            if (0 === strpos($e->getMessage(), sprintf('[WARNING 1549] failed to load external entity "%s"', self::SCHEME_URI))
-                // workaround testing on Windows
-                || false !== strpos($e->getMessage(), 'C:\projects\symfony\src\Symfony\Bundle\FrameworkBundle\Tests')
-            ) {
-                return $this->loadFile(str_replace([self::SCHEME_URI, '\\'], ['file:///'.realpath(self::SCHEME_PATH), '/'], $file));
-            }
 
             throw $e;
         } finally {
