Fix PHP 8.1 deprecations

derrabus · derrabus · commit fb99f9354677 · 2021-05-21T00:43:33.000+02:00
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/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) {

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`