diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1197598..c8c615e 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -22,7 +22,6 @@ use Modules\Media\Models\Media; use Modules\Media\Models\MediaContent; use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaType; -use phpOMS\Localization\BaseStringL11n; use Modules\Media\Models\MediaTypeL11nMapper; use Modules\Media\Models\MediaTypeMapper; use Modules\Media\Models\NullCollection; @@ -39,6 +38,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Application\ApplicationAbstract; use phpOMS\Asset\AssetType; use phpOMS\Autoloader; +use phpOMS\Localization\BaseStringL11n; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; @@ -1158,8 +1158,8 @@ final class ApiController extends Controller */ private function createMediaTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { - $l11nMediaType = new BaseStringL11n(); - $l11nMediaType->ref = (int) ($request->getData('type') ?? 0); + $l11nMediaType = new BaseStringL11n(); + $l11nMediaType->ref = (int) ($request->getData('type') ?? 0); $l11nMediaType->content = (string) ($request->getData('title') ?? ''); $l11nMediaType->setLanguage((string) ( $request->getData('language') ?? $request->getLanguage() diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index 0bb7018..f7d584e 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -52,9 +52,9 @@ class MediaMapper extends DataMapperFactory '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_language' => ['name' => 'media_language', 'type' => 'string', 'internal' => 'language'], - 'media_country' => ['name' => 'media_country', 'type' => 'string', 'internal' => 'country'], - 'media_unit' => ['name' => 'media_unit', 'type' => 'int', 'internal' => 'unit', 'readonly' => true], + 'media_language' => ['name' => 'media_language', 'type' => 'string', 'internal' => 'language'], + 'media_country' => ['name' => 'media_country', 'type' => 'string', 'internal' => 'country'], + 'media_unit' => ['name' => 'media_unit', 'type' => 'int', 'internal' => 'unit', 'readonly' => true], '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/MediaType.php b/Models/MediaType.php index 9883697..45954d8 100755 --- a/Models/MediaType.php +++ b/Models/MediaType.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace Modules\Media\Models; -use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\BaseStringL11n; +use phpOMS\Localization\ISO639x1Enum; /** * Media type class. @@ -112,8 +112,8 @@ class MediaType implements \JsonSerializable } elseif ($this->title instanceof BaseStringL11n) { $this->title->content = $title; } else { - $this->title = new BaseStringL11n(); - $this->title->ref = $this->id; + $this->title = new BaseStringL11n(); + $this->title->ref = $this->id; $this->title->content = $title; $this->title->setLanguage($lang); } diff --git a/Theme/Api/spreadsheetAsHtml.tpl.php b/Theme/Api/spreadsheetAsHtml.tpl.php index 957a68b..7b1e274 100755 --- a/Theme/Api/spreadsheetAsHtml.tpl.php +++ b/Theme/Api/spreadsheetAsHtml.tpl.php @@ -12,8 +12,6 @@ */ declare(strict_types=1); -use PhpOffice\PhpSpreadsheet\IOFactory; -use PhpOffice\PhpSpreadsheet\Writer\Html; use phpOMS\Autoloader; use phpOMS\Utils\Parser\Spreadsheet\SpreadsheetParser;