From 851498c51b8bddf2bbb8c6ca840bc23b3ed2dd2a Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 10 Apr 2022 16:09:22 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 14 +++++++------- Controller/BackendController.php | 2 +- Models/MediaContent.php | 7 +------ Models/MediaMapper.php | 6 +++--- Models/ReferenceMapper.php | 3 --- Theme/Backend/media-list.tpl.php | 2 +- Theme/Backend/media-single.tpl.php | 2 +- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 0dc7d26..692dd06 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -33,8 +33,12 @@ use Modules\Media\Models\PermissionCategory; use Modules\Media\Models\UploadFile; use Modules\Media\Models\UploadStatus; use Modules\Tag\Models\NullTag; +use PhpOffice\PhpWord\IOFactory; +use PhpOffice\PhpWord\Writer\HTML; use phpOMS\Account\PermissionType; +use phpOMS\Application\ApplicationAbstract; use phpOMS\Asset\AssetType; +use phpOMS\Autoloader; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; @@ -47,12 +51,8 @@ use phpOMS\System\File\FileUtils; use phpOMS\System\File\Local\Directory; use phpOMS\System\MimeType; use phpOMS\Utils\Parser\Markdown\Markdown; -use phpOMS\Views\View; -use PhpOffice\PhpWord\IOFactory; -use PhpOffice\PhpWord\Writer\HTML; -use phpOMS\Application\ApplicationAbstract; -use phpOMS\Autoloader; use phpOMS\Utils\Parser\Pdf\PdfParser; +use phpOMS\Views\View; /** * Media class. @@ -346,7 +346,7 @@ final class ApiController extends Controller return $contents === false ? '' : $contents; default: return ''; - }; + } } /** @@ -931,7 +931,7 @@ final class ApiController extends Controller $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media type successfully created', $type); } - /** + /** * Method to create task from request. * * @param RequestAbstract $request Request diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 4e72149..047859a 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -23,8 +23,8 @@ use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\Media; use Modules\Media\Models\MediaClass; use Modules\Media\Models\MediaMapper; -use Modules\Media\Models\MediaTypeMapper; use Modules\Media\Models\MediaTypeL11nMapper; +use Modules\Media\Models\MediaTypeMapper; use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullMedia; use Modules\Media\Models\PermissionCategory; diff --git a/Models/MediaContent.php b/Models/MediaContent.php index e914b9a..3f669c8 100644 --- a/Models/MediaContent.php +++ b/Models/MediaContent.php @@ -14,11 +14,6 @@ declare(strict_types=1); namespace Modules\Media\Models; -use Modules\Admin\Models\Account; -use Modules\Admin\Models\NullAccount; -use Modules\Tag\Models\NullTag; -use Modules\Tag\Models\Tag; - /** * Media class. * @@ -55,7 +50,7 @@ class MediaContent implements \JsonSerializable public function toArray() : array { return [ - 'id' => $this->id, + 'id' => $this->id, 'content' => $this->content, ]; } diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index dcd8f0d..e71708a 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -41,7 +41,7 @@ class MediaMapper extends DataMapperFactory 'media_type' => ['name' => 'media_type', 'type' => 'int', 'internal' => 'type'], 'media_description' => ['name' => 'media_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], 'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], - 'media_content' => ['name' => 'media_content', 'type' => 'int', 'internal' => 'content'], + 'media_content' => ['name' => 'media_content', 'type' => 'int', 'internal' => 'content'], 'media_versioned' => ['name' => 'media_versioned', 'type' => 'bool', 'internal' => 'isVersioned'], 'media_status' => ['name' => 'media_status', 'type' => 'bool', 'internal' => 'status'], 'media_file' => ['name' => 'media_file', 'type' => 'string', 'internal' => 'path', 'autocomplete' => true], @@ -51,8 +51,8 @@ class MediaMapper extends DataMapperFactory 'media_password' => ['name' => 'media_password', 'type' => 'string', 'internal' => 'password'], 'media_extension' => ['name' => 'media_extension', 'type' => 'string', 'internal' => 'extension'], 'media_size' => ['name' => 'media_size', 'type' => 'int', 'internal' => 'size'], - 'media_source' => ['name' => 'media_source', 'type' => 'int', 'internal' => 'source'], - 'media_class' => ['name' => 'media_class', 'type' => 'int', 'internal' => 'class'], + 'media_source' => ['name' => 'media_source', 'type' => 'int', 'internal' => 'source'], + 'media_class' => ['name' => 'media_class', 'type' => 'int', 'internal' => 'class'], 'media_created_by' => ['name' => 'media_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'media_created_at' => ['name' => 'media_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; diff --git a/Models/ReferenceMapper.php b/Models/ReferenceMapper.php index b2e4932..076c046 100644 --- a/Models/ReferenceMapper.php +++ b/Models/ReferenceMapper.php @@ -14,9 +14,6 @@ declare(strict_types=1); namespace Modules\Media\Models; -use Modules\Admin\Models\Account; -use phpOMS\DataStorage\Database\Mapper\ReadMapper; - /** * Mapper class. * diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php index 1e204ed..039d2fd 100755 --- a/Theme/Backend/media-list.tpl.php +++ b/Theme/Backend/media-list.tpl.php @@ -27,7 +27,7 @@ $mediaPath = \urldecode($this->getData('path') ?? '/'); $media = $this->getData('media') ?? []; /** @var \Modules\Admin\Models\Account $account */ -$account = $this->getData('account'); +$account = $this->getData('account'); $accountDir = $account->getId() . ' ' . $account->login; $previous = empty($media) ? '{/prefix}media/list' : '{/prefix}media/list?{?}&id=' . \reset($media)->getId() . '&ptype=p'; diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index de55470..642bf66 100755 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -26,7 +26,7 @@ $view = $this->getData('view'); $tags = $media->getTags(); /** @var \Modules\Admin\Models\Account $account */ -$account = $this->getData('account'); +$account = $this->getData('account'); $accountDir = $account->getId() . ' ' . $account->login; $mediaPath = \urldecode($media->getVirtualPath() ?? '/');