Skip to content

Commit 8387514

Browse files
committed
Hokkaido suffix issue
1 parent cb55bc6 commit 8387514

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/Geo/Japan/Prefecture.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public static function __callStatic(string $name, array $arguments): self
188188
public static function ofKanjiName(string $kanjiName): self
189189
{
190190
$filteredData = array_filter(self::DATA, function (array $prefecture) use ($kanjiName) {
191-
return $kanjiName === strtolower($prefecture['kanjiName']);
191+
return $kanjiName === $prefecture['kanjiName'];
192192
});
193193
if ([] === $filteredData) {
194194
throw new InvalidArgumentException(sprintf('There is no prefecture of kanji name: %s', $kanjiName));
@@ -214,6 +214,9 @@ public static function ofSuffixedKanjiName(string $suffixedKanjiName): self
214214
{
215215
$filteredData = array_filter(self::DATA, function (array $prefecture) use ($suffixedKanjiName) {
216216
$suffixFactoryMethod = $prefecture['suffix'];
217+
if ($suffixedKanjiName === '北海道') {
218+
return $suffixedKanjiName === $prefecture['kanjiName'];
219+
}
217220

218221
return $suffixedKanjiName === $prefecture['kanjiName'] . PrefectureSuffix::$suffixFactoryMethod()->kanjiName();
219222
});

tests/Geo/Japan/PrefectureTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,11 @@ public function testCreationFromInvalidKanjiName()
272272

273273
public function testCreationFromSuffixedKanjiName()
274274
{
275+
$this->assertSame('JP-01', Prefecture::ofSuffixedKanjiName('北海道')->isoCode());
276+
$this->assertSame('Hokkaido', Prefecture::ofSuffixedKanjiName('北海道')->suffixedName());
277+
$this->assertSame('北海道', Prefecture::ofSuffixedKanjiName('北海道')->suffixedKanjiName());
278+
$this->assertTrue(Prefecture::ofSuffixedKanjiName('北海道')->region()->equals(Region::hokkaido()));
279+
275280
$this->assertSame('JP-47', Prefecture::ofSuffixedKanjiName('沖縄県')->isoCode());
276281
$this->assertSame('Okinawa-ken', Prefecture::ofSuffixedKanjiName('沖縄県')->suffixedName());
277282
$this->assertSame('沖縄県', Prefecture::ofSuffixedKanjiName('沖縄県')->suffixedKanjiName());

0 commit comments

Comments
 (0)