symfony
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 2 additions & 1 deletion b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DomCrawler/Crawler.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DomCrawler/Crawler.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/String/AbstractString.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/String/AbstractString.php
Lines changed: 1 addition & 1 deletion
@@ -14,8 +14,9 @@ This will help reviewers and should be a good start for the documentation.
 Additionally (see https://symfony.com/releases):
  - Always add tests and ensure they pass.
  - Bug fixes must be submitted against the lowest maintained branch where they apply
-   (lowest branches are regularly merged to upper ones so they get the fixes too.)
+   (lowest branches are regularly merged to upper ones so they get the fixes too).
  - Features and deprecations must be submitted against the latest branch.
+ - For new features, provide some code snippets to help understand usage.  
  - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
  - Never break backward compatibility (see https://symfony.com/bc).
 -->
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Twig;
 
+use Composer\InstalledVersions;
 use Symfony\Bundle\FullStack;
 use Twig\Error\SyntaxError;
 use Twig\TwigFilter;
@@ -102,6 +103,12 @@ private static function onUndefined(string $name, string $type, string $componen
             return sprintf('Did you forget to %s? Unknown %s "%s".', self::FULL_STACK_ENABLE[$component], $type, $name);
         }
 
-        return sprintf('Did you forget to run "composer require symfony/%s"? Unknown %s "%s".', $component, $type, $name);
+        $missingPackage = 'symfony/'.$component;
+
+        if (class_exists(InstalledVersions::class) && InstalledVersions::isInstalled($missingPackage)) {
+            $missingPackage = 'symfony/twig-bundle';
+        }
+
+        return sprintf('Did you forget to run "composer require %s"? Unknown %s "%s".', $missingPackage, $type, $name);
     }
 }
@@ -623,7 +623,7 @@ public function text(string $default = null, bool $normalizeWhitespace = true)
         $text = $this->getNode(0)->nodeValue;
 
         if ($normalizeWhitespace) {
-            return trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $text));
+            return trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+|[\n\r\t\x0C])/", ' ', $text), " \n\r\t\x0C");
         }
 
         return $text;
 
@@ -245,7 +245,7 @@ abstract public function chunk(int $length = 1): array;
     public function collapseWhitespace(): self
     {
         $str = clone $this;
-        $str->string = trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $str->string));
+        $str->string = trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+|[\n\r\t\x0C])/", ' ', $str->string), " \n\r\t\x0C");
 
         return $str;
     }
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Twig;`
`13`	`13`
	`14`	`+use Composer\InstalledVersions;`
`14`	`15`	`use Symfony\Bundle\FullStack;`
`15`	`16`	`use Twig\Error\SyntaxError;`
`16`	`17`	`use Twig\TwigFilter;`
`@@ -102,6 +103,12 @@ private static function onUndefined(string $name, string $type, string $componen`
`102`	`103`	`return sprintf('Did you forget to %s? Unknown %s "%s".', self::FULL_STACK_ENABLE[$component], $type, $name);`
`103`	`104`	`}`
`104`	`105`
`105`		`- return sprintf('Did you forget to run "composer require symfony/%s"? Unknown %s "%s".', $component, $type, $name);`
	`106`	`+ $missingPackage = 'symfony/'.$component;`
	`107`	`+`
	`108`	`+ if (class_exists(InstalledVersions::class) && InstalledVersions::isInstalled($missingPackage)) {`
	`109`	`+ $missingPackage = 'symfony/twig-bundle';`
	`110`	`+ }`
	`111`	`+`
	`112`	`+ return sprintf('Did you forget to run "composer require %s"? Unknown %s "%s".', $missingPackage, $type, $name);`
`106`	`113`	`}`
`107`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ public function text(string $default = null, bool $normalizeWhitespace = true)`
`623`	`623`	`$text = $this->getNode(0)->nodeValue;`
`624`	`624`
`625`	`625`	`if ($normalizeWhitespace) {`
`626`		`- return trim(preg_replace('/(?:\s{2,}+\|[^\S ])/', ' ', $text));`
	`626`	`+ return trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+\|[\n\r\t\x0C])/", ' ', $text), " \n\r\t\x0C");`
`627`	`627`	`}`
`628`	`628`
`629`	`629`	`return $text;`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ abstract public function chunk(int $length = 1): array;`
`245`	`245`	`public function collapseWhitespace(): self`
`246`	`246`	`{`
`247`	`247`	`$str = clone $this;`
`248`		`- $str->string = trim(preg_replace('/(?:\s{2,}+\|[^\S ])/', ' ', $str->string));`
	`248`	`+ $str->string = trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+\|[\n\r\t\x0C])/", ' ', $str->string), " \n\r\t\x0C");`
`249`	`249`
`250`	`250`	`return $str;`
`251`	`251`	`}`