From e1d922f40216f49856bee4a803ce3ec59c8762f9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 29 Mar 2022 16:41:17 +0200 Subject: [PATCH] phpstan and phpcs fixes --- Admin/Install/Navigation.install.json | 12 ++++----- Controller/ApiController.php | 37 ++++++++++++++++++++------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 7ac64b5..8d3b528 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -10,7 +10,7 @@ "icon": null, "order": 40, "from": "News", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1006901001, "children": [ { @@ -24,7 +24,7 @@ "icon": null, "order": 1, "from": "News", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1000601001, "children": [] }, @@ -39,7 +39,7 @@ "icon": null, "order": 5, "from": "News", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1000601001, "children": [] }, @@ -54,7 +54,7 @@ "icon": null, "order": 10, "from": "News", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1000601001, "children": [] }, @@ -69,7 +69,7 @@ "icon": null, "order": 15, "from": "News", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1000601001, "children": [] }, @@ -84,7 +84,7 @@ "icon": null, "order": 15, "from": "News", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1000601001, "children": [] } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 7f59ed6..8e87774 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -160,9 +160,19 @@ final class ApiController extends Controller $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully created', $newsArticle); } + /** + * Create media files for news article + * + * @param NewsArticle $news News article + * @param RequestAbstract $request Request incl. media do upload + * + * @return void + * + * @since 1.0.0 + */ private function createNewsMedia(NewsArticle $news, RequestAbstract $request) : void { - $path = $this->createNewsDir($news); + $path = $this->createNewsDir($news); $account = AccountMapper::get()->where('id', $request->header->account)->execute(); if (!empty($uploadedFiles = $request->getFiles() ?? [])) { @@ -181,11 +191,13 @@ final class ApiController extends Controller MediaMapper::create()->execute($media); NewsArticleMapper::writer()->createRelationTable('media', [$media->getId()], $news->getId()); - $ref = new Reference(); - $ref->name = $media->name; - $ref->source = new NullMedia($media->getId()); + $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId(); + + $ref = new Reference(); + $ref->name = $media->name; + $ref->source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); - $ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()); + $ref->setVirtualPath($accountPath); ReferenceMapper::create()->execute($ref); @@ -194,7 +206,6 @@ final class ApiController extends Controller if ($collection instanceof NullCollection) { $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - '/Modules/Media/Files', $accountPath, $request->header->account, __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId() @@ -212,8 +223,8 @@ final class ApiController extends Controller foreach ($mediaFiles as $media) { NewsArticleMapper::writer()->createRelationTable('media', [(int) $media], $news->getId()); - $ref = new Reference(); - $ref->source = new NullMedia((int) $media); + $ref = new Reference(); + $ref->source = new NullMedia((int) $media); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($path); @@ -224,7 +235,6 @@ final class ApiController extends Controller if ($collection instanceof NullCollection) { $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - '/Modules/Media/Files', $path, $request->header->account, __DIR__ . '/../../../Modules/Media/Files' . $path @@ -237,6 +247,15 @@ final class ApiController extends Controller } } + /** + * Create media directory path + * + * @param NewsArticle $news News article + * + * @return string + * + * @since 1.0.0 + */ private function createNewsDir(NewsArticle $news) : string { return '/Modules/News/'