[DomCrawler] Added argument $default to method Crawler::attr()

Rastishka · nicolas-grekas · commit 942a302c7a43 · 2023-08-16T12:04:32.000+02:00
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
 * Add `CrawlerAnySelectorTextContains` test constraint
 * Add `CrawlerAnySelectorTextSame` test constraint
+* Added argument `$default` to `Crawler::attr()`
 
 6.3
 ---
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -58,7 +58,6 @@ class Crawler implements \Countable, \IteratorAggregate
      */
     private bool $isHtml = true;
 
-
     private ?HTML5 $html5Parser = null;
 
     /**
@@ -522,17 +521,24 @@ public function children(string $selector = null): static
     /**
      * Returns the attribute value of the first node of the list.
      *
+     * @param string|null $default When not null: the value to return when the node or attribute is empty
+     *
      * @throws \InvalidArgumentException When current node is empty
      */
-    public function attr(string $attribute): ?string
+    public function attr(string $attribute/* , string $default = null */): ?string
     {
+        $default = \func_num_args() > 1 ? func_get_arg(1) : null;
         if (!$this->nodes) {
+            if (null !== $default) {
+                return $default;
+            }
+
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
         $node = $this->getNode(0);
 
-        return $node->hasAttribute($attribute) ? $node->getAttribute($attribute) : null;
+        return $node->hasAttribute($attribute) ? $node->getAttribute($attribute) : $default;
     }
 
     /**
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
@@ -305,6 +305,9 @@ public function testAttr()
         } catch (\InvalidArgumentException $e) {
             $this->assertTrue(true, '->attr() throws an \InvalidArgumentException if the node list is empty');
         }
+
+        $this->assertSame('my value', $this->createTestCrawler()->filterXPath('//notexists')->attr('class', 'my value'));
+        $this->assertSame('my value', $this->createTestCrawler()->filterXPath('//li')->attr('attr-not-exists', 'my value'));
     }
 
     public function testMissingAttrValueIsNull()

Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,9 @@ public function testAttr()`
`305`	`305`	`} catch (\InvalidArgumentException $e) {`
`306`	`306`	`$this->assertTrue(true, '->attr() throws an \InvalidArgumentException if the node list is empty');`
`307`	`307`	`}`
	`308`	`+`
	`309`	`+ $this->assertSame('my value', $this->createTestCrawler()->filterXPath('//notexists')->attr('class', 'my value'));`
	`310`	`+ $this->assertSame('my value', $this->createTestCrawler()->filterXPath('//li')->attr('attr-not-exists', 'my value'));`
`308`	`311`	`}`
`309`	`312`
`310`	`313`	`public function testMissingAttrValueIsNull()`