Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Dennis Eichhorn 2023-01-26 22:09:32 +01:00
commit 15d381a423
4 changed files with 9 additions and 11 deletions

View File

@ -22,7 +22,6 @@ use Modules\Media\Models\Media;
use Modules\Media\Models\MediaContent; use Modules\Media\Models\MediaContent;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\MediaType; use Modules\Media\Models\MediaType;
use phpOMS\Localization\BaseStringL11n;
use Modules\Media\Models\MediaTypeL11nMapper; use Modules\Media\Models\MediaTypeL11nMapper;
use Modules\Media\Models\MediaTypeMapper; use Modules\Media\Models\MediaTypeMapper;
use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullCollection;
@ -39,6 +38,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationAbstract; use phpOMS\Application\ApplicationAbstract;
use phpOMS\Asset\AssetType; use phpOMS\Asset\AssetType;
use phpOMS\Autoloader; use phpOMS\Autoloader;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;

View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\Media\Models; namespace Modules\Media\Models;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum;
/** /**
* Media type class. * Media type class.

View File

@ -12,8 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Writer\Html;
use phpOMS\Autoloader; use phpOMS\Autoloader;
use phpOMS\Utils\Parser\Spreadsheet\SpreadsheetParser; use phpOMS\Utils\Parser\Spreadsheet\SpreadsheetParser;