Skip to content

Commit c2dcc0d

Browse files
committed
Merge branch '3.0' into 3.1
* 3.0: fixed CS fixed CS 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 Mention generating absolute urls in UPGRADE files and CHANGELOG add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support FormBuilderInterface: fix getForm() return type. Fixed typo in PHPDoc
2 parents 500facc + c411ce3 commit c2dcc0d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Command/AbstractConfigCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected function listBundles($output)
3232
$rows = array();
3333

3434
$bundles = $this->getContainer()->get('kernel')->getBundles();
35-
usort($bundles, function($bundleA, $bundleB) {
35+
usort($bundles, function ($bundleA, $bundleB) {
3636
return strcmp($bundleA->getName(), $bundleB->getName());
3737
});
3838

Tests/Templating/Helper/AssetsHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function setUp()
2525
$fooPackage = new Package(new StaticVersionStrategy('42', '%s?v=%s'));
2626
$barPackage = new Package(new StaticVersionStrategy('22', '%s?%s'));
2727

28-
$packages = new Packages($fooPackage, ['bar' => $barPackage]);
28+
$packages = new Packages($fooPackage, array('bar' => $barPackage));
2929

3030
$this->helper = new AssetsHelper($packages);
3131
}

0 commit comments

Comments
 (0)