Skip to content

Commit 5251efd

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age Changed visibility of setUp() and tearDown to protected [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback Added default button class used HTML5 meta charset tag and removed hardcoded ones Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)" fixed XSS in the exception handler Php Inspections (EA Extended) - static code analysis includes: [2.3] Remove most refs uses Test with local components instead of waiting for the subtree-splitter when possible Conflicts: .travis.yml
2 parents 734bfd2 + 3f8969c commit 5251efd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DataCollector/MemoryDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private function convertToBytes($memoryLimit)
9494
} elseif (0 === strpos($max, '0')) {
9595
$max = intval($max, 8);
9696
} else {
97-
$max = intval($max);
97+
$max = (int) $max;
9898
}
9999

100100
switch (substr($memoryLimit, -1)) {

0 commit comments

Comments
 (0)