mirror of
https://github.com/Karaka-Management/oms-Media.git
synced 2026-01-26 07:48:41 +00:00
rector fixes + bug fixes
This commit is contained in:
parent
1af1af6f86
commit
8558bd4d5d
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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']);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user