Rename Entity\{Fields,Features}\ to Model\

docs/ddd/entities.md

@@ -7,23 +7,23 @@ are provided in the form of PHP [traits].
 
 Use entity fields to provide _read operations_ for common entity fields. Built-in fields are:
 
-- `Msgphp\Domain\Entity\Fields\CreatedAtField`
-- `Msgphp\Domain\Entity\Fields\LastUpdatedAtField`
+- `Msgphp\Domain\Model\CreatedAtField`
+- `Msgphp\Domain\Model\LastUpdatedAtField`
 
 ## Entity Features
 
 Use entity features to provide _write operations_ for common entity fields. Built-in features are:
 
-- `MsgPhp\Domain\Entity\Features\CanBeConfirmed`
-- `MsgPhp\Domain\Entity\Features\CanBeEnabled`
+- `MsgPhp\Domain\Model\CanBeConfirmed`
+- `MsgPhp\Domain\Model\CanBeEnabled`
 
 ## Basic Example
 
 ```php
 <?php
 
-use MsgPhp\Domain\Entity\Fields\CreatedAtField;
-use MsgPhp\Domain\Entity\Features\CanBeEnabled;
+use MsgPhp\Domain\Model\CreatedAtField;
+use MsgPhp\Domain\Model\CanBeEnabled;
 
 // --- SETUP ---
 

docs/event-sourcing/events.md

@@ -19,7 +19,7 @@ A domain event is bound to `MsgPhp\Domain\Event\DomainEventInterface`. Its purpo
 ```php
 <?php
 
-use MsgPhp\Domain\Entity\Features\CanBeEnabled;
+use MsgPhp\Domain\Model\CanBeEnabled;
 use MsgPhp\Domain\Event\DomainEventHandlerInterface;
 use MsgPhp\Domain\Event\DomainEventHandlerTrait;
 use MsgPhp\Domain\Event\EnableEvent;

phpstan.neon

@@ -48,10 +48,7 @@ parameters:
         - '#Static property MsgPhp\\.+\\Tests\\.+Test::\$bus \(Symfony\\Component\\Messenger\\MessageBusInterface\) does not accept null\.#'
         -
             message: '#Call to an undefined method object::.+\(\)\.#'
-            path: *src/*/Tests/Entity/Fields/*Test.php
-        -
-            message: '#Call to an undefined method object::.+\(\)\.#'
-            path: *src/*/Tests/Entity/Features/*Test.php
+            path: *src/*/Tests/Model/*Test.php
         -
             message: '#Call to an undefined method object::dispatch\(\)\.#'
             path: src/Domain/Tests/Message/MessageDispatchingTraitTest.php

src/Domain/Infra/Doctrine/ObjectMappings.php

@@ -4,8 +4,7 @@
 
 namespace MsgPhp\Domain\Infra\Doctrine;
 
-use MsgPhp\Domain\Entity\Features;
-use MsgPhp\Domain\Entity\Fields;
+use MsgPhp\Domain\Model;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
@@ -16,7 +15,7 @@ final class ObjectMappings implements ObjectMappingProviderInterface
 {
     public static function provideObjectMappings(MappingConfig $config): iterable
     {
-        yield Features\CanBeConfirmed::class => [
+        yield Model\CanBeConfirmed::class => [
             'confirmationToken' => [
                 'type' => 'string',
                 'unique' => true,
@@ -28,17 +27,17 @@ public static function provideObjectMappings(MappingConfig $config): iterable
                 'nullable' => true,
             ],
         ];
-        yield Features\CanBeEnabled::class => [
+        yield Model\CanBeEnabled::class => [
             'enabled' => [
                 'type' => 'boolean',
             ],
         ];
-        yield Fields\CreatedAtField::class => [
+        yield Model\CreatedAtField::class => [
             'createdAt' => [
                 'type' => 'datetime',
             ],
         ];
-        yield Fields\LastUpdatedAtField::class => [
+        yield Model\LastUpdatedAtField::class => [
             'lastUpdatedAt' => [
                 'type' => 'datetime',
             ],

src/Domain/Entity/Features/CanBeConfirmed.php → src/Domain/Model/CanBeConfirmed.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Entity\Features;
+namespace MsgPhp\Domain\Model;
 
 use MsgPhp\Domain\Event\ConfirmEvent;
 

src/Domain/Entity/Features/CanBeEnabled.php → src/Domain/Model/CanBeEnabled.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Entity\Features;
+namespace MsgPhp\Domain\Model;
 
 use MsgPhp\Domain\Event\DisableEvent;
 use MsgPhp\Domain\Event\EnableEvent;

src/Domain/Entity/Fields/CreatedAtField.php → src/Domain/Model/CreatedAtField.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Entity\Fields;
+namespace MsgPhp\Domain\Model;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/Domain/Entity/Fields/LastUpdatedAtField.php → src/Domain/Model/LastUpdatedAtField.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Entity\Fields;
+namespace MsgPhp\Domain\Model;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/Domain/Tests/Infra/Doctrine/ObjectMappingsTest.php

@@ -13,8 +13,8 @@ final class ObjectMappingsTest extends TestCase
     public function testMapping(): void
     {
         $available = array_flip(array_map(function (string $file): string {
-            return 'MsgPhp\\Domain\\Entity\\'.basename(\dirname($file)).'\\'.basename($file, '.php');
-        }, array_merge(glob(\dirname(__DIR__, 3).'/Entity/Features/*.php'), glob(\dirname(__DIR__, 3).'/Entity/Fields/*.php'))));
+            return 'MsgPhp\\Domain\\Model\\'.basename($file, '.php');
+        }, glob(\dirname(__DIR__, 3).'/Model/*.php')));
         $mappings = ObjectMappings::provideObjectMappings(new MappingConfig([]));
         $mappings = array_keys($mappings instanceof \Traversable ? iterator_to_array($mappings) : $mappings);
         sort($mappings);

src/Domain/Tests/Entity/Features/CanBeConfirmedTest.php → src/Domain/Tests/Model/CanBeConfirmedTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Tests\Entity\Features;
+namespace MsgPhp\Domain\Tests\Model;
 
-use MsgPhp\Domain\Entity\Features\CanBeConfirmed;
 use MsgPhp\Domain\Event\ConfirmEvent;
+use MsgPhp\Domain\Model\CanBeConfirmed;
 use PHPUnit\Framework\TestCase;
 
 final class CanBeConfirmedTest extends TestCase

src/Domain/Tests/Entity/Features/CanBeEnabledTest.php → src/Domain/Tests/Model/CanBeEnabledTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Tests\Entity\Features;
+namespace MsgPhp\Domain\Tests\Model;
 
-use MsgPhp\Domain\Entity\Features\CanBeEnabled;
 use MsgPhp\Domain\Event\DisableEvent;
 use MsgPhp\Domain\Event\EnableEvent;
+use MsgPhp\Domain\Model\CanBeEnabled;
 use PHPUnit\Framework\TestCase;
 
 final class CanBeEnabledTest extends TestCase

src/Domain/Tests/Entity/Fields/CreatedAtFieldTest.php → src/Domain/Tests/Model/CreatedAtFieldTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Tests\Entity\Fields;
+namespace MsgPhp\Domain\Tests\Model;
 
-use MsgPhp\Domain\Entity\Fields\CreatedAtField;
+use MsgPhp\Domain\Model\CreatedAtField;
 use PHPUnit\Framework\TestCase;
 
 final class CreatedAtFieldTest extends TestCase

src/Domain/Tests/Entity/Fields/LastUpdatedAtFieldTest.php → src/Domain/Tests/Model/LastUpdatedAtFieldTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Domain\Tests\Entity\Fields;
+namespace MsgPhp\Domain\Tests\Model;
 
-use MsgPhp\Domain\Entity\Fields\LastUpdatedAtField;
+use MsgPhp\Domain\Model\LastUpdatedAtField;
 use PHPUnit\Framework\TestCase;
 
 final class LastUpdatedAtFieldTest extends TestCase

src/Eav/Entity/AttributeValue.php

@@ -5,7 +5,7 @@
 namespace MsgPhp\Eav\Entity;
 
 use MsgPhp\Eav\AttributeValueIdInterface;
-use MsgPhp\Eav\Entity\Fields\AttributeField;
+use MsgPhp\Eav\Model\AttributeField;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/Eav/Infra/Doctrine/ObjectMappings.php

@@ -8,8 +8,7 @@
 use MsgPhp\Domain\Infra\Doctrine\ObjectMappingProviderInterface;
 use MsgPhp\Eav\Entity\Attribute;
 use MsgPhp\Eav\Entity\AttributeValue;
-use MsgPhp\Eav\Entity\Features;
-use MsgPhp\Eav\Entity\Fields;
+use MsgPhp\Eav\Model;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
@@ -20,7 +19,7 @@ final class ObjectMappings implements ObjectMappingProviderInterface
 {
     public static function provideObjectMappings(MappingConfig $config): iterable
     {
-        yield Features\EntityAttributeValue::class => [
+        yield Model\EntityAttributeValue::class => [
             'attributeValue' => [
                 'type' => self::TYPE_ONE_TO_ONE,
                 'targetEntity' => AttributeValue::class,
@@ -30,7 +29,7 @@ public static function provideObjectMappings(MappingConfig $config): iterable
                 ],
             ],
         ];
-        yield Fields\AttributeField::class => [
+        yield Model\AttributeField::class => [
             'attribute' => [
                 'type' => self::TYPE_MANY_TO_ONE,
                 'targetEntity' => Attribute::class,

src/Eav/Entity/Fields/AttributeField.php → src/Eav/Model/AttributeField.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Eav\Entity\Fields;
+namespace MsgPhp\Eav\Model;
 
 use MsgPhp\Eav\AttributeIdInterface;
 use MsgPhp\Eav\Entity\Attribute;

src/Eav/Entity/Features/EntityAttributeValue.php → src/Eav/Model/EntityAttributeValue.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Eav\Entity\Features;
+namespace MsgPhp\Eav\Model;
 
 use MsgPhp\Eav\AttributeIdInterface;
 use MsgPhp\Eav\AttributeValueIdInterface;

src/Eav/Tests/Infra/Doctrine/ObjectMappingsTest.php

@@ -13,8 +13,8 @@ final class ObjectMappingsTest extends TestCase
     public function testMapping(): void
     {
         $available = array_flip(array_map(function (string $file): string {
-            return 'MsgPhp\\Eav\\Entity\\'.basename(\dirname($file)).'\\'.basename($file, '.php');
-        }, array_merge(glob(\dirname(__DIR__, 3).'/Entity/Features/*.php'), glob(\dirname(__DIR__, 3).'/Entity/Fields/*.php'))));
+            return 'MsgPhp\\Eav\\Model\\'.basename($file, '.php');
+        }, glob(\dirname(__DIR__, 3).'/Model/*.php')));
         $mappings = ObjectMappings::provideObjectMappings(new MappingConfig([]));
         $mappings = array_keys($mappings instanceof \Traversable ? iterator_to_array($mappings) : $mappings);
         sort($mappings);

src/Eav/Tests/Entity/Fields/AttributeFieldTest.php → src/Eav/Tests/Model/AttributeFieldTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Eav\Tests\Entity\Fields;
+namespace MsgPhp\Eav\Tests\Model;
 
 use MsgPhp\Eav\AttributeIdInterface;
 use MsgPhp\Eav\Entity\Attribute;
-use MsgPhp\Eav\Entity\Fields\AttributeField;
+use MsgPhp\Eav\Model\AttributeField;
 use PHPUnit\Framework\TestCase;
 
 final class AttributeFieldTest extends TestCase

src/Eav/Tests/Entity/Features/EntityAttributeValueTest.php → src/Eav/Tests/Model/EntityAttributeValueTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\Eav\Tests\Entity\Features;
+namespace MsgPhp\Eav\Tests\Model;
 
 use MsgPhp\Eav\AttributeIdInterface;
 use MsgPhp\Eav\AttributeValueIdInterface;
 use MsgPhp\Eav\Entity\Attribute;
 use MsgPhp\Eav\Entity\AttributeValue;
-use MsgPhp\Eav\Entity\Features\EntityAttributeValue;
+use MsgPhp\Eav\Model\EntityAttributeValue;
 use PHPUnit\Framework\TestCase;
 
 final class EntityAttributeValueTest extends TestCase

src/User/Entity/UserEmail.php

@@ -4,7 +4,7 @@
 
 namespace MsgPhp\User\Entity;
 
-use MsgPhp\User\Entity\Fields\UserField;
+use MsgPhp\User\Model\UserField;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/User/Entity/UserRole.php

@@ -4,8 +4,8 @@
 
 namespace MsgPhp\User\Entity;
 
-use MsgPhp\User\Entity\Fields\RoleField;
-use MsgPhp\User\Entity\Fields\UserField;
+use MsgPhp\User\Model\RoleField;
+use MsgPhp\User\Model\UserField;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/User/Entity/Username.php

@@ -4,7 +4,7 @@
 
 namespace MsgPhp\User\Entity;
 
-use MsgPhp\User\Entity\Fields\UserField;
+use MsgPhp\User\Model\UserField;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>

src/User/Infra/Doctrine/ObjectMappings.php

@@ -7,12 +7,11 @@
 use MsgPhp\Domain\Infra\Doctrine\MappingConfig;
 use MsgPhp\Domain\Infra\Doctrine\ObjectMappingProviderInterface;
 use MsgPhp\User\Entity\Credential;
-use MsgPhp\User\Entity\Features;
-use MsgPhp\User\Entity\Fields;
 use MsgPhp\User\Entity\Role;
 use MsgPhp\User\Entity\User;
 use MsgPhp\User\Entity\UserEmail;
 use MsgPhp\User\Entity\UserRole;
+use MsgPhp\User\Model;
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
@@ -22,11 +21,11 @@
 final class ObjectMappings implements ObjectMappingProviderInterface
 {
     private const CREDENTIALS = [
-        Features\EmailCredential::class => Credential\Email::class,
-        Features\EmailPasswordCredential::class => Credential\EmailPassword::class,
-        Features\NicknameCredential::class => Credential\Nickname::class,
-        Features\NicknamePasswordCredential::class => Credential\NicknamePassword::class,
-        Features\TokenCredential::class => Credential\Token::class,
+        Model\EmailCredential::class => Credential\Email::class,
+        Model\EmailPasswordCredential::class => Credential\EmailPassword::class,
+        Model\NicknameCredential::class => Credential\Nickname::class,
+        Model\NicknamePasswordCredential::class => Credential\NicknamePassword::class,
+        Model\TokenCredential::class => Credential\Token::class,
     ];
 
     public static function provideObjectMappings(MappingConfig $config): iterable
@@ -41,7 +40,7 @@ public static function provideObjectMappings(MappingConfig $config): iterable
             ];
         }
 
-        yield Features\ResettablePassword::class => [
+        yield Model\ResettablePassword::class => [
             'passwordResetToken' => [
                 'type' => 'string',
                 'unique' => true,
@@ -53,15 +52,15 @@ public static function provideObjectMappings(MappingConfig $config): iterable
                 'nullable' => true,
             ],
         ];
-        yield Fields\EmailsField::class => [
+        yield Model\EmailsField::class => [
             'emails' => [
                 'type' => self::TYPE_ONE_TO_MANY,
                 'targetEntity' => UserEmail::class,
                 'mappedBy' => 'user',
                 'indexBy' => 'email',
             ],
         ];
-        yield Fields\RoleField::class => [
+        yield Model\RoleField::class => [
             'role' => [
                 'type' => self::TYPE_MANY_TO_ONE,
                 'targetEntity' => Role::class,
@@ -70,14 +69,14 @@ public static function provideObjectMappings(MappingConfig $config): iterable
                 ],
             ],
         ];
-        yield Fields\RolesField::class => [
+        yield Model\RolesField::class => [
             'roles' => [
                 'type' => self::TYPE_ONE_TO_MANY,
                 'targetEntity' => UserRole::class,
                 'mappedBy' => 'user',
             ],
         ];
-        yield Fields\UserField::class => [
+        yield Model\UserField::class => [
             'user' => [
                 'type' => self::TYPE_MANY_TO_ONE,
                 'targetEntity' => User::class,

src/User/Entity/Features/AbstractCredential.php → src/User/Model/AbstractCredential.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\CredentialInterface;
 use MsgPhp\User\Event\Domain\ChangeCredentialEvent;