diff --git a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php index 266a89b..0818be2 100644 --- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php +++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php @@ -11,7 +11,6 @@ use Drupal\Core\Access\AccessResult; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Cache\Cache; -use Drupal\Core\DependencyInjection\Container; use Drupal\Core\Language\Language; use Drupal\Tests\UnitTestCase; use Symfony\Component\Routing\Route; diff --git a/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php index 8b91791..26a1c86 100644 --- a/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php +++ b/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php @@ -12,8 +12,6 @@ use Drupal\Core\DependencyInjection\Container; use Drupal\quickedit\Access\EditEntityFieldAccessCheck; use Drupal\Tests\UnitTestCase; -use Drupal\field\FieldStorageConfigInterface; -use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Language\LanguageInterface; /** diff --git a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php index f61aba8..dca13e3 100644 --- a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php +++ b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php @@ -11,6 +11,8 @@ use Drupal\Tests\UnitTestCase; use Drupal\user\Access\PermissionAccessCheck; use Symfony\Component\Routing\Route; +use Drupal\Core\Cache\Context\CacheContextsManager; +use Symfony\Component\DependencyInjection\ContainerBuilder; /** * @coversDefaultClass \Drupal\user\Access\PermissionAccessCheck @@ -27,11 +29,23 @@ class PermissionAccessCheckTest extends UnitTestCase { public $accessCheck; /** + * The dependency injection container. + * + * @var \Symfony\Component\DependencyInjection\ContainerBuilder + */ + protected $container; + + /** * {@inheritdoc} */ protected function setUp() { parent::setUp(); + $this->container = new ContainerBuilder(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $this->container->set('cache_contexts_manager', $cache_contexts_manager); + \Drupal::setContainer($this->container); + $this->accessCheck = new PermissionAccessCheck(); } diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php index 09445ce..1397685 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php @@ -19,6 +19,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; +use Drupal\Core\Cache\Context\CacheContextsManager; +use Symfony\Component\DependencyInjection\ContainerBuilder; /** * @coversDefaultClass \Drupal\Core\Form\FormBuilder @@ -27,6 +29,25 @@ class FormBuilderTest extends FormTestBase { /** + * The dependency injection container. + * + * @var \Symfony\Component\DependencyInjection\ContainerBuilder + */ + protected $container; + + /** + * {@inheritdoc} + */ + protected function setUp() { + parent::setUp(); + + $this->container = new ContainerBuilder(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $this->container->set('cache_contexts_manager', $cache_contexts_manager); + \Drupal::setContainer($this->container); + } + + /** * Tests the getFormId() method with a string based form ID. * * @expectedException \InvalidArgumentException