bug #89 Exclude value objects from doctrine mapped classes (chalasr)

chalasr · chalasr · commit e6eaf348a8c2 · 2022-04-25T10:21:15.000+02:00
This PR was merged into the 0.1-dev branch. Discussion ---------- Exclude value objects from doctrine mapped classes Fixes #78 Commits ------- 7670753 Exclude value objects from doctrine mapped classes
diff --git a/src/Command/CreateClientCommand.php b/src/Command/CreateClientCommand.php
@@ -6,9 +6,9 @@
 
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Command/ListClientsCommand.php b/src/Command/ListClientsCommand.php
@@ -7,9 +7,9 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ClientFilter;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Command/UpdateClientCommand.php b/src/Command/UpdateClientCommand.php
@@ -5,9 +5,9 @@
 namespace League\Bundle\OAuth2ServerBundle\Command;
 
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Converter/ScopeConverter.php b/src/Converter/ScopeConverter.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\Converter;
 
 use League\Bundle\OAuth2ServerBundle\Entity\Scope as ScopeEntity;
-use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 
 final class ScopeConverter implements ScopeConverterInterface
diff --git a/src/Converter/ScopeConverterInterface.php b/src/Converter/ScopeConverterInterface.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\Converter;
 
 use League\Bundle\OAuth2ServerBundle\Entity\Scope as ScopeEntity;
-use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 
 interface ScopeConverterInterface
diff --git a/src/DBAL/Type/Grant.php b/src/DBAL/Type/Grant.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\DBAL\Type;
 
-use League\Bundle\OAuth2ServerBundle\Model\Grant as GrantModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant as GrantModel;
 
 /**
  * @extends ImplodedArray<GrantModel>
diff --git a/src/DBAL/Type/RedirectUri.php b/src/DBAL/Type/RedirectUri.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\DBAL\Type;
 
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri as RedirectUriModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri as RedirectUriModel;
 
 /**
  * @template-extends ImplodedArray<RedirectUriModel>
diff --git a/src/DBAL/Type/Scope.php b/src/DBAL/Type/Scope.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\DBAL\Type;
 
-use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
 
 /**
  * @extends ImplodedArray<ScopeModel>
diff --git a/src/DependencyInjection/LeagueOAuth2ServerExtension.php b/src/DependencyInjection/LeagueOAuth2ServerExtension.php
@@ -16,7 +16,7 @@
 use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\RefreshTokenManager;
 use League\Bundle\OAuth2ServerBundle\Manager\InMemory\AccessTokenManager as InMemoryAccessTokenManager;
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
-use League\Bundle\OAuth2ServerBundle\Model\Scope as ScopeModel;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope as ScopeModel;
 use League\Bundle\OAuth2ServerBundle\Persistence\Mapping\Driver;
 use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
 use League\Bundle\OAuth2ServerBundle\Service\CredentialsRevoker\DoctrineCredentialsRevoker;
diff --git a/src/Event/AuthorizationRequestResolveEvent.php b/src/Event/AuthorizationRequestResolveEvent.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\Event;
 
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/src/Event/ScopeResolveEvent.php b/src/Event/ScopeResolveEvent.php
@@ -5,8 +5,8 @@
 namespace League\Bundle\OAuth2ServerBundle\Event;
 
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Contracts\EventDispatcher\Event;
 
 final class ScopeResolveEvent extends Event
diff --git a/src/Event/UserResolveEvent.php b/src/Event/UserResolveEvent.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\Event;
 
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
diff --git a/src/EventListener/AddClientDefaultScopesListener.php b/src/EventListener/AddClientDefaultScopesListener.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\EventListener;
 
 use League\Bundle\OAuth2ServerBundle\Event\PreSaveClientEvent;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 /**
  * Sets default scopes to the client before being saved by a ClientManager if no scope is specified.
diff --git a/src/Manager/ClientFilter.php b/src/Manager/ClientFilter.php
@@ -4,9 +4,9 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Manager;
 
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 final class ClientFilter
 {
diff --git a/src/Manager/Doctrine/ClientManager.php b/src/Manager/Doctrine/ClientManager.php
@@ -9,9 +9,9 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ClientFilter;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
diff --git a/src/Manager/InMemory/ClientManager.php b/src/Manager/InMemory/ClientManager.php
@@ -8,9 +8,9 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ClientFilter;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
diff --git a/src/Manager/InMemory/ScopeManager.php b/src/Manager/InMemory/ScopeManager.php
@@ -5,7 +5,7 @@
 namespace League\Bundle\OAuth2ServerBundle\Manager\InMemory;
 
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 final class ScopeManager implements ScopeManagerInterface
 {
diff --git a/src/Manager/ScopeManagerInterface.php b/src/Manager/ScopeManagerInterface.php
@@ -4,7 +4,7 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Manager;
 
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 interface ScopeManagerInterface
 {
diff --git a/src/Model/AbstractClient.php b/src/Model/AbstractClient.php
@@ -4,6 +4,10 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Model;
 
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
+
 /**
  * @psalm-consistent-constructor
  *
diff --git a/src/Model/AccessToken.php b/src/Model/AccessToken.php
@@ -4,6 +4,8 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Model;
 
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
+
 class AccessToken
 {
     /**
diff --git a/src/Model/AuthorizationCode.php b/src/Model/AuthorizationCode.php
@@ -4,6 +4,8 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Model;
 
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
+
 class AuthorizationCode
 {
     /**
diff --git a/src/Persistence/Mapping/Driver.php b/src/Persistence/Mapping/Driver.php
@@ -11,7 +11,10 @@
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 /**
  * Metadata driver that enables mapping dynamically accordingly to container configuration.
diff --git a/src/Repository/ScopeRepository.php b/src/Repository/ScopeRepository.php
@@ -9,8 +9,8 @@
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
@@ -8,7 +8,7 @@
 use League\Bundle\OAuth2ServerBundle\Event\UserResolveEvent;
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\AbstractClient;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
 use League\Bundle\OAuth2ServerBundle\OAuth2Events;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\UserEntityInterface;
diff --git a/src/ValueObject/Grant.php b/src/ValueObject/Grant.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\Model;
+namespace League\Bundle\OAuth2ServerBundle\ValueObject;
 
 /**
  * @psalm-immutable
diff --git a/src/ValueObject/RedirectUri.php b/src/ValueObject/RedirectUri.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\Model;
+namespace League\Bundle\OAuth2ServerBundle\ValueObject;
 
 /**
  * @psalm-immutable
diff --git a/src/ValueObject/Scope.php b/src/ValueObject/Scope.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace League\Bundle\OAuth2ServerBundle\Model;
+namespace League\Bundle\OAuth2ServerBundle\ValueObject;
 
 /**
  * @psalm-immutable
diff --git a/tests/Acceptance/CreateClientCommandTest.php b/tests/Acceptance/CreateClientCommandTest.php
@@ -6,7 +6,7 @@
 
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Tester\CommandTester;
 
 final class CreateClientCommandTest extends AbstractAcceptanceTest
diff --git a/tests/Acceptance/DoctrineClientManagerTest.php b/tests/Acceptance/DoctrineClientManagerTest.php
@@ -9,7 +9,7 @@
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\Bundle\OAuth2ServerBundle\Tests\Fixtures\FixtureFactory;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
diff --git a/tests/Acceptance/InMemoryClientManagerTest.php b/tests/Acceptance/InMemoryClientManagerTest.php
@@ -6,7 +6,7 @@
 
 use League\Bundle\OAuth2ServerBundle\Manager\InMemory\ClientManager as InMemoryClientManager;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use League\Bundle\OAuth2ServerBundle\Tests\Acceptance\AbstractAcceptanceTest;
 use League\Bundle\OAuth2ServerBundle\Tests\Fixtures\FixtureFactory;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
diff --git a/tests/Acceptance/ListClientsCommandTest.php b/tests/Acceptance/ListClientsCommandTest.php
@@ -6,8 +6,8 @@
 
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/Acceptance/UpdateClientCommandTest.php b/tests/Acceptance/UpdateClientCommandTest.php
@@ -6,9 +6,9 @@
 
 use League\Bundle\OAuth2ServerBundle\Manager\ClientManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 use Symfony\Component\Console\Tester\CommandTester;
 
 final class UpdateClientCommandTest extends AbstractAcceptanceTest
diff --git a/tests/Fixtures/FixtureFactory.php b/tests/Fixtures/FixtureFactory.php
@@ -12,10 +12,10 @@
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\AuthorizationCode;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
-use League\Bundle\OAuth2ServerBundle\Model\Grant;
-use League\Bundle\OAuth2ServerBundle\Model\RedirectUri;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;
+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
-use League\Bundle\OAuth2ServerBundle\Model\Scope;
+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;
 
 /**
  * Development hints:

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace League\Bundle\OAuth2ServerBundle\Manager\InMemory;`
`6`	`6`
`7`	`7`	`use League\Bundle\OAuth2ServerBundle\Manager\ScopeManagerInterface;`
`8`		`-use League\Bundle\OAuth2ServerBundle\Model\Scope;`
	`8`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;`
`9`	`9`
`10`	`10`	`final class ScopeManager implements ScopeManagerInterface`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace League\Bundle\OAuth2ServerBundle\Manager;`
`6`	`6`
`7`		`-use League\Bundle\OAuth2ServerBundle\Model\Scope;`
	`7`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;`
`8`	`8`
`9`	`9`	`interface ScopeManagerInterface`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace League\Bundle\OAuth2ServerBundle\Model;`
`6`	`6`
	`7`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\Grant;`
	`8`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\RedirectUri;`
	`9`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;`
	`10`	`+`
`7`	`11`	`/**`
`8`	`12`	`* @psalm-consistent-constructor`
`9`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace League\Bundle\OAuth2ServerBundle\Model;`
`6`	`6`
	`7`	`+use League\Bundle\OAuth2ServerBundle\ValueObject\Scope;`
	`8`	`+`
`7`	`9`	`class AccessToken`
`8`	`10`	`{`
`9`	`11`	`/**`