bug and media fixes

This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent 5fbde09e26
commit 74c77311bd
12 changed files with 30 additions and 32 deletions

View File

@ -18,6 +18,9 @@ use Modules\Exchange\Models\ExchangeLogMapper;
use Modules\Exchange\Models\InterfaceManager; use Modules\Exchange\Models\InterfaceManager;
use Modules\Exchange\Models\InterfaceManagerMapper; use Modules\Exchange\Models\InterfaceManagerMapper;
use Modules\Media\Models\UploadFile; use Modules\Media\Models\UploadFile;
use phpOMS\Autoloader;
use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
@ -26,9 +29,6 @@ use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\System\MimeType; use phpOMS\System\MimeType;
use phpOMS\Autoloader;
use phpOMS\Localization\L11nManager;
use phpOMS\DataStorage\Database\Connection\NullConnection;
/** /**
* Exchange controller class. * Exchange controller class.

View File

@ -173,10 +173,10 @@ class ExchangeLog implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'message' => $this->message, 'message' => $this->message,
'type' => $this->type, 'type' => $this->type,
'fields' => $this->fields, 'fields' => $this->fields,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
]; ];
} }

View File

@ -24,7 +24,7 @@ namespace Modules\Exchange\Models;
*/ */
final class NullExchangeLog extends ExchangeLog final class NullExchangeLog extends ExchangeLog
{ {
/** /**
* Constructor * Constructor
* *
* @param int $id Model id * @param int $id Model id

View File

@ -24,7 +24,7 @@ namespace Modules\Exchange\Models;
*/ */
final class NullInterfaceManager extends InterfaceManager final class NullInterfaceManager extends InterfaceManager
{ {
/** /**
* Constructor * Constructor
* *
* @param int $id Model id * @param int $id Model id

View File

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

View File

@ -16,22 +16,21 @@ namespace Modules\Exchange\tests\Controller;
use Model\CoreSettings; use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermission;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Account\Account; use phpOMS\Account\Account;
use phpOMS\Account\AccountManager; use phpOMS\Account\AccountManager;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationAbstract; use phpOMS\Application\ApplicationAbstract;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher; use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager; use phpOMS\Event\EventManager;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Utils\TestUtils;
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;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Uri\HttpUri; use phpOMS\Uri\HttpUri;
use phpOMS\System\MimeType; use phpOMS\Utils\TestUtils;
/** /**
* @testdox Modules\Exchange\tests\Controller\ApiControllerTest: Exchange api controller * @testdox Modules\Exchange\tests\Controller\ApiControllerTest: Exchange api controller

View File

@ -15,10 +15,10 @@ declare(strict_types=1);
namespace Modules\Exchange\tests\Interfacs\OMS; namespace Modules\Exchange\tests\Interfacs\OMS;
use Modules\Exchange\Interfaces\OMS\Exporter; use Modules\Exchange\Interfaces\OMS\Exporter;
use phpOMS\Localization\L11nManager;
use phpOMS\DataStorage\Database\Connection\NullConnection; use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Uri\HttpUri; use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Uri\HttpUri;
/** /**
* @internal * @internal

View File

@ -15,10 +15,10 @@ declare(strict_types=1);
namespace Modules\Exchange\tests\Interfacs\OMS; namespace Modules\Exchange\tests\Interfacs\OMS;
use Modules\Exchange\Interfaces\OMS\Importer; use Modules\Exchange\Interfaces\OMS\Importer;
use phpOMS\Localization\L11nManager;
use phpOMS\DataStorage\Database\Connection\NullConnection; use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Uri\HttpUri; use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\TestUtils; use phpOMS\Utils\TestUtils;
/** /**

View File

@ -64,7 +64,7 @@ final class ExchangeLogTest extends \PHPUnit\Framework\TestCase
public function testFieldsInputOutput() : void public function testFieldsInputOutput() : void
{ {
$this->log->setFields($fields = [ $this->log->setFields($fields = [
'name' => 'test', 'name' => 'test',
'start' => 'now', 'start' => 'now',
]); ]);
self::assertEquals($fields, $this->log->getFields()); self::assertEquals($fields, $this->log->getFields());
@ -84,10 +84,10 @@ final class ExchangeLogTest extends \PHPUnit\Framework\TestCase
self::assertEquals( self::assertEquals(
[ [
'id' => 0, 'id' => 0,
'message' => '123456', 'message' => '123456',
'type' => ExchangeType::EXPORT, 'type' => ExchangeType::EXPORT,
'fields' => [], 'fields' => [],
], ],
$serialized $serialized
); );

View File

@ -15,11 +15,11 @@ declare(strict_types=1);
namespace Modules\Exchange\tests\Models; namespace Modules\Exchange\tests\Models;
use Modules\Exchange\Models\ExporterAbstract; use Modules\Exchange\Models\ExporterAbstract;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\DataStorage\Database\Connection\SQLiteConnection; use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
use phpOMS\Uri\HttpUri;
use phpOMS\Localization\L11nManager; use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\RequestAbstract;
use phpOMS\Uri\HttpUri;
/** /**
* @internal * @internal

View File

@ -15,12 +15,12 @@ declare(strict_types=1);
namespace Modules\Exchange\tests\Models; namespace Modules\Exchange\tests\Models;
use Modules\Exchange\Models\ImporterAbstract; use Modules\Exchange\Models\ImporterAbstract;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
use phpOMS\DataStorage\Database\Connection\NullConnection; use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Uri\HttpUri; use phpOMS\DataStorage\Database\Connection\SQLiteConnection;
use phpOMS\Localization\L11nManager; use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\RequestAbstract;
use phpOMS\Uri\HttpUri;
/** /**
* @internal * @internal

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\Exchange\tests\Models; namespace Modules\Exchange\tests\Models;
use Modules\Exchange\Models\InterfaceManager; use Modules\Exchange\Models\InterfaceManager;
use Modules\Exchange\Models\ExchangeType;
/** /**
* @internal * @internal