Add LowercaseTimezoneIdentifier (#50)

Co-authored-by: Ren Xie Liu <ren.xie@proton.ch>
ProtonMail · Apr 22, 2022 · f2d3f95 · f2d3f95
1 parent 13cbb28
commit f2d3f95
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 0 deletions.
diff --git a/lib/TimeZoneUtil.php b/lib/TimeZoneUtil.php
@@ -9,6 +9,7 @@
 use Sabre\VObject\TimezoneGuesser\FindFromTimezoneMap;
 use Sabre\VObject\TimezoneGuesser\GuessFromLicEntry;
 use Sabre\VObject\TimezoneGuesser\GuessFromMsTzId;
+use Sabre\VObject\TimezoneGuesser\LowercaseTimezoneIdentifier;
 use Sabre\VObject\TimezoneGuesser\TimezoneFinder;
 use Sabre\VObject\TimezoneGuesser\TimezoneGuesser;
 
@@ -40,6 +41,7 @@ private function __construct()
         $this->addFinder('tzid', new FindFromTimezoneIdentifier());
         $this->addFinder('tzmap', new FindFromTimezoneMap());
         $this->addFinder('offset', new FindFromOffset());
+        $this->addFinder('lowercase', new LowercaseTimezoneIdentifier());
     }
 
     private static function getInstance(): self

diff --git a/lib/TimezoneGuesser/LowercaseTimezoneIdentifier.php b/lib/TimezoneGuesser/LowercaseTimezoneIdentifier.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sabre\VObject\TimezoneGuesser;
+
+use DateTimeZone;
+
+class LowercaseTimezoneIdentifier implements TimezoneFinder
+{
+    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+    {
+        foreach (DateTimeZone::listIdentifiers() as $timezone) {
+            if (strtolower($tzid) === strtolower($timezone)) {
+                return new DateTimeZone($timezone);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/tests/VObject/TimeZoneUtilTest.php b/tests/VObject/TimeZoneUtilTest.php
@@ -463,4 +463,37 @@ public function offsetTimeZoneProvider(): iterable
             'expected' => 'America/Lima',
         ];
     }
+
+    /**
+     * @dataProvider letterCaseTimeZoneProvider
+     */
+    public function testDifferentLetterCaseTimeZone(string $origin, string $expected)
+    {
+        $tz = TimeZoneUtil::getTimeZone($origin, null, true);
+        $ex = new \DateTimeZone($expected);
+        $this->assertEquals($ex->getName(), $tz->getName());
+    }
+
+    public function letterCaseTimeZoneProvider(): iterable
+    {
+        yield 'case 1' => [
+            'origin' => 'Europe/paris',
+            'expected' => 'Europe/Paris',
+        ];
+
+        yield 'case 2' => [
+            'origin' => 'europe/paris',
+            'expected' => 'Europe/Paris',
+        ];
+
+        yield 'case 3' => [
+            'origin' => 'Europe/pAris',
+            'expected' => 'Europe/Paris',
+        ];
+
+        yield 'case 4' => [
+            'origin' => 'Asia/taipei',
+            'expected' => 'Asia/Taipei',
+        ];
+    }
 }