Don't override the timezone when called with a DateTime object

alphp · May 15, 2024 · bb8a957 · bb8a957
1 parent ced926c
commit bb8a957
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ Thumbs.db
 #######################
 /.vscode
 /composer.lock
+.phpunit.result.cache
 # vim
 *~
 *.swp

diff --git a/src/php-8.1-strftime.php b/src/php-8.1-strftime.php
@@ -38,9 +38,9 @@ function strftime (string $format, $timestamp = null, ?string $locale = null) :
       } catch (Exception $e) {
         throw new InvalidArgumentException('$timestamp argument is neither a valid UNIX timestamp, a valid date-time string or a DateTime object.', 0, $e);
       }
-    }
 
-    $timestamp->setTimezone(new DateTimeZone(date_default_timezone_get()));
+      $timestamp->setTimezone(new DateTimeZone(date_default_timezone_get()));
+    }
 
     $locale = Locale::canonicalize($locale ?? (Locale::getDefault() ?? setlocale(LC_TIME, '0')));