Deprecate loading multiple documents in the same crawler

stof · stof · commit 0d1cb3bd1bc4 · 2015-10-02T10:46:05.000+02:00
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -40,6 +40,11 @@ class Crawler extends \SplObjectStorage
      */
     private $baseHref;
 
+    /**
+     * @var \DOMDocument|null
+     */
+    private $document;
+
     /**
      * Whether the Crawler contains HTML or XML content (used when converting CSS to XPath).
      *
@@ -68,6 +73,7 @@ public function __construct($node = null, $currentUri = null, $baseHref = null)
     public function clear()
     {
         parent::removeAll($this);
+        $this->document = null;
     }
 
     /**
@@ -307,6 +313,14 @@ 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) {
             parent::attach($node->documentElement);
         } else {
@@ -1152,6 +1166,7 @@ private function createSubCrawler($nodes)
     {
         $crawler = new static($nodes, $this->uri, $this->baseHref);
         $crawler->isHtml = $this->isHtml;
+        $crawler->document = $this->document;
 
         return $crawler;
     }
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -20,7 +20,10 @@ public function testConstructor()
         $crawler = new Crawler();
         $this->assertCount(0, $crawler, '__construct() returns an empty crawler');
 
-        $crawler = new Crawler(new \DOMNode());
+        $doc = new \DOMDocument();
+        $node = $doc->createElement('test');
+
+        $crawler = new Crawler($node);
         $this->assertCount(1, $crawler, '__construct() takes a node as a first argument');
     }
 
@@ -71,6 +74,14 @@ public function testAddHtmlContent()
         $crawler->addHtmlContent('<html><div class="foo"></html>', 'UTF-8');
 
         $this->assertEquals('foo', $crawler->filterXPath('//div')->attr('class'), '->addHtmlContent() adds nodes from an HTML string');
+    }
+
+    /**
+     * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
+     */
+    public function testAddHtmlContentWithBaseTag()
+    {
+        $crawler = new Crawler();
 
         $crawler->addHtmlContent('<html><head><base href="http://symfony.com"></head><a href="/contact"></a></html>', 'UTF-8');
 
@@ -267,6 +278,7 @@ public function testAddNodeList()
      */
     public function testAddNodes()
     {
+        $list = array();
         foreach ($this->createNodeList() as $node) {
             $list[] = $node;
         }
@@ -290,7 +302,10 @@ public function testAddNode()
 
     public function testClear()
     {
-        $crawler = new Crawler(new \DOMNode());
+        $doc = new \DOMDocument();
+        $node = $doc->createElement('test');
+
+        $crawler = new Crawler($node);
         $crawler->clear();
         $this->assertCount(0, $crawler, '->clear() removes all the nodes from the crawler');
     }
