Fix update script for entry date fields.

Author: duncanmcclean

src/UpdateScripts/ConvertDatesToUtc.php

@@ -54,7 +54,11 @@ private function updateDateFields($item, Fields $fields, ?string $dottedPrefix =
                     && empty($dottedPrefix)
                     && $field->handle() === 'date'
                 ) {
-                    $item->date($item->date());
+                    $existingDate = $item->date();
+                    $localDate = Carbon::parse($existingDate->format('Y-m-d H:i:s'), config('app.timezone'));
+                    $convertedDate = $localDate->setTimezone('UTC');
+
+                    $item->date($convertedDate);
 
                     return;
                 }

tests/UpdateScripts/ConvertDatesToUtcTest.php

@@ -2,16 +2,13 @@
 
 namespace Tests\UpdateScripts;
 
-use Illuminate\Support\Carbon;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
-use ReflectionClass;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Fieldset;
 use Statamic\Facades\GlobalSet;
-use Statamic\Facades\Stache;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Term;
 use Statamic\Facades\User;
@@ -71,24 +68,11 @@ public function it_converts_entry_date_field_in_entries()
             ],
         ])->save();
 
-        // We want to set the time to 12pm in America/New_York, which is 5pm in UTC.
-        // Since Entry::date() automatically converts the value to UTC, we need to set it directly.
-        // It's naughty, but it's the only way I could find to set the "old" value.
-        $entry = Entry::make()->id('foo')->collection('articles');
-
-        $reflection = new ReflectionClass($entry);
-        $property = $reflection->getProperty('date');
-        $property->setAccessible(true);
-        $property->setValue($entry, Carbon::parse('2025-01-01 12:00', 'America/New_York'));
-
+        $entry = Entry::make()->id('foo')->collection('articles')->date('2025-01-01-1200');
         $entry->save();
 
         $this->runUpdateScript(ConvertDatesToUtc::class);
 
-        // We're clearing the Stache here to ensure the Carbon instance above doesn't end
-        // up being the same one we're testing against below.
-        Stache::clear();
-
         $entry = Entry::find($entry->id());
 
         $this->assertEquals('2025-01-01 17:00', $entry->date()->format('Y-m-d H:i'));