From f6fc2d62af27cde6cb8ca4b2cb3ca825323bda7e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 28 Nov 2017 14:07:07 +0100 Subject: [PATCH] Add news controller test --- Controller.php | 6 +++--- Models/NewsStatus.php | 1 - Models/NewsType.php | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Controller.php b/Controller.php index 45917df..4249662 100644 --- a/Controller.php +++ b/Controller.php @@ -23,7 +23,7 @@ use Modules\News\Models\NewsType; use Modules\News\Models\PermissionState; use phpOMS\Account\Account; use phpOMS\Account\PermissionType; -use phpOMS\Localization\ISO639Enum; +use phpOMS\Localization\ISO639x1Enum; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -248,7 +248,7 @@ class Controller extends ModuleAbstract implements WebInterface || ($val['plain'] = empty($request->getData('plain'))) || ($val['lang'] = ( $request->getData('lang') !== null - && !ISO639Enum::isValidValue(strtolower((string) $request->getData('lang'))) + && !ISO639x1Enum::isValidValue(strtolower((string) $request->getData('lang'))) )) || ($val['type'] = ( $request->getData('type') === null @@ -291,7 +291,7 @@ class Controller extends ModuleAbstract implements WebInterface $newsArticle = $this->createNewsArticleFromRequest($request); NewsArticleMapper::create($newsArticle); - $response->set('news', $newsArticle->jsonSerialize()); + $response->set($request->__toString(), $newsArticle->jsonSerialize()); } private function createNewsArticleFromRequest(RequestAbstract $request) : NewsArticle diff --git a/Models/NewsStatus.php b/Models/NewsStatus.php index 81b282d..d0406b4 100644 --- a/Models/NewsStatus.php +++ b/Models/NewsStatus.php @@ -28,6 +28,5 @@ use phpOMS\Stdlib\Base\Enum; abstract class NewsStatus extends Enum { /* public */ const VISIBLE = 0; - /* public */ const DRAFT = 1; } diff --git a/Models/NewsType.php b/Models/NewsType.php index 71255ee..8965219 100644 --- a/Models/NewsType.php +++ b/Models/NewsType.php @@ -28,8 +28,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class NewsType extends Enum { /* public */ const ARTICLE = 0; - /* public */ const LINK = 1; - /* public */ const HEADLINE = 2; }