Skip to content

Commit c42aee0

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig src/Symfony/Component/Console/Tests/ApplicationTest.php src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
2 parents 9edff29 + 8ad9555 commit c42aee0

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Compiler/CheckCircularReferencesPass.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/
2727
class CheckCircularReferencesPass implements CompilerPassInterface
2828
{
29-
private $currentId;
3029
private $currentPath;
3130
private $checkedNodes;
3231

@@ -41,7 +40,6 @@ public function process(ContainerBuilder $container)
4140

4241
$this->checkedNodes = array();
4342
foreach ($graph->getNodes() as $id => $node) {
44-
$this->currentId = $id;
4543
$this->currentPath = array($id);
4644

4745
$this->checkOutEdges($node->getOutEdges());

0 commit comments

Comments
 (0)