diff --git a/Controller/ApiController.php b/Controller/ApiController.php index e00e2b2..9a4a6b9 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -33,13 +33,13 @@ use Modules\ItemManagement\Models\NullItemAttributeType; use Modules\ItemManagement\Models\NullItemAttributeValue; use Modules\ItemManagement\Models\NullItemL11nType; use Modules\Media\Models\PathSettings; +use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\Money; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; -use phpOMS\Localization\ISO639x1Enum; /** * ItemManagement class. @@ -223,7 +223,7 @@ final class ApiController extends Controller */ private function createItemAttributeTypeL11nFromRequest(RequestAbstract $request) : ItemAttributeTypeL11n { - $attrL11n = new ItemAttributeTypeL11n(); + $attrL11n = new ItemAttributeTypeL11n(); $attrL11n->type = (int) ($request->getData('type') ?? 0); $attrL11n->setLanguage((string) ( $request->getData('language') ?? $request->getLanguage() diff --git a/Models/Item.php b/Models/Item.php index 19ed55e..848d56e 100755 --- a/Models/Item.php +++ b/Models/Item.php @@ -310,10 +310,10 @@ class Item public function toArray() : array { return [ - 'id' => $this->id, - 'number' => $this->number, - 'status' => $this->status, - 'info' => $this->info, + 'id' => $this->id, + 'number' => $this->number, + 'status' => $this->status, + 'info' => $this->info, ]; } diff --git a/Models/ItemAttribute.php b/Models/ItemAttribute.php index 224a7a0..9901552 100755 --- a/Models/ItemAttribute.php +++ b/Models/ItemAttribute.php @@ -65,7 +65,7 @@ class ItemAttribute implements \JsonSerializable, ArrayableInterface */ public function __construct() { - $this->type = new NullItemAttributeType(); + $this->type = new NullItemAttributeType(); $this->value = new NullItemAttributeValue(); } @@ -87,8 +87,9 @@ class ItemAttribute implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'type' => $this->type, + 'id' => $this->id, + 'item' => $this->item, + 'type' => $this->type, 'value' => $this->value, ]; } diff --git a/Models/ItemAttributeType.php b/Models/ItemAttributeType.php index 4b42699..6c98591 100755 --- a/Models/ItemAttributeType.php +++ b/Models/ItemAttributeType.php @@ -154,11 +154,11 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'name' => $this->name, + 'id' => $this->id, + 'name' => $this->name, 'validationPattern' => $this->validationPattern, - 'custom' => $this->custom, - 'isRequired' => $this->isRequired, + 'custom' => $this->custom, + 'isRequired' => $this->isRequired, ]; } diff --git a/Models/ItemL11nType.php b/Models/ItemL11nType.php index 1e02ee2..a0a2bae 100755 --- a/Models/ItemL11nType.php +++ b/Models/ItemL11nType.php @@ -72,7 +72,7 @@ class ItemL11nType implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, + 'id' => $this->id, 'title' => $this->title, ]; } diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index 1a5b2cb..c133452 100755 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -35,12 +35,12 @@ final class ItemMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'], - 'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true], + 'itemmgmt_item_id' => ['name' => 'itemmgmt_item_id', 'type' => 'int', 'internal' => 'id'], + 'itemmgmt_item_no' => ['name' => 'itemmgmt_item_no', 'type' => 'string', 'internal' => 'number', 'autocomplete' => true], 'itemmgmt_item_status' => ['name' => 'itemmgmt_item_status', 'type' => 'int', 'internal' => 'status'], - 'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], - 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], - 'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'], + 'itemmgmt_item_info' => ['name' => 'itemmgmt_item_info', 'type' => 'string', 'internal' => 'info'], + 'itemmgmt_item_salesprice' => ['name' => 'itemmgmt_item_salesprice', 'type' => 'Serializable', 'internal' => 'salesPrice'], + 'itemmgmt_item_purchaseprice' => ['name' => 'itemmgmt_item_purchaseprice', 'type' => 'Serializable', 'internal' => 'purchasePrice'], ]; protected static array $conditionals = [ diff --git a/tests/Controller/Api/ApiControllerItemTrait.php b/tests/Controller/Api/ApiControllerItemTrait.php index 206f684..ffac0fd 100644 --- a/tests/Controller/Api/ApiControllerItemTrait.php +++ b/tests/Controller/Api/ApiControllerItemTrait.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\ItemManagement\tests\Controller\Api; -use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 42dadb5..a197b46 100644 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -25,14 +25,9 @@ use phpOMS\Application\ApplicationAbstract; use phpOMS\DataStorage\Session\HttpSession; use phpOMS\Dispatcher\Dispatcher; use phpOMS\Event\EventManager; -use phpOMS\Message\Http\HttpRequest; -use phpOMS\Message\Http\HttpResponse; -use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleManager; use phpOMS\Router\WebRouter; -use phpOMS\System\MimeType; -use phpOMS\Uri\HttpUri; use phpOMS\Utils\TestUtils; /** diff --git a/tests/Models/ItemAttributeTest.php b/tests/Models/ItemAttributeTest.php index 6dd029a..b4bb9fb 100644 --- a/tests/Models/ItemAttributeTest.php +++ b/tests/Models/ItemAttributeTest.php @@ -51,6 +51,7 @@ final class ItemAttributeTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ 'id', + 'item', 'type', 'value', ], diff --git a/tests/Models/ItemAttributeTypeTest.php b/tests/Models/ItemAttributeTypeTest.php index 66f2f1f..3de31ca 100644 --- a/tests/Models/ItemAttributeTypeTest.php +++ b/tests/Models/ItemAttributeTypeTest.php @@ -65,18 +65,18 @@ final class ItemAttributeTypeTest extends \PHPUnit\Framework\TestCase */ public function testSerialize() : void { - $this->attr->name = 'Test'; + $this->attr->name = 'Test'; $this->attr->validationPattern = 'Pattern'; - $this->attr->custom = true; - $this->attr->isRequired = true; + $this->attr->custom = true; + $this->attr->isRequired = true; self::assertEquals( [ - 'id' => 0, - 'name' => 'Test', + 'id' => 0, + 'name' => 'Test', 'validationPattern' => 'Pattern', - 'custom' => true, - 'isRequired' => true, + 'custom' => true, + 'isRequired' => true, ], $this->attr->jsonSerialize() ); diff --git a/tests/Models/ItemAttributeValueTest.php b/tests/Models/ItemAttributeValueTest.php index 020caa7..061c268 100644 --- a/tests/Models/ItemAttributeValueTest.php +++ b/tests/Models/ItemAttributeValueTest.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\ItemManagement\tests\Models; use Modules\ItemManagement\Models\ItemAttributeValue; -use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO3166TwoEnum; +use phpOMS\Localization\ISO639x1Enum; /** * @internal @@ -41,7 +41,7 @@ final class ItemAttributeValueTest extends \PHPUnit\Framework\TestCase { self::assertEquals(0, $this->attr->getId()); self::assertEquals(0, $this->attr->type); - self::assertEquals(null, $this->attr->getValue()); + self::assertNull($this->attr->getValue()); self::assertFalse($this->attr->isDefault); } diff --git a/tests/Models/ItemL11nTest.php b/tests/Models/ItemL11nTest.php index 094993f..6384663 100644 --- a/tests/Models/ItemL11nTest.php +++ b/tests/Models/ItemL11nTest.php @@ -62,15 +62,15 @@ final class ItemL11nTest extends \PHPUnit\Framework\TestCase public function testSerialize() : void { $this->l11n->description = 'Title'; - $this->l11n->item = 2; + $this->l11n->item = 2; $this->l11n->setLanguage(ISO639x1Enum::_DE); self::assertEquals( [ - 'id' => 0, + 'id' => 0, 'description' => 'Title', - 'item' => 2, - 'language' => ISO639x1Enum::_DE, + 'item' => 2, + 'language' => ISO639x1Enum::_DE, ], $this->l11n->jsonSerialize() ); diff --git a/tests/Models/ItemTest.php b/tests/Models/ItemTest.php index 8cf0ab5..28399f2 100644 --- a/tests/Models/ItemTest.php +++ b/tests/Models/ItemTest.php @@ -14,13 +14,12 @@ declare(strict_types=1); namespace Modules\ItemManagement\tests\Models; +use Modules\Editor\Models\EditorDoc; use Modules\ItemManagement\Models\Item; use Modules\ItemManagement\Models\ItemAttribute; use Modules\ItemManagement\Models\ItemL11n; use Modules\ItemManagement\Models\ItemStatus; -use Modules\Editor\Models\EditorDoc; use Modules\Media\Models\Media; -use Modules\Profile\Models\ContactElement; /** * @internal @@ -58,7 +57,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase self::assertInstanceOf('phpOMS\Localization\Money', $this->item->purchasePrice); } - /** + /** * @covers Modules\ItemManagement\Models\Item * @group module */ @@ -68,7 +67,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase self::assertEquals(ItemStatus::INACTIVE, $this->item->getStatus()); } - /** + /** * @covers Modules\ItemManagement\Models\Item * @group module */