Issue #3073318 by Spokje, Mile23, mondrake: Remove usages of... (0a6a417e) · Commits · project / drupal

core/modules/ban/tests/src/Unit/BanMiddlewareTest.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,14 +17,14 @@ class BanMiddlewareTest extends UnitTestCase {
		/**
		* The mocked wrapped kernel.
		*
		* @var \Symfony\Component\HttpKernel\HttpKernelInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Symfony\Component\HttpKernel\HttpKernelInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $kernel;

		/**
		* The mocked ban IP manager.
		*
		* @var \Drupal\ban\BanIpManagerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\ban\BanIpManagerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $banManager;

core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
		/**
		* The entity type used for testing.
		*
		* @var \Drupal\Core\Entity\EntityTypeInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityTypeInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $entityType;

		/**
		* The entity type manager used for testing.
		*
		* @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $entityTypeManager;

		@@ -39,7 +39,7 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
		/**
		* The UUID generator used for testing.
		*
		* @var \Drupal\Component\Uuid\UuidInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Component\Uuid\UuidInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $uuid;

core/modules/block/tests/src/Unit/BlockFormTest.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -17,21 +17,21 @@ class BlockFormTest extends UnitTestCase {
		/**
		* The condition plugin manager.
		*
		* @var \Drupal\Core\Executable\ExecutableManagerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Executable\ExecutableManagerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $conditionManager;

		/**
		* The block storage.
		*
		* @var \Drupal\Core\Entity\EntityStorageInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityStorageInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $storage;

		/**
		* The language manager service.
		*
		* @var \Drupal\Core\Language\LanguageManagerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Language\LanguageManagerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $language;

		@@ -39,21 +39,21 @@ class BlockFormTest extends UnitTestCase {
		/**
		* The theme handler.
		*
		* @var \Drupal\Core\Extension\ThemeHandlerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Extension\ThemeHandlerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $themeHandler;

		/**
		* The entity type manager.
		*
		* @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $entityTypeManager;

		/**
		* The mocked context repository.
		*
		* @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $contextRepository;

		@@ -90,7 +90,7 @@ protected function setUp() {
		* @param string $machine_name
		* The machine name of the block plugin.
		*
		* @return \Drupal\block\BlockInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @return \Drupal\block\BlockInterface\|\PHPUnit\Framework\MockObject\MockObject
		* The mocked block.
		*/
		protected function getBlockMockWithMachineName($machine_name) {

core/modules/block/tests/src/Unit/BlockRepositoryTest.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ class BlockRepositoryTest extends UnitTestCase {
		protected $blockRepository;

		/**
		* @var \Drupal\Core\Entity\EntityStorageInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityStorageInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $blockStorage;

		@@ -36,7 +36,7 @@ class BlockRepositoryTest extends UnitTestCase {
		protected $theme;

		/**
		* @var \Drupal\Core\Plugin\Context\ContextHandlerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Plugin\Context\ContextHandlerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $contextHandler;

		@@ -67,7 +67,7 @@ protected function setUp() {

		$this->contextHandler = $this->createMock('Drupal\Core\Plugin\Context\ContextHandlerInterface');
		$this->blockStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
		/** @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit_Framework_MockObject_MockObject $entity_type_manager */
		/** @var \Drupal\Core\Entity\EntityTypeManagerInterface\|\PHPUnit\Framework\MockObject\MockObject $entity_type_manager */
		$entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
		$entity_type_manager->expects($this->any())
		->method('getStorage')

core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,21 +15,21 @@ class BlockPageVariantTest extends UnitTestCase {
		/**
		* The block repository.
		*
		* @var \Drupal\block\BlockRepositoryInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\block\BlockRepositoryInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $blockRepository;

		/**
		* The block view builder.
		*
		* @var \Drupal\Core\Entity\EntityViewBuilderInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Entity\EntityViewBuilderInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $blockViewBuilder;

		/**
		* The plugin context handler.
		*
		* @var \Drupal\Core\Plugin\Context\ContextHandlerInterface\|\PHPUnit_Framework_MockObject_MockObject
		* @var \Drupal\Core\Plugin\Context\ContextHandlerInterface\|\PHPUnit\Framework\MockObject\MockObject
		*/
		protected $contextHandler;

		@@ -41,7 +41,7 @@ class BlockPageVariantTest extends UnitTestCase {
		* @param array $definition
		* The plugin definition array.
		*
		* @return \Drupal\block\Plugin\DisplayVariant\BlockPageVariant\|\PHPUnit_Framework_MockObject_MockObject
		* @return \Drupal\block\Plugin\DisplayVariant\BlockPageVariant\|\PHPUnit\Framework\MockObject\MockObject
		* A mocked display variant plugin.
		*/
		public function setUpDisplayVariant($configuration = [], $definition = []) {