From e07d0d52bd01c610dfd1b2b5b948c6a3cb050772 Mon Sep 17 00:00:00 2001 From: Adam Kadlec Date: Tue, 6 Feb 2024 23:56:57 +0100 Subject: [PATCH] Removed unused dependency --- .docs/en/index.md | 1 - composer.json | 1 - src/Entities/Tokens/Token.php | 6 ++---- src/Mapping/Attribute/Owner.php | 2 +- tests/common.neon | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.docs/en/index.md b/.docs/en/index.md index acdc6fd..e4ad1ab 100644 --- a/.docs/en/index.md +++ b/.docs/en/index.md @@ -26,7 +26,6 @@ extensions: .... ipubDoctrineCrud: IPub\DoctrineCrud\DI\DoctrineCrudExtension ipubDoctrineConsistence: IPub\DoctrineConsistence\DI\DoctrineConsistenceExtension - ipubDynamicDiscriminatorMap: IPub\DoctrineDynamicDiscriminatorMap\DI\DoctrineDynamicDiscriminatorMapExtension fbDateTimeFactory: FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension ``` diff --git a/composer.json b/composer.json index ba0673d..26740d6 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,6 @@ "fastybird/datetime-factory": "^0.6", "ipub/doctrine-consistence": "^0.4", "ipub/doctrine-crud": "^4.0", - "ipub/doctrine-dynamic-discriminator-map": "^1.4", "ipub/doctrine-orm-query": "^0.1", "ipub/slim-router": "^0.2.0", "lcobucci/jwt": "^4.2", diff --git a/src/Entities/Tokens/Token.php b/src/Entities/Tokens/Token.php index 9d2c7de..6d3ad07 100644 --- a/src/Entities/Tokens/Token.php +++ b/src/Entities/Tokens/Token.php @@ -21,7 +21,6 @@ use FastyBird\SimpleAuth\Types; use IPub\DoctrineCrud; use IPub\DoctrineCrud\Mapping\Attribute as IPubDoctrine; -use IPub\DoctrineDynamicDiscriminatorMap\Entities as DoctrineDynamicDiscriminatorMapEntities; use Ramsey\Uuid; use Throwable; @@ -40,8 +39,7 @@ #[ORM\InheritanceType('SINGLE_TABLE')] #[ORM\DiscriminatorColumn(name: 'token_type', type: 'string', length: 20)] #[ORM\MappedSuperclass] -abstract class Token implements DoctrineCrud\Entities\IEntity, - DoctrineDynamicDiscriminatorMapEntities\IDiscriminatorProvider +abstract class Token implements DoctrineCrud\Entities\IEntity { #[ORM\Id] @@ -71,8 +69,8 @@ abstract class Token implements DoctrineCrud\Entities\IEntity, */ #[IPubDoctrine\Crud(writable: true)] #[ORM\Column( - type: 'string_enum', name: 'token_state', + type: 'string_enum', nullable: false, options: ['default' => Types\TokenState::ACTIVE], )] diff --git a/src/Mapping/Attribute/Owner.php b/src/Mapping/Attribute/Owner.php index 5df3761..d794d7c 100644 --- a/src/Mapping/Attribute/Owner.php +++ b/src/Mapping/Attribute/Owner.php @@ -19,7 +19,7 @@ use Doctrine\ORM\Mapping as ORMMapping; /** - * Entity owner annotation for Doctrine2 + * Entity owner attribute for Doctrine2 * * @package FastyBird:SimpleAuth! * @subpackage Mapping diff --git a/tests/common.neon b/tests/common.neon index 760e17f..db41e2b 100644 --- a/tests/common.neon +++ b/tests/common.neon @@ -24,7 +24,6 @@ extensions: nettrineOrmCache : Nettrine\ORM\DI\OrmCacheExtension ipubDoctrineCrud : IPub\DoctrineCrud\DI\DoctrineCrudExtension ipubDoctrineConsistence : IPub\DoctrineConsistence\DI\DoctrineConsistenceExtension - ipubDynamicDiscriminatorMap : IPub\DoctrineDynamicDiscriminatorMap\DI\DoctrineDynamicDiscriminatorMapExtension fbDateTimeFactory : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension services: