Skip to content

Commit e96b7ac

Browse files
committed
Merge branch '2.5'
* 2.5: added missing files [TwigBundle] added a test Indicate which file was being parsed if an exception is thrown while running translation:debug [ClassLoader] Cast $useIncludePath property to boolean [HttpFoundation] Minor spelling fix in PHPDocs improve error message for multiple documents Remove aligned '=>' and '=' [Session] remove invalid workaround in session regenerate [Kernel] ensure session is saved before sending response [Routing] serialize the compiled route to speed things up [Form] Fixed usage of "name" variable in form_start block [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns [DependencyInjection] use inheritdoc for loaders [Config] fix filelocator with empty name [Form] fix form handling with unconventional request methods like OPTIONS CSRF warning docs on Request::enableHttpMethodParameterOverride() Conflicts: src/Symfony/Component/Console/Helper/ProgressBar.php
2 parents a34d4d1 + cbac7a2 commit e96b7ac

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public function testUnableToNormalizeObjectAttribute()
268268
$serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
269269
$this->normalizer->setSerializer($serializer);
270270

271-
$obj = new GetSetDummy();
271+
$obj = new GetSetDummy();
272272
$object = new \stdClass();
273273
$obj->setObject($object);
274274

0 commit comments

Comments
 (0)