Skip to content

Commit 0d1f53f

Browse files
fabpotfabpot
committed
Merge branch '3.2'
* 3.2: Fix serializer/translations/validator resources loading for bundles overriding getPath() Fix the priority order of compiler pass trait
2 parents df38318 + be882c4 commit 0d1f53f

File tree

11 files changed

+100
-27
lines changed

11 files changed

+100
-27
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -846,12 +846,11 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
846846
$dirs[] = dirname(dirname($r->getFileName())).'/Resources/translations';
847847
}
848848
$rootDir = $container->getParameter('kernel.root_dir');
849-
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
850-
$reflection = new \ReflectionClass($class);
851-
if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
849+
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
850+
if (is_dir($dir = $bundle['path'].'/Resources/translations')) {
852851
$dirs[] = $dir;
853852
}
854-
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) {
853+
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
855854
$dirs[] = $dir;
856855
}
857856
}
@@ -974,11 +973,8 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
974973
$container->addResource(new FileResource($files[0][0]));
975974
}
976975

977-
$bundles = $container->getParameter('kernel.bundles');
978-
foreach ($bundles as $bundle) {
979-
$reflection = new \ReflectionClass($bundle);
980-
$dirname = dirname($reflection->getFileName());
981-
976+
foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
977+
$dirname = $bundle['path'];
982978
if (is_file($file = $dirname.'/Resources/config/validation.xml')) {
983979
$files[0][] = $file;
984980
$container->addResource(new FileResource($file));
@@ -1151,10 +1147,8 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
11511147
$serializerLoaders[] = $annotationLoader;
11521148
}
11531149

1154-
$bundles = $container->getParameter('kernel.bundles');
1155-
foreach ($bundles as $bundle) {
1156-
$reflection = new \ReflectionClass($bundle);
1157-
$dirname = dirname($reflection->getFileName());
1150+
foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
1151+
$dirname = $bundle['path'];
11581152

11591153
if (is_file($file = $dirname.'/Resources/config/serialization.xml')) {
11601154
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.xml

Whitespace-only changes.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.yml

Whitespace-only changes.

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bundle\FrameworkBundle\Tests;
13+
14+
class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
15+
{
16+
public function getPath()
17+
{
18+
return __DIR__.'/..';
19+
}
20+
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@ public function testValidationPaths()
472472
require_once __DIR__.'/Fixtures/TestBundle/TestBundle.php';
473473

474474
$container = $this->createContainerFromFile('validation_annotations', array(
475-
'kernel.bundles' => array('TestBundle' => 'Symfony\Bundle\FrameworkBundle\Tests\TestBundle'),
475+
'kernel.bundles' => array('TestBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\TestBundle'),
476+
'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/TestBundle')),
476477
));
477478

478479
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
@@ -502,6 +503,33 @@ public function testValidationPaths()
502503
$this->assertStringEndsWith('TestBundle/Resources/config/validation.yml', $yamlMappings[0]);
503504
}
504505

506+
public function testValidationPathsUsingCustomBundlePath()
507+
{
508+
require_once __DIR__.'/Fixtures/CustomPathBundle/src/CustomPathBundle.php';
509+
510+
$container = $this->createContainerFromFile('validation_annotations', array(
511+
'kernel.bundles' => array('CustomPathBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\CustomPathBundle'),
512+
'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/CustomPathBundle')),
513+
));
514+
515+
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
516+
$xmlMappings = $calls[3][1][0];
517+
$this->assertCount(2, $xmlMappings);
518+
519+
try {
520+
// Testing symfony/symfony
521+
$this->assertStringEndsWith('Component'.DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
522+
} catch (\Exception $e) {
523+
// Testing symfony/framework-bundle with deps=high
524+
$this->assertStringEndsWith('symfony'.DIRECTORY_SEPARATOR.'form/Resources/config/validation.xml', $xmlMappings[0]);
525+
}
526+
$this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.xml', $xmlMappings[1]);
527+
528+
$yamlMappings = $calls[4][1][0];
529+
$this->assertCount(1, $yamlMappings);
530+
$this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.yml', $yamlMappings[0]);
531+
}
532+
505533
public function testValidationNoStaticMethod()
506534
{
507535
$container = $this->createContainerFromFile('validation_no_static_method');
@@ -763,6 +791,7 @@ protected function createContainer(array $data = array())
763791
{
764792
return new ContainerBuilder(new ParameterBag(array_merge(array(
765793
'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
794+
'kernel.bundles_metadata' => array('FrameworkBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..', 'parent' => null)),
766795
'kernel.cache_dir' => __DIR__,
767796
'kernel.debug' => false,
768797
'kernel.environment' => 'test',

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,16 @@ public function load(array $configs, ContainerBuilder $container)
9393
$container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
9494

9595
// register bundles as Twig namespaces
96-
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
97-
$dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views';
96+
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
97+
$dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views';
9898
if (is_dir($dir)) {
99-
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
99+
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $name);
100100
}
101101
$container->addResource(new FileExistenceResource($dir));
102102

103-
$reflection = new \ReflectionClass($class);
104-
$dir = dirname($reflection->getFileName()).'/Resources/views';
103+
$dir = $bundle['path'].'/Resources/views';
105104
if (is_dir($dir)) {
106-
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
105+
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $name);
107106
}
108107
$container->addResource(new FileExistenceResource($dir));
109108
}

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ private function createContainer()
245245
'kernel.charset' => 'UTF-8',
246246
'kernel.debug' => false,
247247
'kernel.bundles' => array('TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle'),
248+
'kernel.bundles_metadata' => array('TwigBundle' => array('namespace' => 'Symfony\\Bundle\\TwigBundle', 'parent' => null, 'path' => realpath(__DIR__.'/../..'))),
248249
)));
249250

250251
return $container;

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"symfony/config": "~3.2",
2121
"symfony/twig-bridge": "^3.2.1",
2222
"symfony/http-foundation": "~2.8|~3.0",
23-
"symfony/http-kernel": "~2.8|~3.0",
23+
"symfony/http-kernel": "~2.8.16|~3.1.9|^3.2.2",
2424
"twig/twig": "~1.28|~2.0"
2525
},
2626
"require-dev": {

‎src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,34 @@ trait PriorityTaggedServiceTrait
2424
/**
2525
* Finds all services with the given tag name and order them by their priority.
2626
*
27+
* The order of additions must be respected for services having the same priority,
28+
* and knowing that the \SplPriorityQueue class does not respect the FIFO method,
29+
* we should not use this class.
30+
*
31+
* @see https://bugs.php.net/bug.php?id=53710
32+
* @see https://bugs.php.net/bug.php?id=60926
33+
*
2734
* @param string $tagName
2835
* @param ContainerBuilder $container
2936
*
3037
* @return Reference[]
3138
*/
3239
private function findAndSortTaggedServices($tagName, ContainerBuilder $container)
3340
{
34-
$services = $container->findTaggedServiceIds($tagName);
35-
36-
$queue = new \SplPriorityQueue();
41+
$services = array();
3742

38-
foreach ($services as $serviceId => $tags) {
43+
foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $tags) {
3944
foreach ($tags as $attributes) {
4045
$priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
41-
$queue->insert(new Reference($serviceId), $priority);
46+
$services[$priority][] = new Reference($serviceId);
4247
}
4348
}
4449

45-
return iterator_to_array($queue, false);
50+
if ($services) {
51+
krsort($services);
52+
$services = call_user_func_array('array_merge', $services);
53+
}
54+
55+
return $services;
4656
}
4757
}

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
3333
'my_service11' => array('my_custom_tag' => array('priority' => -1001)),
3434
'my_service12' => array('my_custom_tag' => array('priority' => -1002)),
3535
'my_service13' => array('my_custom_tag' => array('priority' => -1003)),
36+
'my_service14' => array('my_custom_tag' => array('priority' => -1000)),
37+
'my_service15' => array('my_custom_tag' => array('priority' => 1)),
38+
'my_service16' => array('my_custom_tag' => array('priority' => -1)),
39+
'my_service17' => array('my_custom_tag' => array('priority' => 200)),
40+
'my_service18' => array('my_custom_tag' => array('priority' => 100)),
41+
'my_service19' => array('my_custom_tag' => array()),
3642
);
3743

3844
$container = new ContainerBuilder();
@@ -47,15 +53,21 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
4753

4854
$expected = array(
4955
new Reference('my_service2'),
56+
new Reference('my_service17'),
5057
new Reference('my_service1'),
58+
new Reference('my_service18'),
5159
new Reference('my_service8'),
60+
new Reference('my_service15'),
5261
new Reference('my_service4'),
62+
new Reference('my_service19'),
5363
new Reference('my_service5'),
64+
new Reference('my_service16'),
5465
new Reference('my_service9'),
5566
new Reference('my_service7'),
5667
new Reference('my_service6'),
5768
new Reference('my_service3'),
5869
new Reference('my_service10'),
70+
new Reference('my_service14'),
5971
new Reference('my_service11'),
6072
new Reference('my_service12'),
6173
new Reference('my_service13'),

0 commit comments

Comments
 (0)