Skip to content

Commit 404b313

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: fix test setup [Validator] Review Turkish translations [Validator] Review Croatian translations [Validator] Review translations for Polish (pl) use the empty string instead of null as an array offset Review translations for Chinese (zh_TW) [Serializer] Adjust ObjectNormalizerTest for the accessor method changes from #61097
2 parents 9062121 + 330642c commit 404b313

6 files changed

+13
-13
lines changed

Compiler/CheckTypeDeclarationsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function __construct(
7676

7777
protected function processValue(mixed $value, bool $isRoot = false): mixed
7878
{
79-
if (isset($this->skippedIds[$this->currentId])) {
79+
if (isset($this->skippedIds[$this->currentId ?? ''])) {
8080
return $value;
8181
}
8282

Compiler/DefinitionErrorExceptionPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
6666
ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()
6767
|| ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior()
6868
) {
69-
$this->sourceReferences[$targetId][$this->currentId] ??= true;
69+
$this->sourceReferences[$targetId][$this->currentId ?? ''] ??= true;
7070
} else {
71-
$this->sourceReferences[$targetId][$this->currentId] = false;
71+
$this->sourceReferences[$targetId][$this->currentId ?? ''] = false;
7272
}
7373

7474
return $value;
@@ -78,7 +78,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
7878
return parent::processValue($value, $isRoot);
7979
}
8080

81-
$this->erroredDefinitions[$this->currentId] = $value;
81+
$this->erroredDefinitions[$this->currentId ?? ''] = $value;
8282

8383
return parent::processValue($value);
8484
}

Compiler/InlineServiceDefinitionsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
142142

143143
$this->container->log($this, \sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));
144144
$this->inlinedIds[$id] = $definition->isPublic() || !$definition->isShared();
145-
$this->notInlinedIds[$this->currentId] = true;
145+
$this->notInlinedIds[$this->currentId ?? ''] = true;
146146

147147
if ($definition->isShared()) {
148148
return $definition;

Compiler/ResolveBindingsPass.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
118118
foreach ($bindings as $key => $binding) {
119119
[$bindingValue, $bindingId, $used, $bindingType, $file] = $binding->getValues();
120120
if ($used) {
121-
$this->usedBindings[$bindingId] = true;
122-
unset($this->unusedBindings[$bindingId]);
123-
} elseif (!isset($this->usedBindings[$bindingId])) {
124-
$this->unusedBindings[$bindingId] = [$key, $this->currentId, $bindingType, $file];
121+
$this->usedBindings[$bindingId ?? ''] = true;
122+
unset($this->unusedBindings[$bindingId ?? '']);
123+
} elseif (!isset($this->usedBindings[$bindingId ?? ''])) {
124+
$this->unusedBindings[$bindingId ?? ''] = [$key, $this->currentId, $bindingType, $file];
125125
}
126126

127127
if (preg_match('/^(?:(?:array|bool|float|int|string|iterable|([^ $]++)) )\$/', $key, $m)) {
@@ -260,8 +260,8 @@ private function getBindingValue(BoundArgument $binding): mixed
260260
{
261261
[$bindingValue, $bindingId] = $binding->getValues();
262262

263-
$this->usedBindings[$bindingId] = true;
264-
unset($this->unusedBindings[$bindingId]);
263+
$this->usedBindings[$bindingId ?? ''] = true;
264+
unset($this->unusedBindings[$bindingId ?? '']);
265265

266266
return $bindingValue;
267267
}

Compiler/ResolveHotPathPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
4848
return $value->clearTag('container.hot_path');
4949
}
5050

51-
$this->resolvedIds[$this->currentId] = true;
51+
$this->resolvedIds[$this->currentId ?? ''] = true;
5252

5353
if (!$value->hasTag('container.hot_path')) {
5454
return $value;

ContainerBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function registerExtension(ExtensionInterface $extension): void
202202
$this->extensions[$extension->getAlias()] = $extension;
203203

204204
if (false !== $extension->getNamespace()) {
205-
$this->extensionsByNs[$extension->getNamespace()] = $extension;
205+
$this->extensionsByNs[$extension->getNamespace() ?? ''] = $extension;
206206
}
207207
}
208208

0 commit comments

Comments
 (0)