Fix PR

sulu · Jan 27, 2025 · 516b871 · 516b871
1 parent 7390f88
commit 516b871
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 28 deletions.
diff --git a/Content/Application/ContentDataMapper/DataMapper/AuthorDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/AuthorDataMapper.php
@@ -57,15 +57,15 @@ private function setAuthorData(AuthorInterface $dimensionContent, array $data):
         if (\array_key_exists('lastModified', $data)) {
             $dimensionContent->setLastModified(
                 $data['lastModified'] && (\array_key_exists('lastModifiedEnabled', $data) && $data['lastModifiedEnabled'])
-                    ? new \DateTime($data['lastModified'])
+                    ? new \DateTimeImmutable($data['lastModified'])
                     : null
             );
         }
 
         if (\array_key_exists('authored', $data)) {
             $dimensionContent->setAuthored(
                 $data['authored']
-                    ? new \DateTime($data['authored'])
+                    ? new \DateTimeImmutable($data['authored'])
                     : null
             );
         }

diff --git a/Content/Domain/Model/AuthorInterface.php b/Content/Domain/Model/AuthorInterface.php
@@ -19,15 +19,15 @@ interface AuthorInterface
 {
     public function getLastModifiedEnabled(): ?bool;
 
-    public function getLastModified(): ?\DateTime;
+    public function getLastModified(): ?\DateTimeImmutable;
 
-    public function setLastModified(?\DateTime $lastModified): void;
+    public function setLastModified(?\DateTimeImmutable $lastModified): void;
 
     public function getAuthor(): ?ContactInterface;
 
     public function setAuthor(?ContactInterface $author): void;
 
-    public function getAuthored(): ?\DateTime;
+    public function getAuthored(): ?\DateTimeImmutable;
 
-    public function setAuthored(?\DateTime $authored): void;
+    public function setAuthored(?\DateTimeImmutable $authored): void;
 }
diff --git a/Content/Domain/Model/AuthorTrait.php b/Content/Domain/Model/AuthorTrait.php
@@ -26,12 +26,12 @@ trait AuthorTrait
     private $author;
 
     /**
-     * @var \DateTime|null
+     * @var \DateTimeImmutable|null
      */
     private $authored;
 
     /**
-     * @var \DateTime|null
+     * @var \DateTimeImmutable|null
      */
     private $lastModified;
 
@@ -40,12 +40,12 @@ public function getLastModifiedEnabled(): ?bool
         return null !== $this->lastModified;
     }
 
-    public function getLastModified(): ?\DateTime
+    public function getLastModified(): ?\DateTimeImmutable
     {
         return $this->lastModified;
     }
 
-    public function setLastModified(?\DateTime $lastModified): void
+    public function setLastModified(?\DateTimeImmutable $lastModified): void
     {
         $this->lastModified = $lastModified;
     }
@@ -60,12 +60,12 @@ public function setAuthor(?ContactInterface $author): void
         $this->author = $author;
     }
 
-    public function getAuthored(): ?\DateTime
+    public function getAuthored(): ?\DateTimeImmutable
     {
         return $this->authored;
     }
 
-    public function setAuthored(?\DateTime $authored): void
+    public function setAuthored(?\DateTimeImmutable $authored): void
     {
         $this->authored = $authored;
     }

diff --git a/Content/Infrastructure/Doctrine/MetadataLoader.php b/Content/Infrastructure/Doctrine/MetadataLoader.php
@@ -108,8 +108,8 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event): void
         }
 
         if ($reflection->implementsInterface(AuthorInterface::class)) {
-            $this->addField($metadata, 'authored', 'datetime', ['nullable' => true]);
-            $this->addField($metadata, 'lastModified', 'datetime', ['nullable' => true]);
+            $this->addField($metadata, 'authored', 'datetime_immutable', ['nullable' => true]);
+            $this->addField($metadata, 'lastModified', 'datetime_immutable', ['nullable' => true]);
             $this->addManyToOne($event, $metadata, 'author', ContactInterface::class, true);
         }
 

diff --git a/Content/Infrastructure/Sulu/Structure/ContentDocument.php b/Content/Infrastructure/Sulu/Structure/ContentDocument.php
@@ -166,7 +166,7 @@ public function getLastModifiedEnabled(): ?bool
         return null;
     }
 
-    public function getLastModified(): ?\DateTime
+    public function getLastModified(): ?\DateTimeImmutable
     {
         if ($this->content instanceof AuthorInterface) {
             return $this->content->getLastModified();
@@ -176,14 +176,17 @@ public function getLastModified(): ?\DateTime
     }
 
     /**
-     * @param \DateTime|null $lastModified
+     * @param \DateTimeImmutable|null $lastModified
      */
     public function setLastModified($lastModified): void
     {
         throw $this->createReadOnlyException(__METHOD__);
     }
 
-    public function getAuthored(): ?\DateTime
+    /**
+     * @return \DateTimeInterface|null
+     */
+    public function getAuthored()
     {
         if ($this->content instanceof AuthorInterface) {
             return $this->content->getAuthored();

diff --git a/Tests/Unit/Content/Application/ContentDataMapper/DataMapper/AuthorDataMapperTest.php b/Tests/Unit/Content/Application/ContentDataMapper/DataMapper/AuthorDataMapperTest.php
@@ -122,7 +122,7 @@ public function testMapDataNull(): void
         $unlocalizedDimensionContent = new ExampleDimensionContent($example);
         $localizedDimensionContent = new ExampleDimensionContent($example);
         $localizedDimensionContent->setAuthor(new Contact());
-        $localizedDimensionContent->setAuthored(new \DateTime());
+        $localizedDimensionContent->setAuthored(new \DateTimeImmutable());
 
         $this->contactFactory->create(Argument::cetera())
             ->shouldNotBeCalled();

diff --git a/Tests/Unit/Content/Application/ContentMerger/Merger/AuthorMergerTest.php b/Tests/Unit/Content/Application/ContentMerger/Merger/AuthorMergerTest.php
@@ -62,8 +62,8 @@ public function testMergeSet(): void
         $merger = $this->getAuthorMergerInstance();
 
         $contact = $this->prophesize(ContactInterface::class);
-        $authoredDate = new \DateTime('2020-05-08T00:00:00+00:00');
-        $lastModifiedDate = new \DateTime('2020-05-08T00:00:00+00:00');
+        $authoredDate = new \DateTimeImmutable('2020-05-08T00:00:00+00:00');
+        $lastModifiedDate = new \DateTimeImmutable('2020-05-08T00:00:00+00:00');
 
         $source = $this->prophesize(DimensionContentInterface::class);
         $source->willImplement(AuthorInterface::class);

diff --git a/Tests/Unit/Content/Application/ContentNormalizer/Normalizer/AuthorNormalizerTest.php b/Tests/Unit/Content/Application/ContentNormalizer/Normalizer/AuthorNormalizerTest.php
@@ -59,7 +59,7 @@ public function testEnhanceNotImplementAuthorInterface(): void
 
         $data = [
             'author' => 1,
-            'authored' => new \DateTime('2020-05-08T00:00:00+00:00'),
+            'authored' => new \DateTimeImmutable('2020-05-08T00:00:00+00:00'),
         ];
 
         $this->assertSame(
@@ -76,8 +76,8 @@ public function testEnhance(): void
         $contact = $this->prophesize(ContactInterface::class);
         $contact->getId()->shouldBeCalled()->willReturn(1);
         $object->getAuthor()->willReturn($contact->reveal());
-        $authored = new \DateTime('2020-05-08T00:00:00+00:00');
-        $lastModified = new \DateTime('2022-05-08T00:00:00+00:00');
+        $authored = new \DateTimeImmutable('2020-05-08T00:00:00+00:00');
+        $lastModified = new \DateTimeImmutable('2022-05-08T00:00:00+00:00');
 
         $data = [
             'author' => $contact->reveal(),

diff --git a/Tests/Unit/Content/Domain/Model/AuthorTraitTest.php b/Tests/Unit/Content/Domain/Model/AuthorTraitTest.php
@@ -42,7 +42,7 @@ public function testGetSetAuthor(): void
     public function testGetSetAuthored(): void
     {
         $model = $this->getAuthorInstance();
-        $authored = new \DateTime('2020-05-08T00:00:00+00:00');
+        $authored = new \DateTimeImmutable('2020-05-08T00:00:00+00:00');
         $this->assertNull($model->getAuthored());
         $model->setAuthored($authored);
         $this->assertSame($authored, $model->getAuthored());
@@ -51,7 +51,7 @@ public function testGetSetAuthored(): void
     public function testGetSetLastModified(): void
     {
         $model = $this->getAuthorInstance();
-        $lastModified = new \DateTime('2024-05-08T00:00:00+00:00');
+        $lastModified = new \DateTimeImmutable('2024-05-08T00:00:00+00:00');
         $model->setLastModified($lastModified);
         $this->assertTrue($model->getLastModifiedEnabled());
         $this->assertSame($lastModified, $model->getLastModified());

diff --git a/Tests/Unit/Content/Infrastructure/Sulu/Structure/ContentDocumentTest.php b/Tests/Unit/Content/Infrastructure/Sulu/Structure/ContentDocumentTest.php
@@ -180,8 +180,8 @@ public function testGetLastModified(): void
         $content = $this->prophesize(TemplateInterface::class);
         $content->willImplement(AuthorInterface::class);
         $content->getLastModifiedEnabled()->willReturn(true);
-        $authored = new \DateTime('2020-01-01');
-        $lastModified = new \DateTime('2022-01-01');
+        $authored = new \DateTimeImmutable('2020-01-01');
+        $lastModified = new \DateTimeImmutable('2022-01-01');
         $content->getLastModified()->willReturn($lastModified);
         $content->getAuthored()->willReturn($authored);
         $document = $this->createContentDocument($content->reveal());
@@ -194,7 +194,7 @@ public function testGetLastModified(): void
     public function testSetLastModified(): void
     {
         $this->expectException(\BadMethodCallException::class);
-        $lastModified = new \DateTime('2020-01-01');
+        $lastModified = new \DateTimeImmutable('2020-01-01');
         $document = $this->createContentDocument();
 
         $document->setLastModified($lastModified);