Skip to content

Commit c5b52f0

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: Textarea value should default to empty string instead of null. Fix doc blocks [Process] Fix #10681, process are failing on Windows Server 2003 [Security] fix DBAL connection typehint [HttpFoundation] status 201 is allowed to have a body unified return null usages Conflicts: src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
2 parents bb3f403 + 3bbc004 commit c5b52f0

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
@@ -163,7 +163,7 @@ public function provideCallbacks()
163163
array(
164164
array(
165165
'bar' => function ($bar) {
166-
return null;
166+
return;
167167
},
168168
),
169169
'baz',

0 commit comments

Comments
 (0)