Skip to content

Commit 65f326d

Browse files
committed
Merge branch '2.3'
* 2.3: (24 commits) Add german translation for several validators (Greater/Equal/Less) No Entity Manager defined exception fixed CS [Acl] Fix for issue #9433 [Validator] fix docblock typos [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class Removed useless check if self::$trustProxies is set Fix mistake in translation's service definition. if handler_id is identical to null fix CS fix Fixed ModelChoiceList tests in Propel1 bridge. [AclProvider] Fix incorrect behaviour when partial results returned from cache Check if the pipe array is empty before calling stream_select() [Intl] fixed datetime test as described in #9455 bumped Symfony version to 2.3.8 updated VERSION for 2.3.7 updated CHANGELOG for 2.3.7 re-factor Propel1 ModelChoiceList [Form] Added method Form::getClickedButton() to remove memory leak in FormValidator [Locale] fixed the failing test described in #9455 ... Conflicts: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php src/Symfony/Bridge/Propel1/Tests/Propel1TestCase.php src/Symfony/Component/Form/Tests/CompoundFormTest.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Process/Process.php
2 parents 83c614c + 54e5017 commit 65f326d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
342342
$container->setParameter('session.storage.options', $options);
343343

344344
// session handler (the internal callback registered with PHP session management)
345-
if (null == $config['handler_id']) {
345+
if (null === $config['handler_id']) {
346346
// Set the handler class to be null
347347
$container->getDefinition('session.storage.native')->replaceArgument(1, null);
348348
$container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);

Resources/config/translation.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<tag name="translation.loader" alias="res" />
8585
</service>
8686

87-
<service id="translation.loader.dat" class="%translation.loader.res.class%">
87+
<service id="translation.loader.dat" class="%translation.loader.dat.class%">
8888
<tag name="translation.loader" alias="dat" />
8989
</service>
9090

0 commit comments

Comments
 (0)