Merge branch '5.2' into 5.3

derrabus · derrabus · commit 03489a49ecca · 2021-05-21T16:04:06.000+02:00
* 5.2:
  Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed
  Fix PHP 8.1 deprecations
  Add missing deprecation entry
  [VarDumper] Don't pass null to parse_url()
diff --git a/UPGRADE-5.1.md b/UPGRADE-5.1.md
@@ -101,6 +101,7 @@ Notifier
    arguments were removed.
  * [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
    methods' `$transport` argument was removed.
+ * Deprecate `SlackOptions::channel()`, use `SlackOptions::recipient()` instead.
 
 OptionsResolver
 ---------------
diff --git a/UPGRADE-5.2.md b/UPGRADE-5.2.md
@@ -173,4 +173,3 @@ Security
  * Deprecated the `AbstractRememberMeServices::$providerKey` property in favor of
    `AbstractRememberMeServices::$firewallName`, the old property will be removed
    in 6.0.
-
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -151,6 +151,11 @@ Monolog
  * The `$actionLevel` constructor argument of `Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy` has been replaced by the `$inner` one which expects an ActivationStrategyInterface to decorate instead. `Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy` is now final.
  * The `$actionLevel` constructor argument of `Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy` has been replaced by the `$inner` one which expects an ActivationStrategyInterface to decorate instead. `Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy` is now final.
 
+Notifier
+--------
+
+ * Remove `SlackOptions::channel()`, use `SlackOptions::recipient()` instead.
+
 OptionsResolver
 ---------------
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -5,7 +5,7 @@
                 them as JavaScript source code. Always use '/*' comments instead
                 of '//' comments to avoid impossible-to-debug side-effects #}
 
-if (typeof Sfjs === 'undefined') {
+if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
     Sfjs = (function() {
         "use strict";
 
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -520,7 +520,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
             if ($isNotStyledByTag) {
                 $cellFormat = $cell->getStyle()->getCellFormat();
                 if (!\is_string($cellFormat)) {
-                    $tag = http_build_query($cell->getStyle()->getTagOptions(), null, ';');
+                    $tag = http_build_query($cell->getStyle()->getTagOptions(), '', ';');
                     $cellFormat = '<'.$tag.'>%s</>';
                 }
 
diff --git a/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js b/src/Symfony/Component/ErrorHandler/Resources/assets/js/exception.js
diff --git a/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php b/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
@@ -138,6 +138,7 @@ public function testBindFailureShouldThrowAnException()
         $this->expectException(BadCredentialsException::class);
         $this->expectExceptionMessage('The presented password is invalid.');
 
+        $this->ldap->method('escape')->willReturnArgument(0);
         $this->ldap->expects($this->any())->method('bind')->willThrowException(new ConnectionException());
 
         $listener = $this->createListener();
@@ -178,6 +179,7 @@ public function testEmptyQueryResultShouldThrowAnException()
             ->withConsecutive(
                 ['elsa', 'test1234A$']
             );
+        $this->ldap->method('escape')->willReturnArgument(0);
         $this->ldap->expects($this->once())->method('query')->willReturn($query);
 
         $listener = $this->createListener();
diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
@@ -103,7 +103,7 @@ public function slug(string $string, string $separator = '-', string $locale = n
         $locale = $locale ?? $this->defaultLocale;
 
         $transliterator = [];
-        if ('de' === $locale || 0 === strpos($locale, 'de_')) {
+        if ($locale && ('de' === $locale || 0 === strpos($locale, 'de_'))) {
             // Use the shortcut for German in UnicodeString::ascii() if possible (faster and no requirement on intl)
             $transliterator = ['de-ASCII'];
         } elseif (\function_exists('transliterator_transliterate') && $locale) {
diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php
@@ -71,7 +71,7 @@ private static function register(): void
                 $dumper = new CliDumper();
                 break;
             case 'server' === $format:
-            case 'tcp' === parse_url($format, \PHP_URL_SCHEME):
+            case $format && 'tcp' === parse_url($format, \PHP_URL_SCHEME):
                 $host = 'server' === $format ? $_SERVER['VAR_DUMPER_SERVER'] ?? '127.0.0.1:9912' : $format;
                 $dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliDumper() : new HtmlDumper();
                 $dumper = new ServerDumper($host, $dumper, self::getDefaultContextProviders());

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string`
`520`	`520`	`if ($isNotStyledByTag) {`
`521`	`521`	`$cellFormat = $cell->getStyle()->getCellFormat();`
`522`	`522`	`if (!\is_string($cellFormat)) {`
`523`		`- $tag = http_build_query($cell->getStyle()->getTagOptions(), null, ';');`
	`523`	`+ $tag = http_build_query($cell->getStyle()->getTagOptions(), '', ';');`
`524`	`524`	`$cellFormat = '<'.$tag.'>%s</>';`
`525`	`525`	`}`
`526`	`526`