Skip to content
This repository has been archived by the owner on Feb 24, 2023. It is now read-only.

Remove internals from autowiring #530

Merged
merged 1 commit into from Nov 29, 2017
Merged

Remove internals from autowiring #530

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
View file
Open in desktop
Expand Up @@ -22,8 +22,8 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
*/
public function process(ContainerBuilder $container)
{
if ($container->hasDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage')) {
$definition = $container->findDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
if ($container->hasDefinition('sensio_framework_extra.security.expression_language.default')) {
$definition = $container->findDefinition('sensio_framework_extra.security.expression_language.default');
foreach ($container->findTaggedServiceIds('security.expression_language_provider') as $id => $attributes) {
$definition->addMethodCall('registerProvider', array(new Reference($id)));
}
Expand Down
4 changes: 2 additions & 2 deletions DependencyInjection/Compiler/AddParamConverterPass.php
View file
Open in desktop
Expand Up @@ -24,11 +24,11 @@ class AddParamConverterPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
if (false === $container->hasDefinition('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager')) {
if (false === $container->hasDefinition('sensio_framework_extra.converter.manager')) {
return;
}

$definition = $container->getDefinition('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager');
$definition = $container->getDefinition('sensio_framework_extra.converter.manager');
$disabled = $container->getParameter('sensio_framework_extra.disabled_converters');
$container->getParameterBag()->remove('sensio_framework_extra.disabled_converters');

Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Compiler/OptimizerPass.php
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ class OptimizerPass implements CompilerPassInterface
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('security.token_storage')) {
$container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener');
$container->removeDefinition('sensio_framework_extra.security.listener');
}

if (!$container->hasDefinition('twig')) {
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/Configuration.php
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ public function getConfigTreeBuilder()
->addDefaultsIfNotSet()
->children()
->booleanNode('annotations')->defaultTrue()->end()
->scalarNode('expression_language')->defaultValue('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage')->end()
->scalarNode('expression_language')->defaultValue('sensio_framework_extra.security.expression_language.default')->end()
->end()
->end()
->arrayNode('psr_message')
Expand Down
6 changes: 3 additions & 3 deletions DependencyInjection/SensioFrameworkExtraExtension.php
View file
Open in desktop
Expand Up @@ -103,10 +103,10 @@ public function load(array $configs, ContainerBuilder $container)
if (class_exists(SecurityExpressionLanguage::class)) {
$container->setAlias('sensio_framework_extra.security.expression_language', new Alias($config['security']['expression_language'], false));
} else {
$container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
$container->removeDefinition('sensio_framework_extra.security.expression_language.default');
}
} else {
$container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
$container->removeDefinition('sensio_framework_extra.security.expression_language.default');
}

if (PHP_VERSION_ID < 70000) {
Expand Down Expand Up @@ -137,7 +137,7 @@ public function load(array $configs, ContainerBuilder $container)

if (!empty($config['templating']['controller_patterns'])) {
$container
->getDefinition('Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser')
->getDefinition('sensio_framework_extra.view.guesser')
->addArgument($config['templating']['controller_patterns']);
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/config/annotations.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" public="false">
<service id="framework_extra_bundle.event.controller" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" public="false">
<tag name="kernel.event_subscriber" />
<argument type="service" id="annotation_reader" />
</service>
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/cache.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" public="false">
<service id="framework_extra_bundle.event.http_cache" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" public="false">
<tag name="kernel.event_subscriber" />
</service>
</services>
Expand Down
10 changes: 5 additions & 5 deletions Resources/config/converters.xml
View file
Open in desktop
Expand Up @@ -7,22 +7,22 @@
<services>
<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" public="false">
<tag name="kernel.event_subscriber" />
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
<argument type="service" id="sensio_framework_extra.converter.manager" />
<argument>true</argument>
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
<service id="sensio_framework_extra.converter.manager" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />

<service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" public="false">
<service id="framework_extra_bundle.doctrine_param_converter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" public="false">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of services are missing the sensio_ part in the prefix, so they don't respect the best practices, and are not reverted to the old names

<tag name="request.param_converter" converter="doctrine.orm" />
<argument type="service" id="doctrine" on-invalid="ignore" />
<argument type="service" id="sensio_framework_extra.converter.doctrine.orm.expression_language" on-invalid="null" />
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" public="false">
<service id="framework_extra_bundle.date_time_param_converter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" public="false">
<tag name="request.param_converter" converter="datetime" />
</service>

<service id="Symfony\Component\ExpressionLanguage\ExpressionLanguage" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
<service id="framework_extra_bundle.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it be sensio_framework_extra.converter.doctrine.orm.expression_language to match what is used in the framework_extra_bundle.doctrine_param_converter service ?

</services>
</container>
10 changes: 5 additions & 5 deletions Resources/config/routing.xml
View file
Open in desktop
Expand Up @@ -5,19 +5,19 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
<service id="framework_extra_bundle.loader.annotation_directory" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
<tag name="routing.loader" />
<argument type="service" id="file_locator" />
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" />
<argument type="service" id="framework_extra_bundle.controller.annotated_route" />
</service>

<service id="Symfony\Component\Routing\Loader\AnnotationFileLoader" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
<service id="framework_extra_bundle.loader.annotation_file" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
<tag name="routing.loader" />
<argument type="service" id="file_locator" />
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" />
<argument type="service" id="framework_extra_bundle.controller.annotated_route" />
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
<service id="framework_extra_bundle.controller.annotated_route" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
<tag name="routing.loader" />
<argument type="service" id="annotation_reader" />
</service>
Expand Down
14 changes: 7 additions & 7 deletions Resources/config/security.xml
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" public="false">
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" />
<argument type="service" id="sensio_framework_extra.security.expression_language" on-invalid="null" />
<service id="sensio_framework_extra.security.listener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" public="false">
<argument type="service" id="framework_extra_bundle.argument_name_convertor" />
<argument type="service" id="sensio_framework_extra.security.expression_language.default" on-invalid="null" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's wrong. It must used the configured service (which will be an alias)

<argument type="service" id="security.authentication.trust_resolver" on-invalid="null" />
<argument type="service" id="security.role_hierarchy" on-invalid="null" />
<argument type="service" id="security.token_storage" on-invalid="null" />
Expand All @@ -16,15 +16,15 @@
<tag name="kernel.event_subscriber" />
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" class="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" public="false" />
<service id="sensio_framework_extra.security.expression_language.default" class="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" public="false" />

<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" public="false">
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" />
<service id="framework_extra_bundle.event.is_granted" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" public="false">
<argument type="service" id="framework_extra_bundle.argument_name_convertor" />
<argument type="service" id="security.authorization_checker" on-invalid="null" />
<tag name="kernel.event_subscriber" />
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" public="false">
<service id="framework_extra_bundle.argument_name_convertor" class="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" public="false">
<argument type="service" id="argument_metadata_factory" />
</service>
</services>
Expand Down
6 changes: 3 additions & 3 deletions Resources/config/view.xml
View file
Open in desktop
Expand Up @@ -5,13 +5,13 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" class="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" public="false">
<service id="sensio_framework_extra.view.guesser" class="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" public="false">
<argument type="service" id="kernel" />
</service>

<service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" public="false">
<service id="sensio_framework_extra.view.listener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" public="false">
<tag name="kernel.event_subscriber" />
<argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" />
<argument type="service" id="sensio_framework_extra.view.guesser" />
<argument type="service" id="twig" on-invalid="null" />
</service>
</services>
Expand Down
4 changes: 2 additions & 2 deletions Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
View file
Open in desktop
Expand Up @@ -38,12 +38,12 @@ public function setUp()
$this->pass = new AddExpressionLanguageProvidersPass();
$this->container = new ContainerBuilder();
$this->expressionLangDefinition = new Definition();
$this->container->setDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage', $this->expressionLangDefinition);
$this->container->setDefinition('sensio_framework_extra.security.expression_language.default', $this->expressionLangDefinition);
}

public function testProcessNoOpNoExpressionLang()
{
$this->container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
$this->container->removeDefinition('sensio_framework_extra.security.expression_language.default');
$this->pass->process($this->container);
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/DependencyInjection/Compiler/AddParamConverterPassTest.php
View file
Open in desktop
Expand Up @@ -38,13 +38,13 @@ public function setUp()
$this->pass = new AddParamConverterPass();
$this->container = new ContainerBuilder();
$this->managerDefinition = new Definition();
$this->container->setDefinition('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager', $this->managerDefinition);
$this->container->setDefinition('sensio_framework_extra.converter.manager', $this->managerDefinition);
$this->container->setParameter('sensio_framework_extra.disabled_converters', array());
}

public function testProcessNoOpNoManager()
{
$this->container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager');
$this->container->removeDefinition('sensio_framework_extra.converter.manager');
$this->pass->process($this->container);
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/DependencyInjection/SensioFrameworkExtraExtensionTest.php
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ public function testDefaultExpressionLanguageConfig()
$extension = new SensioFrameworkExtraExtension();
$extension->load(array(), $container);

$this->assertAlias($container, 'Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage', 'sensio_framework_extra.security.expression_language');
$this->assertAlias($container, 'sensio_framework_extra.security.expression_language.default', 'sensio_framework_extra.security.expression_language');
}

public function testOverrideExpressionLanguageConfig()
Expand Down Expand Up @@ -58,7 +58,7 @@ public function testTemplatingControllerPatterns()

$extension->load(array($config), $container);

$this->assertEquals($patterns, $container->getDefinition('Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser')->getArgument(1));
$this->assertEquals($patterns, $container->getDefinition('sensio_framework_extra.view.guesser')->getArgument(1));
}

private function assertAlias(ContainerBuilder $container, $value, $key)
Expand Down
7 changes: 4 additions & 3 deletions Tests/EventListener/HttpCacheListenerTest.php
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
use Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener;
use Symfony\Component\HttpKernel\HttpKernelInterface;

class HttpCacheListenerTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -172,7 +173,7 @@ public function testLastModifiedHeader()
$controllerEvent = new FilterControllerEvent($this->getKernel(), function () { return new Response(); }, $request, null);
$listener->onKernelController($controllerEvent);

$responseEvent = new FilterResponseEvent($this->getKernel(), $request, null, call_user_func($controllerEvent->getController()));
$responseEvent = new FilterResponseEvent($this->getKernel(), $request, HttpKernelInterface::MASTER_REQUEST, call_user_func($controllerEvent->getController()));
$listener->onKernelResponse($responseEvent);

$response = $responseEvent->getResponse();
Expand Down Expand Up @@ -207,7 +208,7 @@ public function testEtagHeader()
$controllerEvent = new FilterControllerEvent($this->getKernel(), function () { return new Response(); }, $request, null);
$listener->onKernelController($controllerEvent);

$responseEvent = new FilterResponseEvent($this->getKernel(), $request, null, call_user_func($controllerEvent->getController()));
$responseEvent = new FilterResponseEvent($this->getKernel(), $request, HttpKernelInterface::MASTER_REQUEST, call_user_func($controllerEvent->getController()));
$listener->onKernelResponse($responseEvent);

$response = $responseEvent->getResponse();
Expand Down Expand Up @@ -237,7 +238,7 @@ public function testConfigurationDoesNotOverrideAlreadySetResponseHeaders()
$response->setVary(array('foobaz'));

$listener = new HttpCacheListener();
$responseEvent = new FilterResponseEvent($this->getKernel(), $request, null, $response);
$responseEvent = new FilterResponseEvent($this->getKernel(), $request, HttpKernelInterface::MASTER_REQUEST, $response);
$listener->onKernelResponse($responseEvent);

$this->assertEquals('"54321"', $response->getEtag());
Expand Down