Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 04c27d575b2c · 2023-02-11T11:39:59.000+01:00
* 5.4:
  [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing &gt;= 6.0
  Add warning about Symfony 5.2 changing pcntl_async_signals
  [Tests] Fix static calls and Mock var annotation
  [FrameworkBundle] Fix checkboxes check assertions
  [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null`
  [HttpClient] Fix over-encoding of URL parts to match browser's behavior
  Fix Psalm job
  [HttpClient] Fix data collector
  [Tests] Migrate tests to static data providers
  [Semaphore] Fix test
  Fix: Split and clean up tests
  Remove unused data provider
  add Sender to the list of bypassed headers
diff --git a/Test/DomCrawlerAssertionsTrait.php b/Test/DomCrawlerAssertionsTrait.php
@@ -15,7 +15,6 @@
 use PHPUnit\Framework\Constraint\LogicalNot;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;
-use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorAttributeValueSame;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorExists;
 
 /**
@@ -87,18 +86,12 @@ public static function assertInputValueNotSame(string $fieldName, string $expect
 
     public static function assertCheckboxChecked(string $fieldName, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
-            new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked')
-        ), $message);
+        self::assertThat(self::getCrawler(), new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked"), $message);
     }
 
     public static function assertCheckboxNotChecked(string $fieldName, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
-            new LogicalNot(new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked'))
-        ), $message);
+        self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked")), $message);
     }
 
     public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void
diff --git a/Tests/Test/WebTestCaseTest.php b/Tests/Test/WebTestCaseTest.php
@@ -233,16 +233,18 @@ public function testAssertInputValueNotSame()
     public function testAssertCheckboxChecked()
     {
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');
+        $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and has a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');
+        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]:checked".');
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxChecked('rememberMe');
     }
 
     public function testAssertCheckboxNotChecked()
     {
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');
+        $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and does not have a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');
+        $this->expectExceptionMessage('does not match selector "input[name="rememberMe"]:checked".');
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxNotChecked('rememberMe');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use PHPUnit\Framework\Constraint\LogicalNot;`
`16`	`16`	`use Symfony\Component\DomCrawler\Crawler;`
`17`	`17`	`use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;`
`18`		`-use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorAttributeValueSame;`
`19`	`18`	`use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorExists;`
`20`	`19`
`21`	`20`	`/**`
`@@ -87,18 +86,12 @@ public static function assertInputValueNotSame(string $fieldName, string $expect`
`87`	`86`
`88`	`87`	`public static function assertCheckboxChecked(string $fieldName, string $message = ''): void`
`89`	`88`	`{`
`90`		`- self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(`
`91`		`- new CrawlerSelectorExists("input[name=\"$fieldName\"]"),`
`92`		`- new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked')`
`93`		`- ), $message);`
	`89`	`+ self::assertThat(self::getCrawler(), new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked"), $message);`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`public static function assertCheckboxNotChecked(string $fieldName, string $message = ''): void`
`97`	`93`	`{`
`98`		`- self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(`
`99`		`- new CrawlerSelectorExists("input[name=\"$fieldName\"]"),`
`100`		`- new LogicalNot(new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked'))`
`101`		`- ), $message);`
	`94`	`+ self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked")), $message);`
`102`	`95`	`}`
`103`	`96`
`104`	`97`	`public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void`
Original file line number	Diff line number	Diff line change
`@@ -233,16 +233,18 @@ public function testAssertInputValueNotSame()`
`233`	`233`	`public function testAssertCheckboxChecked()`
`234`	`234`	`{`
`235`	`235`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');`
	`236`	`+ $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');`
`236`	`237`	`$this->expectException(AssertionFailedError::class);`
`237`		`- $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and has a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');`
	`238`	`+ $this->expectExceptionMessage('matches selector "input[name="rememberMe"]:checked".');`
`238`	`239`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxChecked('rememberMe');`
`239`	`240`	`}`
`240`	`241`
`241`	`242`	`public function testAssertCheckboxNotChecked()`
`242`	`243`	`{`
`243`	`244`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');`
	`245`	`+ $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');`
`244`	`246`	`$this->expectException(AssertionFailedError::class);`
`245`		`- $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and does not have a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');`
	`247`	`+ $this->expectExceptionMessage('does not match selector "input[name="rememberMe"]:checked".');`
`246`	`248`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxNotChecked('rememberMe');`
`247`	`249`	`}`
`248`	`250`