Merge branch '4.4'

* 4.4:
  [Mailer] fixed tests on Windows
  [PhpUnitBridge] fix tests
  [Mailer] fixed error message when connecting to a stream raises an error before connect()
  [Mailer] fixed timeout type hint
  improve error messages in the event dispatcher
  [Security/Core] work around sodium_compat issue
  bumped Symfony version to 4.3.3
  updated VERSION for 4.3.2
  updated CHANGELOG for 4.3.2
  bumped Symfony version to 4.2.11
  updated VERSION for 4.2.10
  updated CHANGELOG for 4.2.10
  bumped Symfony version to 3.4.30
  updated VERSION for 3.4.29
  update CONTRIBUTORS for 3.4.29
  updated CHANGELOG for 3.4.29
  Fixed type annotation.

Author: nicolas-grekas

Tests/DeprecationErrorHandler/default.phpt

@@ -3,7 +3,9 @@ Test DeprecationErrorHandler in default mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+unset($_SERVER[$k], $_ENV[$k]);
+putenv($k);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/deprecated_regexp.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler in weak mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=/foo/');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = '/foo/');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/disabled.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler in weak mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'disabled');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/eval_not_self.phpt

@@ -3,7 +3,8 @@ Test eval()'d deprecation is not considered as self
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=max[self]=0');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/lagging_vendor.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler in weak vendors mode on vendor file
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=max[self]=0&max[direct]=0');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0&max[direct]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/quiet.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler with quiet output
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=verbose=0');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'verbose=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/self_on_non_vendor.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler with no self deprecations on self deprecation
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=max[self]=0');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/shutdown_deprecations.phpt

@@ -3,7 +3,9 @@ Test DeprecationErrorHandler in default mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+unset($_SERVER[$k], $_ENV[$k]);
+putenv($k);
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/weak.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler in weak mode
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=weak');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'weak');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');

Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt

@@ -3,7 +3,8 @@ Test DeprecationErrorHandler in weak vendors mode on eval()'d deprecation
 --FILE--
 <?php
 
-putenv('SYMFONY_DEPRECATIONS_HELPER=max[self]=0');
+$k = 'SYMFONY_DEPRECATIONS_HELPER';
+putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'max[self]=0');
 putenv('ANSICON');
 putenv('ConEmuANSI');
 putenv('TERM');