From 45ff74d8c50d50214b3a3ea15b005ddf765155ae Mon Sep 17 00:00:00 2001 From: Flavio Heleno Date: Tue, 15 Mar 2022 22:59:27 -0300 Subject: [PATCH] Remove unused listeners --- app/messages.php | 17 ++---- app/processors.php | 4 -- composer.json | 6 +-- composer.lock | 22 ++++---- .../Console/Packagist/GetDataCommand.php | 2 - .../Console/Packagist/GetListCommand.php | 2 - .../Console/Queue/QueueConsumerCommand.php | 2 - .../Dependency/DependencyCreatedListener.php | 52 ------------------- .../Dependency/DependencyUpdatedListener.php | 2 +- .../Package/PackageCreatedListener.php | 2 +- .../Package/PackageUpdatedListener.php | 2 +- .../Version/VersionCreatedListener.php | 2 +- .../Version/VersionUpdatedListener.php | 20 ------- 13 files changed, 22 insertions(+), 113 deletions(-) delete mode 100644 src/Application/Processor/Listener/Dependency/DependencyCreatedListener.php delete mode 100644 src/Application/Processor/Listener/Version/VersionUpdatedListener.php diff --git a/app/messages.php b/app/messages.php index 684a844f..77cba03d 100644 --- a/app/messages.php +++ b/app/messages.php @@ -4,33 +4,26 @@ use App\Application\Message\Command\PackageDiscoveryCommand; use App\Application\Message\Command\UpdateDependencyStatusCommand; use App\Application\Message\Command\UpdateVersionStatusCommand; -use App\Application\Message\Event\Dependency\DependencyCreatedEvent; use App\Application\Message\Event\Dependency\DependencyUpdatedEvent; use App\Application\Message\Event\Package\PackageCreatedEvent; use App\Application\Message\Event\Package\PackageUpdatedEvent; use App\Application\Message\Event\Version\VersionCreatedEvent; -use App\Application\Message\Event\Version\VersionUpdatedEvent; use App\Application\Processor\Handler\PackageDiscoveryHandler; use App\Application\Processor\Handler\UpdateDependencyStatusHandler; use App\Application\Processor\Handler\UpdateVersionStatusHandler; -use App\Application\Processor\Listener\Dependency\DependencyCreatedListener; use App\Application\Processor\Listener\Dependency\DependencyUpdatedListener; use App\Application\Processor\Listener\Package\PackageCreatedListener; use App\Application\Processor\Listener\Package\PackageUpdatedListener; use App\Application\Processor\Listener\Version\VersionCreatedListener; -use App\Application\Processor\Listener\Version\VersionUpdatedListener; use Courier\Bus; use Psr\Container\ContainerInterface; return static function (ContainerInterface $container): void { - $router = $container->get(Bus::class)->getRouter(); + $bus = $container->get(Bus::class); + $router = $bus->getRouter(); /* DEPENDENCY EVENTS */ $router - ->addRoute( - DependencyCreatedEvent::class, - DependencyCreatedListener::class - ) ->addRoute( DependencyUpdatedEvent::class, DependencyUpdatedListener::class @@ -52,10 +45,6 @@ ->addRoute( VersionCreatedEvent::class, VersionCreatedListener::class - ) - ->addRoute( - VersionUpdatedEvent::class, - VersionUpdatedListener::class ); /* PACKAGE COMMANDS */ @@ -75,4 +64,6 @@ UpdateVersionStatusCommand::class, UpdateVersionStatusHandler::class ); + + $bus->bindRoutes(); }; diff --git a/app/processors.php b/app/processors.php index 85132140..588911d6 100644 --- a/app/processors.php +++ b/app/processors.php @@ -4,12 +4,10 @@ use App\Application\Processor\Handler\PackageDiscoveryHandler; use App\Application\Processor\Handler\UpdateDependencyStatusHandler; use App\Application\Processor\Handler\UpdateVersionStatusHandler; -use App\Application\Processor\Listener\Dependency\DependencyCreatedListener; use App\Application\Processor\Listener\Dependency\DependencyUpdatedListener; use App\Application\Processor\Listener\Package\PackageCreatedListener; use App\Application\Processor\Listener\Package\PackageUpdatedListener; use App\Application\Processor\Listener\Version\VersionCreatedListener; -use App\Application\Processor\Listener\Version\VersionUpdatedListener; use DI\ContainerBuilder; use function DI\autowire; @@ -26,12 +24,10 @@ /* LISTENERS */ $containerBuilder->addDefinitions( [ - DependencyCreatedListener::class => autowire(DependencyCreatedListener::class), DependencyUpdatedListener::class => autowire(DependencyUpdatedListener::class), PackageCreatedListener::class => autowire(PackageCreatedListener::class), PackageUpdatedListener::class => autowire(PackageUpdatedListener::class), VersionCreatedListener::class => autowire(VersionCreatedListener::class), - VersionUpdatedListener::class => autowire(VersionUpdatedListener::class) ] ); }; diff --git a/composer.json b/composer.json index e76c8665..212e9488 100644 --- a/composer.json +++ b/composer.json @@ -53,13 +53,13 @@ }, "require-dev": { "infection/infection": "^0.26", - "php-parallel-lint/php-parallel-lint": "^1.2", + "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", "psy/psysh": "^0.11", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.3" + "squizlabs/php_codesniffer": "^3.6", + "vimeo/psalm": "^4.8" }, "scripts": { "console": "vendor/bin/psysh", diff --git a/composer.lock b/composer.lock index b463becf..2e94b0d3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b2331f4914d321fd0994b1f1953871f7", + "content-hash": "cac5f9b991b6ce104c803545f256714a", "packages": [ { "name": "badges/poser", @@ -411,12 +411,12 @@ "source": { "type": "git", "url": "https://github.com/courier-php/courier.git", - "reference": "1daaf3ccf6f95f2ef71d2c7aa47063cb2e53827f" + "reference": "8db33b9e09df9602eb2ba40618addc455df81b18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/courier-php/courier/zipball/1daaf3ccf6f95f2ef71d2c7aa47063cb2e53827f", - "reference": "1daaf3ccf6f95f2ef71d2c7aa47063cb2e53827f", + "url": "https://api.github.com/repos/courier-php/courier/zipball/8db33b9e09df9602eb2ba40618addc455df81b18", + "reference": "8db33b9e09df9602eb2ba40618addc455df81b18", "shasum": "" }, "require": { @@ -424,14 +424,14 @@ "ramsey/collection": "^1.2" }, "require-dev": { - "infection/infection": "^0.25", - "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan": "^0.12.58", + "infection/infection": "^0.26", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^9.5", - "psy/psysh": "^0.10.5", + "psy/psysh": "^0.11", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.3" + "squizlabs/php_codesniffer": "^3.6", + "vimeo/psalm": "^4.8" }, "default-branch": true, "type": "library", @@ -459,7 +459,7 @@ "issues": "https://github.com/courier-php/courier/issues", "source": "https://github.com/courier-php/courier/tree/main" }, - "time": "2022-03-15T18:36:31+00:00" + "time": "2022-03-16T01:32:53+00:00" }, { "name": "courier/locator-container", diff --git a/src/Application/Console/Packagist/GetDataCommand.php b/src/Application/Console/Packagist/GetDataCommand.php index fc352db4..48666efe 100644 --- a/src/Application/Console/Packagist/GetDataCommand.php +++ b/src/Application/Console/Packagist/GetDataCommand.php @@ -133,8 +133,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int $json = json_decode(file_get_contents($dataPath), true, 512, JSON_THROW_ON_ERROR); - $this->producer->setupBroker(); - $package = $this->packageRepository->get($packageName); $package = $package ->withDescription($json['package']['description'] ?? '') diff --git a/src/Application/Console/Packagist/GetListCommand.php b/src/Application/Console/Packagist/GetListCommand.php index cb894588..9827c180 100644 --- a/src/Application/Console/Packagist/GetListCommand.php +++ b/src/Application/Console/Packagist/GetListCommand.php @@ -149,8 +149,6 @@ static function (Package $package): string { ) ); - $this->producer->setupBroker(); - foreach ($addList as $packageName) { $package = $this->packageRepository->create($packageName); diff --git a/src/Application/Console/Queue/QueueConsumerCommand.php b/src/Application/Console/Queue/QueueConsumerCommand.php index 5a47506e..1f7e39fc 100644 --- a/src/Application/Console/Queue/QueueConsumerCommand.php +++ b/src/Application/Console/Queue/QueueConsumerCommand.php @@ -48,8 +48,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int ) ); - $this->consumer->setupBroker(); - while (true) { $this->consumer->consume(); usleep(200000); diff --git a/src/Application/Processor/Listener/Dependency/DependencyCreatedListener.php b/src/Application/Processor/Listener/Dependency/DependencyCreatedListener.php deleted file mode 100644 index d04ef6af..00000000 --- a/src/Application/Processor/Listener/Dependency/DependencyCreatedListener.php +++ /dev/null @@ -1,52 +0,0 @@ -packageRepository = $packageRepository; - $this->producer = $producer; - $this->logger = $logger; - } - - /** - * Checks if the dependency is registered as a package, if it's not, registers it. - */ - public function __invoke(EventInterface $event): void { - $dependency = $event->getDependency(); - $this->logger->debug('Dependency created', [$dependency]); - - // $packageCol = $this->packageRepository->find( - // [ - // 'name' => $dependency->getName() - // ] - // ); - - // $package = $packageCol[0] ?? null; - // if ($package === null) { - // $package = $this->packageRepository->create( - // $dependency->getName() - // ); - - // $this->producer->sendEvent( - // new PackageCreatedEvent($package) - // ); - // } - } -} diff --git a/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php b/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php index 3d440abf..bc540bc4 100644 --- a/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php +++ b/src/Application/Processor/Listener/Dependency/DependencyUpdatedListener.php @@ -23,7 +23,7 @@ public function __construct(Producer $producer, LoggerInterface $logger) { */ public function __invoke(EventInterface $event): void { $dependency = $event->getDependency(); - $this->logger->debug('Dependency updated', [$dependency]); + // $this->logger->debug('Dependency updated', [$dependency]); $this->producer->sendCommand( new UpdateVersionStatusCommand($dependency) diff --git a/src/Application/Processor/Listener/Package/PackageCreatedListener.php b/src/Application/Processor/Listener/Package/PackageCreatedListener.php index 21ea2e06..0c5e1470 100644 --- a/src/Application/Processor/Listener/Package/PackageCreatedListener.php +++ b/src/Application/Processor/Listener/Package/PackageCreatedListener.php @@ -21,7 +21,7 @@ public function __construct(Producer $producer, LoggerInterface $logger) { public function __invoke(EventInterface $event): void { $package = $event->getPackage(); - $this->logger->debug('Package created', [$package]); + // $this->logger->debug('Package created', [$package]); $this->producer->sendCommand( new PackageDiscoveryCommand($package) diff --git a/src/Application/Processor/Listener/Package/PackageUpdatedListener.php b/src/Application/Processor/Listener/Package/PackageUpdatedListener.php index d0a3d345..58c1a229 100644 --- a/src/Application/Processor/Listener/Package/PackageUpdatedListener.php +++ b/src/Application/Processor/Listener/Package/PackageUpdatedListener.php @@ -22,7 +22,7 @@ public function __construct(Producer $producer, LoggerInterface $logger) { public function __invoke(EventInterface $event): void { $package = $event->getPackage(); - $this->logger->debug('Package updated', [$package]); + // $this->logger->debug('Package updated', [$package]); if ($package->getLatestVersion() === '') { return; diff --git a/src/Application/Processor/Listener/Version/VersionCreatedListener.php b/src/Application/Processor/Listener/Version/VersionCreatedListener.php index fee97353..9662b13d 100644 --- a/src/Application/Processor/Listener/Version/VersionCreatedListener.php +++ b/src/Application/Processor/Listener/Version/VersionCreatedListener.php @@ -37,7 +37,7 @@ public function __construct( */ public function __invoke(EventInterface $event): void { $version = $event->getVersion(); - $this->logger->debug('Version created', [$version]); + // $this->logger->debug('Version created', [$version]); // ignore non-release versions if ($version->isRelease() === false) { diff --git a/src/Application/Processor/Listener/Version/VersionUpdatedListener.php b/src/Application/Processor/Listener/Version/VersionUpdatedListener.php deleted file mode 100644 index a96df59c..00000000 --- a/src/Application/Processor/Listener/Version/VersionUpdatedListener.php +++ /dev/null @@ -1,20 +0,0 @@ -logger = $logger; - } - - public function __invoke(EventInterface $event): void { - $this->logger->debug('Version updated', [$event->getVersion()]); - } -}