Skip to content

Commit

Permalink
Deprecation fixes (#169)
Browse files Browse the repository at this point in the history
* Fixed `doctrine-bundle` (6.3+) deprecations

* Renamed `TableSchemaSubscriber` to `TableSchemaListener`
  • Loading branch information
DamienHarper committed Jun 8, 2023
1 parent 7c8a7b4 commit 6c08882
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
8 changes: 5 additions & 3 deletions src/Provider/Doctrine/DoctrineProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
use DH\Auditor\Provider\Doctrine\Auditing\Event\DoctrineSubscriber;
use DH\Auditor\Provider\Doctrine\Auditing\Transaction\TransactionManager;
use DH\Auditor\Provider\Doctrine\Persistence\Event\CreateSchemaListener;
use DH\Auditor\Provider\Doctrine\Persistence\Event\TableSchemaSubscriber;
use DH\Auditor\Provider\Doctrine\Persistence\Event\TableSchemaListener;
use DH\Auditor\Provider\Doctrine\Persistence\Helper\DoctrineHelper;
use DH\Auditor\Provider\Doctrine\Service\AuditingService;
use DH\Auditor\Provider\Doctrine\Service\StorageService;
use DH\Auditor\Provider\ProviderInterface;
use DH\Auditor\Provider\Service\AuditingServiceInterface;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Events;
use Doctrine\ORM\Tools\ToolEvents;
use Exception;

/**
Expand Down Expand Up @@ -64,8 +66,8 @@ public function registerAuditingService(AuditingServiceInterface $service): Prov
$evm = $entityManager->getEventManager();

// Register subscribers
$evm->addEventSubscriber(new TableSchemaSubscriber($this));
$evm->addEventSubscriber(new CreateSchemaListener($this));
$evm->addEventListener([Events::loadClassMetadata], new TableSchemaListener($this));
$evm->addEventListener([ToolEvents::postGenerateSchemaTable], new CreateSchemaListener($this));
$evm->addEventSubscriber(new DoctrineSubscriber($this->transactionManager));

return $this;
Expand Down
11 changes: 1 addition & 10 deletions src/Provider/Doctrine/Persistence/Event/CreateSchemaListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
use DH\Auditor\Provider\Doctrine\Persistence\Schema\SchemaManager;
use DH\Auditor\Provider\Doctrine\Service\AuditingService;
use DH\Auditor\Provider\Doctrine\Service\StorageService;
use Doctrine\Common\EventSubscriber;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs;
use Doctrine\ORM\Tools\ToolEvents;
use Exception;

/**
* @see \DH\Auditor\Tests\Provider\Doctrine\Persistence\Event\CreateSchemaListenerTest
*/
final class CreateSchemaListener implements EventSubscriber
final class CreateSchemaListener
{
private DoctrineProvider $provider;

Expand Down Expand Up @@ -73,11 +71,4 @@ public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $eventArgs)
$updater = new SchemaManager($this->provider);
$updater->createAuditTable($targetEntity, $isSameEntityManager ? $eventArgs->getSchema() : null);
}

public function getSubscribedEvents(): array
{
return [
ToolEvents::postGenerateSchemaTable,
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
use DH\Auditor\Provider\Doctrine\DoctrineProvider;
use DH\Auditor\Provider\Doctrine\Persistence\Schema\SchemaManager;
use DH\Auditor\Provider\Doctrine\Service\StorageService;
use Doctrine\Common\EventSubscriber;
use Doctrine\ORM\Event\LoadClassMetadataEventArgs;

final class TableSchemaSubscriber implements EventSubscriber
final class TableSchemaListener
{
private DoctrineProvider $provider;

Expand All @@ -36,12 +35,4 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
}
}
}

/**
* @return array<string>
*/
public function getSubscribedEvents(): array
{
return ['loadClassMetadata'];
}
}

0 comments on commit 6c08882

Please sign in to comment.