minor #16073 Fix the DomCrawler tests (stof)

fabpot · fabpot · commit a6d5c3305cb7 · 2015-10-02T14:32:10.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- Fix the DomCrawler tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This fixes the tests by applying changes from #16057 and #16058 in the right order in ``addNode`` Commits ------- e6feed2 Fix the DomCrawler tests
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -313,14 +313,6 @@ public function addNodes(array $nodes)
      */
     public function addNode(\DOMNode $node)
     {
-        if (null !== $this->document && $this->document !== $node->ownerDocument) {
-            @trigger_error('Attaching DOM nodes from multiple documents in a Crawler is deprecated as of 2.8 and will be forbidden in 3.0.', E_USER_DEPRECATED);
-        }
-
-        if (null === $this->document) {
-            $this->document = $node->ownerDocument;
-        }
-
         if ($node instanceof \DOMDocument) {
             $node = $node->documentElement;
         }
@@ -329,6 +321,14 @@ public function addNode(\DOMNode $node)
             throw new \InvalidArgumentException(sprintf('Nodes set in a Crawler must be DOMElement or DOMDocument instances, "%s" given.', get_class($node)));
         }
 
+        if (null !== $this->document && $this->document !== $node->ownerDocument) {
+            @trigger_error('Attaching DOM nodes from multiple documents in a Crawler is deprecated as of 2.8 and will be forbidden in 3.0.', E_USER_DEPRECATED);
+        }
+
+        if (null === $this->document) {
+            $this->document = $node->ownerDocument;
+        }
+
         parent::attach($node);
     }
 
