diff core/modules/simpletest/src/TestServiceProvider.php @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10

--- a/core/modules/simpletest/src/TestServiceProvider.php	Thu Feb 28 11:14:44 2019 +0000
+++ b/core/modules/simpletest/src/TestServiceProvider.php	Thu Feb 28 13:11:55 2019 +0000
@@ -2,54 +2,16 @@
 
 namespace Drupal\simpletest;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\DependencyInjection\ServiceModifierInterface;
-use Drupal\Core\DependencyInjection\ServiceProviderInterface;
-use Symfony\Component\DependencyInjection\Definition;
+use Drupal\KernelTests\TestServiceProvider as CoreTestServiceProvider;
 
-class TestServiceProvider implements ServiceProviderInterface, ServiceModifierInterface {
-
-  /**
-   * @var \Drupal\simpletest\TestBase;
-   */
-  public static $currentTest;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function register(ContainerBuilder $container) {
-    if (static::$currentTest && method_exists(static::$currentTest, 'containerBuild')) {
-      static::$currentTest->containerBuild($container);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(ContainerBuilder $container) {
-    if (static::$currentTest instanceof KernelTestBase) {
-      static::addRouteProvider($container);
-    }
-  }
-
-  /**
-   * Add the on demand rebuild route provider service.
-   *
-   * @param \Drupal\Core\DependencyInjection\ContainerBuilder $container
-   */
-  public static function addRouteProvider(ContainerBuilder $container) {
-    foreach (['router.route_provider' => 'RouteProvider'] as $original_id => $class) {
-      // While $container->get() does a recursive resolve, getDefinition() does
-      // not, so do it ourselves.
-      // @todo Make the code more readable in
-      //   https://www.drupal.org/node/2911498.
-      for ($id = $original_id; $container->hasAlias($id); $id = (string) $container->getAlias($id)) {
-      }
-      $definition = $container->getDefinition($id);
-      $definition->clearTag('needs_destruction');
-      $container->setDefinition("simpletest.$original_id", $definition);
-      $container->setDefinition($id, new Definition('Drupal\simpletest\\' . $class));
-    }
-  }
+/**
+ * Provides special routing services for tests.
+ *
+ * @deprecated in 8.6.0 for removal before Drupal 9.0.0. Use
+ *   Drupal\KernelTests\TestServiceProvider instead.
+ *
+ * @see https://www.drupal.org/node/2943146
+ */
+class TestServiceProvider extends CoreTestServiceProvider {
 
 }