Merge branch '1.x' into 2.x

* 1.x:
  added PHP 8.1 as experimental
This commit is contained in:
Fabien Potencier
2021-03-22 09:23:06 +01:00
5 changed files with 12 additions and 5 deletions
+1 -1
View File
@@ -623,7 +623,7 @@ class Environment
*/
public function setCharset($charset)
{
if ('UTF8' === $charset = strtoupper($charset)) {
if ('UTF8' === $charset = null === $charset ? null : strtoupper($charset)) {
// iconv on Windows requires "UTF-8" instead of "UTF8"
$charset = 'UTF-8';
}