Skip to content

Commit 0b6e015

Browse files
Merge branch '5.4' into 6.0
* 5.4: [SecurityBundle] Fix using same handler for multiple authenticators [DependencyInjection] Fix dump order of inlined deps [VarExporter] Fix exporting enums [HttpClient] Let curl handle content-length headers
2 parents f8ec789 + 66b61ee commit 0b6e015

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Dumper/PhpDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ private function collectCircularReferences(string $sourceId, array $edges, array
486486
$loop = [];
487487
}
488488
}
489-
$this->addCircularReferences($first, $loop, true);
489+
$this->addCircularReferences($first, $loop, $loopByConstructor);
490490
break;
491491
}
492492
}

Tests/Fixtures/php/services_almost_circular_private.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,17 +419,16 @@ protected function getMonologInline_LoggerService()
419419
*/
420420
protected function getPAService()
421421
{
422-
$a = new \stdClass();
423-
424-
$b = ($this->privates['pC'] ?? $this->getPCService());
422+
$a = ($this->privates['pC'] ?? $this->getPCService());
425423

426424
if (isset($this->services['pA'])) {
427425
return $this->services['pA'];
428426
}
427+
$b = new \stdClass();
429428

430-
$this->services['pA'] = $instance = new \stdClass($a, $b);
429+
$this->services['pA'] = $instance = new \stdClass($b, $a);
431430

432-
$a->d = ($this->privates['pD'] ?? $this->getPDService());
431+
$b->d = ($this->privates['pD'] ?? $this->getPDService());
433432

434433
return $instance;
435434
}

0 commit comments

Comments
 (0)