Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-18 17:38:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-08-28 22:06:35 +00:00
parent 3f44d1a522
commit a8f4009521
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -111,7 +111,7 @@ final class ApiController extends Controller
*/ */
private function updateNewsFromRequest(RequestAbstract $request, NewsArticle $new) : NewsArticle private function updateNewsFromRequest(RequestAbstract $request, NewsArticle $new) : NewsArticle
{ {
$new->publish = new \DateTime((string) ($request->getData('publish') ?? $new->publish->format('Y-m-d H:i:s'))); $new->publish = $request->hasData('publish') ? new \DateTime($request->getDataString('publish') ?? 'now') : $new->publish;
$new->title = $request->getDataString('title') ?? $new->title; $new->title = $request->getDataString('title') ?? $new->title;
$new->plain = $request->getDataString('plain') ?? $new->plain; $new->plain = $request->getDataString('plain') ?? $new->plain;
$new->content = Markdown::parse($request->getDataString('plain') ?? $new->plain); $new->content = Markdown::parse($request->getDataString('plain') ?? $new->plain);
@ -322,7 +322,7 @@ final class ApiController extends Controller
{ {
$newsArticle = new NewsArticle(); $newsArticle = new NewsArticle();
$newsArticle->createdBy = new NullAccount($request->header->account); $newsArticle->createdBy = new NullAccount($request->header->account);
$newsArticle->publish = new \DateTime((string) ($request->getData('publish') ?? 'now')); $newsArticle->publish = new \DateTime($request->getDataString('publish') ?? 'now');
$newsArticle->title = $request->getDataString('title') ?? ''; $newsArticle->title = $request->getDataString('title') ?? '';
$newsArticle->plain = $request->getDataString('plain') ?? ''; $newsArticle->plain = $request->getDataString('plain') ?? '';
$newsArticle->content = Markdown::parse($request->getDataString('plain') ?? ''); $newsArticle->content = Markdown::parse($request->getDataString('plain') ?? '');

4
Models/NewsArticle.php
View File

@ -192,6 +192,8 @@ class NewsArticle implements \JsonSerializable
* *
* @return void * @return void
* *
* @throws InvalidEnumValue
*
* @since 1.0.0 * @since 1.0.0
*/ */
public function setLanguage(string $language) : void public function setLanguage(string $language) : void
@ -222,6 +224,8 @@ class NewsArticle implements \JsonSerializable
* *
* @return void * @return void
* *
* @throws InvalidEnumValue
*
* @since 1.0.0 * @since 1.0.0
*/ */
public function setType(int $type) : void public function setType(int $type) : void

4
tests/Autoloader.php
View File

@ -71,14 +71,12 @@ final class Autoloader
* *
* @return void * @return void
* *
* @throws AutoloadException Throws this exception if the class to autoload doesn't exist. This could also be related to a wrong namespace/file path correlation.
*
* @since 1.0.0 * @since 1.0.0
*/ */
public static function defaultAutoloader(string $class) : void public static function defaultAutoloader(string $class) : void
{ {
$class = \ltrim($class, '\\'); $class = \ltrim($class, '\\');
$class = \str_replace(['_', '\\'], '/', $class); $class = \strtr($class, '_\\', '//');
foreach (self::$paths as $path) { foreach (self::$paths as $path) {
$file = $path . $class . '.php'; $file = $path . $class . '.php';