From f92858344748a8f7bc35d4bc39d9bc04186f865f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 16 Nov 2021 00:05:43 +0100 Subject: [PATCH] cs fixes, bug fixes, code coverage --- CONTRIBUTING.md | 4 +--- Controller/ApiController.php | 21 +++++++------------ Models/MediaType.php | 6 +++--- .../Api/ApiControllerMediaTrait.php | 4 ++-- tests/Models/MediaTypeL11nTest.php | 8 +++---- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cab9f5e..ad8944e 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,9 +12,7 @@ If you have a good idea for improvement feel free to create a new issue with all ### Issues -Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the `Project.md` file in the `Docs` repository. - -The issue information can be used to provide additional information such as priority, difficulty and type. For your first issue try to find a issue marked `[d:first]` or `[d:beginner]`. +Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the code marked with `@todo` or in the [PROJECT.md](https://github.com/Orange-Management/Docs/blob/master/Project/PROJECT.md) file. ### Code Style diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 078189b..b13862f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -167,8 +167,8 @@ final class ApiController extends Controller return []; } - $upload = new UploadFile(); - $upload->outputDir = $outputDir; + $upload = new UploadFile(); + $upload->outputDir = $outputDir; $status = $upload->upload($files, $fileNames, $absolute, $encryptionKey); @@ -199,12 +199,10 @@ final class ApiController extends Controller string $path = '', ) : array { - $upload = new UploadFile(); - $upload->outputDir = $path; + $upload = new UploadFile(); + $upload->outputDir = $path; - $status = $upload->upload($files, $fileNames, true, ''); - - return $status; + return $upload->upload($files, $fileNames, true, ''); } /** @@ -621,8 +619,8 @@ final class ApiController extends Controller } } + $this->setMediaResponseHeader($media, $request, $response); $view = $this->createView($media, $request, $response); - $this->setMediaResponseHeader($view, $media, $request, $response); $view->setData('path', __DIR__ . '/../../../'); $response->set('export', $view); @@ -644,9 +642,7 @@ final class ApiController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setData('media', $media); - if (!\headers_sent()) { - $response->endAllOutputBuffering(); // for large files - } + $response->endAllOutputBuffering(); // for large files if (($type = $request->getData('type')) === null) { $view->setTemplate('/Modules/Media/Theme/Api/render'); @@ -681,7 +677,6 @@ final class ApiController extends Controller /** * Set header for report/template * - * @param View $view Media view * @param Media $media Media file * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -690,7 +685,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - private function setMediaResponseHeader(View $view, Media $media, RequestAbstract $request, ResponseAbstract $response) : void + private function setMediaResponseHeader(Media $media, RequestAbstract $request, ResponseAbstract $response) : void { switch ($request->getData('type') ?? \strtolower($media->extension)) { case 'htm': diff --git a/Models/MediaType.php b/Models/MediaType.php index 3533f70..6541ed9 100644 --- a/Models/MediaType.php +++ b/Models/MediaType.php @@ -116,9 +116,9 @@ class MediaType implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'title' => $this->title, - 'name' => $this->name, + 'id' => $this->id, + 'title' => $this->title, + 'name' => $this->name, ]; } diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php index eac7f6d..51c7daa 100755 --- a/tests/Controller/Api/ApiControllerMediaTrait.php +++ b/tests/Controller/Api/ApiControllerMediaTrait.php @@ -14,16 +14,16 @@ declare(strict_types=1); namespace Modules\Media\tests\Controller\Api; -use Modules\Media\Models\MediaMapper; use Modules\Media\Models\Media; +use Modules\Media\Models\MediaMapper; use Modules\Media\Models\PathSettings; use Modules\Media\Models\UploadStatus; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\System\File\Local\Directory; +use phpOMS\System\MimeType; use phpOMS\Uri\HttpUri; use phpOMS\Utils\TestUtils; -use phpOMS\System\MimeType; trait ApiControllerMediaTrait { diff --git a/tests/Models/MediaTypeL11nTest.php b/tests/Models/MediaTypeL11nTest.php index 4006ad2..4a15b95 100644 --- a/tests/Models/MediaTypeL11nTest.php +++ b/tests/Models/MediaTypeL11nTest.php @@ -71,15 +71,15 @@ final class MediaTypeL11nTest extends \PHPUnit\Framework\TestCase public function testSerialize() : void { $this->l11n->title = 'Title'; - $this->l11n->type = 2; + $this->l11n->type = 2; $this->l11n->setLanguage(ISO639x1Enum::_DE); self::assertEquals( [ - 'id' => 0, + 'id' => 0, 'title' => 'Title', - 'type' => 2, - 'language' => ISO639x1Enum::_DE, + 'type' => 2, + 'language' => ISO639x1Enum::_DE, ], $this->l11n->jsonSerialize() );