Merge branch '3.3' into 3.4

* 3.3:
  Make it easy for Drupal to use the PHPUnit bridge

Author: nicolas-grekas

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 
 @trigger_error('root deprecation', E_USER_DEPRECATED);

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/disabled.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 
 echo (int) set_error_handler('var_dump');

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/regexp.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 
 @trigger_error('root deprecation', E_USER_DEPRECATED);

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 
 @trigger_error('root deprecation', E_USER_DEPRECATED);

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_non_vendor.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 
 @trigger_error('root deprecation', E_USER_DEPRECATED);

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt

@@ -12,8 +12,12 @@ $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
     $vendor = dirname($vendor);
 }
-define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
-require PHPUNIT_COMPOSER_INSTALL;
+// Fake class to ensure bootstrap.php calls DeprecationErrorHandler::register().
+class PHPUnit_TextUI_Command
+{
+
+}
+require  $vendor.'/vendor/autoload.php';
 require_once __DIR__.'/../../bootstrap.php';
 require __DIR__.'/fake_vendor/autoload.php';
 require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';

src/Symfony/Bridge/PhpUnit/bootstrap.php

@@ -13,7 +13,7 @@
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we're loaded by an actual run of phpunit
-if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
+if (!class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
     if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
         DeprecationErrorHandler::collectDeprecations($ser);
     }