Skip to content

Add enum support php8 #62

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add enum support php8 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6dde06
Update name to allow enums in configuration
buibr Mar 5, 2023
6e9b1cf
Update configuration to php 8.2 with enums.
buibr Mar 5, 2023
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
12 changes: 9 additions & 3 deletions Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,16 @@ protected function validateDuplicateNames(array $keys)
if (!isset($item['name'])) {
$item['name'] = '';
}
if (isset($names[$item['name']])) {
throw new InvalidConfigException("Duplicate name `{$item['name']}` in {$key}");

$name = $item['name'];
if(is_a($name, \UnitEnum::class)){
$name = $item['name']->name;
}
$names[$item['name']] = true;

if (isset($names[$name])) {
throw new InvalidConfigException("Duplicate name `{$name}` in {$key}");
}
$names[$name] = true;
}
}
}
Expand Down
20 changes: 16 additions & 4 deletions DependencyInjection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ protected function registerProducers(Configuration $config)
{
$autoDeclare = $config->auto_declare;
foreach ($config->producers as $options) {
$serviceAlias = sprintf(Configuration::PRODUCER_SERVICE_NAME, $options['name']);

$name = $options['name'];
if(is_a($name, \UnitEnum::class)){
$name = $name->name;
}

$serviceAlias = sprintf(Configuration::PRODUCER_SERVICE_NAME, $name);
\Yii::$container->setSingleton($serviceAlias, function () use ($options, $autoDeclare) {
/**
* @var $connection AbstractConnection
Expand All @@ -98,7 +104,7 @@ protected function registerProducers(Configuration $config)
*/
$logger = \Yii::$container->get(Configuration::LOGGER_SERVICE_NAME);
$producer = new Producer($connection, $routing, $logger, $autoDeclare);
\Yii::$container->invoke([$producer, 'setName'], [$options['name']]);
\Yii::$container->invoke([$producer, 'setName'], [$name]);
\Yii::$container->invoke([$producer, 'setContentType'], [$options['content_type']]);
\Yii::$container->invoke([$producer, 'setDeliveryMode'], [$options['delivery_mode']]);
\Yii::$container->invoke([$producer, 'setSafe'], [$options['safe']]);
Expand All @@ -117,7 +123,13 @@ protected function registerConsumers(Configuration $config)
{
$autoDeclare = $config->auto_declare;
foreach ($config->consumers as $options) {
$serviceAlias = sprintf(Configuration::CONSUMER_SERVICE_NAME, $options['name']);

$name = $options['name'];
if(is_a($name, \UnitEnum::class)){
$name = $name->name;
}

$serviceAlias = sprintf(Configuration::CONSUMER_SERVICE_NAME, $name);
\Yii::$container->setSingleton($serviceAlias, function () use ($options, $autoDeclare) {
/**
* @var $connection AbstractConnection
Expand All @@ -137,7 +149,7 @@ protected function registerConsumers(Configuration $config)
$callbackClass = $this->getCallbackClass($callback);
$queues[$queueName] = [$callbackClass, 'execute'];
}
\Yii::$container->invoke([$consumer, 'setName'], [$options['name']]);
\Yii::$container->invoke([$consumer, 'setName'], [$name]);
\Yii::$container->invoke([$consumer, 'setQueues'], [$queues]);
\Yii::$container->invoke([$consumer, 'setQos'], [$options['qos']]);
\Yii::$container->invoke([$consumer, 'setIdleTimeout'], [$options['idle_timeout']]);
Expand Down