Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update cs #113

Closed
wants to merge 1 commit into from
Closed

chore: update cs #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,9 @@

$config = new PhpCsFixer\Config();
return $config->setRules([
'@PER-CS2.0' => true,
'array_syntax' => ['syntax' => 'short'],

// imports
'fully_qualified_strict_types' => true,
'global_namespace_import' => [
'import_classes' => false,
'import_constants' => false,
'import_functions' => false,
],
'no_leading_import_slash' => true,
'no_unneeded_import_alias' => true,
'no_unused_imports' => true,
'ordered_imports' => [
'sort_algorithm' => 'alpha',
'imports_order' => ['const', 'class', 'function']
],
'single_line_after_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'@PhpCsFixer:risky' => true,
'declare_strict_types' => true,
'native_function_invocation' => ['include' => ['@compiler_optimized']],
'php_unit_strict' => false,
'header_comment' => [
'header' => <<<EOF
This file is part of rekalogika/domain-event-src package.
Expand Down
7 changes: 6 additions & 1 deletion packages/domain-event-outbox/src/Entity/OutboxMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ public function getEvent(): Envelope
return $this->cachedResult;
}

$decoded = base64_decode($this->event);
$decoded = base64_decode($this->event, true);

if ($decoded === false) {
throw new UnserializeFailureException($this->event);
}

$result = unserialize($decoded);

if (false === $result) {
Expand Down
6 changes: 3 additions & 3 deletions packages/domain-event/src/EventDispatcher/ImmediateEventDispatchingDomainEventDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct(
private readonly PsrEventDispatcherInterface $defaultEventDispatcher,
) {}

// @phpstan-ignore-next-line
/** @phpstan-ignore-next-line */
#[\Override]
public function addListener(string $eventName, callable|array $listener, int $priority = 0): void
{
Expand All @@ -45,7 +45,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber): void
$this->decorated->addSubscriber($subscriber);
}

// @phpstan-ignore-next-line
/** @phpstan-ignore-next-line */
#[\Override]
public function removeListener(string $eventName, callable|array $listener): void
{
Expand All @@ -65,7 +65,7 @@ public function getListeners(?string $eventName = null): array
return $this->decorated->getListeners($eventName);
}

// @phpstan-ignore-next-line
/** @phpstan-ignore-next-line */
#[\Override]
public function getListenerPriority(string $eventName, callable|array $listener): ?int
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Framework/Security/AccessTokenHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getUserBadgeFrom(string $accessToken): UserBadge
return match ($accessToken) {
'user' => new UserBadge(
'user',
fn(string $userIdentifier): User => new User(),
static fn(string $userIdentifier): User => new User(),
),
default => throw new BadCredentialsException('Invalid credentials.'),
};
Expand Down
30 changes: 15 additions & 15 deletions tests/Framework/Tests/BasicDomainEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,75 +23,75 @@ final class BasicDomainEventTest extends DomainEventTestCase
public function testImmediateListener(): void
{
$listener = static::getContainer()->get(BookEventImmediateListener::class);
$this->assertInstanceOf(BookEventImmediateListener::class, $listener);
self::assertInstanceOf(BookEventImmediateListener::class, $listener);

$this->assertFalse($listener->onCreateCalled());
self::assertFalse($listener->onCreateCalled());
new Book('title', 'description');
$this->assertTrue($listener->onCreateCalled());
self::assertTrue($listener->onCreateCalled());
}

public function testPreFlushListener(): void
{
$listener = static::getContainer()->get(BookEventPreFlushListener::class);
$this->assertInstanceOf(BookEventPreFlushListener::class, $listener);
self::assertInstanceOf(BookEventPreFlushListener::class, $listener);

$this->assertFalse($listener->onCreateCalled());
self::assertFalse($listener->onCreateCalled());

$book = new Book('title', 'description');
static::getEntityManager()->persist($book);
static::getEntityManager()->flush();

$this->assertTrue($listener->onCreateCalled());
self::assertTrue($listener->onCreateCalled());
}

public function testPostFlushListener(): void
{
$listener = static::getContainer()->get(BookEventPostFlushListener::class);
$this->assertInstanceOf(BookEventPostFlushListener::class, $listener);
self::assertInstanceOf(BookEventPostFlushListener::class, $listener);

$this->assertFalse($listener->onCreateCalled());
self::assertFalse($listener->onCreateCalled());

$book = new Book('title', 'description');
static::getEntityManager()->persist($book);
static::getEntityManager()->flush();

$this->assertTrue($listener->onCreateCalled());
self::assertTrue($listener->onCreateCalled());
}

public function testManualPreFlush(): void
{
$entityManager = static::getEntityManager();
$listener = static::getContainer()->get(BookEventPreFlushListener::class);
$this->assertInstanceOf(BookEventPreFlushListener::class, $listener);
self::assertInstanceOf(BookEventPreFlushListener::class, $listener);

$entityManager->setAutoDispatchDomainEvents(false);

$this->assertFalse($listener->onCreateCalled());
self::assertFalse($listener->onCreateCalled());

$book = new Book('title', 'description');
$entityManager->persist($book);
$entityManager->dispatchPreFlushDomainEvents();
$entityManager->flush();
$entityManager->clearDomainEvents();

$this->assertTrue($listener->onCreateCalled());
self::assertTrue($listener->onCreateCalled());
}

public function testManualPostFlush(): void
{
$entityManager = static::getEntityManager();
$listener = static::getContainer()->get(BookEventPostFlushListener::class);
$this->assertInstanceOf(BookEventPostFlushListener::class, $listener);
self::assertInstanceOf(BookEventPostFlushListener::class, $listener);

$entityManager->setAutoDispatchDomainEvents(false);

$this->assertFalse($listener->onCreateCalled());
self::assertFalse($listener->onCreateCalled());

$book = new Book('title', 'description');
$entityManager->persist($book);
$entityManager->flush();
$entityManager->dispatchPostFlushDomainEvents();

$this->assertTrue($listener->onCreateCalled());
self::assertTrue($listener->onCreateCalled());
}
}
38 changes: 19 additions & 19 deletions tests/Framework/Tests/DecorationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@
final class DecorationTest extends DomainEventTestCase
{
/**
* @dataProvider entityManagerDecorationProvider
* @dataProvider provideEntityManagerDecorationFromContainerCases
*/
public function testEntityManagerDecorationFromContainer(string $serviceId): void
{
$entityManager = static::getContainer()->get($serviceId);
$this->assertInstanceOf(EntityManagerInterface::class, $entityManager);
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $entityManager);
self::assertInstanceOf(EntityManagerInterface::class, $entityManager);
self::assertInstanceOf(DomainEventAwareEntityManager::class, $entityManager);
// @phpstan-ignore-next-line
$this->assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $entityManager);
self::assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $entityManager);
// @phpstan-ignore-next-line
$this->assertInstanceOf(ObjectManager::class, $entityManager);
self::assertInstanceOf(ObjectManager::class, $entityManager);
// @phpstan-ignore-next-line
$this->assertInstanceOf(DomainEventAwareObjectManager::class, $entityManager);
self::assertInstanceOf(DomainEventAwareObjectManager::class, $entityManager);
}

/**
* @return array<int,array<int,string>>
*/
public static function entityManagerDecorationProvider(): array
public static function provideEntityManagerDecorationFromContainerCases(): iterable
{
return [
['doctrine.orm.entity_manager'],
Expand All @@ -59,39 +59,39 @@ public static function entityManagerDecorationProvider(): array
public function testEntityManagerDecorationFromRegistry(): void
{
$managerRegistry = static::getContainer()->get('doctrine');
$this->assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);
$this->assertInstanceOf(DomainEventAwareManagerRegistryImplementation::class, $managerRegistry);
self::assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);
self::assertInstanceOf(DomainEventAwareManagerRegistryImplementation::class, $managerRegistry);

$this->assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager());
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager('default'));
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager('other'));
self::assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager());
self::assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager('default'));
self::assertInstanceOf(DomainEventAwareEntityManager::class, $managerRegistry->getManager('other'));

$managers = $managerRegistry->getManagers();

foreach ($managers as $manager) {
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $manager);
self::assertInstanceOf(DomainEventAwareEntityManager::class, $manager);
}
}

public function testEntityManagerDecorationFromRepository(): void
{
$entityManager = static::getContainer()->get('doctrine.orm.default_entity_manager');
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $entityManager);
self::assertInstanceOf(DomainEventAwareEntityManager::class, $entityManager);

$repository = $entityManager->getRepository(Book::class);
$this->assertInstanceOf(BookRepository::class, $repository);
$this->assertInstanceOf(DomainEventAwareEntityManager::class, $repository->getEntityManager());
self::assertInstanceOf(BookRepository::class, $repository);
self::assertInstanceOf(DomainEventAwareEntityManager::class, $repository->getEntityManager());
}

public function testGetManagerNameFromManager(): void
{
$managerRegistry = static::getContainer()->get('doctrine');
$this->assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);
self::assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);

$entityManager = $managerRegistry->getManager();
$this->assertSame('default', $managerRegistry->getManagerName($entityManager));
self::assertSame('default', $managerRegistry->getManagerName($entityManager));

$entityManager = $managerRegistry->getManager('other');
$this->assertSame('other', $managerRegistry->getManagerName($entityManager));
self::assertSame('other', $managerRegistry->getManagerName($entityManager));
}
}
14 changes: 7 additions & 7 deletions tests/Framework/Tests/DomainEventTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ abstract class DomainEventTestCase extends KernelTestCase

protected DomainEventAwareManagerRegistry $managerRegistry;

// @phpstan-ignore-next-line
/** @phpstan-ignore-next-line */
#[\Override]
protected static function createKernel(array $options = []): KernelInterface
{
return new Kernel();
}

#[\Override]
public function setUp(): void
protected function setUp(): void
{
parent::setUp();

// setup manager registry

$managerRegistry = static::getContainer()->get('doctrine');
$this->assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);
self::assertInstanceOf(DomainEventAwareManagerRegistry::class, $managerRegistry);

$this->managerRegistry = $managerRegistry;

Expand All @@ -53,15 +53,15 @@ public function setUp(): void
$managers = $managerRegistry->getManagers();

foreach ($managers as $manager) {
$this->assertInstanceOf(EntityManagerInterface::class, $manager);
self::assertInstanceOf(EntityManagerInterface::class, $manager);
$schemaTool = new SchemaTool($manager);
$schemaTool->createSchema($manager->getMetadataFactory()->getAllMetadata());
}

// save entity manager to class property

$entityManager = static::getContainer()->get('doctrine.orm.entity_manager');
$this->assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $entityManager);
self::assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $entityManager);

$this->entityManager = $entityManager;
}
Expand All @@ -86,14 +86,14 @@ public static function getEntityManager(): DomainEventAwareEntityManager
}

#[\Override]
public function tearDown(): void
protected function tearDown(): void
{
parent::tearDown();

$managers = $this->managerRegistry->getManagers();

foreach ($managers as $manager) {
$this->assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $manager);
self::assertInstanceOf(DomainEventAwareEntityManagerInterface::class, $manager);
$manager->clearDomainEvents();
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Framework/Tests/EquatableEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ final class EquatableEventTest extends DomainEventTestCase
public function testWithoutTransaction(): void
{
$preFlushListener = static::getContainer()->get(BookEventPreFlushListener::class);
$this->assertInstanceOf(BookEventPreFlushListener::class, $preFlushListener);
self::assertInstanceOf(BookEventPreFlushListener::class, $preFlushListener);

$postFlushListener = static::getContainer()->get(BookEventPostFlushListener::class);
$this->assertInstanceOf(BookEventPostFlushListener::class, $postFlushListener);
self::assertInstanceOf(BookEventPostFlushListener::class, $postFlushListener);

$book = new Book('Book A', 'Description A');

Expand All @@ -40,7 +40,7 @@ public function testWithoutTransaction(): void

$this->entityManager->flush();

$this->assertEquals(1, $preFlushListener->onChangeCalled());
$this->assertEquals(1, $postFlushListener->onChangeCalled());
self::assertEquals(1, $preFlushListener->onChangeCalled());
self::assertEquals(1, $postFlushListener->onChangeCalled());
}
}
2 changes: 1 addition & 1 deletion tests/Framework/Tests/IntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function testEventDispatcherWiring(): void
];

foreach ($serviceIds as $serviceId) {
$this->assertInstanceOf(
self::assertInstanceOf(
EventDispatcherInterface::class,
static::getContainer()->get('test.' . $serviceId),
);
Expand Down
10 changes: 5 additions & 5 deletions tests/Framework/Tests/OutboxSetupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
final class OutboxSetupTest extends DomainEventTestCase
{
/**
* @dataProvider databaseSetupProvider
* @dataProvider provideDatabaseSetupCases
*/
public function testDatabaseSetup(string $id): void
{
Expand All @@ -42,15 +42,15 @@ public function testDatabaseSetup(string $id): void

$result = $queryBuilder->fetchAssociative();

$this->assertIsArray($result);
$this->assertArrayHasKey('name', $result);
$this->assertEquals('rekalogika_event_outbox', $result['name']);
self::assertIsArray($result);
self::assertArrayHasKey('name', $result);
self::assertEquals('rekalogika_event_outbox', $result['name']);
}

/**
* @return iterable<array-key,array<int,string>>
*/
public static function databaseSetupProvider(): iterable
public static function provideDatabaseSetupCases(): iterable
{
$managerRegistry = static::getContainer()->get('doctrine');
self::assertInstanceOf(ManagerRegistry::class, $managerRegistry);
Expand Down
Loading