Rename Entity\{Fields,Features}\ to Model\ (#301)

ro0NL · web-flow · commit 473a9d871d69 · 2019-03-17T11:54:02.000+01:00
diff --git a/Entity/UserEmail.php b/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>
diff --git a/Entity/UserRole.php b/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>
diff --git a/Entity/Username.php b/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>
diff --git a/Infra/Doctrine/ObjectMappings.php b/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,
diff --git a/Model/AbstractCredential.php b/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;
diff --git a/Model/AbstractPasswordCredential.php b/Model/AbstractPasswordCredential.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;
diff --git a/Model/EmailCredential.php b/Model/EmailCredential.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Credential\Email;
 use MsgPhp\User\Event\Domain\ChangeCredentialEvent;
diff --git a/Model/EmailPasswordCredential.php b/Model/EmailPasswordCredential.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Credential\EmailPassword;
 
diff --git a/Model/EmailsField.php b/Model/EmailsField.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Fields;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\Domain\DomainCollectionInterface;
 use MsgPhp\Domain\GenericDomainCollection;
diff --git a/Model/NicknameCredential.php b/Model/NicknameCredential.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Credential\Nickname;
 use MsgPhp\User\Event\Domain\ChangeCredentialEvent;
diff --git a/Model/NicknamePasswordCredential.php b/Model/NicknamePasswordCredential.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Credential\NicknamePassword;
 
diff --git a/Model/ResettablePassword.php b/Model/ResettablePassword.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Event\Domain\RequestPasswordEvent;
 
diff --git a/Model/RoleField.php b/Model/RoleField.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Fields;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Role;
 
diff --git a/Model/RolesField.php b/Model/RolesField.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Fields;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\Domain\DomainCollectionInterface;
 use MsgPhp\Domain\GenericDomainCollection;
diff --git a/Model/TokenCredential.php b/Model/TokenCredential.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Features;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\Credential\Token;
 use MsgPhp\User\Event\Domain\ChangeCredentialEvent;
diff --git a/Model/UserField.php b/Model/UserField.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Entity\Fields;
+namespace MsgPhp\User\Model;
 
 use MsgPhp\User\Entity\User;
 use MsgPhp\User\UserIdInterface;
diff --git a/Tests/Infra/Doctrine/ObjectMappingsTest.php b/Tests/Infra/Doctrine/ObjectMappingsTest.php
@@ -5,20 +5,20 @@
 namespace MsgPhp\User\Tests\Infra\Doctrine;
 
 use MsgPhp\Domain\Infra\Doctrine\MappingConfig;
-use MsgPhp\User\Entity\Features;
 use MsgPhp\User\Infra\Doctrine\ObjectMappings;
+use MsgPhp\User\Model;
 use PHPUnit\Framework\TestCase;
 
 final class ObjectMappingsTest extends TestCase
 {
     public function testMapping(): void
     {
         $available = array_flip(array_map(function (string $file): string {
-            return 'MsgPhp\\User\\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\\User\\Model\\'.basename($file, '.php');
+        }, glob(\dirname(__DIR__, 3).'/Model/*.php')));
         unset(
-            $available[Features\AbstractCredential::class],
-            $available[Features\AbstractPasswordCredential::class]
+            $available[Model\AbstractCredential::class],
+            $available[Model\AbstractPasswordCredential::class]
         );
 
         $mappings = ObjectMappings::provideObjectMappings(new MappingConfig([]));
diff --git a/Tests/Model/EmailsFieldTest.php b/Tests/Model/EmailsFieldTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Tests\Entity\Fields;
+namespace MsgPhp\User\Tests\Model;
 
 use MsgPhp\Domain\DomainCollectionInterface;
-use MsgPhp\User\Entity\Fields\EmailsField;
 use MsgPhp\User\Entity\UserEmail;
+use MsgPhp\User\Model\EmailsField;
 use PHPUnit\Framework\TestCase;
 
 final class EmailsFieldTest extends TestCase
diff --git a/Tests/Model/RoleFieldTest.php b/Tests/Model/RoleFieldTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Tests\Entity\Fields;
+namespace MsgPhp\User\Tests\Model;
 
-use MsgPhp\User\Entity\Fields\RoleField;
 use MsgPhp\User\Entity\Role;
+use MsgPhp\User\Model\RoleField;
 use PHPUnit\Framework\TestCase;
 
 final class RoleFieldTest extends TestCase
diff --git a/Tests/Model/RolesFieldTest.php b/Tests/Model/RolesFieldTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Tests\Entity\Fields;
+namespace MsgPhp\User\Tests\Model;
 
 use MsgPhp\Domain\DomainCollectionInterface;
-use MsgPhp\User\Entity\Fields\RolesField;
 use MsgPhp\User\Entity\UserRole;
+use MsgPhp\User\Model\RolesField;
 use PHPUnit\Framework\TestCase;
 
 final class RolesFieldTest extends TestCase
diff --git a/Tests/Model/UserFieldTest.php b/Tests/Model/UserFieldTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace MsgPhp\User\Tests\Entity\Fields;
+namespace MsgPhp\User\Tests\Model;
 
-use MsgPhp\User\Entity\Fields\UserField;
 use MsgPhp\User\Entity\User;
+use MsgPhp\User\Model\UserField;
 use MsgPhp\User\UserIdInterface;
 use PHPUnit\Framework\TestCase;
 
