Skip to content

Commit 80068b6

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: (30 commits) Update validators.ro.xlf add non-standard port to HTTP_HOST fixed attribute "source-language" for translations Update PluralizationRules.php Update validators.pt_BR.xlf Translated remaining items (57-72) Updated Vietnamese translation 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 [Component/Security] Fixed some phpdocs in Security/Core Completed Luxembourgish translation Fixing the Logger deprecation notices to match the correct method name it should be informing of ... Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php src/Symfony/Component/Console/Application.php
2 parents 86e13d5 + e7181e9 commit 80068b6

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
@@ -695,7 +695,8 @@ public function renderException($e, $output)
695695
do {
696696
$title = sprintf(' [%s] ', get_class($e));
697697
$len = $strlen($title);
698-
$width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
698+
// 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
699+
$width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : (defined('HHVM_VERSION') ? 1 << 31 : PHP_INT_MAX);
699700
$formatter = $output->getFormatter();
700701
$lines = array();
701702
foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
@@ -1052,7 +1053,7 @@ public function extractNamespace($name, $limit = null)
10521053
* if nothing is found in $collection, try in $abbrevs
10531054
*
10541055
* @param string $name The string
1055-
* @param array|Traversable $collection The collection
1056+
* @param array|\Traversable $collection The collection
10561057
*
10571058
* @return array A sorted array of similar string
10581059
*/

0 commit comments

Comments
 (0)