Merge branch '4.4' into 5.1

* 4.4:
  [Intl] promote warnings to value errors on PHP 8
  Fix CS
  DateTime validator support for trailing data
  Remove some leftover for HHVM support
  Simplify code
  Fix tests on 5.6
  [Debug] Skip a test that was meant for HHVM.
  [Console] Silence warnings on sapi_windows_cp_set() call
  guard $argv + $token against null, preventing unnecessary exceptions

src/Symfony/Component/Console/Helper/QuestionHelper.php

@@ -112,7 +112,7 @@ class QuestionHelper extends Helper
 
         if (\function_exists('sapi_windows_cp_set')) {
             // Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
-            sapi_windows_cp_set(1252);
+            @sapi_windows_cp_set(1252);
         }
 
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {

src/Symfony/Component/Console/Input/ArgvInput.php

@@ -45,9 +45,7 @@ class ArgvInput extends Input
 
     public function __construct(array $argv = null, InputDefinition $definition = null)
     {
-        if (null === $argv) {
+        $argv = $argv ?? $_SERVER['argv'] ?? [];
-            $argv = $_SERVER['argv'];
-        }
 
         // strip the application name
         array_shift($argv);

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php

@@ -194,10 +194,6 @@ class NativeSessionStorageTest extends TestCase
 
     public function testSessionOptions()
     {
-        if (\defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM is not handled in this test case.');
-        }
-
         $options = [
             'url_rewriter.tags' => 'a=href',
             'cache_expire' => '200',

src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php

@@ -354,6 +354,10 @@ abstract class NumberFormatter
     {
         // The original NumberFormatter does not support this format type
         if (self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%s given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -508,6 +512,10 @@ abstract class NumberFormatter
     public function parse(string $value, int $type = self::TYPE_DOUBLE, int &$position = 0)
     {
         if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%d given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;

src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -324,7 +324,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -338,6 +340,10 @@ abstract class AbstractNumberFormatterTest extends TestCase
      */
     public function testFormatTypeCurrencyReturn($formatter, $value)
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        }
+
         $this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
     }
 
@@ -699,7 +705,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
 
     public function testParseTypeDefault()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -823,7 +831,9 @@ abstract class AbstractNumberFormatterTest extends TestCase
 
     public function testParseTypeCurrency()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);

src/Symfony/Component/Validator/Constraints/DateTimeValidator.php

@@ -53,6 +53,12 @@ class DateTimeValidator extends DateValidator
             return;
         }
 
+        if ('+' === substr($constraint->format, -1)) {
+            $errors['warnings'] = array_filter($errors['warnings'], function ($warning) {
+                return 'Trailing data' !== $warning;
+            });
+        }
+
         foreach ($errors['warnings'] as $warning) {
             if ('The parsed date was invalid' === $warning) {
                 $this->context->buildViolation($constraint->message)

src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php

@@ -114,4 +114,12 @@ class DateTimeValidatorTest extends ConstraintValidatorTestCase
             ['Y-m-d H:i:s', '2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR],
         ];
     }
+
+    public function testDateTimeWithTrailingData()
+    {
+        $this->validator->validate('1995-05-10 00:00:00', new DateTime([
+            'format' => 'Y-m-d+',
+        ]));
+        $this->assertNoViolation();
+    }
 }

src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php

@@ -84,9 +84,6 @@ EOTXT
 
     public function testFromCallableClosureCaster()
     {
-        if (\defined('HHVM_VERSION_ID')) {
-            $this->markTestSkipped('Not for HHVM.');
-        }
         $var = [
             (new \ReflectionMethod($this, __FUNCTION__))->getClosure($this),
             (new \ReflectionMethod(__CLASS__, 'stub'))->getClosure(),