diff --git a/Admin/Installer.php b/Admin/Installer.php index 9fe40e9..68a6f0e 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -188,9 +188,9 @@ final class Installer extends InstallerAbstract return []; } - return !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + return \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); } /** @@ -226,9 +226,9 @@ final class Installer extends InstallerAbstract return []; } - return !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + return \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); } /** @@ -380,8 +380,8 @@ final class Installer extends InstallerAbstract return []; } - return !\is_array($responseData['response']) - ? $responseData['response']->toArray() - : $responseData['response']; + return \is_array($responseData['response']) + ? $responseData['response'] + : $responseData['response']->toArray(); } } diff --git a/Controller/FileUploaderTrait.php b/Controller/FileUploaderTrait.php index a1968f9..ef32c6f 100644 --- a/Controller/FileUploaderTrait.php +++ b/Controller/FileUploaderTrait.php @@ -28,21 +28,21 @@ use phpOMS\Message\ResponseAbstract; */ trait FileUploaderTrait { - /** + /** * Setup file uploader. - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param mixed $data Misc. data - * - * @return void - * - * @since 1.0.0 + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Misc. data + * + * @return void + * + * @since 1.0.0 * @codeCoverageIgnore - */ - public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void - { - $head = $response->get('Content')->getData('head'); - $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']); - } + */ + public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void + { + $head = $response->get('Content')->getData('head'); + $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']); + } } diff --git a/Models/NullMedia.php b/Models/NullMedia.php index ee112d7..7a00e41 100644 --- a/Models/NullMedia.php +++ b/Models/NullMedia.php @@ -24,24 +24,24 @@ namespace Modules\Media\Models; */ final class NullMedia extends Media { - /** - * Constructor. - * - * @param int $id Model id - * - * @since 1.0.0 - */ - public function __construct(int $id = 0) - { - $this->id = $id; - parent::__construct(); - } + /** + * Constructor. + * + * @param int $id Model id + * + * @since 1.0.0 + */ + public function __construct(int $id = 0) + { + $this->id = $id; + parent::__construct(); + } - /** - * {@inheritdoc} - */ + /** + * {@inheritdoc} + */ public function jsonSerialize() : mixed - { - return ['id' => $this->id]; - } + { + return ['id' => $this->id]; + } } diff --git a/Models/NullMediaContent.php b/Models/NullMediaContent.php index 2ab7231..7c0a33b 100644 --- a/Models/NullMediaContent.php +++ b/Models/NullMediaContent.php @@ -25,23 +25,23 @@ namespace Modules\Media\Models; */ final class NullMediaContent extends MediaContent { - /** + /** * Constructor - * + * * @param int $id Model id - * - * @since 1.0.0 - */ - public function __construct(int $id = 0) - { - $this->id = $id; - } + * + * @since 1.0.0 + */ + public function __construct(int $id = 0) + { + $this->id = $id; + } - /** + /** * {@inheritdoc} - */ - public function jsonSerialize() : mixed - { - return ['id' => $this->id]; - } + */ + public function jsonSerialize() : mixed + { + return ['id' => $this->id]; + } } diff --git a/Models/Reference.php b/Models/Reference.php index 1572d3a..8446708 100644 --- a/Models/Reference.php +++ b/Models/Reference.php @@ -26,19 +26,19 @@ namespace Modules\Media\Models; */ class Reference extends Media { - /** - * The file extension of the reference file. - * - * @var string - * @since 1.0.0 - */ - public string $extension = 'reference'; + /** + * The file extension of the reference file. + * + * @var string + * @since 1.0.0 + */ + public string $extension = 'reference'; - /** - * The media class of the reference. - * - * @var int - * @since 1.0.0 - */ - public int $class = MediaClass::REFERENCE; + /** + * The media class of the reference. + * + * @var int + * @since 1.0.0 + */ + public int $class = MediaClass::REFERENCE; } diff --git a/Models/UploadFile.php b/Models/UploadFile.php index c48a1e8..78ebc9e 100755 --- a/Models/UploadFile.php +++ b/Models/UploadFile.php @@ -182,7 +182,7 @@ class UploadFile $this->preserveFileName ? $result[$key]['filename'] : '', $result[$key]['extension'] ); - } catch (\Exception $e) { + } catch (\Throwable $_) { $result[$key]['filename'] = $f['name']; $result[$key]['status'] = UploadStatus::FAILED_HASHING;