Merge branch '4.4' into 5.3

derrabus · derrabus · commit c7eef3a60ccf · 2021-08-29T21:32:13.000+02:00
* 4.4:
  [DomCrawler] Don't pass null to trim()
diff --git a/Test/Constraint/CrawlerSelectorAttributeValueSame.php b/Test/Constraint/CrawlerSelectorAttributeValueSame.php
@@ -47,7 +47,7 @@ protected function matches($crawler): bool
             return false;
         }
 
-        return $this->expectedText === trim($crawler->attr($this->attribute));
+        return $this->expectedText === trim($crawler->attr($this->attribute) ?? '');
     }
 
     /**
diff --git a/Tests/Test/Constraint/CrawlerSelectorAttributeValueSameTest.php b/Tests/Test/Constraint/CrawlerSelectorAttributeValueSameTest.php
@@ -23,6 +23,7 @@ public function testConstraint()
     {
         $constraint = new CrawlerSelectorAttributeValueSame('input[name="username"]', 'value', 'Fabien');
         $this->assertTrue($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username" value="Fabien">'), '', true));
+        $this->assertFalse($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username">'), '', true));
         $this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>Bar'), '', true));
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function matches($crawler): bool`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`	`49`
`50`		`- return $this->expectedText === trim($crawler->attr($this->attribute));`
	`50`	`+ return $this->expectedText === trim($crawler->attr($this->attribute) ?? '');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public function testConstraint()`
`23`	`23`	`{`
`24`	`24`	`$constraint = new CrawlerSelectorAttributeValueSame('input[name="username"]', 'value', 'Fabien');`
`25`	`25`	`$this->assertTrue($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username" value="Fabien">'), '', true));`
	`26`	`+ $this->assertFalse($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username">'), '', true));`
`26`	`27`	`$this->assertFalse($constraint->evaluate(new Crawler('<html><head><title>Bar'), '', true));`
`27`	`28`
`28`	`29`	`try {`