bug and media fixes

Controller/ApiController.php

@@ -32,11 +32,11 @@ use Modules\ClientManagement\Models\NullClientAttributeValue;
 use Modules\Media\Models\PathSettings;
 use Modules\Profile\Models\ContactElementMapper;
 use Modules\Profile\Models\Profile;
+use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Model\Message\FormValidation;
 
 /**
@@ -489,7 +489,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/ClientManagement/' . ($request->getData('client') ?? '0'),

Models/Client.php

@@ -18,7 +18,6 @@ use Modules\Admin\Models\Address;
 use Modules\Admin\Models\NullAddress;
 use Modules\Editor\Models\EditorDoc;
 use Modules\Media\Models\Media;
-use Modules\Media\Models\NullMedia;
 use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\NullContactElement;
 use Modules\Profile\Models\Profile;

tests/Bootstrap.php

@@ -392,4 +392,4 @@ function phpServe() : void
     });
 }
 
-phpServe();
+\phpServe();

tests/Controller/Api/ApiControllerAttributeTrait.php

@@ -14,17 +14,13 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\tests\Controller\Api;
 
+use Modules\ClientManagement\Models\AttributeValueType;
+use phpOMS\Localization\ISO3166TwoEnum;
+use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Uri\HttpUri;
-use Modules\ClientManagement\Models\AttributeValueType;
-use Modules\Profile\Models\ContactType;
-use phpOMS\Localization\ISO3166TwoEnum;
-use phpOMS\Localization\ISO639x1Enum;
-use phpOMS\Stdlib\Base\AddressType;
-use phpOMS\System\MimeType;
-use phpOMS\Utils\TestUtils;
 
 trait ApiControllerAttributeTrait
 {

tests/Controller/Api/ApiControllerClientTrait.php

@@ -14,16 +14,13 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\tests\Controller\Api;
 
+use Modules\Profile\Models\ContactType;
+use phpOMS\Localization\ISO3166TwoEnum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Uri\HttpUri;
-use Modules\ClientManagement\Models\AttributeValueType;
-use Modules\Profile\Models\ContactType;
-use phpOMS\Localization\ISO3166TwoEnum;
-use phpOMS\Localization\ISO639x1Enum;
-use phpOMS\Stdlib\Base\AddressType;
 use phpOMS\System\MimeType;
+use phpOMS\Uri\HttpUri;
 use phpOMS\Utils\TestUtils;
 
 trait ApiControllerClientTrait
@@ -31,11 +28,11 @@ trait ApiControllerClientTrait
     public static function tearDownAfterClass() : void
     {
         if (\is_file(__DIR__ . '/m_icon_tmp.png')) {
-            unlink(__DIR__ . '/m_icon_tmp.png');
+            \unlink(__DIR__ . '/m_icon_tmp.png');
         }
 
         if (\is_file(__DIR__ . '/Test file_tmp.txt')) {
-            unlink(__DIR__ . '/Test file_tmp.txt');
+            \unlink(__DIR__ . '/Test file_tmp.txt');
         }
     }
 

tests/Controller/ApiControllerTest.php

@@ -16,13 +16,13 @@ namespace Modules\ClientManagement\tests\Controller;
 
 use Model\CoreSettings;
 use Modules\Admin\Models\AccountPermission;
-use Modules\ClientManagement\tests\Controller\Api\ApiControllerClientTrait;
 use Modules\ClientManagement\tests\Controller\Api\ApiControllerAttributeTrait;
-use phpOMS\DataStorage\Session\HttpSession;
+use Modules\ClientManagement\tests\Controller\Api\ApiControllerClientTrait;
 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;

tests/Models/ClientAttributeTypeTest.php

@@ -16,7 +16,6 @@ namespace Modules\ClientManagement\tests\Models;
 
 use Modules\ClientManagement\Models\ClientAttributeType;
 use Modules\ClientManagement\Models\ClientAttributeTypeL11n;
-use phpOMS\Localization\ISO639x1Enum;
 
 /**
  * @internal

tests/Models/ClientAttributeValueTest.php

@@ -40,7 +40,7 @@ final class ClientAttributeValueTest extends \PHPUnit\Framework\TestCase
     public function testDefault() : void
     {
         self::assertEquals(0, $this->value->getId());
-        self::assertEquals(null, $this->value->getValue());
+        self::assertNull($this->value->getValue());
     }
 
     /**

tests/Models/ClientTest.php

@@ -14,13 +14,11 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\tests\Models;
 
-use Modules\Media\Models\Media;
-use Modules\Editor\Models\EditorDoc;
-use Modules\Profile\Models\ContactElement;
-use Modules\Admin\Models\Account;
-use Modules\Admin\Models\NullAccount;
 use Modules\ClientManagement\Models\Client;
 use Modules\ClientManagement\Models\ClientStatus;
+use Modules\Editor\Models\EditorDoc;
+use Modules\Media\Models\Media;
+use Modules\Profile\Models\ContactElement;
 
 /**
  * @internal

tests/Models/NullClientAttributeTypeL11nTest.php

@@ -30,7 +30,6 @@ final class NullClientAttributeTypeL11nTest extends \PHPUnit\Framework\TestCase
         self::assertInstanceOf('\Modules\ClientManagement\Models\ClientAttributeTypeL11n', new NullClientAttributeTypeL11n());
     }
 
-
     /**
      * @covers Modules\ClientManagement\Models\NullClientAttributeTypeL11n
      * @group framework