Skip to content

Commit 47e82ea

Browse files
committed
Merge branch '2.4'
* 2.4: (35 commits) Update validators.ro.xlf add non-standard port to HTTP_HOST fixed attribute "source-language" for translations [Process] clarify idle timeout [Security] fix DI for SimpleFormAuthenticationListener Update PluralizationRules.php Update validators.pt_BR.xlf Translated remaining items (57-72) Updated Vietnamese translation allow null value in fragment handler added missing dot in translation updated Arabic translations Update validators.id.xlf [Validator] Translate validator messages into Brazilian Portuguese Added more Swedish validator translations Update validators.ca.xlf fixed typos in Welsh translation Added missing Croatian translations [Form] fixed allow render 0 and 0.0 numeric input values Fixed validators.nl.xlf ... Conflicts: src/Symfony/Bridge/Twig/composer.json
2 parents 62a18a5 + 80068b6 commit 47e82ea

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Application.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,8 @@ public function renderException($e, $output)
696696
do {
697697
$title = sprintf(' [%s] ', get_class($e));
698698
$len = $strlen($title);
699-
$width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
699+
// HHVM only accepts 32 bits integer in str_split, even when PHP_INT_MAX is a 64 bit integer: https://github.com/facebook/hhvm/issues/1327
700+
$width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : (defined('HHVM_VERSION') ? 1 << 31 : PHP_INT_MAX);
700701
$formatter = $output->getFormatter();
701702
$lines = array();
702703
foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
@@ -1053,7 +1054,7 @@ public function extractNamespace($name, $limit = null)
10531054
* if nothing is found in $collection, try in $abbrevs
10541055
*
10551056
* @param string $name The string
1056-
* @param array|Traversable $collection The collection
1057+
* @param array|\Traversable $collection The collection
10571058
*
10581059
* @return array A sorted array of similar string
10591060
*/

0 commit comments

Comments
 (0)