Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-09 14:08:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cs fixes, bug fixes, code coverage

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-11-16 00:05:43 +01:00
parent 9d61848c51
commit f928583447
5 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -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

21
Controller/ApiController.php
View File

@ -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':

6
Models/MediaType.php
View File

@ -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,
];
}

4
tests/Controller/Api/ApiControllerMediaTrait.php
View File

@ -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
{

8
tests/Models/MediaTypeL11nTest.php
View File

@ -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()
);