Replace drupal_container() with Drupal::service() in the simpletest module

+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.phpundefined
@@ -88,7 +88,7 @@ protected function setUp() {
+    $this->containerBuild(\Drupal::getContainer());

@@ -156,7 +156,7 @@ public function containerBuild(ContainerBuilder $container) {
+      // \Drupal::getContainer() which is somewhat the mirror of the empty

+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.phpundefined
@@ -862,7 +862,7 @@ protected function prepareEnvironment() {
+    $this->originalContainer = clone \Drupal::getContainer();

@@ -963,7 +963,7 @@ protected function prepareConfigDirectories() {
+   * Rebuild \Drupal::getContainer().

@@ -981,9 +981,9 @@ protected function prepareConfigDirectories() {
-    // DrupalKernel replaces the container in drupal_container() with a
+    // DrupalKernel replaces the container in \Drupal::getContainer() with a
...
+    $this->container = \Drupal::getContainer();

@@ -1026,7 +1026,7 @@ protected function tearDown() {
+    if (($container = \Drupal::getContainer()) && $container->has('keyvalue')) {

You should always use internal container $this->container in tests

tagged for rocketship

This is the thing that we're creating the internal container with, so that correctly uses Drupal, $this->container = $this->container isn't going to work very well ;), with the exception of the last one maybe about keyvalue.

+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.phpundefined
@@ -963,7 +963,7 @@ protected function prepareConfigDirectories() {
-   * Rebuild drupal_container().
+   * Rebuild \Drupal::getContainer().

I'd just say "Rebuild the container". You can't rebuild a method or function :)

Ah, that was very stupid of me.

and again....

#6: drupal_container-2014015-6.patch queued for re-testing.

I have looked into it a bit more and found that Drupal::getContainer is deprecated. My guess would be to use Drupal::$container but I want someone else to confirm before I post another silly patch.

Drupal::getContainer() is correct, that's just a documentation bug :)

@Berdir - any idea why I am getting this fatal error - Undefined class constant 'getContainer' ?

+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.phpundefined
@@ -879,7 +880,7 @@ protected function prepareEnvironment() {
-    $this->originalContainer = clone drupal_container();
+    $this->originalContainer = clone \Drupal::getContainer;

Because it's a method, not a constant: \Drupal::getContainer();

So the patch failed and error seems to be here -

     simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE);
-    if (($container = drupal_container()) && $container->has('keyvalue')) {
+    if (($container = $this->container) && $container->has('keyvalue')) {
       $captured_emails = \Drupal::state()->get('system.test_email_collector') ?: array();
       $emailCount = count($captured_emails);

error message in review log is - 'The service definition "state" does not exist. Does this mean it needs a create method to inject keyvalue properly?

Have a look at #1786490: Add caching to the state system, I had to fix that too there, the problem is that it's called too late. While you move it around, please change the container id it is checking from keyvalue to state, as that's what it is using.

Also, if you check in $this->container, you also want to call $this->container->get('state')->get().

Double post.

Hopefully this is it.

@Berdir - I have followed what you recommended under comment but it seems like same error I was getting before.

That's what I meant, let's try this. And yes, this is not a Novice issue :)

#40: simpletest-2014015-40.patch queued for re-testing.

#40 seems OK to me visually if the bot still approves. Mr. Roboto can CNW it if it wants.

Committed and pushed to 8.x. Thanks!

add link to related task