Skip to content

Convert YAML to PHP configuration #151

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

Closed
ruudk wants to merge 1 commit into from
Closed

Convert YAML to PHP configuration #151

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
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"symfony/dependency-injection": "^5.3.7 || ^5.4",
"symfony/framework-bundle": "^5.3.7 || ^5.4",
"symfony/http-kernel": "^5.3.7 || ^5.4",
"symfony/monolog-bundle": "^3.4",
"symfony/yaml": "^5.3.7 || ^5.4"
"symfony/monolog-bundle": "^3.4"
},
"replace": {
"simple-bus/asynchronous": "self.version",
Expand Down Expand Up @@ -72,6 +71,7 @@
"symfony/proxy-manager-bridge": "^5.3.7 || ^5.4",
"symfony/stopwatch": "^5.3.7 || ^5.4",
"symfony/translation": "^5.3.7 || ^5.4",
"symfony/yaml": "^5.3.7 || ^5.4",
"symplify/easy-ci": "^9.0",
"symplify/monorepo-builder": "^9.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/asynchronous-bundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
"symfony/dependency-injection": "^5.3.7 || ^5.4",
"symfony/framework-bundle": "^5.3.7 || ^5.4"
},
"conflict": {
"monolog/monolog": "<1.26.1 || >=2.0,<2.3.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.11",
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
"phpunit/phpunit": "^9.5.5",
"symfony/monolog-bundle": "^3.4",
"symfony/phpunit-bridge": "^6.0"
},
"conflict": {
"monolog/monolog": "<1.26.1 || >=2.0,<2.3.0"
},
"suggest": {
"symfony/monolog-bundle": "For logging messages"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/asynchronous-bundle/src/DependencyInjection/SimpleBusAsynchronousExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;

class SimpleBusAsynchronousExtension extends ConfigurableExtension
Expand Down Expand Up @@ -36,9 +36,9 @@ public function getConfiguration(array $config, ContainerBuilder $container): Co
*/
protected function loadInternal(array $mergedConfig, ContainerBuilder $container): void
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

$loader->load('asynchronous_serialization.yml');
$loader->load('asynchronous_serialization.php');
$container->setAlias(
'simple_bus.asynchronous.object_serializer',
$mergedConfig['object_serializer_service_id']
Expand Down Expand Up @@ -67,7 +67,7 @@ private function requireBundle(string $bundleName, ContainerBuilder $container):
private function loadAsynchronousCommandBus(array $config, ContainerBuilder $container, LoaderInterface $loader): void
{
$this->requireBundle('SimpleBusCommandBusBundle', $container);
$loader->load('asynchronous_commands.yml');
$loader->load('asynchronous_commands.php');

$container->setAlias(
'simple_bus.asynchronous.command_bus.command_name_resolver',
Expand All @@ -80,7 +80,7 @@ private function loadAsynchronousCommandBus(array $config, ContainerBuilder $con
);

if ($config['logging']['enabled']) {
$loader->load('asynchronous_commands_logging.yml');
$loader->load('asynchronous_commands_logging.php');
}
}

Expand All @@ -90,7 +90,7 @@ private function loadAsynchronousCommandBus(array $config, ContainerBuilder $con
private function loadAsynchronousEventBus(array $config, ContainerBuilder $container, LoaderInterface $loader): void
{
$this->requireBundle('SimpleBusEventBusBundle', $container);
$loader->load('asynchronous_events.yml');
$loader->load('asynchronous_events.php');

$container->setAlias(
'simple_bus.asynchronous.event_bus.event_name_resolver',
Expand All @@ -103,7 +103,7 @@ private function loadAsynchronousEventBus(array $config, ContainerBuilder $conta
);

if ($config['logging']['enabled']) {
$loader->load('asynchronous_events_logging.yml');
$loader->load('asynchronous_events_logging.php');
}

$eventMiddleware = $config['strategy']['strategy_service_id'];
Expand Down
79 changes: 79 additions & 0 deletions packages/asynchronous-bundle/src/Resources/config/asynchronous_commands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

declare(strict_types=1);

use SimpleBus\Asynchronous\Consumer\StandardSerializedEnvelopeConsumer;
use SimpleBus\Asynchronous\MessageBus\PublishesUnhandledMessages;
use SimpleBus\AsynchronousBundle\Bus\AsynchronousCommandBus;
use SimpleBus\Message\Bus\Middleware\FinishesHandlingMessageBeforeHandlingNext;
use SimpleBus\Message\CallableResolver\CallableMap;
use SimpleBus\Message\CallableResolver\ServiceLocatorAwareCallableResolver;
use SimpleBus\Message\Handler\DelegatesToMessageHandlerMiddleware;
use SimpleBus\Message\Handler\Resolver\NameBasedMessageHandlerResolver;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
use Symfony\Component\DependencyInjection\ServiceLocator;

return static function (ContainerConfigurator $container): void {
$parameters = $container->parameters();

$parameters->set('simple_bus.asynchronous.command_bus.unhandled_messages_log_level', 'debug');

$services = $container->services();

$services->alias(AsynchronousCommandBus::class, 'simple_bus.asynchronous.command_bus');

$services->alias('asynchronous_command_bus', 'simple_bus.asynchronous.command_bus')
->public();

$services->set('simple_bus.asynchronous.command_bus', AsynchronousCommandBus::class)
->tag('message_bus', [
'type' => 'command',
'middleware_tag' => 'asynchronous_command_bus_middleware',
]);

$services->set('simple_bus.asynchronous.command_bus.delegates_to_message_handler_middleware', DelegatesToMessageHandlerMiddleware::class)
->args([
service('simple_bus.asynchronous.command_bus.command_handler_resolver'),
])
->tag('asynchronous_command_bus_middleware', ['priority' => -1000]);

$services->set('simple_bus.asynchronous.command_bus.callable_resolver', ServiceLocatorAwareCallableResolver::class)
->args([
[service('simple_bus.asynchronous.command_bus.command_handler_service_locator'), 'get'],
]);

$services->set('simple_bus.asynchronous.command_bus.command_handler_service_locator', ServiceLocator::class)
->tag('container.service_locator')
->args([[]]);

$services->set('simple_bus.asynchronous.command_bus.command_handler_map', CallableMap::class)
->args([
[],
service('simple_bus.asynchronous.command_bus.callable_resolver'),
]);

$services->set('simple_bus.asynchronous.command_bus.command_handler_resolver', NameBasedMessageHandlerResolver::class)
->args([
service('simple_bus.asynchronous.command_bus.command_name_resolver'),
service('simple_bus.asynchronous.command_bus.command_handler_map'),
]);

$services->set('simple_bus.asynchronous.command_bus.finishes_command_before_handling_next_middleware', FinishesHandlingMessageBeforeHandlingNext::class)
->tag('asynchronous_command_bus_middleware', ['priority' => 1000]);

$services->set('simple_bus.asynchronous.command_bus.publishes_unhandled_commands_middleware', PublishesUnhandledMessages::class)
->args([
service('simple_bus.asynchronous.command_publisher'),
service('logger'),
'%simple_bus.asynchronous.command_bus.unhandled_messages_log_level%',
])
->tag('command_bus_middleware', ['priority' => -999])
->tag('monolog.logger', ['channel' => 'command_bus']);

$services->set('simple_bus.asynchronous.standard_serialized_command_envelope_consumer', StandardSerializedEnvelopeConsumer::class)
->args([
service('simple_bus.asynchronous.message_serializer'),
service('simple_bus.asynchronous.command_bus'),
]);
};
75 changes: 0 additions & 75 deletions packages/asynchronous-bundle/src/Resources/config/asynchronous_commands.yml
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions packages/asynchronous-bundle/src/Resources/config/asynchronous_commands_logging.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

use SimpleBus\Message\Logging\LoggingMiddleware;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $container): void {
$parameters = $container->parameters();

$parameters->set('simple_bus.asynchronous.command_bus.logging.level', 'debug');

$services = $container->services();

$services->set('simple_bus.asynchronous.command_bus.logging_middleware', LoggingMiddleware::class)
->args([
service('logger'),
'%simple_bus.asynchronous.command_bus.logging.level%',
])
->tag('monolog.logger', ['channel' => 'asynchronous_command_bus'])
->tag('asynchronous_command_bus_middleware', ['priority' => -999]);
};
13 changes: 0 additions & 13 deletions packages/asynchronous-bundle/src/Resources/config/asynchronous_commands_logging.yml
View file
Open in desktop

This file was deleted.

79 changes: 79 additions & 0 deletions packages/asynchronous-bundle/src/Resources/config/asynchronous_events.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

declare(strict_types=1);

use SimpleBus\Asynchronous\Consumer\StandardSerializedEnvelopeConsumer;
use SimpleBus\Asynchronous\MessageBus\AlwaysPublishesMessages;
use SimpleBus\Asynchronous\MessageBus\PublishesPredefinedMessages;
use SimpleBus\AsynchronousBundle\Bus\AsynchronousEventBus;
use SimpleBus\Message\Bus\Middleware\FinishesHandlingMessageBeforeHandlingNext;
use SimpleBus\Message\CallableResolver\CallableCollection;
use SimpleBus\Message\CallableResolver\ServiceLocatorAwareCallableResolver;
use SimpleBus\Message\Subscriber\NotifiesMessageSubscribersMiddleware;
use SimpleBus\Message\Subscriber\Resolver\NameBasedMessageSubscriberResolver;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
use Symfony\Component\DependencyInjection\ServiceLocator;

return static function (ContainerConfigurator $container): void {
$services = $container->services();

$services->alias(AsynchronousEventBus::class, 'simple_bus.asynchronous.event_bus');

$services->alias('asynchronous_event_bus', 'simple_bus.asynchronous.event_bus')
->public();

$services->set('simple_bus.asynchronous.event_bus', AsynchronousEventBus::class)
->tag('message_bus', [
'type' => 'event',
'middleware_tag' => 'asynchronous_event_bus_middleware',
]);

$services->set('simple_bus.asynchronous.always_publishes_messages_middleware', AlwaysPublishesMessages::class)
->args([
service('simple_bus.asynchronous.event_publisher'),
]);

$services->set('simple_bus.asynchronous.publishes_predefined_messages_middleware', PublishesPredefinedMessages::class)
->args([
service('simple_bus.asynchronous.event_publisher'),
service('simple_bus.event_bus.event_name_resolver'),
[],
]);

$services->set('simple_bus.asynchronous.event_bus.finishes_message_before_handling_next_middleware', FinishesHandlingMessageBeforeHandlingNext::class)
->tag('asynchronous_event_bus_middleware', ['priority' => 1000]);

$services->set('simple_bus.asynchronous.event_bus.notifies_message_subscribers_middleware', NotifiesMessageSubscribersMiddleware::class)
->args([
service('simple_bus.asynchronous.event_bus.event_subscribers_resolver'),
])
->tag('asynchronous_event_bus_middleware', ['priority' => -1000]);

$services->set('simple_bus.asynchronous.event_bus.callable_resolver', ServiceLocatorAwareCallableResolver::class)
->args([
[service('simple_bus.asynchronous.event_bus.event_subscribers_service_locator'), 'get'],
]);

$services->set('simple_bus.asynchronous.event_bus.event_subscribers_service_locator', ServiceLocator::class)
->tag('container.service_locator')
->args([[]]);

$services->set('simple_bus.asynchronous.event_bus.event_subscribers_collection', CallableCollection::class)
->args([
[],
service('simple_bus.asynchronous.event_bus.callable_resolver'),
]);

$services->set('simple_bus.asynchronous.event_bus.event_subscribers_resolver', NameBasedMessageSubscriberResolver::class)
->args([
service('simple_bus.asynchronous.event_bus.event_name_resolver'),
service('simple_bus.asynchronous.event_bus.event_subscribers_collection'),
]);

$services->set('simple_bus.asynchronous.standard_serialized_event_envelope_consumer', StandardSerializedEnvelopeConsumer::class)
->args([
service('simple_bus.asynchronous.message_serializer'),
service('simple_bus.asynchronous.event_bus'),
]);
};
Loading