[DomCrawler] Added ability to return empty string on `Crawler::text()…

…` and `Crawler::html()` instead of an exception
symfony · Sep 29, 2018 · a6858eb · a6858eb
1 parent 3cd411a
commit a6858eb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
   `Image` classes is now optional.
 * The `Crawler::children()` method will have a new `$selector` argument in version 5.0, 
   not defining it is deprecated.
+* Added ability to return empty string on `Crawler::text()` and `Crawler::html()` instead of an exception
 
 3.1.0
 -----

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -570,13 +570,20 @@ public function nodeName()
     /**
      * Returns the node value of the first node of the list.
      *
+     * @param bool $emptyString When set, it will return an empty string instead of an exception
+     *
      * @return string The node value
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function text()
     {
         if (!$this->nodes) {
+            $args = func_get_args();
+            if (1 === \count($args) && true === $args[0]) {
+                return '';
+            }
+
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -586,13 +593,20 @@ public function text()
     /**
      * Returns the first node of the list as HTML.
      *
+     * @param bool $emptyString When set, it will return an empty string instead of an exception
+     *
      * @return string The node html
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function html()
     {
         if (!$this->nodes) {
+            $args = func_get_args();
+            if (1 === \count($args) && true === $args[0]) {
+                return '';
+            }
+
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 

diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -392,6 +392,8 @@ public function testText()
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->text() throws an \InvalidArgumentException if the node list is empty');
         }
+
+        $this->assertSame('', $this->createTestCrawler(null)->filterXPath('//ol')->text(true));
     }
 
     public function testHtml()
@@ -405,6 +407,8 @@ public function testHtml()
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->html() throws an \InvalidArgumentException if the node list is empty');
         }
+
+        $this->assertSame('', $this->createTestCrawler(null)->filterXPath('//ol')->html(true));
     }
 
     public function testExtract()