Skip to content

Commit a917d7c

Browse files
committed
Merge branch '5.2' into 5.3
* 5.2: Simplify some code with null coalesce operator Don't use deprecated TestLogger class
2 parents 006f585 + bcb47bb commit a917d7c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Compiler/MergeExtensionConfigurationPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function freezeAfterProcessing(Extension $extension, ContainerBuilder $co
143143
*/
144144
public function getEnvPlaceholders(): array
145145
{
146-
return null !== $this->processedEnvPlaceholders ? $this->processedEnvPlaceholders : parent::getEnvPlaceholders();
146+
return $this->processedEnvPlaceholders ?? parent::getEnvPlaceholders();
147147
}
148148

149149
public function getUnusedEnvPlaceholders(): array

ContainerBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ private function callMethod(object $service, array $call, array &$inlineServices
16241624
*/
16251625
private function shareService(Definition $definition, $service, ?string $id, array &$inlineServices)
16261626
{
1627-
$inlineServices[null !== $id ? $id : spl_object_hash($definition)] = $service;
1627+
$inlineServices[$id ?? spl_object_hash($definition)] = $service;
16281628

16291629
if (null !== $id && $definition->isShared()) {
16301630
$this->services[$id] = $service;

0 commit comments

Comments
 (0)