Skip to content

Commit 0092860

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: Remove aligned '=>' and '=' Break infinite loop while resolving aliases [Security][listener] change priority of switchuser Improved the phpdoc for security token classes bumped Symfony version to 2.3.22 updated VERSION for 2.3.21 update CONTRIBUTORS for 2.3.21 updated CHANGELOG for 2.3.21 Conflicts: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bridge/Propel1/Form/Type/ModelType.php src/Symfony/Bridge/Propel1/Logger/PropelLogger.php src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php src/Symfony/Component/Console/Descriptor/JsonDescriptor.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php src/Symfony/Component/Form/Extension/Core/Type/FormType.php src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php src/Symfony/Component/Form/Extension/Core/Type/NumberType.php src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Validator/Constraints/ImageValidator.php src/Symfony/Component/Validator/Constraints/TypeValidator.php
2 parents 52f08ab + 11ac6d1 commit 0092860

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎Controller/ExceptionController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public function showAction(Request $request, FlattenException $exception, DebugL
5454
return new Response($this->twig->render(
5555
(string) $this->findTemplate($request, $request->getRequestFormat(), $code, $this->debug),
5656
array(
57-
'status_code' => $code,
58-
'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
59-
'exception' => $exception,
60-
'logger' => $logger,
57+
'status_code' => $code,
58+
'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '',
59+
'exception' => $exception,
60+
'logger' => $logger,
6161
'currentContent' => $currentContent,
6262
)
6363
));

‎DependencyInjection/TwigExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function load(array $configs, ContainerBuilder $container)
4141
foreach ($config['globals'] as $name => $value) {
4242
if (is_array($value) && isset($value['key'])) {
4343
$config['globals'][$name] = array(
44-
'key' => $name,
44+
'key' => $name,
4545
'value' => $config['globals'][$name],
4646
);
4747
}

‎Tests/DependencyInjection/Fixtures/php/customTemplateEscapingGuesser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

33
$container->loadFromExtension('twig', array(
4-
'autoescape_service' => 'my_project.some_bundle.template_escaping_guesser',
4+
'autoescape_service' => 'my_project.some_bundle.template_escaping_guesser',
55
'autoescape_service_method' => 'guess',
66
));

‎Tests/DependencyInjection/Fixtures/php/extra.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
$container->loadFromExtension('twig', array(
4-
'paths' => array(
4+
'paths' => array(
55
'namespaced_path3' => 'namespace3',
66
),
77
));

‎Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
'globals' => array(
1010
'foo' => '@bar',
1111
'baz' => '@@qux',
12-
'pi' => 3.14,
12+
'pi' => 3.14,
1313
'bad' => array('key' => 'foo'),
1414
),
15-
'auto_reload' => true,
16-
'autoescape' => true,
15+
'auto_reload' => true,
16+
'autoescape' => true,
1717
'base_template_class' => 'stdClass',
18-
'cache' => '/tmp',
19-
'charset' => 'ISO-8859-1',
20-
'debug' => true,
21-
'strict_variables' => true,
22-
'paths' => array(
18+
'cache' => '/tmp',
19+
'charset' => 'ISO-8859-1',
20+
'debug' => true,
21+
'strict_variables' => true,
22+
'paths' => array(
2323
'path1',
2424
'path2',
2525
'namespaced_path1' => 'namespace1',

‎Tests/DependencyInjection/TwigExtensionTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ public function testLoadDefaultTemplateEscapingGuesserConfiguration($format)
114114
public function testGlobalsWithDifferentTypesAndValues()
115115
{
116116
$globals = array(
117-
'array' => array(),
118-
'false' => false,
119-
'float' => 2.0,
117+
'array' => array(),
118+
'false' => false,
119+
'float' => 2.0,
120120
'integer' => 3,
121-
'null' => null,
122-
'object' => new \stdClass(),
123-
'string' => 'foo',
124-
'true' => true,
121+
'null' => null,
122+
'object' => new \stdClass(),
123+
'string' => 'foo',
124+
'true' => true,
125125
);
126126

127127
$container = $this->createContainer();
@@ -183,10 +183,10 @@ private function createContainer()
183183
{
184184
$container = new ContainerBuilder(new ParameterBag(array(
185185
'kernel.cache_dir' => __DIR__,
186-
'kernel.root_dir' => __DIR__.'/Fixtures',
187-
'kernel.charset' => 'UTF-8',
188-
'kernel.debug' => false,
189-
'kernel.bundles' => array('TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle'),
186+
'kernel.root_dir' => __DIR__.'/Fixtures',
187+
'kernel.charset' => 'UTF-8',
188+
'kernel.debug' => false,
189+
'kernel.bundles' => array('TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle'),
190190
)));
191191

192192
return $container;

0 commit comments

Comments
 (0)