Skip to content

Commit b7a945a

Browse files
committed
Merge branch '2.3'
* 2.3: Update JsonResponse.php [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124) CookieJar remove unneeded var, Client remove unneeded else [DI] Fixed bug requesting non existing service from dumped frozen container Update validators.sk.xlf [WebProfiler] fix content-type parameter Replace romaji period characters with Japanese style zenkaku period characters fixed CS fixed CS [Console] Avoided an unnecessary check. Added missing French validator translations typo first->second Passed the config when building the Configuration in ConfigurableExtension removed unused code Fixed variable name used in translation cache Conflicts: src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
2 parents b6eb7ec + 08dc54a commit b7a945a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Encoder/JsonDecode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class JsonDecode implements DecoderInterface
4444
public function __construct($associative = false, $depth = 512)
4545
{
4646
$this->associative = $associative;
47-
$this->recursionDepth = (int)$depth;
47+
$this->recursionDepth = (int) $depth;
4848
}
4949

5050
/**

Normalizer/GetSetMethodNormalizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ protected function formatAttribute($attributeName)
165165
{
166166
if (in_array($attributeName, $this->camelizedAttributes)) {
167167
return preg_replace_callback(
168-
'/(^|_|\.)+(.)/', function ($match) {
169-
return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
168+
'/(^|_|\.)+(.)/', function ($match) {
169+
return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
170170
}, $attributeName
171171
);
172172
}

0 commit comments

Comments
 (0)