Merge branch '4.4'

* 4.4:
  Re-allow to use "tagged" in service definitions
  [HttpFoundation] Allow to not pass a parameter to Request::isMethodSafe()
  Add missing lock connection string in FrameworkExtension
  [DomCrawler] normalizeWhitespace should be true by default
  [DoctrineBridge] Auto-validation must work if no regex are passed
  Allows URL DSN in Lock and Cache

Author: nicolas-grekas

Crawler.php

@@ -571,7 +571,7 @@ public function nodeName()
     /**
      * Returns the text of the first node of the list.
      *
-     * Pass true as the 2nd argument to normalize whitespaces.
+     * Pass true as the second argument to normalize whitespaces.
      *
      * @param string|null $default             When not null: the value to return when the current node is empty
      * @param bool        $normalizeWhitespace Whether whitespaces should be trimmed and normalized to single spaces
@@ -580,7 +580,7 @@ public function nodeName()
      *
      * @throws \InvalidArgumentException When current node is empty
      */
-    public function text(string $default = null, bool $normalizeWhitespace = false)
+    public function text(string $default = null, bool $normalizeWhitespace = true)
     {
         if (!$this->nodes) {
             if (null !== $default) {
@@ -592,7 +592,7 @@ public function text(string $default = null, bool $normalizeWhitespace = false)
 
         $text = $this->getNode(0)->nodeValue;
 
-        if (\func_num_args() > 1 && func_get_arg(1)) {
+        if ($normalizeWhitespace) {
             return trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $text));
         }
 

Tests/AbstractCrawlerTest.php

@@ -258,6 +258,14 @@ public function testNormalizeWhiteSpace()
         $crawler = $this->createTestCrawler()->filterXPath('//p');
         $this->assertSame('Elsa <3', $crawler->text(null, true), '->text(null, true) returns the text with normalized whitespace');
         $this->assertNotSame('Elsa <3', $crawler->text(null, false));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyNormalizeWhiteSpace()
+    {
+        $crawler = $this->createTestCrawler()->filterXPath('//p');
         $this->assertNotSame('Elsa <3', $crawler->text());
     }