10000 Merge branch '3.1' · symfony/symfony@3ee28b5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3ee28b5

Browse files
fabpotfabpot
committed
Merge branch '3.1'
* 3.1: fixed Twig support for 1.26 and 2.0 Fix indexBy type extraction
2 parents 469818c + 6d1d35d commit 3ee28b5

File tree

17 files changed

+32
-30
lines changed

17 files changed

+32
-30
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"doctrine/common": "~2.4",
21-
"twig/twig": "~1.23|~2.0",
21+
"twig/twig": "~1.26|~2.0",
2222
"psr/cache": "~1.0",
2323
"psr/log": "~1.0",
2424
"symfony/polyfill-intl-icu": "~1.0",

‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public function getTypes($class, $property, array $context = array())
8888

8989
if (isset($associationMapping['indexBy'])) {
9090
$indexProperty = $associationMapping['indexBy'];
91-
$typeOfField = $metadata->getTypeOfField($indexProperty);
91+
$subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
92+
$typeOfField = $subMetadata->getTypeOfField($indexProperty);
9293

9394
$collectionKeyType = $this->getPhpType($typeOfField);
9495
}

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DoctrineDummy
4141
public $bar;
4242

4343
/**
44-
* @ManyToMany(targetEntity="DoctrineRelation", indexBy="guid")
44+
* @ManyToMany(targetEntity="DoctrineRelation", indexBy="rguid")
4545
*/
4646
protected $indexedBar;
4747

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ class DoctrineRelation
3131
/**
3232
* @Column(type="guid")
3333
*/
34-
protected $guid;
34+
protected $rguid;
3535
}

‎src/Symfony/Bridge/Twig/Node/FormThemeNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function compile(\Twig_Compiler $compiler)
3030
{
3131
$compiler
3232
->addDebugInfo($this)
33-
->write('$this->env->getExtension(\'form\')->renderer->setTheme(')
33+
->write('$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->setTheme(')
3434
->subcompile($this->getNode('form'))
3535
->raw(', ')
3636
->subcompile($this->getNode('resources'))

‎src/Symfony/Bridge/Twig/Node/RenderBlockNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function compile(\Twig_Compiler $compiler)
2525
{
2626
$compiler->addDebugInfo($this);
2727
$arguments = iterator_to_array($this->getNode('arguments'));
28-
$compiler->write('$this->env->getExtension(\'form\')->renderer->renderBlock(');
28+
$compiler->write('$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->renderBlock(');
2929

3030
if (isset($arguments[0])) {
3131
$compiler->subcompile($arguments[0]);

‎src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SearchAndRenderBlockNode extends \Twig_Node_Expression_Function
1919
public function compile(\Twig_Compiler $compiler)
2020
{
2121
$compiler->addDebugInfo($this);
22-
$compiler->raw('$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(');
22+
$compiler->raw('$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(');
2323

2424
preg_match('/_([^_]+)$/', $this->getAttribute('name'), $matches);
2525

‎src/Symfony/Bridge/Twig/Node/StopwatchNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public function compile(\Twig_Compiler $compiler)
3232
->raw(' = ')
3333
->subcompile($this->getNode('name'))
3434
->write(";\n")
35-
->write("\$this->env->getExtension('stopwatch')->getStopwatch()->start(")
35+
->write("\$this->env->getExtension('Symfony\Bridge\Twig\Extension\StopwatchExtension')->getStopwatch()->start(")
3636
->subcompile($this->getNode('var'))
3737
->raw(", 'template');\n")
3838
->subcompile($this->getNode('body'))
39-
->write("\$this->env->getExtension('stopwatch')->getStopwatch()->stop(")
39+
->write("\$this->env->getExtension('Symfony\Bridge\Twig\Extension\StopwatchExtension')->getStopwatch()->stop(")
4040
->subcompile($this->getNode('var'))
4141
->raw(");\n")
4242
;

‎src/Symfony/Bridge/Twig/Node/TransNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function compile(\Twig_Compiler $compiler)
5454
$method = !$this->hasNode('count') ? 'trans' : 'transChoice';
5555

5656
$compiler
57-
->write('echo $this->env->getExtension(\'translator\')->getTranslator()->'.$method.'(')
57+
->write('echo $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->getTranslator()->'.$method.'(')
5858
->subcompile($msg)
5959
;
6060

‎src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testCompile()
4545

4646
$this->assertEquals(
4747
sprintf(
48-
'$this->env->getExtension(\'form\')->renderer->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
48+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->setTheme(%s, array(0 => "tpl1", 1 => "tpl2"));',
4949
$this->getVariableGetter('form')
5050
),
5151
trim($compiler->compile($node)->getSource())
@@ -57,7 +57,7 @@ public function testCompile()
5757

5858
$this->assertEquals(
5959
sprintf(
60-
'$this->env->getExtension(\'form\')->renderer->setTheme(%s, "tpl1");',
60+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->setTheme(%s, "tpl1");',
6161
$this->getVariableGetter('form')
6262
),
6363
trim($compiler->compile($node)->getSource())

‎src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testCompileWidget()
2727

2828
$this->assertEquals(
2929
sprintf(
30-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'widget\')',
30+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'widget\')',
3131
$this->getVariableGetter('form')
3232
),
3333
trim($compiler->compile($node)->getSource())
@@ -50,7 +50,7 @@ public function testCompileWidgetWithVariables()
5050

5151
$this->assertEquals(
5252
sprintf(
53-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'widget\', array("foo" => "bar"))',
53+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'widget\', array("foo" => "bar"))',
5454
$this->getVariableGetter('form')
5555
),
5656
trim($compiler->compile($node)->getSource())
@@ -70,7 +70,7 @@ public function testCompileLabelWithLabel()
7070

7171
$this->assertEquals(
7272
sprintf(
73-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\', array("label" => "my label"))',
73+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\', array("label" => "my label"))',
7474
$this->getVariableGetter('form')
7575
),
7676
trim($compiler->compile($node)->getSource())
@@ -92,7 +92,7 @@ public function testCompileLabelWithNullLabel()
9292
// Otherwise the default label is overwritten with null.
9393
$this->assertEquals(
9494
sprintf(
95-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\')',
95+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\')',
9696
$this->getVariableGetter('form')
9797
),
9898
trim($compiler->compile($node)->getSource())
@@ -114,7 +114,7 @@ public function testCompileLabelWithEmptyStringLabel()
114114
// Otherwise the default label is overwritten with null.
115115
$this->assertEquals(
116116
sprintf(
117-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\')',
117+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\')',
118118
$this->getVariableGetter('form')
119119
),
120120
trim($compiler->compile($node)->getSource())
@@ -133,7 +133,7 @@ public function testCompileLabelWithDefaultLabel()
133133

134134
$this->assertEquals(
135135
sprintf(
136-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\')',
136+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\')',
137137
$this->getVariableGetter('form')
138138
),
139139
trim($compiler->compile($node)->getSource())
@@ -160,7 +160,7 @@ public function testCompileLabelWithAttributes()
160160
// https://github.com/symfony/symfony/issues/5029
161161
$this->assertEquals(
162162
sprintf(
163-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar"))',
163+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar"))',
164164
$this->getVariableGetter('form')
165165
),
166166
trim($compiler->compile($node)->getSource())
@@ -186,7 +186,7 @@ public function testCompileLabelWithLabelAndAttributes()
186186

187187
$this->assertEquals(
188188
sprintf(
189-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar", "label" => "value in argument"))',
189+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar", "label" => "value in argument"))',
190190
$this->getVariableGetter('form')
191191
),
192192
trim($compiler->compile($node)->getSource())
@@ -217,7 +217,7 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
217217
// https://github.com/symfony/symfony/issues/5029
218218
$this->assertEquals(
219219
sprintf(
220-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\', (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? array() : array("label" => $_label_)))',
220+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\', (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? array() : array("label" => $_label_)))',
221221
$this->getVariableGetter('form')
222222
),
223223
trim($compiler->compile($node)->getSource())
@@ -254,7 +254,7 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
254254
// https://github.com/symfony/symfony/issues/5029
255255
$this->assertEquals(
256256
sprintf(
257-
'$this->env->getExtension(\'form\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar", "label" => "value in attributes") + (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? array() : array("label" => $_label_)))',
257+
'$this->env->getExtension(\'Symfony\Bridge\Twig\Extension\FormExtension\')->renderer->searchAndRenderBlock(%s, \'label\', array("foo" => "bar", "label" => "value in attributes") + (twig_test_empty($_label_ = ((true) ? (null) : (null))) ? array() : array("label" => $_label_)))',
258258
$this->getVariableGetter('form')
259259
),
260260
trim($compiler->compile($node)->getSource())

‎src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testCompileStrict()
2929

3030
$this->assertEquals(
3131
sprintf(
32-
'echo $this->env->getExtension(\'translator\')->getTranslator()->trans("trans %%var%%", array_merge(array("%%var%%" => %s), %s), "messages");',
32+
'echo $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->getTranslator()->trans("trans %%var%%", array_merge(array("%%var%%" => %s), %s), "messages");',
3333
$this->getVariableGetterWithoutStrictCheck('var'),
3434
$this->getVariableGetterWithStrictCheck('foo')
3535
),

‎src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function setPrefix($prefix)
8282

8383
protected function extractTemplate($template, MessageCatalogue $catalogue)
8484
{
85-
$visitor = $this->twig->getExtension('translator')->getTranslationNodeVisitor();
85+
$visitor = $this->twig->getExtension('Symfony\Bridge\Twig\Extension\TranslationExtension')->getTranslationNodeVisitor();
8686
$visitor->enable();
8787

8888
$this->twig->parse($this->twig->tokenize($template));

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"twig/twig": "~1.23|~2.0"
20+
"twig/twig": "~1.26|~2.0"
2121
},
2222
"require-dev": {
2323
"symfony/asset": "~2.8|~3.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"symfony/yaml": "~2.8|~3.0",
3939
"symfony/expression-language": "~2.8|~3.0",
4040
"doctrine/doctrine-bundle": "~1.4",
41-
"twig/twig": "~1.23|~2.0"
41+
"twig/twig": "~1.26|~2.0"
4242
},
4343
"suggest": {
4444
"symfony/security-acl": "For using the ACL functionality of this bundle"

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function __construct($dateFormat, $intervalFormat, $timezone, $decimals,
3737

3838
public function configure(\Twig_Environment $environment)
3939
{
40-
$environment->getExtension('core')->setDateFormat($this->dateFormat, $this->intervalFormat);
40+
$environment->getExtension('Twig_Extension_Core')->setDateFormat($this->dateFormat, $this->intervalFormat);
4141

4242
if (null !== $this->timezone) {
43-
$environment->getExtension('core')->setTimezone($this->timezone);
43+
$environment->getExtension('Twig_Extension_Core')->setTimezone($this->timezone);
4444
}
4545

46-
$environment->getExtension('core')->setNumberFormat($this->decimals, $this->decimalPoint, $this->thousandsSeparator);
46+
$environment->getExtension('Twig_Extension_Core')->setNumberFormat($this->decimals, $this->decimalPoint, $this->thousandsSeparator);
4747
}
4848
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"symfony/asset": "~2.8|~3.0",
2121
"symfony/twig-bridge": "~2.8|~3.0",
2222
"symfony/http-foundation": "~2.8|~3.0",
23-
"symfony/http-kernel": "~2.8|~3.0"
23+
"symfony/http-kernel": "~2.8|~3.0",
24+
"twig/twig": "~1.26|~2.0"
2425
},
2526
"require-dev": {
2627
"symfony/stopwatch": "~2.8|~3.0",

0 commit comments

Comments
 (0)
0