From c84d223b3175461aa7d2c163240a52e5e78c00a1 Mon Sep 17 00:00:00 2001
From: Toon Verwerft <toonverwerft@gmail.com>
Date: Tue, 2 Nov 2021 20:09:03 +0100
Subject: [PATCH] Fix namespace check

---
 src/Xml/Configurator/FlattenXsdImports.php | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/Xml/Configurator/FlattenXsdImports.php b/src/Xml/Configurator/FlattenXsdImports.php
index bcd06d2..0cead6b 100644
--- a/src/Xml/Configurator/FlattenXsdImports.php
+++ b/src/Xml/Configurator/FlattenXsdImports.php
@@ -49,7 +49,7 @@ public function __invoke(DOMDocument $document): DOMDocument
         foreach ($imports as $import) {
             $schemas = match ($import->localName) {
                 'include', 'redefine' => $this->includeSchema($import),
-                'import' => $this->importSchema($document, $import),
+                'import' => $this->importSchema($import),
             };
 
             foreach ($schemas as $schema) {
@@ -69,10 +69,13 @@ public function __invoke(DOMDocument $document): DOMDocument
      */
     private function includeSchema(DOMElement $include): iterable
     {
+        // All includes and redefines require a schemLocation attribute
         if (!$location = $include->getAttribute('schemaLocation')) {
             throw FlattenException::noLocation($include->localName);
         }
 
+        // Include tags can be removed, since the schema will be made available in the types
+        // using the namespace it defines.
         $schemas = $this->loadSchemas($location);
         $include->remove();
 
@@ -82,25 +85,38 @@ private function includeSchema(DOMElement $include): iterable
     /**
      * @throws RuntimeException
      * @throws UnloadableWsdlException
+     * @throws FlattenException
      *
      * @return iterable<DOMElement>
      */
-    private function importSchema(DOMDocument $wsdl, DOMElement $import): iterable
+    private function importSchema(DOMElement $import): iterable
     {
+        // xsd:import tags don't require a location!
         $location = $import->getAttribute('schemaLocation');
+        if (!$location) {
+            return [];
+        }
+
+        // Normally an import has an owner document, since it is coming from xpath on an existing document
+        // However, static analysis does not know about this.
+        if (!$import->ownerDocument) {
+            return [];
+        }
+
+        // Find the schema that wants to import the new schema:
+        $doc = Document::fromUnsafeDocument($import->ownerDocument);
+        $xpath = $doc->xpath(new WsdlPreset($doc));
+        /** @var DOMElement $schema */
+        $schema = $xpath->querySingle('ancestor::schema:schema', $import);
+
+        // Detect namespaces from both the current schema and the import
         $namespace = $import->getAttribute('namespace');
-        $tns = $wsdl->documentElement->getAttribute('targetNamespace');
+        $tns = $schema->getAttribute('targetNamespace');
 
         // Imports can only deal with different namespaces.
         // You'll need to use "include" if you want to inject something in the same namespace.
         if ($tns && $namespace && $tns === $namespace) {
-            // TODO : exception seems a bit too harsh ... Regular import ok?
-            //throw FlattenException::unableToImportXsd($location);
-        }
-
-        // xsd:import tags don't require a location!
-        if (!$location) {
-            return [];
+            throw FlattenException::unableToImportXsd($location);
         }
 
         $schemas = $this->loadSchemas($location);