Skip to content

Commit ff7ef66

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) Enhance hhvm test skip message
2 parents aa7eb67 + 7eba724 commit ff7ef66

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Logger/DbalLoggerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function testLogNonUtf8Array()
9191
'utf8' => 'foo',
9292
array(
9393
'nonutf8' => DbalLogger::BINARY_DATA_VALUE,
94-
)
94+
),
9595
)
9696
)
9797
;
@@ -100,7 +100,7 @@ public function testLogNonUtf8Array()
100100
'utf8' => 'foo',
101101
array(
102102
'nonutf8' => "\x7F\xFF",
103-
)
103+
),
104104
));
105105
}
106106

0 commit comments

Comments
 (0)