Skip to content

Fix: Rename bundle class to the one expected by Symfony Flex #58

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

Merged
merged 4 commits into from
Jan 18, 2024
Merged

Fix: Rename bundle class to the one expected by Symfony Flex #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fe1a08
Fix: Rename bundle class to the one expected by Symfony Flex
RikudouSage Jan 17, 2024
49d544e
Alias existing class
RikudouSage Jan 17, 2024
0d40bac
Rename extension to expected format
RikudouSage Jan 17, 2024
94b614d
Don't make bundle interna
RikudouSage Jan 17, 2024
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
103 changes: 103 additions & 0 deletions src/DependencyInjection/UnleashClientExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?php

namespace Unleash\Client\Bundle\DependencyInjection;

use Exception;
use ReflectionClass;
use ReflectionException;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Twig\Extension\ExtensionInterface;
use Unleash\Client\Strategy\StrategyHandler;

/**
* @internal
*/
final class UnleashClientExtension extends Extension
{
/**
* @param array<string,mixed> $configs
*
* @throws Exception
*/
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yaml');
$loader->load('autowiring.yaml');
if (interface_exists(ExtensionInterface::class)) {
$loader->load('twig.yaml');
}

$configs = $this->processConfiguration($this->getConfiguration([], $container), $configs);
$container->setParameter('unleash.client.internal.service_configs', [
'http_client_service' => $configs['http_client_service'],
'request_factory_service' => $configs['request_factory_service'],
'cache_service' => $configs['cache_service'],
]);
$container->setParameter('unleash.client.internal.app_url', $configs['app_url'] ?? '');
$container->setParameter('unleash.client.internal.instance_id', $configs['instance_id'] ?? '');
$container->setParameter('unleash.client.internal.app_name', $configs['app_name'] ?? '');
$container->setParameter('unleash.client.internal.cache_ttl', $configs['cache_ttl']);
$container->setParameter('unleash.client.internal.metrics_send_interval', $configs['metrics_send_interval']);
$container->setParameter('unleash.client.internal.metrics_enabled', $configs['metrics_enabled']);
$container->setParameter('unleash.client.internal.custom_headers', $configs['custom_headers']);
$container->setParameter('unleash.client.internal.auto_registration', $configs['auto_registration']);
$container->setParameter('unleash.client.internal.user_id_field', $configs['context']['user_id_field']);
$container->setParameter('unleash.client.internal.custom_properties', $configs['context']['custom_properties']);
$container->setParameter('unleash.client.internal.twig_functions_enabled', $configs['twig']['functions']);
$container->setParameter('unleash.client.internal.twig_filters_enabled', $configs['twig']['filters']);
$container->setParameter('unleash.client.internal.twig_tests_enabled', $configs['twig']['tests']);
$container->setParameter('unleash.client.internal.twig_tags_enabled', $configs['twig']['tags']);
$container->setParameter('unleash.client.internal.disabled_strategies', $configs['disabled_strategies']);
$container->setParameter('unleash.client.internal.bootstrap', $configs['bootstrap']);
$container->setParameter('unleash.client.internal.fetching_enabled', $configs['fetching_enabled']);
$container->setParameter('unleash.client.internal.stale_ttl', $configs['stale_ttl']);

if (class_exists(ExpressionLanguage::class)) {
$definition = new Definition(ExpressionLanguage::class);
$container->setDefinition('unleash.client.internal.expression_language', $definition);
}
}

/**
* @param array<mixed> $config
*
* @throws ReflectionException
*/
public function getConfiguration(array $config, ContainerBuilder $container): Configuration
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yaml');

$handlerNames = [];
foreach ($this->getDefaultStrategyHandlers($container) as $defaultStrategyHandler) {
$reflection = new ReflectionClass($defaultStrategyHandler);
$instance = $reflection->newInstanceWithoutConstructor();
assert($instance instanceof StrategyHandler);
$handlerNames[] = $instance->getStrategyName();
}

return new Configuration($handlerNames);
}

/**
* @return array<string,string>
*/
private function getDefaultStrategyHandlers(ContainerBuilder $container): array
{
$result = [];
foreach ($container->findTaggedServiceIds('unleash.client.built_in_strategy_handler') as $handler => $tags) {
$definition = $container->getDefinition($handler);
$class = $definition->getClass();
assert(is_string($class));
$result[$handler] = $class;
}

return $result;
}
}
102 changes: 1 addition & 101 deletions src/DependencyInjection/UnleashSymfonyClientExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,103 +1,3 @@
<?php

namespace Unleash\Client\Bundle\DependencyInjection;

use Exception;
use ReflectionClass;
use ReflectionException;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Twig\Extension\ExtensionInterface;
use Unleash\Client\Strategy\StrategyHandler;

/**
* @todo Make internal in next major
*/
final class UnleashSymfonyClientExtension extends Extension
{
/**
* @param array<string,mixed> $configs
*
* @throws Exception
*/
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yaml');
$loader->load('autowiring.yaml');
if (interface_exists(ExtensionInterface::class)) {
$loader->load('twig.yaml');
}

$configs = $this->processConfiguration($this->getConfiguration([], $container), $configs);
$container->setParameter('unleash.client.internal.service_configs', [
'http_client_service' => $configs['http_client_service'],
'request_factory_service' => $configs['request_factory_service'],
'cache_service' => $configs['cache_service'],
]);
$container->setParameter('unleash.client.internal.app_url', $configs['app_url'] ?? '');
$container->setParameter('unleash.client.internal.instance_id', $configs['instance_id'] ?? '');
$container->setParameter('unleash.client.internal.app_name', $configs['app_name'] ?? '');
$container->setParameter('unleash.client.internal.cache_ttl', $configs['cache_ttl']);
$container->setParameter('unleash.client.internal.metrics_send_interval', $configs['metrics_send_interval']);
$container->setParameter('unleash.client.internal.metrics_enabled', $configs['metrics_enabled']);
$container->setParameter('unleash.client.internal.custom_headers', $configs['custom_headers']);
$container->setParameter('unleash.client.internal.auto_registration', $configs['auto_registration']);
$container->setParameter('unleash.client.internal.user_id_field', $configs['context']['user_id_field']);
$container->setParameter('unleash.client.internal.custom_properties', $configs['context']['custom_properties']);
$container->setParameter('unleash.client.internal.twig_functions_enabled', $configs['twig']['functions']);
$container->setParameter('unleash.client.internal.twig_filters_enabled', $configs['twig']['filters']);
$container->setParameter('unleash.client.internal.twig_tests_enabled', $configs['twig']['tests']);
$container->setParameter('unleash.client.internal.twig_tags_enabled', $configs['twig']['tags']);
$container->setParameter('unleash.client.internal.disabled_strategies', $configs['disabled_strategies']);
$container->setParameter('unleash.client.internal.bootstrap', $configs['bootstrap']);
$container->setParameter('unleash.client.internal.fetching_enabled', $configs['fetching_enabled']);
$container->setParameter('unleash.client.internal.stale_ttl', $configs['stale_ttl']);

if (class_exists(ExpressionLanguage::class)) {
$definition = new Definition(ExpressionLanguage::class);
$container->setDefinition('unleash.client.internal.expression_language', $definition);
}
}

/**
* @param array<mixed> $config
*
* @throws ReflectionException
*/
public function getConfiguration(array $config, ContainerBuilder $container): Configuration
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.yaml');

$handlerNames = [];
foreach ($this->getDefaultStrategyHandlers($container) as $defaultStrategyHandler) {
$reflection = new ReflectionClass($defaultStrategyHandler);
$instance = $reflection->newInstanceWithoutConstructor();
assert($instance instanceof StrategyHandler);
$handlerNames[] = $instance->getStrategyName();
}

return new Configuration($handlerNames);
}

/**
* @return array<string,string>
*/
private function getDefaultStrategyHandlers(ContainerBuilder $container): array
{
$result = [];
foreach ($container->findTaggedServiceIds('unleash.client.built_in_strategy_handler') as $handler => $tags) {
$definition = $container->getDefinition($handler);
$class = $definition->getClass();
assert(is_string($class));
$result[$handler] = $class;
}

return $result;
}
}
class_alias('\Unleash\Client\Bundle\DependencyInjection\UnleashClientExtension', '\Unleash\Client\Bundle\DependencyInjection\UnleashSymfonyClientExtension');
34 changes: 34 additions & 0 deletions src/UnleashClientBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

namespace Unleash\Client\Bundle;

use Symfony\Component\DependencyInjection\Compiler\PassConfig;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Unleash\Client\Bootstrap\BootstrapProvider;
use Unleash\Client\Bundle\DependencyInjection\Compiler\BootstrapResolver;
use Unleash\Client\Bundle\DependencyInjection\Compiler\CacheServiceResolverCompilerPass;
use Unleash\Client\Bundle\DependencyInjection\Compiler\HttpServicesResolverCompilerPass;
use Unleash\Client\Strategy\StrategyHandler;

final class UnleashClientBundle extends Bundle
{
public function build(ContainerBuilder $container): void
{
$container->registerForAutoconfiguration(StrategyHandler::class)
->addTag('unleash.client.strategy_handler');
$container->registerForAutoconfiguration(BootstrapProvider::class)
->addTag('unleash.client.bootstrap_provider');

$container->addCompilerPass(
new HttpServicesResolverCompilerPass(),
PassConfig::TYPE_BEFORE_OPTIMIZATION,
-100_000
);
$container->addCompilerPass(
new CacheServiceResolverCompilerPass(),
PassConfig::TYPE_OPTIMIZE
);
$container->addCompilerPass(new BootstrapResolver());
}
}
33 changes: 1 addition & 32 deletions src/UnleashSymfonyClientBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
<?php

namespace Unleash\Client\Bundle;

use Symfony\Component\DependencyInjection\Compiler\PassConfig;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Unleash\Client\Bootstrap\BootstrapProvider;
use Unleash\Client\Bundle\DependencyInjection\Compiler\BootstrapResolver;
use Unleash\Client\Bundle\DependencyInjection\Compiler\CacheServiceResolverCompilerPass;
use Unleash\Client\Bundle\DependencyInjection\Compiler\HttpServicesResolverCompilerPass;
use Unleash\Client\Strategy\StrategyHandler;

final class UnleashSymfonyClientBundle extends Bundle
{
public function build(ContainerBuilder $container): void
{
$container->registerForAutoconfiguration(StrategyHandler::class)
->addTag('unleash.client.strategy_handler');
$container->registerForAutoconfiguration(BootstrapProvider::class)
->addTag('unleash.client.bootstrap_provider');

$container->addCompilerPass(
new HttpServicesResolverCompilerPass(),
PassConfig::TYPE_BEFORE_OPTIMIZATION,
-100_000
);
$container->addCompilerPass(
new CacheServiceResolverCompilerPass(),
PassConfig::TYPE_OPTIMIZE
);
$container->addCompilerPass(new BootstrapResolver());
}
}
class_alias('\Unleash\Client\Bundle\UnleashClientBundle', '\Unleash\Client\Bundle\UnleashSymfonyClientBundle');