From a265656a6a0878309ffd63f5550b76bea17bb501 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 24 Nov 2020 18:44:22 +0100 Subject: [PATCH] autofixes --- Controller/ApiController.php | 10 +++--- tests/Models/NewsArticleMapperTest.php | 48 +++++++++++++------------- tests/Models/NewsArticleTest.php | 6 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9e56c19..a18f9a3 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -108,8 +108,8 @@ final class ApiController extends Controller /** @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->title = (string) ($request->getData('title') ?? $newsArticle->title); - $newsArticle->plaint = $request->getData('plain') ?? $newsArticle->plain; + $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())); @@ -157,11 +157,11 @@ final class ApiController extends Controller */ private function createNewsArticleFromRequest(RequestAbstract $request) : NewsArticle { - $newsArticle = new NewsArticle(); + $newsArticle = new NewsArticle(); $newsArticle->createdBy = new NullAccount($request->header->account); $newsArticle->setPublish(new \DateTime((string) ($request->getData('publish') ?? 'now'))); - $newsArticle->title = (string) ($request->getData('title') ?? ''); - $newsArticle->plain = $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)); diff --git a/tests/Models/NewsArticleMapperTest.php b/tests/Models/NewsArticleMapperTest.php index b090bc1..5535671 100755 --- a/tests/Models/NewsArticleMapperTest.php +++ b/tests/Models/NewsArticleMapperTest.php @@ -40,9 +40,9 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $news = new NewsArticle(); $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->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); @@ -77,10 +77,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Created by other - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -89,10 +89,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -103,10 +103,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Created by me - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -115,10 +115,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -127,10 +127,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $id = NewsArticleMapper::create($news); - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -141,10 +141,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase // Language - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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); @@ -158,10 +158,10 @@ class NewsArticleMapperTest extends \PHPUnit\Framework\TestCase $publishDate = new \DateTime('now'); $publishDate->modify('+1 days'); - $news = new NewsArticle(); + $news = new NewsArticle(); $news->createdBy = new NullAccount(1); - $news->title = $text->generateText(\mt_rand(3, 7)); - $news->content = $text->generateText(\mt_rand(10, 300)); + $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 d7719ae..8264cc4 100755 --- a/tests/Models/NewsArticleTest.php +++ b/tests/Models/NewsArticleTest.php @@ -161,10 +161,10 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase */ public function testSerialization() : void { - $this->news->title = 'Title'; + $this->news->title = 'Title'; $this->news->createdBy = new NullAccount(1); - $this->news->content = 'Content'; - $this->news->plain = 'Plain'; + $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);