Ignore validation errors caused by third-party user providers and authenticators

MatTheCat · MatTheCat · commit 6e2363442e44 · 2024-06-25T12:35:35.000+02:00
diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md
@@ -110,7 +110,6 @@ SecurityBundle
  * Deprecate passing an array of arrays as 1st argument to `MainConfiguration`, pass a sorted flat array of
    factories instead.
  * Deprecate the `always_authenticate_before_granting` option
- * XML configured user providers and authenticators not coming from Symfony must now declare their own namespace
 
 Security
 --------
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -404,7 +404,36 @@ private function parseFileToDOM(string $file): \DOMDocument
         try {
             $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file).$e->getMessage(), $e->getCode(), $e);
+            $allowedInvalidElements = [];
+            $errors = explode("\n", $e->getMessage());
+            foreach ($errors as $error) {
+                if (preg_match("#^\[ERROR 1871] Element '\{http://symfony\.com/schema/dic/security}([^']+)'#", $error, $matches)) {
+                    $allowedInvalidElements[] = $matches[1];
+                }
+            }
+            if ($allowedInvalidElements) {
+                $dom = XmlUtils::loadFile($file);
+
+                $allowedInvalidElements = array_filter(
+                    $allowedInvalidElements,
+                    static function (string $tagName) use ($dom): bool {
+                        foreach ($dom->getElementsByTagName($tagName) as $element) {
+                            if (!$parent = $element->parentElement) {
+                                return false;
+                            }
+                            if ('provider' === $parent->tagName || 'firewall' === $parent->tagName) {
+                                trigger_deprecation('symfony/security-bundle', '5.4.41', 'Third-party %s must now be namespaced; please update your security configuration "%s" tag.', 'provider' === $parent->tagName ? 'providers' : 'authenticators', $tagName);
+
+                                return true;
+                            }
+                        }
+                        return false;
+                    }
+                );
+            }
+            if (\count($allowedInvalidElements) !== \count($errors)) {
+                throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file) . $e->getMessage(), $e->getCode(), $e);
+            }
         }
 
         $this->validateExtensions($dom, $file);
