一旦コミット

Author: endou-mame

.vscode/settings.json

@@ -8,10 +8,8 @@
     // php-cs-fixer settings
     "php-cs-fixer.config": ".php-cs-fixer.dist.php",
     "php-cs-fixer.executablePath": "${workspaceFolder}/vendor/friendsofphp/php-cs-fixer/php-cs-fixer",
-    // HACK: PHP8.4 に PHP-CS-Fixer が対応していないが強制的に実行するための設定
-    // TODO: PHP-CS-Fixer が PHP8.4 に対応したら削除すること！！！！
-    "php-cs-fixer.ignorePHPVersion": true,
     // PHPStan settings
+    "phpstan.enabled": true,
     "phpstan.binPath": "vendor/bin/phpstan",
     "phpstan.configFile": "phpstan.neon.dist",
     "phpstan.singleFileMode": true,

examples/DateTime/TestLocalDateRange.php

@@ -6,27 +6,30 @@
 
 use WizDevelop\PhpValueObject\DateTime\LocalDate;
 use WizDevelop\PhpValueObject\DateTime\LocalDateRange;
+use WizDevelop\PhpValueObject\DateTime\RangeType;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
 // 1. 基本的な使用例：月間の範囲
 echo "=== 基本的な使用例 ===\n";
 $startOfMonth = LocalDate::of(2024, 1, 1);
 $endOfMonth = LocalDate::of(2024, 1, 31);
-$january = LocalDateRange::closed($startOfMonth, $endOfMonth);
+$january = LocalDateRange::from($startOfMonth, $endOfMonth);
 
 echo "1月の期間: {$january->toISOString()}\n";
 echo "日数: {$january->days()} 日\n\n";
 
 // 2. 開区間と閉区間の違い
 echo "=== 開区間と閉区間の違い ===\n";
-$closedWeek = LocalDateRange::closed(
+$closedWeek = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 1, 7)
+    LocalDate::of(2024, 1, 7),
+    RangeType::CLOSED,
 );
-$openWeek = LocalDateRange::open(
+$openWeek = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 1, 7)
+    LocalDate::of(2024, 1, 7),
+    RangeType::OPEN,
 );
 
 echo "閉区間（両端含む）: {$closedWeek->toISOString()} = {$closedWeek->days()} 日\n";
@@ -35,9 +38,10 @@
 // 3. 半開区間の使用例（一般的な日付範囲の表現）
 echo "=== 半開区間の使用例 ===\n";
 // 月初から月末まで（月末を含まない一般的なパターン）
-$month = LocalDateRange::halfOpenRight(
+$month = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 2, 1)
+    LocalDate::of(2024, 2, 1),
+    RangeType::HALF_OPEN_RIGHT,
 );
 
 echo "1月（右半開区間）: {$month->toISOString()}\n";
@@ -46,30 +50,34 @@
 
 // 4. 日付の反復処理
 echo "=== 日付の反復処理 ===\n";
-$weekRange = LocalDateRange::closed(
+$weekRange = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 1, 7)
+    LocalDate::of(2024, 1, 7),
+    RangeType::CLOSED,
 );
 
 echo "1週間の日付:\n";
-foreach ($weekRange->iterate() as $date) {
+foreach ($weekRange->getIterator() as $date) {
     echo " - {$date->toISOString()}\n";
 }
 echo "\n";
 
 // 5. 期間の重なり判定
 echo "=== 期間の重なり判定 ===\n";
-$q1 = LocalDateRange::closed(
+$q1 = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 3, 31)
+    LocalDate::of(2024, 3, 31),
+    RangeType::CLOSED,
 );
-$q2 = LocalDateRange::closed(
+$q2 = LocalDateRange::from(
     LocalDate::of(2024, 4, 1),
-    LocalDate::of(2024, 6, 30)
+    LocalDate::of(2024, 6, 30),
+    RangeType::CLOSED,
 );
-$marchToMay = LocalDateRange::closed(
+$marchToMay = LocalDateRange::from(
     LocalDate::of(2024, 3, 1),
-    LocalDate::of(2024, 5, 31)
+    LocalDate::of(2024, 5, 31),
+    RangeType::CLOSED,
 );
 
 echo "第1四半期: {$q1->toISOString()}\n";
@@ -81,9 +89,9 @@
 
 // 6. 特定の日付が期間内かチェック
 echo "=== 期間内チェック ===\n";
-$vacation = LocalDateRange::closed(
+$vacation = LocalDateRange::from(
     LocalDate::of(2024, 8, 10),
-    LocalDate::of(2024, 8, 20)
+    LocalDate::of(2024, 8, 20),
 );
 $checkDate = LocalDate::of(2024, 8, 15);
 
@@ -94,7 +102,8 @@
 echo "=== エラーハンドリング ===\n";
 $invalidResult = LocalDateRange::tryFrom(
     LocalDate::of(2024, 12, 31),
-    LocalDate::of(2024, 1, 1)
+    LocalDate::of(2024, 1, 1),
+    RangeType::CLOSED,
 );
 
 if ($invalidResult->isErr()) {
@@ -108,16 +117,12 @@
 $startDate = LocalDate::of(2024, 1, 1);
 $endDate = null;
 
-$optionRange = LocalDateRange::fromNullable($startDate, $endDate);
-if ($optionRange->isNone()) {
-    echo "範囲を作成できませんでした（いずれかの値がnullです）\n";
-}
-
 // 9. 年間カレンダーの例
 echo "\n=== 年間カレンダーの例 ===\n";
-$year2024 = LocalDateRange::closed(
+$year2024 = LocalDateRange::from(
     LocalDate::of(2024, 1, 1),
-    LocalDate::of(2024, 12, 31)
+    LocalDate::of(2024, 12, 31),
+    RangeType::CLOSED,
 );
 
 echo "2024年: {$year2024->toISOString()}\n";

src/DateTime/LocalDate.php

@@ -146,7 +146,7 @@ final public static function tryFromNullable(?DateTimeInterface $value): Result
         return static::tryFrom($value)->map(static fn ($result) => Option\some($result));
     }
 
-    final public static function now(DateTimeZone $timeZone): static
+    final public static function now(DateTimeZone $timeZone = new DateTimeZone('Asia/Tokyo')): static
     {
         $value = new DateTimeImmutable('now', $timeZone);
 
@@ -155,6 +155,11 @@ final public static function now(DateTimeZone $timeZone): static
         return static::of($year, $month, $day);
     }
 
+    final public static function max(): static
+    {
+        return static::of(self::MAX_YEAR, 12, 31);
+    }
+
     /**
      * Obtains an instance of `LocalDate` from the epoch day count.
      *
@@ -260,8 +265,6 @@ className: static::class,
             );
         }
 
-
-
         return Result\ok(true);
     }
 
@@ -409,6 +412,11 @@ final public function compareTo(self $that): int
         return 0;
     }
 
+    final public function is(self $that): bool
+    {
+        return $this->compareTo($that) === 0;
+    }
+
     final public function isBefore(self $that): bool
     {
         return $this->compareTo($that) === -1;