Merge pull request mautic#12784 from nick-vanpraet/feature/5.x/null-p…

…ublish-dates-on-mail-clone Empty the (un)publish dates on email clone
galvani · Oct 23, 2023 · d1bfac6 · d1bfac6
2 parents 6fb0414 + c729d44
commit d1bfac6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/app/bundles/EmailBundle/Entity/Email.php b/app/bundles/EmailBundle/Entity/Email.php
@@ -111,12 +111,12 @@ class Email extends FormEntity implements VariantEntityInterface, TranslationEnt
     private $emailType = 'template';
 
     /**
-     * @var \DateTimeInterface
+     * @var \DateTimeInterface|null
      */
     private $publishUp;
 
     /**
-     * @var \DateTimeInterface
+     * @var \DateTimeInterface|null
      */
     private $publishDown;
 
@@ -219,6 +219,8 @@ public function __clone()
         $this->variantStartDate = null;
         $this->emailType        = null;
         $this->sessionId        = 'new_'.hash('sha1', uniqid(mt_rand()));
+        $this->publishUp        = null;
+        $this->publishDown      = null;
         $this->clearTranslations();
         $this->clearVariants();
         $this->clearStats();

diff --git a/app/bundles/EmailBundle/Tests/Entity/EmailCloneTest.php b/app/bundles/EmailBundle/Tests/Entity/EmailCloneTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mautic\EmailBundle\Tests\Entity;
+
+use Mautic\EmailBundle\Entity\Email;
+use PHPUnit\Framework\TestCase;
+
+class EmailTest extends TestCase
+{
+    public function testCloneResetPublishDates(): void
+    {
+        $email = new Email();
+        $email->setPublishUp(new \DateTime());
+        $email->setPublishDown(new \DateTime());
+        $emailClone = clone $email;
+        $this->assertNull($emailClone->getPublishUp());
+        $this->assertNull($emailClone->getPublishDown());
+    }
+}