Skip to content

Commit 07c62c2

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS tweaked default CS fixer config [HttpKernel] Dont close the output stream in debug move HttpKernel component to require section Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284 [Session] fix PDO transaction aborted under PostgreSQL [Console] Use InputInterface inherited doc as possible add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support FormBuilderInterface: fix getForm() return type. Fixed typo in PHPDoc
2 parents 427cdb4 + bc7074b commit 07c62c2

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Compiler/ReplaceAliasByActualDefinitionPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ private function updateFactoryReference(array $replacements, $factory)
139139
$factory[0] = new Reference($replacements[$referenceId], $factory[0]->getInvalidBehavior());
140140
}
141141

142-
143142
return $factory;
144143
}
145144
}

0 commit comments

Comments
 (0)