bug and media fixes

Controller/ApiController.php

@@ -15,23 +15,20 @@ declare(strict_types=1);
 namespace Modules\ContractManagement\Controller;
 
 use Modules\Admin\Models\NullAccount;
+use Modules\ContractManagement\Models\Contract;
+use Modules\ContractManagement\Models\ContractMapper;
 use Modules\ContractManagement\Models\ContractType;
-use Modules\ContractManagement\Models\ContractTypeMapper;
 use Modules\ContractManagement\Models\ContractTypeL11n;
 use Modules\ContractManagement\Models\ContractTypeL11nMapper;
-use phpOMS\Message\Http\HttpResponse;
+use Modules\ContractManagement\Models\ContractTypeMapper;
+use Modules\ContractManagement\Models\NullContractType;
+use Modules\Media\Models\PathSettings;
+use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Message\FormValidation;
-use phpOMS\Utils\Parser\Markdown\Markdown;
-use phpOMS\Message\Http\HttpRequest;
-use Modules\Media\Models\PathSettings;
-use Modules\ContractManagement\Models\Contract;
-use Modules\ContractManagement\Models\NullContractType;
-use Modules\ContractManagement\Models\ContractMapper;
-use phpOMS\Localization\ISO639x1Enum;
 
 /**
  * Api controller for the contracts module.
@@ -143,7 +140,8 @@ final class ApiController extends Controller
         }
 
         $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
-            [$request->getData('name') ?? ''],
+            $request->getDataList('names') ?? [],
+            $request->getDataList('filenames') ?? [],
             $uploadedFiles,
             $request->header->account,
             __DIR__ . '/../../../Modules/Media/Files/Modules/ContractManagement/Contracts/' . ($request->getData('contract_title') ?? '0'),

Controller/BackendController.php

@@ -14,17 +14,12 @@ declare(strict_types=1);
 
 namespace Modules\ContractManagement\Controller;
 
-use Modules\ContractManagement\Models\PermissionState;
+use Modules\ContractManagement\Models\ContractMapper;
-use phpOMS\Account\PermissionType;
+use Modules\ContractManagement\Models\ContractTypeL11n;
-use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
-use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
-use Modules\ContractManagement\Models\ContractMapper;
-use Modules\ContractManagement\Models\ContractType;
-use Modules\ContractManagement\Models\ContractTypeL11n;
 
 /**
  * Backend controller for the contracts module.

Models/Contract.php

@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\ContractManagement\Models;
 
-use Modules\Media\Models\Media;
 use Modules\Admin\Models\Account;
 use Modules\Admin\Models\NullAccount;
+use Modules\Media\Models\Media;
 use phpOMS\Localization\Money;
 
 /**

Models/ContractMapper.php

@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\ContractManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
 use Modules\Admin\Models\AccountMapper;
+use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**

Models/ContractTypeMapper.php

@@ -50,7 +50,7 @@ final class ContractTypeMapper extends DataMapperAbstract
             'column'            => 'title',
             'conditional'       => true,
             'external'          => null,
-        ]
+        ],
     ];
 
     /**

Theme/Backend/contract-list.tpl.php

@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
 use phpOMS\Uri\UriFactory;
 
 /**

Theme/Backend/contract-single.tpl.php

@@ -12,9 +12,6 @@
  */
 declare(strict_types=1);
 
-use Modules\Media\Models\NullMedia;
-use phpOMS\Uri\UriFactory;
-
 /**
  * @var \phpOMS\Views\View                          $this
  * @var \Modules\ContractManagement\Models\Contract $contract

tests/Controller/ApiControllerTest.php

@@ -16,26 +16,22 @@ namespace Modules\ContractManagement\tests\Controller;
 
 use Model\CoreSettings;
 use Modules\Admin\Models\AccountPermission;
-use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
 use phpOMS\Account\PermissionType;
 use phpOMS\Application\ApplicationAbstract;
+use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\ModuleManager;
-use phpOMS\Router\WebRouter;
-use phpOMS\Utils\TestUtils;
 use phpOMS\Localization\ISO639x1Enum;
-use Modules\Media\Models\MediaMapper;
-use Modules\Media\Models\PathSettings;
-use Modules\Media\Models\UploadStatus;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\System\File\Local\Directory;
+use phpOMS\Module\ModuleAbstract;
+use phpOMS\Module\ModuleManager;
+use phpOMS\Router\WebRouter;
 use phpOMS\Uri\HttpUri;
+use phpOMS\Utils\TestUtils;
 
 /**
  * @testdox Modules\ContractManagement\tests\Controller\ApiControllerTest: ContractManagement api controller

tests/Models/ContractTypeTest.php

@@ -16,7 +16,6 @@ namespace Modules\ContractManagement\tests\Models;
 
 use Modules\ContractManagement\Models\ContractType;
 use Modules\ContractManagement\Models\ContractTypeL11n;
-use phpOMS\Localization\ISO639x1Enum;
 
 /**
  * @internal