Merge branch '1.x' into 2.x

* 1.x:
  Fix CS

src/Extension/CoreExtension.php

@@ -519,7 +519,7 @@ function twig_date_converter(Environment $env, $date = null, $timezone = null)
     }
 
     if (null === $date || 'now' === $date) {
-        if ($date === null) {
+        if (null === $date) {
             $date = 'now';
         }
         return new \DateTime($date, false !== $timezone ? $timezone : $env->getExtension(CoreExtension::class)->getTimezone());