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

rector fixes + bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-27 03:06:46 +00:00
parent 1af1af6f86
commit 8558bd4d5d
6 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Admin/Installer.php
View File

@ -188,9 +188,9 @@ final class Installer extends InstallerAbstract
return []; return [];
} }
return !\is_array($responseData['response']) return \is_array($responseData['response'])
? $responseData['response']->toArray() ? $responseData['response']
: $responseData['response']; : $responseData['response']->toArray();
} }
/** /**
@ -226,9 +226,9 @@ final class Installer extends InstallerAbstract
return []; return [];
} }
return !\is_array($responseData['response']) return \is_array($responseData['response'])
? $responseData['response']->toArray() ? $responseData['response']
: $responseData['response']; : $responseData['response']->toArray();
} }
/** /**
@ -380,8 +380,8 @@ final class Installer extends InstallerAbstract
return []; return [];
} }
return !\is_array($responseData['response']) return \is_array($responseData['response'])
? $responseData['response']->toArray() ? $responseData['response']
: $responseData['response']; : $responseData['response']->toArray();
} }
} }

30
Controller/FileUploaderTrait.php
View File

@ -28,21 +28,21 @@ use phpOMS\Message\ResponseAbstract;
*/ */
trait FileUploaderTrait trait FileUploaderTrait
{ {
/** /**
* Setup file uploader. * Setup file uploader.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* @param mixed $data Misc. data * @param mixed $data Misc. data
* *
* @return void * @return void
* *
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$head = $response->get('Content')->getData('head'); $head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']); $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']);
} }
} }

36
Models/NullMedia.php
View File

@ -24,24 +24,24 @@ namespace Modules\Media\Models;
*/ */
final class NullMedia extends Media final class NullMedia extends Media
{ {
/** /**
* Constructor. * Constructor.
* *
* @param int $id Model id * @param int $id Model id
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function __construct(int $id = 0) public function __construct(int $id = 0)
{ {
$this->id = $id; $this->id = $id;
parent::__construct(); parent::__construct();
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function jsonSerialize() : mixed public function jsonSerialize() : mixed
{ {
return ['id' => $this->id]; return ['id' => $this->id];
} }
} }

30
Models/NullMediaContent.php
View File

@ -25,23 +25,23 @@ namespace Modules\Media\Models;
*/ */
final class NullMediaContent extends MediaContent final class NullMediaContent extends MediaContent
{ {
/** /**
* Constructor * Constructor
* *
* @param int $id Model id * @param int $id Model id
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function __construct(int $id = 0) public function __construct(int $id = 0)
{ {
$this->id = $id; $this->id = $id;
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function jsonSerialize() : mixed public function jsonSerialize() : mixed
{ {
return ['id' => $this->id]; return ['id' => $this->id];
} }
} }

28
Models/Reference.php
View File

@ -26,19 +26,19 @@ namespace Modules\Media\Models;
*/ */
class Reference extends Media class Reference extends Media
{ {
/** /**
* The file extension of the reference file. * The file extension of the reference file.
* *
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public string $extension = 'reference'; public string $extension = 'reference';
/** /**
* The media class of the reference. * The media class of the reference.
* *
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public int $class = MediaClass::REFERENCE; public int $class = MediaClass::REFERENCE;
} }

2
Models/UploadFile.php
View File

@ -182,7 +182,7 @@ class UploadFile
$this->preserveFileName ? $result[$key]['filename'] : '', $this->preserveFileName ? $result[$key]['filename'] : '',
$result[$key]['extension'] $result[$key]['extension']
); );
} catch (\Exception $e) { } catch (\Throwable $_) {
$result[$key]['filename'] = $f['name']; $result[$key]['filename'] = $f['name'];
$result[$key]['status'] = UploadStatus::FAILED_HASHING; $result[$key]['status'] = UploadStatus::FAILED_HASHING;