ISSUE-345: update template property names

tatevikg1 · tatevikg1 · commit 3882b9e782ac · 2025-04-24T11:49:18.000+04:00
diff --git a/src/Domain/Model/Messaging/Template.php b/src/Domain/Model/Messaging/Template.php
@@ -23,10 +23,10 @@ class Template implements DomainModel, Identity
     private string $title;
 
     #[ORM\Column(name: 'template', type: 'blob', nullable: true)]
-    private mixed $template;
+    private mixed $content;
 
     #[ORM\Column(name: 'template_text', type: 'blob', nullable: true)]
-    private mixed $templateText;
+    private mixed $text;
 
     #[ORM\Column(name: 'listorder', type: 'integer', nullable: true)]
     private ?int $listOrder = null;
@@ -50,24 +50,24 @@ public function getTitle(): string
         return $this->title;
     }
 
-    public function getTemplate(): ?string
+    public function getContent(): ?string
     {
-        if (is_resource($this->template)) {
-            rewind($this->template);
-            return stream_get_contents($this->template);
+        if (is_resource($this->content)) {
+            rewind($this->content);
+            return stream_get_contents($this->content);
         }
 
-        return $this->template;
+        return $this->content;
     }
 
-    public function getTemplateText(): ?string
+    public function getText(): ?string
     {
-        if (is_resource($this->templateText)) {
-            rewind($this->templateText);
-            return stream_get_contents($this->templateText);
+        if (is_resource($this->text)) {
+            rewind($this->text);
+            return stream_get_contents($this->text);
         }
 
-        return $this->templateText;
+        return $this->text;
     }
 
     public function getListOrder(): ?int
@@ -86,16 +86,16 @@ public function setTitle(string $title): self
         return $this;
     }
 
-    public function setTemplate(?string $template): self
+    public function setContent(?string $content): self
     {
-        $this->template = $template !== null ? fopen('data://text/plain,' . $template, 'r') : null;
+        $this->content = $content !== null ? fopen('data://text/plain,' . $content, 'r') : null;
         return $this;
     }
 
 
-    public function setTemplateText(?string $templateText): self
+    public function setText(?string $text): self
     {
-        $this->templateText = $templateText !== null ? fopen('data://text/plain,' . $templateText, 'r') : null;
+        $this->text = $text !== null ? fopen('data://text/plain,' . $text, 'r') : null;
         return $this;
     }
 
diff --git a/tests/Integration/Domain/Repository/Fixtures/Messaging/TemplateFixture.php b/tests/Integration/Domain/Repository/Fixtures/Messaging/TemplateFixture.php
@@ -37,8 +37,8 @@ public function load(ObjectManager $manager): void
             $row = array_combine($headers, $data);
 
             $template = new Template($row['title']);
-            $template->setTemplate($row['template']);
-            $template->setTemplateText($row['template_text']);
+            $template->setContent($row['template']);
+            $template->setText($row['template_text']);
             $template->setListOrder((int)$row['listorder']);
 
             $this->setSubjectId($template, (int)$row['id']);
diff --git a/tests/Integration/Domain/Repository/Messaging/TemplateRepositoryTest.php b/tests/Integration/Domain/Repository/Messaging/TemplateRepositoryTest.php
@@ -56,8 +56,8 @@ public function testTemplateIsPersistedAndFetchedCorrectly(): void
 
         self::assertInstanceOf(Template::class, $fetched);
         self::assertSame('Newsletter Template', $fetched->getTitle());
-        self::assertSame('<html><body><h1>Welcome</h1></body></html>', $fetched->getTemplate());
-        self::assertSame('', $fetched->getTemplateText());
+        self::assertSame('<html><body><h1>Welcome</h1></body></html>', $fetched->getContent());
+        self::assertSame('', $fetched->getText());
         self::assertSame(1, $fetched->getListOrder());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ class Template implements DomainModel, Identity`
`23`	`23`	`private string $title;`
`24`	`24`
`25`	`25`	`#[ORM\Column(name: 'template', type: 'blob', nullable: true)]`
`26`		`- private mixed $template;`
	`26`	`+ private mixed $content;`
`27`	`27`
`28`	`28`	`#[ORM\Column(name: 'template_text', type: 'blob', nullable: true)]`
`29`		`- private mixed $templateText;`
	`29`	`+ private mixed $text;`
`30`	`30`
`31`	`31`	`#[ORM\Column(name: 'listorder', type: 'integer', nullable: true)]`
`32`	`32`	`private ?int $listOrder = null;`
`@@ -50,24 +50,24 @@ public function getTitle(): string`
`50`	`50`	`return $this->title;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function getTemplate(): ?string`
	`53`	`+ public function getContent(): ?string`
`54`	`54`	`{`
`55`		`- if (is_resource($this->template)) {`
`56`		`- rewind($this->template);`
`57`		`- return stream_get_contents($this->template);`
	`55`	`+ if (is_resource($this->content)) {`
	`56`	`+ rewind($this->content);`
	`57`	`+ return stream_get_contents($this->content);`
`58`	`58`	`}`
`59`	`59`
`60`		`- return $this->template;`
	`60`	`+ return $this->content;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function getTemplateText(): ?string`
	`63`	`+ public function getText(): ?string`
`64`	`64`	`{`
`65`		`- if (is_resource($this->templateText)) {`
`66`		`- rewind($this->templateText);`
`67`		`- return stream_get_contents($this->templateText);`
	`65`	`+ if (is_resource($this->text)) {`
	`66`	`+ rewind($this->text);`
	`67`	`+ return stream_get_contents($this->text);`
`68`	`68`	`}`
`69`	`69`
`70`		`- return $this->templateText;`
	`70`	`+ return $this->text;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function getListOrder(): ?int`
`@@ -86,16 +86,16 @@ public function setTitle(string $title): self`
`86`	`86`	`return $this;`
`87`	`87`	`}`
`88`	`88`
`89`		`- public function setTemplate(?string $template): self`
	`89`	`+ public function setContent(?string $content): self`
`90`	`90`	`{`
`91`		`- $this->template = $template !== null ? fopen('data://text/plain,' . $template, 'r') : null;`
	`91`	`+ $this->content = $content !== null ? fopen('data://text/plain,' . $content, 'r') : null;`
`92`	`92`	`return $this;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`
`96`		`- public function setTemplateText(?string $templateText): self`
	`96`	`+ public function setText(?string $text): self`
`97`	`97`	`{`
`98`		`- $this->templateText = $templateText !== null ? fopen('data://text/plain,' . $templateText, 'r') : null;`
	`98`	`+ $this->text = $text !== null ? fopen('data://text/plain,' . $text, 'r') : null;`
`99`	`99`	`return $this;`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ public function testTemplateIsPersistedAndFetchedCorrectly(): void`
`56`	`56`
`57`	`57`	`self::assertInstanceOf(Template::class, $fetched);`
`58`	`58`	`self::assertSame('Newsletter Template', $fetched->getTitle());`
`59`		`- self::assertSame('<html><body><h1>Welcome</h1></body></html>', $fetched->getTemplate());`
`60`		`- self::assertSame('', $fetched->getTemplateText());`
	`59`	`+ self::assertSame('<html><body><h1>Welcome</h1></body></html>', $fetched->getContent());`
	`60`	`+ self::assertSame('', $fetched->getText());`
`61`	`61`	`self::assertSame(1, $fetched->getListOrder());`
`62`	`62`	`}`
`63`	`63`