diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 0c9efbc..9e56c19 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -90,7 +90,7 @@ final class ApiController extends Controller { $old = clone NewsArticleMapper::get((int) $request->getData('id')); $new = $this->updateNewsFromRequest($request); - $this->updateModel($request->getHeader()->getAccount(), $old, $new, NewsArticleMapper::class, 'news', $request->getOrigin()); + $this->updateModel($request->header->account, $old, $new, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully updated', $new); } @@ -105,11 +105,12 @@ final class ApiController extends Controller */ private function updateNewsFromRequest(RequestAbstract $request) : NewsArticle { + /** @var NewsArticle $newsArticle */ $newsArticle = NewsArticleMapper::get((int) $request->getData('id')); $newsArticle->setPublish(new \DateTime((string) ($request->getData('publish') ?? $newsArticle->getPublish()->format('Y-m-d H:i:s')))); - $newsArticle->setTitle((string) ($request->getData('title') ?? $newsArticle->getTitle())); - $newsArticle->setPlain($request->getData('plain') ?? $newsArticle->getPlain()); - $newsArticle->setContent(Markdown::parse((string) ($request->getData('plain') ?? $newsArticle->getPlain()))); + $newsArticle->title = (string) ($request->getData('title') ?? $newsArticle->title); + $newsArticle->plaint = $request->getData('plain') ?? $newsArticle->plain; + $newsArticle->content = Markdown::parse((string) ($request->getData('plain') ?? $newsArticle->plain)); $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $newsArticle->getLanguage()))); $newsArticle->setType((int) ($request->getData('type') ?? $newsArticle->getType())); $newsArticle->setStatus((int) ($request->getData('status') ?? $newsArticle->getStatus())); @@ -135,13 +136,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateNewsCreate($request))) { $response->set('news_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $newsArticle = $this->createNewsArticleFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $newsArticle, NewsArticleMapper::class, 'news', $request->getOrigin()); + $this->createModel($request->header->account, $newsArticle, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully created', $newsArticle); } @@ -157,11 +158,11 @@ final class ApiController extends Controller private function createNewsArticleFromRequest(RequestAbstract $request) : NewsArticle { $newsArticle = new NewsArticle(); - $newsArticle->setCreatedBy(new NullAccount($request->getHeader()->getAccount())); + $newsArticle->createdBy = new NullAccount($request->header->account); $newsArticle->setPublish(new \DateTime((string) ($request->getData('publish') ?? 'now'))); - $newsArticle->setTitle((string) ($request->getData('title') ?? '')); - $newsArticle->setPlain($request->getData('plain') ?? ''); - $newsArticle->setContent(Markdown::parse((string) ($request->getData('plain') ?? ''))); + $newsArticle->title = (string) ($request->getData('title') ?? ''); + $newsArticle->plain = $request->getData('plain') ?? ''; + $newsArticle->content = Markdown::parse((string) ($request->getData('plain') ?? '')); $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getLanguage()))); $newsArticle->setType((int) ($request->getData('type') ?? NewsType::ARTICLE)); $newsArticle->setStatus((int) ($request->getData('status') ?? NewsStatus::VISIBLE)); @@ -185,7 +186,7 @@ final class ApiController extends Controller $internalResponse = new HttpResponse(); $this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse, null); - $newsArticle->addTag($internalResponse->get($request->getUri()->__toString())['response']); + $newsArticle->addTag($internalResponse->get($request->uri->__toString())['response']); } else { $newsArticle->addTag(new NullTag((int) $tag['id'])); } @@ -230,7 +231,7 @@ final class ApiController extends Controller public function apiNewsDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { $news = NewsArticleMapper::get((int) $request->getData('id')); - $this->deleteModel($request->getHeader()->getAccount(), $news, NewsArticleMapper::class, 'news', $request->getOrigin()); + $this->deleteModel($request->header->account, $news, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully deleted', $news); } } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index cdf19bf..a0e08e1 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -116,14 +116,14 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $article = NewsArticleMapper::get((int) $request->getData('id')); - $accountId = $request->getHeader()->getAccount(); + $accountId = $request->header->account; - if ($article->getCreatedBy()->getId() !== $accountId + if ($article->createdBy->getId() !== $accountId && !$this->app->accountManager->get($accountId)->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::NEWS, $article->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); - $response->getHeader()->setStatusCode(RequestStatusCode::R_403); + $response->header->status = RequestStatusCode::R_403; return $view; } diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php index c56d3e3..001052a 100755 --- a/Models/NewsArticle.php +++ b/Models/NewsArticle.php @@ -45,7 +45,7 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - private string $title = ''; + public string $title = ''; /** * Content. @@ -53,7 +53,7 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - private string $content = ''; + public string $content = ''; /** * Unparsed. @@ -61,7 +61,7 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - private string $plain = ''; + public string $plain = ''; /** * News type. @@ -93,7 +93,7 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface * @var \DateTimeImmutable * @since 1.0.0 */ - private \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; /** * Creator. @@ -101,7 +101,7 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface * @var Account * @since 1.0.0 */ - private Account $createdBy; + public Account $createdBy; /** * Publish. @@ -147,58 +147,6 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface $this->publish = new \DateTime('now'); } - /** - * Get content - * - * @return string - * - * @since 1.0.0 - */ - public function getContent() : string - { - return $this->content; - } - - /** - * Set content - * - * @param string $content News article content - * - * @return void - * - * @since 1.0.0 - */ - public function setContent(string $content) : void - { - $this->content = $content; - } - - /** - * Set plain content - * - * @param string $plain Plain/raw content - * - * @return void - * - * @since 1.0.0 - */ - public function setPlain(string $plain) : void - { - $this->plain = $plain; - } - - /** - * Get plain/raw content - * - * @return string - * - * @since 1.0.0 - */ - public function getPlain() : string - { - return $this->plain; - } - /** * Set comment list * @@ -225,18 +173,6 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface return $this->comments; } - /** - * Get date of creation - * - * @return \DateTimeImmutable - * - * @since 1.0.0 - */ - public function getCreatedAt() : \DateTimeImmutable - { - return $this->createdAt; - } - /** * Get id * @@ -305,56 +241,6 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface $this->publish = $publish; } - /** - * Get created by - * - * @return Account - * - * @since 1.0.0 - */ - public function getCreatedBy() : Account - { - return $this->createdBy; - } - - /** - * Set created by - * - * @param Account $account Created by - * - * @return void - * - * @since 1.0.0 - */ - public function setCreatedBy(Account $account) : void - { - $this->createdBy = $account; - } - - /** - * @return string - * - * @since 1.0.0 - */ - public function getTitle() : string - { - return $this->title; - } - - /** - * Set news article title - * - * @param string $title News article title - * - * @return void - * - * @since 1.0.0 - */ - public function setTitle(string $title) : void - { - $this->title = $title; - } - /** * Get news article type * diff --git a/Theme/Backend/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php index 8b4e656..3ce50fc 100755 --- a/Theme/Backend/dashboard-news.tpl.php +++ b/Theme/Backend/dashboard-news.tpl.php @@ -50,7 +50,7 @@ $newsList = $this->getData('news') ?? []; - printHtml($news->getTitle()); ?> + printHtml($news->title); ?> diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php index c355eae..81c8a86 100755 --- a/Theme/Backend/news-archive.tpl.php +++ b/Theme/Backend/news-archive.tpl.php @@ -44,8 +44,8 @@ echo $this->getData('nav')->render(); ?> ?> getHtml('TYPE' . $news->getType()); ?> - printHtml($news->getTitle()); ?> - printHtml($news->getCreatedBy()->getName2() . ', ' . $news->getCreatedBy()->getName1()); ?> + printHtml($news->title); ?> + printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?> printHtml($news->getPublish()->format('Y-m-d')); ?> diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php index b964c0f..818afb2 100755 --- a/Theme/Backend/news-create.tpl.php +++ b/Theme/Backend/news-create.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
- +
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
- getData('editor')->getData('text')->render('iNews', 'plain', 'docForm', $news->getPlain(), $news->getContent()); ?> + getData('editor')->getData('text')->render('iNews', 'plain', 'docForm', $news->plain, $news->content); ?>
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php index 4eaceb3..02c399f 100755 --- a/Theme/Backend/news-dashboard.tpl.php +++ b/Theme/Backend/news-dashboard.tpl.php @@ -28,10 +28,10 @@ echo $this->getData('nav')->render(); ?>
getId()); ?>
- +
- getPlain(), 0, 500)); ?> + plain, 0, 500)); ?>
diff --git a/Theme/Backend/news-draft.tpl.php b/Theme/Backend/news-draft.tpl.php index 0e34d7a..e4da909 100644 --- a/Theme/Backend/news-draft.tpl.php +++ b/Theme/Backend/news-draft.tpl.php @@ -44,8 +44,8 @@ echo $this->getData('nav')->render(); ?> ?> getHtml('TYPE' . $news->getType()); ?> - printHtml($news->getTitle()); ?> - printHtml($news->getCreatedBy()->getName2() . ', ' . $news->getCreatedBy()->getName1()); ?> + printHtml($news->title); ?> + printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?> printHtml($news->getPublish()->format('Y-m-d')); ?> diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php index 5ed485f..8f835c8 100755 --- a/Theme/Backend/news-single.tpl.php +++ b/Theme/Backend/news-single.tpl.php @@ -30,8 +30,8 @@ echo $this->getData('nav')->render(); ?>
-

printHtml($news->getTitle()); ?>

- getContent(); ?> +

printHtml($news->title); ?>

+ content; ?>
diff --git a/tests/Controller/Api/ApiControllerNewsArticleTrait.php b/tests/Controller/Api/ApiControllerNewsArticleTrait.php index 0b48779..f7a8360 100755 --- a/tests/Controller/Api/ApiControllerNewsArticleTrait.php +++ b/tests/Controller/Api/ApiControllerNewsArticleTrait.php @@ -34,7 +34,7 @@ trait ApiControllerNewsArticleTrait $response = new HttpResponse(); $request = new HttpRequest(new HttpUri('')); - $request->getHeader()->setAccount(1); + $request->header->account = 1; $request->setData('title', 'Controller Test Title'); $request->setData('plain', 'Controller Test Content'); $request->setData('lang', 'en'); @@ -44,7 +44,7 @@ trait ApiControllerNewsArticleTrait $this->module->apiNewsCreate($request, $response); - self::assertEquals('Controller Test Title', $response->get('')['response']->getTitle()); + self::assertEquals('Controller Test Title', $response->get('')['response']->title); self::assertGreaterThan(0, $response->get('')['response']->getId()); } @@ -58,7 +58,7 @@ trait ApiControllerNewsArticleTrait $response = new HttpResponse(); $request = new HttpRequest(new HttpUri('')); - $request->getHeader()->setAccount(1); + $request->header->account = 1; $request->setData('id', '1'); $this->module->apiNewsGet($request, $response); @@ -76,7 +76,7 @@ trait ApiControllerNewsArticleTrait $response = new HttpResponse(); $request = new HttpRequest(new HttpUri('')); - $request->getHeader()->setAccount(1); + $request->header->account = 1; $request->setData('id', 1); $request->setData('title', 'New Title'); $request->setData('plain', 'New Content here'); @@ -84,7 +84,7 @@ trait ApiControllerNewsArticleTrait $this->module->apiNewsUpdate($request, $response); $this->module->apiNewsGet($request, $response); - self::assertEquals('New Title', $response->get('')['response']->getTitle()); + self::assertEquals('New Title', $response->get('')['response']->title); } /** @@ -97,7 +97,7 @@ trait ApiControllerNewsArticleTrait $response = new HttpResponse(); $request = new HttpRequest(new HttpUri('')); - $request->getHeader()->setAccount(1); + $request->header->account = 1; $request->setData('id', 1); $this->module->apiNewsDelete($request, $response); diff --git a/tests/Models/NewsArticleMapperTest.php b/tests/Models/NewsArticleMapperTest.php index 05bc8ce..b090bc1 100755 --- a/tests/Models/NewsArticleMapperTest.php +++ b/tests/Models/NewsArticleMapperTest.php @@ -39,10 +39,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $text = new Text(); $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($raw = $text->generateText(\mt_rand(100, 300))); - $news->setPlain($raw); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = ($raw = $text->generateText(\mt_rand(100, 300))); + $news->plaint = $raw; $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(true); $news->setLanguage(ISO639x1Enum::_DE); @@ -54,11 +54,11 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase self::assertEquals($id, $news->getId()); $newsR = NewsArticleMapper::get($news->getId()); - self::assertEquals($news->getCreatedAt()->format('Y-m-d'), $newsR->getCreatedAt()->format('Y-m-d')); - self::assertEquals($news->getCreatedBy()->getId(), $newsR->getCreatedBy()->getId()); - self::assertEquals($news->getContent(), $newsR->getContent()); - self::assertEquals($news->getPlain(), $newsR->getPlain()); - self::assertEquals($news->getTitle(), $newsR->getTitle()); + self::assertEquals($news->createdAt->format('Y-m-d'), $newsR->createdAt->format('Y-m-d')); + self::assertEquals($news->createdBy->getId(), $newsR->createdBy->getId()); + self::assertEquals($news->content, $newsR->content); + self::assertEquals($news->plain, $newsR->plain); + self::assertEquals($news->title, $newsR->title); self::assertEquals($news->getStatus(), $newsR->getStatus()); self::assertEquals($news->getType(), $newsR->getType()); self::assertEquals($news->getLanguage(), $newsR->getLanguage()); @@ -78,9 +78,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Created by other $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); @@ -90,9 +90,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); @@ -104,9 +104,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Created by me $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); @@ -116,9 +116,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); @@ -128,9 +128,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); @@ -142,9 +142,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Language $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish(new \DateTime('2001-05-07')); $news->setFeatured(true); $news->setLanguage(ISO639x1Enum::_EN); @@ -159,9 +159,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $publishDate->modify('+1 days'); $news = new NewsArticle(); - $news->setCreatedBy(new NullAccount(1)); - $news->setTitle($text->generateText(\mt_rand(3, 7))); - $news->setContent($text->generateText(\mt_rand(10, 300))); + $news->createdBy = new NullAccount(1); + $news->title = $text->generateText(\mt_rand(3, 7)); + $news->content = $text->generateText(\mt_rand(10, 300)); $news->setPublish($publishDate); $news->setFeatured(false); $news->setLanguage(ISO639x1Enum::_DE); diff --git a/tests/Models/NewsArticleTest.php b/tests/Models/NewsArticleTest.php index fc12fdd..d7719ae 100755 --- a/tests/Models/NewsArticleTest.php +++ b/tests/Models/NewsArticleTest.php @@ -42,17 +42,17 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase public function testDefault() : void { self::assertEquals(0, $this->news->getId()); - self::assertEquals(0, $this->news->getCreatedBy()->getId()); - self::assertEquals('', $this->news->getTitle()); - self::assertEquals('', $this->news->getContent()); - self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->news->getCreatedAt()->format('Y-m-d')); + self::assertEquals(0, $this->news->createdBy->getId()); + self::assertEquals('', $this->news->title); + self::assertEquals('', $this->news->content); + self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->news->createdAt->format('Y-m-d')); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->news->getPublish()->format('Y-m-d')); self::assertFalse($this->news->isFeatured()); self::assertEquals(ISO639x1Enum::_EN, $this->news->getLanguage()); self::assertEquals(NewsStatus::DRAFT, $this->news->getStatus()); self::assertEquals(NewsType::ARTICLE, $this->news->getType()); self::assertEquals([], $this->news->getTags()); - self::assertEquals('', $this->news->getPlain()); + self::assertEquals('', $this->news->plain); } /** @@ -62,8 +62,8 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testCreatorInputOutput() : void { - $this->news->setCreatedBy(new NullAccount(1)); - self::assertEquals(1, $this->news->getCreatedBy()->getId()); + $this->news->createdBy = new NullAccount(1); + self::assertEquals(1, $this->news->createdBy->getId()); } /** @@ -73,8 +73,8 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testTitleInputOutput() : void { - $this->news->setTitle('Title'); - self::assertEquals('Title', $this->news->getTitle()); + $this->news->title = 'Title'; + self::assertEquals('Title', $this->news->title); } /** @@ -84,8 +84,8 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testContentInputOutput() : void { - $this->news->setContent('Content'); - self::assertEquals('Content', $this->news->getContent()); + $this->news->content = 'Content'; + self::assertEquals('Content', $this->news->content); } /** @@ -95,8 +95,8 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testPlainInputOutput() : void { - $this->news->setPlain('Plain'); - self::assertEquals('Plain', $this->news->getPlain()); + $this->news->plain = 'Plain'; + self::assertEquals('Plain', $this->news->plain); } /** @@ -161,10 +161,10 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testSerialization() : void { - $this->news->setTitle('Title'); - $this->news->setCreatedBy(new NullAccount(1)); - $this->news->setContent('Content'); - $this->news->setPlain('Plain'); + $this->news->title = 'Title'; + $this->news->createdBy = new NullAccount(1); + $this->news->content = 'Content'; + $this->news->plain = 'Plain'; $this->news->setPublish(new \DateTime('2001-05-07')); $this->news->setFeatured(true); $this->news->setLanguage(ISO639x1Enum::_DE); @@ -173,15 +173,15 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase $arr = [ 'id' => 0, - 'title' => $this->news->getTitle(), - 'plain' => $this->news->getPlain(), - 'content' => $this->news->getContent(), + 'title' => $this->news->title, + 'plain' => $this->news->plain, + 'content' => $this->news->content, 'type' => $this->news->getType(), 'status' => $this->news->getStatus(), 'featured' => $this->news->isFeatured(), 'publish' => $this->news->getPublish(), - 'createdAt' => $this->news->getCreatedAt(), - 'createdBy' => $this->news->getCreatedBy(), + 'createdAt' => $this->news->createdAt, + 'createdBy' => $this->news->createdBy, ]; self::assertEquals($arr, $this->news->toArray());