diff --git a/composer.json b/composer.json index a8602e3335..48a8dcf35c 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "jcalderonzumba/gastonjs": "^1.0.2", "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "mikey179/vfsstream": "^1.6.8", - "phpunit/phpunit": "^6.5 || ^7", + "phpunit/phpunit": "^6.5 || ^7 || ^8.4.1", "phpspec/prophecy": "^1.7", "symfony/css-selector": "^3.4.0", "symfony/phpunit-bridge": "^3.4.3", diff --git a/core/drupalci.yml b/core/drupalci.yml index ed02d43c63..6202985899 100644 --- a/core/drupalci.yml +++ b/core/drupalci.yml @@ -24,35 +24,35 @@ build: testgroups: '--all' suppress-deprecations: false halt-on-fail: false - run_tests.kernel: - types: 'PHPUnit-Kernel' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.simpletest: - types: 'Simpletest' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false +# run_tests.kernel: +# types: 'PHPUnit-Kernel' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false +# run_tests.simpletest: +# types: 'Simpletest' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false run_tests.build: types: 'PHPUnit-Build' testgroups: '--all' suppress-deprecations: false halt-on-fail: false - run_tests.functional: - types: 'PHPUnit-Functional' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.javascript: - concurrency: 15 - types: 'PHPUnit-FunctionalJavascript' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false +# run_tests.functional: +# types: 'PHPUnit-Functional' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false +# run_tests.javascript: +# concurrency: 15 +# types: 'PHPUnit-FunctionalJavascript' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false # Run nightwatch testing. # @see https://www.drupal.org/project/drupal/issues/2869825 - nightwatchjs: +# nightwatchjs: # container_command.drupal_project_templates: # commands: # - "sudo -u www-data ${SOURCE_DIR}/core/tests/scripts/test_composer_project_templates.sh" diff --git a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php index 1959f6510a..b4563b735b 100644 --- a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php +++ b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php @@ -11,9 +11,9 @@ */ class ActionLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['action' => 'core/modules/action']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php b/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php index d1f91dfe27..54d9463e52 100644 --- a/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php +++ b/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php @@ -14,9 +14,9 @@ class AggregatorLocalTasksTest extends LocalTaskIntegrationTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['aggregator' => 'core/modules/aggregator']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php index a6918a2127..4f56d3d6a6 100644 --- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php +++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php @@ -38,7 +38,7 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->configFactory = $this->getConfigFactoryStub( [ 'aggregator.settings' => [ diff --git a/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php b/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php index b21c5104a6..51888d8991 100644 --- a/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php +++ b/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php @@ -38,8 +38,8 @@ class BanMiddlewareTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->kernel = $this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'); $this->banManager = $this->createMock('Drupal\ban\BanIpManagerInterface'); diff --git a/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php b/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php index 66e647f2e4..9d9757987a 100644 --- a/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php +++ b/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php @@ -60,7 +60,7 @@ class BlockConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeId = $this->randomMachineName(); $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); diff --git a/core/modules/block/tests/src/Unit/BlockFormTest.php b/core/modules/block/tests/src/Unit/BlockFormTest.php index 47f9e7aec9..0493a0d6b4 100644 --- a/core/modules/block/tests/src/Unit/BlockFormTest.php +++ b/core/modules/block/tests/src/Unit/BlockFormTest.php @@ -67,8 +67,8 @@ class BlockFormTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->conditionManager = $this->createMock('Drupal\Core\Executable\ExecutableManagerInterface'); $this->language = $this->createMock('Drupal\Core\Language\LanguageManagerInterface'); diff --git a/core/modules/block/tests/src/Unit/BlockRepositoryTest.php b/core/modules/block/tests/src/Unit/BlockRepositoryTest.php index 6b9de28dce..7ce6d46ab9 100644 --- a/core/modules/block/tests/src/Unit/BlockRepositoryTest.php +++ b/core/modules/block/tests/src/Unit/BlockRepositoryTest.php @@ -43,8 +43,8 @@ class BlockRepositoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $active_theme = $this->getMockBuilder('Drupal\Core\Theme\ActiveTheme') ->disableOriginalConstructor() ->getMock(); diff --git a/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php b/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php index f542ebfc02..61f2b75019 100644 --- a/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php +++ b/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php @@ -20,7 +20,7 @@ class CategoryAutocompleteTest extends UnitTestCase { */ protected $autocompleteController; - protected function setUp() { + protected function xxxSetUp() { $block_manager = $this->createMock('Drupal\Core\Block\BlockManagerInterface'); $block_manager->expects($this->any()) ->method('getCategories') diff --git a/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php b/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php index c61e3a1cd8..e0abef5ce2 100644 --- a/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php +++ b/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php @@ -12,9 +12,9 @@ */ class BlockLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['block' => 'core/modules/block']; - parent::setUp(); + parent::xxxSetUp(); $config_factory = $this->getConfigFactoryStub([ 'system.theme' => ['default' => 'test_c'], diff --git a/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockVisibilityTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockVisibilityTest.php index d3649b77a7..063148ed96 100644 --- a/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockVisibilityTest.php +++ b/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockVisibilityTest.php @@ -26,8 +26,8 @@ class BlockVisibilityTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class); $migrate_lookup = $this->prophesize(MigrateLookupInterface::class); $this->plugin = new BlockVisibility([], 'block_visibility_pages', [], $this->moduleHandler->reveal(), $migrate_lookup->reveal()); diff --git a/core/modules/block_content/tests/src/Unit/Access/AccessGroupAndTest.php b/core/modules/block_content/tests/src/Unit/Access/AccessGroupAndTest.php index 8915674862..75f146199b 100644 --- a/core/modules/block_content/tests/src/Unit/Access/AccessGroupAndTest.php +++ b/core/modules/block_content/tests/src/Unit/Access/AccessGroupAndTest.php @@ -19,8 +19,8 @@ class AccessGroupAndTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->account = $this->prophesize(AccountInterface::class)->reveal(); } diff --git a/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php b/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php index 89810abc41..5e563ed029 100644 --- a/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php +++ b/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php @@ -34,8 +34,8 @@ class DependentAccessTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->account = $this->prophesize(AccountInterface::class)->reveal(); $this->forbidden = $this->createAccessibleDouble(AccessResult::forbidden('Because I said so')); $this->neutral = $this->createAccessibleDouble(AccessResult::neutral('I have no opinion')); diff --git a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php b/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php index b029d69d18..20439f6fff 100644 --- a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php +++ b/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php @@ -12,12 +12,12 @@ */ class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'block' => 'core/modules/block', 'block_content' => 'core/modules/block_content', ]; - parent::setUp(); + parent::xxxSetUp(); $config_factory = $this->getConfigFactoryStub([ 'system.theme' => ['default' => 'test_c'], diff --git a/core/modules/book/tests/src/Unit/BookManagerTest.php b/core/modules/book/tests/src/Unit/BookManagerTest.php index 503309870a..479c00efef 100644 --- a/core/modules/book/tests/src/Unit/BookManagerTest.php +++ b/core/modules/book/tests/src/Unit/BookManagerTest.php @@ -57,7 +57,7 @@ class BookManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->translation = $this->getStringTranslationStub(); $this->configFactory = $this->getConfigFactoryStub([]); diff --git a/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php index 496acf02fc..1eef829d14 100644 --- a/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php +++ b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php @@ -21,8 +21,8 @@ class BookUninstallValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->bookUninstallValidator = $this->getMockBuilder('Drupal\book\BookUninstallValidator') ->disableOriginalConstructor() ->setMethods(['hasBookOutlines', 'hasBookNodes']) diff --git a/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php b/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php index 7abbc5c0ea..eea15a2000 100644 --- a/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php +++ b/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php @@ -11,12 +11,12 @@ */ class BookLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'book' => 'core/modules/book', 'node' => 'core/modules/node', ]; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php index 79fbd4905d..27651c8305 100644 --- a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php +++ b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php @@ -42,8 +42,8 @@ class BreakpointTest extends UnitTestCase { */ protected $stringTranslation; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->stringTranslation = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface'); } diff --git a/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php b/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php index 3b18c67e79..6f26b5143b 100644 --- a/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php +++ b/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php @@ -23,7 +23,7 @@ class LanguageTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { + public function xxxSetUp() { $this->plugin = new Language([], $this->randomMachineName(), []); } diff --git a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php index 3ac8f6823c..6a771e2745 100644 --- a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php +++ b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php @@ -68,7 +68,7 @@ class CommentLinkBuilderTest extends UnitTestCase { /** * Prepares mocks for the test. */ - protected function setUp() { + protected function xxxSetUp() { $this->commentManager = $this->createMock('\Drupal\comment\CommentManagerInterface'); $this->stringTranslation = $this->getStringTranslationStub(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); diff --git a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php index c57562b415..df3e2a4321 100644 --- a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php +++ b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php @@ -50,7 +50,7 @@ class CommentStatisticsUnitTest extends UnitTestCase { /** * Sets up required mocks and the CommentStatistics service under test. */ - protected function setUp() { + protected function xxxSetUp() { $this->statement = $this->getMockBuilder('Drupal\Core\Database\Driver\sqlite\Statement') ->disableOriginalConstructor() ->getMock(); diff --git a/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php b/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php index 906f5499f5..6fa7644b53 100644 --- a/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php +++ b/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php @@ -17,8 +17,8 @@ class CommentBulkFormTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function tearDown() { - parent::tearDown(); + protected function xxxTearDown() { + parent::xxxTearDown(); $container = new ContainerBuilder(); \Drupal::setContainer($container); } diff --git a/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php b/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php index 0bfb32e93f..5e947e2a21 100644 --- a/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php +++ b/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php @@ -11,9 +11,9 @@ */ class ConfigLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['config' => 'core/modules/config']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php index bc9e2d79b5..c155725265 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php @@ -56,7 +56,7 @@ class ConfigEntityMapperTest extends UnitTestCase { */ protected $eventDispatcher; - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface'); $this->entity = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityInterface'); diff --git a/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php index 5ab3192d94..0108dd616c 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php @@ -45,7 +45,7 @@ class ConfigFieldMapperTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface'); $this->entity = $this->createMock('Drupal\field\FieldConfigInterface'); diff --git a/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php b/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php index 79b3b170dc..d39cb36bfe 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php @@ -30,7 +30,7 @@ class ConfigMapperManagerTest extends UnitTestCase { */ protected $typedConfigManager; - protected function setUp() { + protected function xxxSetUp() { $language = new Language(['id' => 'en']); $language_manager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface'); $language_manager->expects($this->once()) diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php index c73b16662a..c95902122c 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php @@ -95,7 +95,7 @@ class ConfigNamesMapperTest extends UnitTestCase { */ protected $eventDispatcher; - protected function setUp() { + protected function xxxSetUp() { $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); $this->pluginDefinition = [ diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php index 84ba7d6389..ea50216bb0 100644 --- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php +++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php @@ -68,8 +68,8 @@ class MailHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->mailManager = $this->createMock('\Drupal\Core\Mail\MailManagerInterface'); $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface'); $this->logger = $this->createMock('\Psr\Log\LoggerInterface'); diff --git a/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php b/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php index 8185106e3e..8855ec5313 100644 --- a/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php +++ b/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php @@ -28,7 +28,7 @@ class ContentModerationRouteSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class); $this->routeSubscriber = new ContentModerationRouteSubscriber($entity_type_manager); diff --git a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php index 455c0708fd..96796bb95f 100644 --- a/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php +++ b/core/modules/content_moderation/tests/src/Unit/LatestRevisionCheckTest.php @@ -27,8 +27,8 @@ class LatestRevisionCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Initialize Drupal container since the cache context manager is needed. $contexts_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php b/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php index 541ff8f64d..32d48ec584 100644 --- a/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php +++ b/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php @@ -30,8 +30,8 @@ class StateTransitionValidationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Create a container so that the plugin manager and workflow type can be // mocked. 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 165a298fcf..b3f9d3cf57 100644 --- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php +++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php @@ -30,8 +30,8 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() diff --git a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php index d6c3b70750..bf9c6c2123 100644 --- a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php +++ b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php @@ -11,12 +11,12 @@ */ class ContentTranslationLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'content_translation' => 'core/modules/content_translation', 'node' => 'core/modules/node', ]; - parent::setUp(); + parent::xxxSetUp(); $entity_type = $this->createMock('Drupal\Core\Entity\EntityTypeInterface'); $entity_type->expects($this->any()) diff --git a/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php b/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php index a194420417..93c033bc7c 100644 --- a/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php +++ b/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php @@ -21,8 +21,8 @@ class DateFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->prophesize(MigrationInterface::class)->reveal(); } diff --git a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php index 021df3aa26..f1b5d47915 100644 --- a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php +++ b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php @@ -58,7 +58,7 @@ class EditorConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->editorId = $this->randomMachineName(); $this->entityTypeId = $this->randomMachineName(); diff --git a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php index d077b5b1c4..9666faced8 100644 --- a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php +++ b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php @@ -19,7 +19,7 @@ class StandardTest extends UnitTestCase { */ protected $format; - protected function setUp() { + protected function xxxSetUp() { // Mock text format configuration entity object. $this->format = $this->getMockBuilder('\Drupal\filter\Entity\FilterFormat') diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php index dc3da86dc5..2cb2ab6b30 100644 --- a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php @@ -57,7 +57,7 @@ class EntityReferenceSettingsTest extends KernelTestBase { * {@inheritdoc} */ protected function setUp() { - parent::setup(); + parent::setUp(); $this->installEntitySchema('node'); $this->installEntitySchema('taxonomy_term'); diff --git a/core/modules/field/tests/src/Unit/FieldConfigAccessControlHandlerTest.php b/core/modules/field/tests/src/Unit/FieldConfigAccessControlHandlerTest.php index f7c3c0bdfd..147d6d54e8 100644 --- a/core/modules/field/tests/src/Unit/FieldConfigAccessControlHandlerTest.php +++ b/core/modules/field/tests/src/Unit/FieldConfigAccessControlHandlerTest.php @@ -17,8 +17,8 @@ class FieldConfigAccessControlHandlerTest extends FieldStorageConfigAccessContro /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entity = new FieldConfig([ 'field_name' => $this->entity->getName(), diff --git a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php index 2a2ebf685b..893aa7a8d7 100644 --- a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php +++ b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php @@ -73,7 +73,7 @@ class FieldConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeId = $this->randomMachineName(); $this->entityType = $this->createMock('\Drupal\Core\Config\Entity\ConfigEntityTypeInterface'); diff --git a/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php b/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php index 5c5be29334..f4a3c437d8 100644 --- a/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php +++ b/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php @@ -61,8 +61,8 @@ class FieldStorageConfigAccessControlHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->anon = $this->createMock(AccountInterface::class); $this->anon diff --git a/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php b/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php index a94d7b4fab..0eb3b41a81 100644 --- a/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php +++ b/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php @@ -53,7 +53,7 @@ class FieldStorageConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface'); $this->fieldTypeManager = $this->createMock(FieldTypePluginManagerInterface::class); diff --git a/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php index 6032f024ad..8c31c2a9a7 100644 --- a/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php +++ b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php @@ -28,8 +28,8 @@ class FieldUninstallValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->fieldUninstallValidator = $this->getMockBuilder('Drupal\field\FieldUninstallValidator') ->disableOriginalConstructor() ->setMethods(['getFieldStoragesByModule', 'getFieldTypeLabel']) diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/ProcessFieldTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/ProcessFieldTest.php index 60fbbde1f8..7c9b7b7bb7 100644 --- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/ProcessFieldTest.php +++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/ProcessFieldTest.php @@ -25,7 +25,7 @@ class ProcessFieldTest extends MigrateTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->cckFieldManager = $this->prophesize(MigrateCckFieldPluginManagerInterface::class); $this->fieldManager = $this->prophesize(MigrateFieldPluginManagerInterface::class); $this->fieldPlugin = $this->prophesize(MigrateFieldInterface::class); @@ -36,7 +36,7 @@ protected function setUp() { $this->fieldManager->getPluginIdFromFieldType('foo', [], $this->migration->reveal())->willReturn('foo'); $this->fieldManager->createInstance('foo', [], $this->migration->reveal())->willReturn($this->fieldPlugin); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php index 03c1cb1b3b..c293a23779 100644 --- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php +++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldTypeDefaultsTest.php @@ -17,8 +17,8 @@ class FieldTypeDefaultsTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->plugin = new FieldTypeDefaults([], 'd6_field_type_defaults', []); } diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldTypeDefaultsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldTypeDefaultsTest.php index eb080c8410..7c6393f361 100644 --- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldTypeDefaultsTest.php +++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldTypeDefaultsTest.php @@ -16,8 +16,8 @@ class FieldTypeDefaultsTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->plugin = new FieldTypeDefaults([], 'd7_field_type_defaults', []); } diff --git a/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php b/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php index b578694826..b02ab9b8ec 100644 --- a/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php +++ b/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php @@ -46,8 +46,8 @@ class FieldLayoutBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->pluginDefinition = new LayoutDefinition([ 'library' => 'field_layout/drupal.layout.twocol', diff --git a/core/modules/field_ui/tests/src/Unit/FieldUiTest.php b/core/modules/field_ui/tests/src/Unit/FieldUiTest.php index 084d469cb5..93e2c9a6c7 100644 --- a/core/modules/field_ui/tests/src/Unit/FieldUiTest.php +++ b/core/modules/field_ui/tests/src/Unit/FieldUiTest.php @@ -23,8 +23,8 @@ class FieldUiTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->pathValidator = $this->createMock('Drupal\Core\Path\PathValidatorInterface'); $container = new ContainerBuilder(); diff --git a/core/modules/file/tests/src/Functional/FileFieldTestBase.php b/core/modules/file/tests/src/Functional/FileFieldTestBase.php index 05f084ee34..7dd417306d 100644 --- a/core/modules/file/tests/src/Functional/FileFieldTestBase.php +++ b/core/modules/file/tests/src/Functional/FileFieldTestBase.php @@ -10,6 +10,7 @@ use Drupal\Tests\BrowserTestBase; use Drupal\file\Entity\File; use Drupal\Tests\TestFileCreationTrait; +use PHPUnit\Runner\Version; // In order to manage different method signatures between PHPUnit versions, we // dynamically load a compatibility trait dependent on the PHPUnit runner diff --git a/core/modules/file/tests/src/Kernel/FileItemValidationTest.php b/core/modules/file/tests/src/Kernel/FileItemValidationTest.php index 6fbc82f39a..503ba765bc 100644 --- a/core/modules/file/tests/src/Kernel/FileItemValidationTest.php +++ b/core/modules/file/tests/src/Kernel/FileItemValidationTest.php @@ -32,8 +32,8 @@ class FileItemValidationTest extends KernelTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->installEntitySchema('entity_test'); $this->installEntitySchema('user'); diff --git a/core/modules/file/tests/src/Unit/LegacyFileTest.php b/core/modules/file/tests/src/Unit/LegacyFileTest.php index 0c412d1626..e453f9862d 100644 --- a/core/modules/file/tests/src/Unit/LegacyFileTest.php +++ b/core/modules/file/tests/src/Unit/LegacyFileTest.php @@ -28,8 +28,8 @@ class LegacyFileTest extends TestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->configFactory = $this->prophesize(ConfigFactoryInterface::class)->reveal(); $container = new ContainerBuilder(); $container->set('config.factory', $this->configFactory); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d6/FileCckTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d6/FileCckTest.php index 43d7959ec2..2a710abcad 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d6/FileCckTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d6/FileCckTest.php @@ -28,7 +28,7 @@ class FileCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new FileField([], 'file', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php index e47a5a9316..54c535526e 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/FileCckTest.php @@ -28,7 +28,7 @@ class FileCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new FileField([], 'file', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php index b20d3d0f41..885229bb51 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/cckfield/d7/ImageCckTest.php @@ -27,7 +27,7 @@ class ImageCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new ImageField([], 'image', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/FileFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/FileFieldTest.php index 176657ff27..cdb1ca0c14 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/FileFieldTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/FileFieldTest.php @@ -27,7 +27,7 @@ class FileFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new FileField([], 'file', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/ImageFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/ImageFieldTest.php index c84bc6e23b..6e4d262c17 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/ImageFieldTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d6/ImageFieldTest.php @@ -27,7 +27,7 @@ class ImageFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new ImageField([], 'image', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php index 8e85916570..fd81b4f36c 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/FileFieldTest.php @@ -27,7 +27,7 @@ class FileFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new FileField([], 'file', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php index 8606df9e00..110c7589c4 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php @@ -27,7 +27,7 @@ class ImageFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new ImageField([], 'image', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/filter/tests/src/Unit/FilterHtmlTest.php b/core/modules/filter/tests/src/Unit/FilterHtmlTest.php index 0e4340501a..862abb4047 100644 --- a/core/modules/filter/tests/src/Unit/FilterHtmlTest.php +++ b/core/modules/filter/tests/src/Unit/FilterHtmlTest.php @@ -19,8 +19,8 @@ class FilterHtmlTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $configuration['settings'] = [ 'allowed_html' => '


    1. ', 'filter_html_help' => 1, diff --git a/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php b/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php index 9e5b75219d..90108e6d87 100644 --- a/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php +++ b/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php @@ -21,8 +21,8 @@ class FilterUninstallValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->filterUninstallValidator = $this->getMockBuilder('Drupal\filter\FilterUninstallValidator') ->disableOriginalConstructor() ->setMethods(['getFilterDefinitionsByProvider', 'getEnabledFilterFormats']) diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php index 6a86a180ba..fdb5edb81c 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php @@ -17,8 +17,8 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php index 962e5f0eaa..c82490977f 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php @@ -18,8 +18,8 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php index a194ecc686..dd2fa2489e 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php @@ -18,8 +18,8 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() diff --git a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php index 6166ea91c0..c48723d224 100644 --- a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php +++ b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php @@ -22,8 +22,8 @@ class ForumUninstallValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->forumUninstallValidator = $this->getMockBuilder('Drupal\forum\ForumUninstallValidator') ->disableOriginalConstructor() ->setMethods(['hasForumNodes', 'hasTermsForVocabulary', 'getForumVocabulary']) diff --git a/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php b/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php index 2f5258d054..47bff0c074 100644 --- a/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php +++ b/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php @@ -32,7 +32,7 @@ class HelpTopicTwigLoaderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->setUpVfs(); $this->helpLoader = new HelpTopicTwigLoader('\fake\root\path', $this->getHandlerMock('module'), diff --git a/core/modules/help_topics/tests/src/Unit/HelpTopicTwigTest.php b/core/modules/help_topics/tests/src/Unit/HelpTopicTwigTest.php index 201b73b70f..24de3bea79 100644 --- a/core/modules/help_topics/tests/src/Unit/HelpTopicTwigTest.php +++ b/core/modules/help_topics/tests/src/Unit/HelpTopicTwigTest.php @@ -42,7 +42,7 @@ class HelpTopicTwigTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->helpTopic = new HelpTopicTwig([], self::PLUGIN_INFORMATION['id'], self::PLUGIN_INFORMATION, diff --git a/core/modules/image/tests/src/Unit/ImageStyleTest.php b/core/modules/image/tests/src/Unit/ImageStyleTest.php index f02e3eeff4..c9e9121444 100644 --- a/core/modules/image/tests/src/Unit/ImageStyleTest.php +++ b/core/modules/image/tests/src/Unit/ImageStyleTest.php @@ -79,7 +79,7 @@ protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = [ /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeId = $this->randomMachineName(); $this->provider = $this->randomMachineName(); $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); diff --git a/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php b/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php index bca3d01e59..8eb6da202d 100644 --- a/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php +++ b/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php @@ -42,7 +42,7 @@ class DenyPrivateImageStyleDownloadTest extends UnitTestCase { */ protected $routeMatch; - protected function setUp() { + protected function xxxSetUp() { $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface'); $this->policy = new DenyPrivateImageStyleDownload($this->routeMatch); $this->response = new Response(); diff --git a/core/modules/image/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php b/core/modules/image/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php index 638c4eda73..d6fa2a9924 100644 --- a/core/modules/image/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php +++ b/core/modules/image/tests/src/Unit/Plugin/migrate/field/d7/ImageFieldTest.php @@ -27,7 +27,7 @@ class ImageFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new ImageField([], 'image', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php b/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php index d0937aed51..9c839a5155 100644 --- a/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php +++ b/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php @@ -52,8 +52,8 @@ class FormErrorHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->renderer = $this->createMock(RendererInterface::class); $this->messenger = $this->createMock(MessengerInterface::class); diff --git a/core/modules/jsonapi/tests/src/Unit/EventSubscriber/ResourceResponseValidatorTest.php b/core/modules/jsonapi/tests/src/Unit/EventSubscriber/ResourceResponseValidatorTest.php index 1746400ef3..ec627c32d3 100644 --- a/core/modules/jsonapi/tests/src/Unit/EventSubscriber/ResourceResponseValidatorTest.php +++ b/core/modules/jsonapi/tests/src/Unit/EventSubscriber/ResourceResponseValidatorTest.php @@ -33,8 +33,8 @@ class ResourceResponseValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); // Check that the validation class is available. if (!class_exists("\\JsonSchema\\Validator")) { $this->fail('The JSON Schema validator is missing. You can install it with `composer require justinrainbow/json-schema`.'); diff --git a/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php index 2cef29f9fb..1551ee2800 100644 --- a/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php @@ -35,7 +35,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { + public function xxxSetUp() { $resource_type_repository = $this->prophesize(ResourceTypeRepository::class); $field_resolver = $this->prophesize(FieldResolver::class); diff --git a/core/modules/jsonapi/tests/src/Unit/Normalizer/ResourceIdentifierNormalizerTest.php b/core/modules/jsonapi/tests/src/Unit/Normalizer/ResourceIdentifierNormalizerTest.php index 8df76d6559..ec2ebcd81d 100644 --- a/core/modules/jsonapi/tests/src/Unit/Normalizer/ResourceIdentifierNormalizerTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Normalizer/ResourceIdentifierNormalizerTest.php @@ -44,7 +44,7 @@ class ResourceIdentifierNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { + public function xxxSetUp() { $target_resource_type = new ResourceType('lorem', 'dummy_bundle', NULL); $relationship_fields = [ 'field_dummy' => new ResourceTypeRelationship('field_dummy'), diff --git a/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php b/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php index 1659b6f80b..ccaba964a6 100644 --- a/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php @@ -20,8 +20,8 @@ class EntityConditionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new Container(); $cache_context_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/jsonapi/tests/src/Unit/Query/OffsetPageTest.php b/core/modules/jsonapi/tests/src/Unit/Query/OffsetPageTest.php index a845f49047..8abfa2d504 100644 --- a/core/modules/jsonapi/tests/src/Unit/Query/OffsetPageTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Query/OffsetPageTest.php @@ -20,8 +20,8 @@ class OffsetPageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new Container(); $cache_context_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/jsonapi/tests/src/Unit/Query/SortTest.php b/core/modules/jsonapi/tests/src/Unit/Query/SortTest.php index cb2be5153e..5ab4c1e840 100644 --- a/core/modules/jsonapi/tests/src/Unit/Query/SortTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Query/SortTest.php @@ -20,8 +20,8 @@ class SortTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new Container(); $cache_context_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/jsonapi/tests/src/Unit/Routing/RoutesTest.php b/core/modules/jsonapi/tests/src/Unit/Routing/RoutesTest.php index 5ec52a6a92..b84dfc76f4 100644 --- a/core/modules/jsonapi/tests/src/Unit/Routing/RoutesTest.php +++ b/core/modules/jsonapi/tests/src/Unit/Routing/RoutesTest.php @@ -29,8 +29,8 @@ class RoutesTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $relationship_fields = [ 'external' => new ResourceTypeRelationship('external'), 'internal' => new ResourceTypeRelationship('internal'), diff --git a/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php b/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php index f566bc13e3..6469e53426 100644 --- a/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php +++ b/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php @@ -51,7 +51,7 @@ class LanguageConfigOverrideTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); diff --git a/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php b/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php index b89883cd5f..cb35648c41 100644 --- a/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php +++ b/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php @@ -60,7 +60,7 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeId = $this->randomMachineName(); $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); diff --git a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php index f36a1ada01..b6036fb6e5 100644 --- a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php +++ b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php @@ -22,7 +22,7 @@ class LanguageNegotiationUrlTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Set up some languages to be used by the language-based path processor. $language_de = $this->createMock('\Drupal\Core\Language\LanguageInterface'); diff --git a/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php b/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php index a231e198b5..2ce3517ca7 100644 --- a/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php +++ b/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php @@ -11,11 +11,11 @@ */ class LanguageLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'language' => 'core/modules/language', ]; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php b/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php index 022fc4e6cd..bf759698b7 100644 --- a/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php +++ b/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php @@ -19,13 +19,13 @@ class LanguageDomainsTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $configuration = [ 'key' => 'language', 'value' => 'domain', ]; $this->plugin = new LanguageDomains($configuration, 'map', []); - parent::setUp(); + parent::xxxSetUp(); // The language_domains plugin calls getSourceProperty() to check if domain // negotiation is used. If it is the values will be processed so we need it diff --git a/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php b/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php index 27aa0999ea..ffc6604de3 100644 --- a/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php +++ b/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php @@ -15,9 +15,9 @@ class LanguageNegotiationTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new LanguageNegotiation([], 'map', []); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php b/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php index 7b30433b02..cbb319d59c 100644 --- a/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php +++ b/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php @@ -55,8 +55,8 @@ public function providerBlockTypes() { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->blockManager = $this->prophesize(BlockManagerInterface::class); $this->account = $this->prophesize(AccountInterface::class); diff --git a/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php b/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php index 87580ad495..b79ac872b5 100644 --- a/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php +++ b/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php @@ -52,8 +52,8 @@ class DefaultsSectionStorageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); $entity_type_bundle_info = $this->prophesize(EntityTypeBundleInfoInterface::class); diff --git a/core/modules/layout_builder/tests/src/Unit/LayoutBuilderRoutesTest.php b/core/modules/layout_builder/tests/src/Unit/LayoutBuilderRoutesTest.php index e4b20bd840..2d8340889a 100644 --- a/core/modules/layout_builder/tests/src/Unit/LayoutBuilderRoutesTest.php +++ b/core/modules/layout_builder/tests/src/Unit/LayoutBuilderRoutesTest.php @@ -36,8 +36,8 @@ class LayoutBuilderRoutesTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->sectionStorageManager = $this->prophesize(SectionStorageManagerInterface::class); $this->routeBuilder = new LayoutBuilderRoutes($this->sectionStorageManager->reveal()); diff --git a/core/modules/layout_builder/tests/src/Unit/OverridesSectionStorageTest.php b/core/modules/layout_builder/tests/src/Unit/OverridesSectionStorageTest.php index eb03ae2e76..9afc5d67b1 100644 --- a/core/modules/layout_builder/tests/src/Unit/OverridesSectionStorageTest.php +++ b/core/modules/layout_builder/tests/src/Unit/OverridesSectionStorageTest.php @@ -56,8 +56,8 @@ class OverridesSectionStorageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class); diff --git a/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php b/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php index 0989da8487..c1d0529d7d 100644 --- a/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php +++ b/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php @@ -67,8 +67,8 @@ class SectionRenderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $layout_plugin_manager = $this->prophesize(LayoutPluginManagerInterface::class); $this->blockManager = $this->prophesize(BlockManagerInterface::class); diff --git a/core/modules/layout_builder/tests/src/Unit/SectionStorageManagerTest.php b/core/modules/layout_builder/tests/src/Unit/SectionStorageManagerTest.php index b3b99d1fcd..5da2300748 100644 --- a/core/modules/layout_builder/tests/src/Unit/SectionStorageManagerTest.php +++ b/core/modules/layout_builder/tests/src/Unit/SectionStorageManagerTest.php @@ -64,8 +64,8 @@ class SectionStorageManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache = $this->prophesize(CacheBackendInterface::class); $module_handler = $this->prophesize(ModuleHandlerInterface::class); diff --git a/core/modules/layout_builder/tests/src/Unit/SectionTest.php b/core/modules/layout_builder/tests/src/Unit/SectionTest.php index 576eba7e1d..a4713868b7 100644 --- a/core/modules/layout_builder/tests/src/Unit/SectionTest.php +++ b/core/modules/layout_builder/tests/src/Unit/SectionTest.php @@ -22,8 +22,8 @@ class SectionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->section = new Section( 'layout_onecol', diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/cckfield/LinkCckTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/cckfield/LinkCckTest.php index fb4742ecac..0ec64ee7e9 100644 --- a/core/modules/link/tests/src/Unit/Plugin/migrate/cckfield/LinkCckTest.php +++ b/core/modules/link/tests/src/Unit/Plugin/migrate/cckfield/LinkCckTest.php @@ -27,7 +27,7 @@ class LinkCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new LinkField([], 'link', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/field/d6/LinkFieldTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/field/d6/LinkFieldTest.php index a4c86dbabf..7ff7e297f9 100644 --- a/core/modules/link/tests/src/Unit/Plugin/migrate/field/d6/LinkFieldTest.php +++ b/core/modules/link/tests/src/Unit/Plugin/migrate/field/d6/LinkFieldTest.php @@ -26,7 +26,7 @@ class LinkFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new LinkField([], 'link', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php index 944137fd56..1d8301804f 100644 --- a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php +++ b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php @@ -67,7 +67,7 @@ class LocaleLookupTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->storage = $this->createMock('Drupal\locale\StringStorageInterface'); $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/modules/locale/tests/src/Unit/LocaleTranslationTest.php b/core/modules/locale/tests/src/Unit/LocaleTranslationTest.php index 47c4cca8bf..0c499ed1ae 100644 --- a/core/modules/locale/tests/src/Unit/LocaleTranslationTest.php +++ b/core/modules/locale/tests/src/Unit/LocaleTranslationTest.php @@ -36,7 +36,7 @@ class LocaleTranslationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->storage = $this->createMock('Drupal\locale\StringStorageInterface'); $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php b/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php index fced5cd66d..1602b8de2f 100644 --- a/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php +++ b/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php @@ -14,11 +14,11 @@ class LocaleLocalTasksTest extends LocalTaskIntegrationTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'locale' => 'core/modules/locale', ]; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php index 11ab2e796b..10304581ab 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php @@ -49,8 +49,8 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->getMigration(); $this->message = $this->createMock('Drupal\migrate\MigrateMessageInterface'); diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php index 5acc995666..3fe5d867fd 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php @@ -48,8 +48,8 @@ class MigrateExecutableTest extends MigrateTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->getMigration(); $this->message = $this->createMock('Drupal\migrate\MigrateMessageInterface'); $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php index 098603ebcc..fd0c8c4840 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php @@ -56,7 +56,7 @@ class MigrateSqlIdMapTest extends MigrateTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->database = $this->getDatabase([]); } diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php index a1ee4b4f5c..78a6d0c8ea 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php @@ -79,7 +79,7 @@ /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $module_handler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $state = $this->createMock('Drupal\Core\State\StateInterface'); $entity_manager = $this->createMock('Drupal\Core\Entity\EntityManagerInterface'); diff --git a/core/modules/migrate/tests/src/Unit/MigrateStubTest.php b/core/modules/migrate/tests/src/Unit/MigrateStubTest.php index 0a026ffc52..f7fc14107a 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateStubTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateStubTest.php @@ -32,8 +32,8 @@ class MigrateStubTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migrationPluginManager = $this->prophesize(MigrationPluginManagerInterface::class); } diff --git a/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php b/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php index c1228b281b..e3f595d501 100644 --- a/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php @@ -22,8 +22,8 @@ class MigrationPluginManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); // Get a plugin manager for testing. $module_handler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityRevisionTest.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityRevisionTest.php index f0b0379b0f..68c6245406 100644 --- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityRevisionTest.php +++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityRevisionTest.php @@ -21,8 +21,8 @@ class EntityRevisionTest extends EntityTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->prophesize(MigrationInterface::class); $this->storage = $this->prophesize(EntityStorageInterface::class); diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityTestBase.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityTestBase.php index 2b0e221882..6ace466781 100644 --- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityTestBase.php +++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityTestBase.php @@ -41,8 +41,8 @@ class EntityTestBase extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->prophesize(MigrationInterface::class); $this->storage = $this->prophesize(EntityStorageInterface::class); diff --git a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php index 219a13f17f..e35f7e3c51 100644 --- a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php +++ b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php @@ -43,8 +43,8 @@ class EntityRevisionTest extends UnitTestCase { */ protected $fieldTypeManager; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Setup mocks to be used when creating a revision destination. $this->migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/migrate/tests/src/Unit/process/ArrayBuildTest.php b/core/modules/migrate/tests/src/Unit/process/ArrayBuildTest.php index 66ffedddce..6cbf3ab769 100644 --- a/core/modules/migrate/tests/src/Unit/process/ArrayBuildTest.php +++ b/core/modules/migrate/tests/src/Unit/process/ArrayBuildTest.php @@ -14,13 +14,13 @@ class ArrayBuildTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $configuration = [ 'key' => 'foo', 'value' => 'bar', ]; $this->plugin = new ArrayBuild($configuration, 'map', []); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/ConcatTest.php b/core/modules/migrate/tests/src/Unit/process/ConcatTest.php index 6f6181d84d..591f5a6e62 100644 --- a/core/modules/migrate/tests/src/Unit/process/ConcatTest.php +++ b/core/modules/migrate/tests/src/Unit/process/ConcatTest.php @@ -20,9 +20,9 @@ class ConcatTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TestConcat(); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php index b271d37009..6c427c66dd 100644 --- a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php +++ b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php @@ -40,7 +40,7 @@ class DedupeEntityTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityQuery = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryInterface') ->disableOriginalConstructor() ->getMock(); @@ -54,7 +54,7 @@ protected function setUp() { ->method('getStorage') ->with('test_entity_type') ->willReturn($storage); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php b/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php index 2d3f0be320..673e0b8c8c 100644 --- a/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php +++ b/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php @@ -16,12 +16,12 @@ class ExplodeTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $configuration = [ 'delimiter' => ',', ]; $this->plugin = new Explode($configuration, 'map', []); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/ExtractTest.php b/core/modules/migrate/tests/src/Unit/process/ExtractTest.php index 2af2dc3b78..d799f9e533 100644 --- a/core/modules/migrate/tests/src/Unit/process/ExtractTest.php +++ b/core/modules/migrate/tests/src/Unit/process/ExtractTest.php @@ -14,10 +14,10 @@ class ExtractTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $configuration['index'] = ['foo']; $this->plugin = new Extract($configuration, 'map', []); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php b/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php index 5bc91587bb..a6702be6ae 100644 --- a/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php +++ b/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php @@ -21,7 +21,7 @@ class MachineNameTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->transliteration = $this->getMockBuilder('Drupal\Component\Transliteration\TransliterationInterface') ->disableOriginalConstructor() ->getMock(); @@ -31,7 +31,7 @@ protected function setUp() { $this->migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable') ->disableOriginalConstructor() ->getMock(); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php b/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php index 1a5a631855..4045f4ff94 100644 --- a/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php +++ b/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php @@ -39,7 +39,7 @@ class MakeUniqueEntityFieldTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityQuery = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryInterface') ->disableOriginalConstructor() ->getMock(); @@ -53,7 +53,7 @@ protected function setUp() { ->method('getStorage') ->with('test_entity_type') ->willReturn($storage); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/MenuLinkParentTest.php b/core/modules/migrate/tests/src/Unit/process/MenuLinkParentTest.php index d207be0c06..dec0d35dac 100644 --- a/core/modules/migrate/tests/src/Unit/process/MenuLinkParentTest.php +++ b/core/modules/migrate/tests/src/Unit/process/MenuLinkParentTest.php @@ -52,8 +52,8 @@ class MenuLinkParentTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration = $this->prophesize(MigrationInterface::class); $this->migrateLookup = $this->prophesize(MigrateLookupInterface::class); $this->migrateLookup->lookup(NULL, [1])->willReturn([]); diff --git a/core/modules/migrate/tests/src/Unit/process/MigrateProcessTestCase.php b/core/modules/migrate/tests/src/Unit/process/MigrateProcessTestCase.php index 1932433330..7ea2a44d0f 100644 --- a/core/modules/migrate/tests/src/Unit/process/MigrateProcessTestCase.php +++ b/core/modules/migrate/tests/src/Unit/process/MigrateProcessTestCase.php @@ -24,7 +24,7 @@ /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->row = $this->getMockBuilder('Drupal\migrate\Row') ->disableOriginalConstructor() ->getMock(); @@ -32,7 +32,7 @@ protected function setUp() { ->disableOriginalConstructor() ->getMock(); - parent::setUp(); + parent::xxxSetUp(); } } diff --git a/core/modules/migrate/tests/src/Unit/process/MigrationLookupTestCase.php b/core/modules/migrate/tests/src/Unit/process/MigrationLookupTestCase.php index c22127dd9d..0ff2a0ed2c 100644 --- a/core/modules/migrate/tests/src/Unit/process/MigrationLookupTestCase.php +++ b/core/modules/migrate/tests/src/Unit/process/MigrationLookupTestCase.php @@ -28,8 +28,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migrateStub = $this->prophesize(MigrateStub::class); $this->migrateLookup = $this->prophesize(MigrateLookupInterface::class); } diff --git a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php index e337f10cce..513c9d8dc8 100644 --- a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php +++ b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php @@ -35,8 +35,8 @@ class MigrationTest extends MigrationLookupTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->migration_plugin = $this->prophesize(MigrationInterface::class); $this->migration_plugin_manager = $this->prophesize(MigrationPluginManagerInterface::class); diff --git a/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php b/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php index cc77c393cd..bd17e47c87 100644 --- a/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php +++ b/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php @@ -17,10 +17,10 @@ class StaticMapTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $configuration['map']['foo']['bar'] = 'baz'; $this->plugin = new StaticMap($configuration, 'map', []); - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate/tests/src/Unit/process/SubstrTest.php b/core/modules/migrate/tests/src/Unit/process/SubstrTest.php index 54ef1c2b21..ffe767e958 100644 --- a/core/modules/migrate/tests/src/Unit/process/SubstrTest.php +++ b/core/modules/migrate/tests/src/Unit/process/SubstrTest.php @@ -17,8 +17,8 @@ class SubstrTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); } /** diff --git a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php index 813c8b78f8..dd52195ec2 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php @@ -42,8 +42,8 @@ class FieldDiscoveryTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->fieldPluginManager = $this->prophesize(MigrateFieldPluginManagerInterface::class); $this->migrationPluginManager = $this->prophesize(MigrationPluginManagerInterface::class); $this->logger = $this->prophesize(LoggerChannelInterface::class); diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php index 9e97fe24cd..3a977f1349 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php @@ -66,7 +66,7 @@ class Drupal6SqlBaseTest extends MigrateTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $plugin = 'placeholder_id'; /** @var \Drupal\Core\State\StateInterface $state */ $state = $this->createMock('Drupal\Core\State\StateInterface'); diff --git a/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php b/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php index 2a78d2565d..51b353b1bb 100644 --- a/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php +++ b/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php @@ -42,7 +42,7 @@ class DenyNodePreviewTest extends UnitTestCase { */ protected $routeMatch; - protected function setUp() { + protected function xxxSetUp() { $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface'); $this->policy = new DenyNodePreview($this->routeMatch); $this->response = new Response(); diff --git a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php index 3b94bb8bd6..54fa000275 100644 --- a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php @@ -17,8 +17,8 @@ class NodeBulkFormTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function tearDown() { - parent::tearDown(); + protected function xxxTearDown() { + parent::xxxTearDown(); $container = new ContainerBuilder(); \Drupal::setContainer($container); } diff --git a/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php b/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php index 6dc8a5835d..d7f5f31543 100644 --- a/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php +++ b/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php @@ -26,7 +26,7 @@ class QuickEditEntityFieldAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->editAccessCheck = new QuickEditEntityFieldAccessCheck(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php index d8ba6f018f..f4498b4a1e 100644 --- a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php +++ b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php @@ -44,7 +44,7 @@ class RdfMappingConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeId = $this->randomMachineName(); $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php index 8091ad32f8..642b5a4989 100644 --- a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php +++ b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php @@ -38,7 +38,7 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); $this->entityType->expects($this->any()) ->method('getProvider') diff --git a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php index 7e456130c9..9e47e4e948 100644 --- a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php +++ b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php @@ -30,8 +30,8 @@ class CollectRoutesTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new ContainerBuilder(); diff --git a/core/modules/rest/tests/src/Unit/Plugin/views/style/SerializerTest.php b/core/modules/rest/tests/src/Unit/Plugin/views/style/SerializerTest.php index 2670b2ab8b..c025c4bac7 100644 --- a/core/modules/rest/tests/src/Unit/Plugin/views/style/SerializerTest.php +++ b/core/modules/rest/tests/src/Unit/Plugin/views/style/SerializerTest.php @@ -32,8 +32,8 @@ class SerializerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->view = $this->getMockBuilder(ViewExecutable::class) ->disableOriginalConstructor() diff --git a/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php b/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php index be8cbfc293..b2460ec270 100644 --- a/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php +++ b/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php @@ -49,7 +49,7 @@ class SearchPageRepositoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->query = $this->createMock('Drupal\Core\Entity\Query\QueryInterface'); $this->storage = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityStorageInterface'); diff --git a/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php b/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php index a96d89d0a0..5cac3d4dd3 100644 --- a/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php +++ b/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php @@ -35,7 +35,7 @@ class SearchPluginCollectionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->pluginManager = $this->createMock('Drupal\Component\Plugin\PluginManagerInterface'); $this->searchPluginCollection = new SearchPluginCollection($this->pluginManager, 'banana', ['id' => 'banana', 'color' => 'yellow'], 'fruit_stand'); } diff --git a/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php b/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php index 1703660463..fefb3b3101 100644 --- a/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php +++ b/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php @@ -33,7 +33,7 @@ class XmlEncoderTest extends UnitTestCase { */ protected $testArray = ['test' => 'test']; - protected function setUp() { + protected function xxxSetUp() { $this->baseEncoder = $this->createMock(BaseXmlEncoder::class); $this->encoder = new XmlEncoder(); $this->encoder->setBaseEncoder($this->baseEncoder); diff --git a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php index 3dbe73ebc9..ef92bf34e9 100644 --- a/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php +++ b/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php @@ -35,7 +35,7 @@ class ChainEntityResolverTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->testNormalizer = $this->createMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface'); $this->testData = new \stdClass(); } diff --git a/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php b/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php index a9cc71f98b..6e410b5eec 100644 --- a/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php +++ b/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php @@ -29,7 +29,7 @@ class UuidResolverTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityRepository = $this->createMock(EntityRepositoryInterface::class); $this->resolver = new UuidResolver($this->entityRepository); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php index 1bf6cf4a81..189d10d26c 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/ComplexDataNormalizerTest.php @@ -37,7 +37,7 @@ class ComplexDataNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->normalizer = new ComplexDataNormalizer(); } diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php index f11971e730..b03850bea2 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php @@ -34,7 +34,7 @@ class ContentEntityNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $entity_field_manager = $this->createMock(EntityFieldManagerInterface::class); $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class); $entity_type_repository = $this->createMock(EntityTypeRepositoryInterface::class); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php index bcb6a34907..815c0b7d9c 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php @@ -45,8 +45,8 @@ class DateTimeIso8601NormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $system_date_config = $this->prophesize(ImmutableConfig::class); $system_date_config->get('timezone.default') diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php index e6b6c788e8..6915a8a920 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php @@ -38,8 +38,8 @@ class DateTimeNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $system_date_config = $this->prophesize(ImmutableConfig::class); $system_date_config->get('timezone.default') diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php index 9d760fb79b..a655f3d011 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php @@ -55,7 +55,7 @@ class EntityNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityFieldManager = $this->createMock(EntityFieldManagerInterface::class); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityTypeRepository = $this->createMock(EntityTypeRepositoryInterface::class); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php index 04a9c5cbf2..39b797f52d 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php @@ -69,7 +69,7 @@ class EntityReferenceFieldItemNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityRepository = $this->prophesize(EntityRepositoryInterface::class); $this->normalizer = new EntityReferenceFieldItemNormalizer($this->entityRepository->reveal()); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php index e74ffba9bb..8e83cc5bcf 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php @@ -43,7 +43,7 @@ class ListNormalizerTest extends UnitTestCase { */ protected $typedData; - protected function setUp() { + protected function xxxSetUp() { // Mock the TypedDataManager to return a TypedDataInterface mock. $this->typedData = $this->createMock('Drupal\Core\TypedData\TypedDataInterface'); $typed_data_manager = $this->createMock(TypedDataManagerInterface::class); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php index ff3b9861b1..8df6f98331 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php @@ -28,7 +28,7 @@ class NullNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->normalizer = new NullNormalizer($this->interface); } diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php index acdc6daa3a..25764b33d6 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php @@ -25,7 +25,7 @@ class PrimitiveDataNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->normalizer = new PrimitiveDataNormalizer(); } diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php index 3d74c7cf77..bd688a339a 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php @@ -38,8 +38,8 @@ class TimestampItemNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->normalizer = new TimestampItemNormalizer(); } diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php index 81c456d674..635529b225 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php @@ -37,8 +37,8 @@ class TimestampNormalizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->normalizer = new TimestampNormalizer($this->prophesize(ConfigFactoryInterface::class)->reveal()); $this->data = $this->prophesize(Timestamp::class); diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php index 0a899616bf..4cc9c941cf 100644 --- a/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php +++ b/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php @@ -25,7 +25,7 @@ class TypedDataNormalizerTest extends UnitTestCase { */ protected $typedData; - protected function setUp() { + protected function xxxSetUp() { $this->normalizer = new TypedDataNormalizer(); $this->typedData = $this->createMock('Drupal\Core\TypedData\TypedDataInterface'); } diff --git a/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php b/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php index 09b6468afe..f0a789e9d7 100644 --- a/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php +++ b/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php @@ -11,12 +11,12 @@ */ class ShortcutLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = [ 'shortcut' => 'core/modules/shortcut', 'user' => 'core/modules/user', ]; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php b/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php index 4f90438d1d..1fad02d8e0 100644 --- a/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php +++ b/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php @@ -5,6 +5,7 @@ use Drupal\Core\Database\Database; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\File\FileSystemInterface; +use Drupal\Tests\PhpunitCompatibilityTrait; use Drupal\Core\Test\PhpUnitTestRunner; use PHPUnit\Framework\TestCase; @@ -30,6 +31,8 @@ */ class SimpletestPhpunitRunCommandTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * Path to the app root. * @@ -47,7 +50,7 @@ class SimpletestPhpunitRunCommandTest extends TestCase { /** * {@inheritdoc} */ - public static function setUpBeforeClass() { + public static function xxxSetUpBeforeClass() { parent::setUpBeforeClass(); // Figure out our app root. self::$root = dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))); @@ -63,7 +66,7 @@ public static function setUpBeforeClass() { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Organize our mock container. $container = new ContainerBuilder(); @@ -142,7 +145,7 @@ public function testSimpletestPhpUnitRunCommand($status, $label) { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { // We unset the $base_url global, since the test code sets it as a // side-effect. unset($GLOBALS['base_url']); diff --git a/core/modules/system/tests/src/Kernel/Installer/InstallTranslationFilePatternTest.php b/core/modules/system/tests/src/Kernel/Installer/InstallTranslationFilePatternTest.php index b541ed8cb3..c1fe21bb1a 100644 --- a/core/modules/system/tests/src/Kernel/Installer/InstallTranslationFilePatternTest.php +++ b/core/modules/system/tests/src/Kernel/Installer/InstallTranslationFilePatternTest.php @@ -30,8 +30,8 @@ class InstallTranslationFilePatternTest extends KernelTestBase { /** * {@inheritdoc} */ - protected function setup() { - parent::setUp(); + protected function xxxSetup() { + parent::xxxSetUp(); $this->fileTranslation = new FileTranslation('filename', $this->container->get('file_system')); $method = new \ReflectionMethod('\Drupal\Core\StringTranslation\Translator\FileTranslation', 'getTranslationFilesPattern'); $method->setAccessible(TRUE); diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php index 61ca3e0a8d..8811dd20a5 100644 --- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php +++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php @@ -97,8 +97,8 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestMatcher = $this->createMock('\Symfony\Component\Routing\Matcher\RequestMatcherInterface'); diff --git a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php index 782715e9a3..c09039530c 100644 --- a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php +++ b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php @@ -28,8 +28,8 @@ class MenuLinkTreeTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->menuLinkTree = new MenuLinkTree( $this->createMock('\Drupal\Core\Menu\MenuTreeStorageInterface'), diff --git a/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php b/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php index fa17be8ad1..25eb1f6490 100644 --- a/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php +++ b/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php @@ -22,8 +22,8 @@ class SystemLocalTasksTest extends LocalTaskIntegrationTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->directoryList = [ 'system' => 'core/modules/system', diff --git a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php index 3ee7939846..9790c13a36 100644 --- a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php +++ b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php @@ -31,8 +31,8 @@ class MachineNameControllerTest extends UnitTestCase { */ protected $tokenGenerator; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Create the machine name controller. $this->tokenGenerator = $this->prophesize(CsrfTokenGenerator::class); $this->tokenGenerator->validate(Argument::cetera())->will(function ($args) { diff --git a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php index 894232344b..55f94f6747 100644 --- a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php +++ b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php @@ -11,9 +11,9 @@ */ class TaxonomyLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['taxonomy' => 'core/modules/taxonomy']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php index 48af5687fe..0fcefc9894 100644 --- a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php +++ b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/cckfield/TaxonomyTermReferenceCckTest.php @@ -27,7 +27,7 @@ class TaxonomyTermReferenceCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TaxonomyTermReference([], 'taxonomy', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php index 5b7ec3e9c3..e2b725452c 100644 --- a/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php +++ b/core/modules/taxonomy/tests/src/Unit/Plugin/migrate/field/TaxonomyTermReferenceFieldTest.php @@ -26,7 +26,7 @@ class TaxonomyTermReferenceFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TaxonomyTermReference([], 'taxonomy', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php index 51ec9af9c8..cdd8b0dd43 100644 --- a/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/TextCckTest.php @@ -28,7 +28,7 @@ class TextCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TextField([], 'text', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php index 6e1381e03f..40701fd8bc 100644 --- a/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php @@ -28,7 +28,7 @@ class TextFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TextField([], 'text', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php index 696c34cba3..a2a4d37484 100644 --- a/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php +++ b/core/modules/text/tests/src/Unit/Plugin/migrate/cckfield/TextCckTest.php @@ -28,7 +28,7 @@ class TextCckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TextField([], 'text', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php index 5f8dc9c66a..0eeaa247c8 100644 --- a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php @@ -27,7 +27,7 @@ class TextFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TextField([], 'text', []); $migration = $this->prophesize(MigrationInterface::class); diff --git a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d7/TextFieldTest.php b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d7/TextFieldTest.php index ff20defcf5..02deaa85d8 100644 --- a/core/modules/text/tests/src/Unit/Plugin/migrate/field/d7/TextFieldTest.php +++ b/core/modules/text/tests/src/Unit/Plugin/migrate/field/d7/TextFieldTest.php @@ -20,7 +20,7 @@ class TextFieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->plugin = new TextField([], 'text', []); } diff --git a/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php b/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php index 01ca004574..22d86e66e6 100644 --- a/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php +++ b/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php @@ -20,7 +20,7 @@ class AllowToolbarPathTest extends UnitTestCase { */ protected $policy; - protected function setUp() { + protected function xxxSetUp() { $this->policy = new AllowToolbarPath(); } diff --git a/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php b/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php index 51b83c8d5b..ab8f4b7b36 100644 --- a/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php +++ b/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php @@ -11,9 +11,9 @@ */ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['update' => 'core/modules/update']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php index 61c767deda..ec5ea96aa3 100644 --- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php +++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php @@ -26,7 +26,7 @@ class UpdateFetcherTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $config_factory = $this->getConfigFactoryStub(['update.settings' => ['fetch_url' => 'http://www.example.com']]); $http_client_mock = $this->createMock('\GuzzleHttp\ClientInterface'); $this->updateFetcher = new UpdateFetcher($config_factory, $http_client_mock); diff --git a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php index 97cf5931f3..ca90a749c0 100644 --- a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php +++ b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php @@ -11,9 +11,9 @@ */ class UserLocalTasksTest extends LocalTaskIntegrationTestBase { - protected function setUp() { + protected function xxxSetUp() { $this->directoryList = ['user' => 'core/modules/user']; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php index ddda064fb2..648bdc86be 100644 --- a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php +++ b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php @@ -33,8 +33,8 @@ class PermissionAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php index 6964ac95b0..be889778b7 100644 --- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php +++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php @@ -57,8 +57,8 @@ class PermissionHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->stringTranslation = new TestTranslationManager(); $this->controllerResolver = $this->createMock('Drupal\Core\Controller\ControllerResolverInterface'); diff --git a/core/modules/user/tests/src/Unit/Plugin/Action/RoleUserTestBase.php b/core/modules/user/tests/src/Unit/Plugin/Action/RoleUserTestBase.php index 668fbd09ac..ecd12732bb 100644 --- a/core/modules/user/tests/src/Unit/Plugin/Action/RoleUserTestBase.php +++ b/core/modules/user/tests/src/Unit/Plugin/Action/RoleUserTestBase.php @@ -26,8 +26,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->account = $this ->getMockBuilder('Drupal\user\Entity\User') diff --git a/core/modules/user/tests/src/Unit/Plugin/migrate/process/ConvertTokensTest.php b/core/modules/user/tests/src/Unit/Plugin/migrate/process/ConvertTokensTest.php index ddd731f833..629fa8e4f0 100644 --- a/core/modules/user/tests/src/Unit/Plugin/migrate/process/ConvertTokensTest.php +++ b/core/modules/user/tests/src/Unit/Plugin/migrate/process/ConvertTokensTest.php @@ -15,8 +15,8 @@ class ConvertTokensTest extends MigrateProcessTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->plugin = new ConvertTokens([], 'convert_tokens', []); } diff --git a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php index bd3de0ca2b..a4d87e46dd 100644 --- a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php +++ b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php @@ -17,8 +17,8 @@ class UserBulkFormTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function tearDown() { - parent::tearDown(); + protected function xxxTearDown() { + parent::xxxTearDown(); $container = new ContainerBuilder(); \Drupal::setContainer($container); } diff --git a/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php b/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php index 8ee659a4bd..9ed29e79f2 100644 --- a/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php +++ b/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php @@ -69,8 +69,8 @@ class PrivateTempStoreTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->keyValue = $this->createMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/modules/user/tests/src/Unit/SharedTempStoreTest.php b/core/modules/user/tests/src/Unit/SharedTempStoreTest.php index 59a9d8f711..c46cfcd222 100644 --- a/core/modules/user/tests/src/Unit/SharedTempStoreTest.php +++ b/core/modules/user/tests/src/Unit/SharedTempStoreTest.php @@ -69,8 +69,8 @@ class SharedTempStoreTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->keyValue = $this->createMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php index 0a73d7ff15..2e4e055365 100644 --- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php +++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php @@ -56,8 +56,8 @@ class UserAccessControlHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); diff --git a/core/modules/user/tests/src/Unit/UserAuthTest.php b/core/modules/user/tests/src/Unit/UserAuthTest.php index a7c0935f5c..71b63f373a 100644 --- a/core/modules/user/tests/src/Unit/UserAuthTest.php +++ b/core/modules/user/tests/src/Unit/UserAuthTest.php @@ -57,7 +57,7 @@ class UserAuthTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->userStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface'); /** @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit\Framework\MockObject\MockObject $entity_type_manager */ diff --git a/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php b/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php index dd3189decb..1bc461cf2b 100644 --- a/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php +++ b/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php @@ -60,8 +60,8 @@ class UserRegistrationResourceTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->logger = $this->prophesize(LoggerInterface::class)->reveal(); diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php index 8f208f15b7..bdc702e18c 100644 --- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php +++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php @@ -66,7 +66,7 @@ class ViewAjaxControllerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->viewStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface'); $this->executableFactory = $this->getMockBuilder('Drupal\views\ViewExecutableFactory') ->disableOriginalConstructor() diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index 0633f61482..c36df8691d 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -90,7 +90,7 @@ class EntityViewsDataTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityStorage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') ->disableOriginalConstructor() ->getMock(); diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php index 7916bbec29..b72e51d602 100644 --- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php +++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php @@ -48,7 +48,7 @@ class RouteSubscriberTest extends UnitTestCase { */ protected $state; - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->viewStorage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage') ->disableOriginalConstructor() diff --git a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php index da23ca9645..d00afe68f5 100644 --- a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php @@ -57,9 +57,9 @@ class ViewsBlockTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // TODO: Change the autogenerated stub. - parent::setUp(); + parent::xxxSetUp(); $condition_plugin_manager = $this->createMock('Drupal\Core\Executable\ExecutableManagerInterface'); $condition_plugin_manager->expects($this->any()) ->method('getDefinitions') diff --git a/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php b/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php index feb30db43b..7353c1b07f 100644 --- a/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php @@ -49,7 +49,7 @@ class ViewsLocalTaskTest extends UnitTestCase { */ protected $localTaskDerivative; - protected function setUp() { + protected function xxxSetUp() { $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); $this->state = $this->createMock('Drupal\Core\State\StateInterface'); $this->viewStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface'); diff --git a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php index ec79b52d94..f69a193829 100644 --- a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php @@ -21,8 +21,8 @@ class HandlerBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->setupViewsData(); $this->setupExecutableAndView(); diff --git a/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php b/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php index 84dc5be25f..59248f62d4 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php @@ -81,8 +81,8 @@ class EntityTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityRepository = $this->createMock(EntityRepositoryInterface::class); diff --git a/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php b/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php index 1c6728da37..ce5ab634ca 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php @@ -28,8 +28,8 @@ class MessagesTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->messagesHandler = new Messages([], 'result', []); } diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php index a94b672af5..5e48e11cea 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php @@ -32,8 +32,8 @@ class ResultTest extends UnitTestCase { */ protected $resultHandler; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $storage = $this->prophesize(View::class); $storage->label()->willReturn('ResultTest'); diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php index b7b306fe8f..40f2967509 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php @@ -28,8 +28,8 @@ class ViewTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface'); $this->viewHandler = new ViewAreaPlugin([], 'view', [], $this->entityStorage); $this->viewHandler->view = $this->getMockBuilder('Drupal\views\ViewExecutable') diff --git a/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php b/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php index d119f1f8f9..0f149f3064 100644 --- a/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php @@ -51,8 +51,8 @@ class EntityTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityTypeBundleInfo = $this->createMock(EntityTypeBundleInfoInterface::class); diff --git a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php index 2d4546892d..1e1dc3610e 100644 --- a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php @@ -49,8 +49,8 @@ class PathPluginBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); $this->state = $this->createMock('\Drupal\Core\State\StateInterface'); diff --git a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php index 4e4b5b16ea..3066e31d63 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php @@ -54,8 +54,8 @@ class CounterTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Setup basic stuff like the view and the display. $config = []; diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php index 623436e6ba..5de3f54b0f 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php @@ -130,8 +130,8 @@ class FieldPluginBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->executable = $this->getMockBuilder('Drupal\views\ViewExecutable') ->disableOriginalConstructor() diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php index ac5d1c4f79..8b80e46b30 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php @@ -84,8 +84,8 @@ class FieldTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityFieldManager = $this->createMock(EntityFieldManagerInterface::class); diff --git a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php index 3f273552db..3badb57d52 100644 --- a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php @@ -24,7 +24,7 @@ class PagerPluginBaseTest extends UnitTestCase { */ protected $pager; - protected function setUp() { + protected function xxxSetUp() { $this->pager = $this->getMockBuilder('Drupal\views\Plugin\views\pager\PagerPluginBase') ->disableOriginalConstructor() ->getMockForAbstractClass(); diff --git a/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php b/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php index 91688a0368..29d51751d5 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php @@ -34,8 +34,8 @@ class BlockTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->executable = $this->getMockBuilder('Drupal\views\ViewExecutable') ->disableOriginalConstructor() diff --git a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php index 5f07966475..6b4c6ec9a5 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php @@ -47,7 +47,7 @@ class EntityOperationsUnitTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityRepository = $this->createMock(EntityRepositoryInterface::class); $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface'); diff --git a/core/modules/views/tests/src/Unit/Plugin/views/query/MysqlDateSqlTest.php b/core/modules/views/tests/src/Unit/Plugin/views/query/MysqlDateSqlTest.php index 575cc58cf6..13da5af9b7 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/query/MysqlDateSqlTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/query/MysqlDateSqlTest.php @@ -25,8 +25,8 @@ class MysqlDateSqlTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->database = $this->prophesize(Connection::class)->reveal(); } diff --git a/core/modules/views/tests/src/Unit/Plugin/views/query/PostgresqlDateSqlTest.php b/core/modules/views/tests/src/Unit/Plugin/views/query/PostgresqlDateSqlTest.php index 14f367d261..c8330ab40d 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/query/PostgresqlDateSqlTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/query/PostgresqlDateSqlTest.php @@ -25,8 +25,8 @@ class PostgresqlDateSqlTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->database = $this->prophesize(Connection::class)->reveal(); } diff --git a/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php b/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php index 749a1efffa..19ffc9c452 100644 --- a/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php @@ -25,8 +25,8 @@ class SqliteDateSqlTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->database = $this->prophesize(Connection::class)->reveal(); } diff --git a/core/modules/views/tests/src/Unit/PluginBaseTest.php b/core/modules/views/tests/src/Unit/PluginBaseTest.php index afa849f8c8..883e957dca 100644 --- a/core/modules/views/tests/src/Unit/PluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/PluginBaseTest.php @@ -21,8 +21,8 @@ class PluginBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->testHelperPlugin = new TestHelperPlugin([], 'default', []); } diff --git a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php index 0364558124..451e8e5ddd 100644 --- a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php +++ b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php @@ -35,7 +35,7 @@ class ViewPageControllerTest extends UnitTestCase { '#view_display_show_admin_links' => NULL, ]; - protected function setUp() { + protected function xxxSetUp() { $this->pageController = new ViewPageController(); } diff --git a/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php b/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php index c5e7138f5d..14a18d0da3 100644 --- a/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php +++ b/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php @@ -58,8 +58,8 @@ class ViewExecutableFactoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->user = $this->createMock('Drupal\Core\Session\AccountInterface'); $this->requestStack = new RequestStack(); diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php index 59c5f860c5..8f1efba206 100644 --- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php +++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php @@ -104,8 +104,8 @@ class ViewExecutableTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->view = $this->createMock('Drupal\views\ViewEntityInterface'); $this->user = $this->createMock('Drupal\Core\Session\AccountInterface'); diff --git a/core/modules/views/tests/src/Unit/ViewsDataTest.php b/core/modules/views/tests/src/Unit/ViewsDataTest.php index cd718c759f..369c75aaaa 100644 --- a/core/modules/views/tests/src/Unit/ViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/ViewsDataTest.php @@ -58,7 +58,7 @@ class ViewsDataTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); $this->cacheBackend = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->getContainerWithCacheTagsInvalidator($this->cacheTagsInvalidator); diff --git a/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php b/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php index 3b1297f373..0ee456d594 100644 --- a/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php +++ b/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php @@ -41,8 +41,8 @@ class ViewsHandlerManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->viewsData = $this->getMockBuilder('Drupal\views\ViewsData') ->disableOriginalConstructor() ->getMock(); diff --git a/core/modules/views/tests/src/Unit/ViewsTest.php b/core/modules/views/tests/src/Unit/ViewsTest.php index f6dbaadb2a..9aac5da63d 100644 --- a/core/modules/views/tests/src/Unit/ViewsTest.php +++ b/core/modules/views/tests/src/Unit/ViewsTest.php @@ -27,8 +27,8 @@ class ViewsTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $user = $this->createMock('Drupal\Core\Session\AccountInterface'); diff --git a/core/modules/workflows/tests/src/Unit/WorkflowTest.php b/core/modules/workflows/tests/src/Unit/WorkflowTest.php index 8da8e5fd19..7102dcb92e 100644 --- a/core/modules/workflows/tests/src/Unit/WorkflowTest.php +++ b/core/modules/workflows/tests/src/Unit/WorkflowTest.php @@ -21,8 +21,8 @@ class WorkflowTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Create a container so that the plugin manager and workflow type can be // mocked. $container = new ContainerBuilder(); diff --git a/core/modules/workspaces/tests/src/Unit/ActiveWorkspaceCheckTest.php b/core/modules/workspaces/tests/src/Unit/ActiveWorkspaceCheckTest.php index 34db19b58a..45037f7f7f 100644 --- a/core/modules/workspaces/tests/src/Unit/ActiveWorkspaceCheckTest.php +++ b/core/modules/workspaces/tests/src/Unit/ActiveWorkspaceCheckTest.php @@ -28,8 +28,8 @@ class ActiveWorkspaceCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); diff --git a/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php b/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php index e5f109832d..8b3ad9aa9e 100644 --- a/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php +++ b/core/modules/workspaces/tests/src/Unit/WorkspaceRequestSubscriberTest.php @@ -37,8 +37,8 @@ class WorkspaceRequestSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->aliasManager = $this->prophesize(AliasManagerInterface::class)->reveal(); $this->currentPath = $this->prophesize(CurrentPathStack::class)->reveal(); diff --git a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php index 335844cce1..ecf883e36c 100644 --- a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php +++ b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php @@ -15,6 +15,7 @@ use Symfony\Component\Lock\Store\FlockStore; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * Provides a workspace to test build processes. @@ -51,6 +52,7 @@ */ abstract class BuildTestBase extends TestCase { + use PhpunitCompatibilityTrait; use ExternalCommandRequirementsTrait; /** @@ -142,16 +144,16 @@ /** * {@inheritdoc} */ - public static function setUpBeforeClass() { - parent::setUpBeforeClass(); + public static function xxxSetUpBeforeClass() { + parent::xxxSetUpBeforeClass(); static::checkClassCommandRequirements(); } /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); static::checkMethodCommandRequirements($this->getName()); $this->phpFinder = new PhpExecutableFinder(); // Set up the workspace directory. @@ -166,8 +168,8 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { - parent::tearDown(); + protected function xxxTearDown() { + parent::xxxTearDown(); $this->stopServer(); foreach ($this->portLocks as $lock) { diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php index 0e1ba5daab..22c71433bc 100644 --- a/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php +++ b/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php @@ -35,8 +35,8 @@ class ContextAwarePluginBaseTest extends KernelTestBase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $configuration = [ 'context' => [ 'nato_letter' => 'Alpha', diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php index 9c065d48be..f0858640be 100644 --- a/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php +++ b/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php @@ -29,8 +29,8 @@ protected $defaultsTestPluginManager; protected $defaultsTestPluginExpectedDefinitions; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Real modules implementing plugin types may expose a module-specific API // for retrieving each type's plugin manager, or make them available in diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index 790a76a64f..35e0792890 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -224,7 +224,7 @@ /** * {@inheritdoc} */ - public static function setUpBeforeClass() { + public static function xxxSetUpBeforeClass() { parent::setUpBeforeClass(); // Change the current dir to DRUPAL_ROOT. @@ -234,7 +234,7 @@ public static function setUpBeforeClass() { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $this->root = static::getDrupalRoot(); @@ -582,7 +582,7 @@ protected function getConfigSchemaExclusions() { /** * {@inheritdoc} */ - protected function assertPostConditions() { + protected function xxxAssertPostConditions() { // Execute registered Drupal shutdown functions prior to tearing down. // @see _drupal_shutdown_function() $callbacks = &drupal_register_shutdown_function(); @@ -602,7 +602,7 @@ protected function assertPostConditions() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { // Destroy the testing kernel. if (isset($this->kernel)) { $this->kernel->shutdown(); diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/BaseTestCase.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/BaseTestCase.php new file mode 100644 index 0000000000..2fe31e30b7 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/BaseTestCase.php @@ -0,0 +1,68 @@ +expectedDeprecations([$message]); + } + + /** + * Sets expected deprecation messages. + * + * @param string[] $messages + * The expected deprecation messages. + */ + public function expectedDeprecations(array $messages) { + if ($this instanceof TestCase) { + // Ensure the class or method is in the legacy group. + $groups = Test::getGroups(get_class($this), $this->getName(FALSE)); + if (!in_array('legacy', $groups, TRUE)) { + throw new AssertionFailedError('Only tests with the `@group legacy` annotation can call `setExpectedDeprecation()`.'); + } + + // If setting an expected deprecation there is no need to be strict about + // testing nothing as this is an assertion. + $this->getTestResultObject() + ->beStrictAboutTestsThatDoNotTestAnything(FALSE); + + if ($trait = $this->getSymfonyTestListenerTrait()) { + // Add the expected deprecation message to the class property. + $reflection_class = new \ReflectionClass($trait); + $expected_deprecations_property = $reflection_class->getProperty('expectedDeprecations'); + $expected_deprecations_property->setAccessible(TRUE); + $expected_deprecations = $expected_deprecations_property->getValue($trait); + $expected_deprecations = array_merge($expected_deprecations, $messages); + $expected_deprecations_property->setValue($trait, $expected_deprecations); + + // Register the error handler if necessary. + $previous_error_handler_property = $reflection_class->getProperty('previousErrorHandler'); + $previous_error_handler_property->setAccessible(TRUE); + $previous_error_handler = $previous_error_handler_property->getValue($trait); + if (!$previous_error_handler) { + $previous_error_handler = set_error_handler([$trait, 'handleError']); + $previous_error_handler_property->setValue($trait, $previous_error_handler); + } + return; + } + } + + // Expected deprecations set by isolated tests need to be written to a file + // so that the test running process can take account of them. + if ($file = getenv('DRUPAL_EXPECTED_DEPRECATIONS_SERIALIZE')) { + $expected_deprecations = file_get_contents($file); + if ($expected_deprecations) { + $expected_deprecations = array_merge(unserialize($expected_deprecations), $messages); + } + else { + $expected_deprecations = $messages; + } + file_put_contents($file, serialize($expected_deprecations)); + return; + } + + throw new AssertionFailedError('Can not set an expected deprecation message because the Symfony\Bridge\PhpUnit\SymfonyTestsListener is not registered as a PHPUnit test listener.'); + } + + /** + * Gets the SymfonyTestsListenerTrait. + * + * @return \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait|null + * The SymfonyTestsListenerTrait object or NULL is a Symfony test listener + * is not present. + */ + private function getSymfonyTestListenerTrait() { + $test_result_object = $this->getTestResultObject(); + $reflection_class = new \ReflectionClass($test_result_object); + $reflection_property = $reflection_class->getProperty('listeners'); + $reflection_property->setAccessible(TRUE); + $listeners = $reflection_property->getValue($test_result_object); + foreach ($listeners as $listener) { + if ($listener instanceof SymfonyTestsListener || $listener instanceof LegacySymfonyTestsListener) { + $reflection_class = new \ReflectionClass($listener); + $reflection_property = $reflection_class->getProperty('trait'); + $reflection_property->setAccessible(TRUE); + return $reflection_property->getValue($listener); + } + } + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/BaseTestCase.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/BaseTestCase.php new file mode 100644 index 0000000000..a88723c0a1 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/BaseTestCase.php @@ -0,0 +1,60 @@ +xxxSetUp(); + } + else { + parent::setUp(); + } + } + + /** + * {@inheritdoc} + */ + protected function tearDown() { + if (method_exists($this, 'xxxTearDown')) { + $this->xxxTearDown(); + } + else { + parent::tearDown(); + } + } + + /** + * {@inheritdoc} + */ + public static function setUpBeforeClass() { + if (method_exists(self::class, 'xxxSetUpBeforeClass')) { + self::xxxSetUpBeforeClass(); + } + else { + parent::setUpBeforeClass(); + } + } + + /** + * {@inheritdoc} + */ + protected function assertPostConditions() { + if (method_exists($this, 'xxxAssertPostConditions')) { + $this->xxxAssertPostConditions(); + } + else { + parent::assertPostConditions(); + } + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/ExpectDeprecationTrait.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/ExpectDeprecationTrait.php new file mode 100644 index 0000000000..2cd79b4711 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/ExpectDeprecationTrait.php @@ -0,0 +1,112 @@ +expectedDeprecations([$message]); + } + + /** + * Sets expected deprecation messages. + * + * @param string[] $messages + * The expected deprecation messages. + */ + public function expectedDeprecations(array $messages) { + if ($this instanceof TestCase) { + // Ensure the class or method is in the legacy group. + $groups = Test::getGroups(get_class($this), $this->getName(FALSE)); + if (!in_array('legacy', $groups, TRUE)) { + throw new AssertionFailedError('Only tests with the `@group legacy` annotation can call `setExpectedDeprecation()`.'); + } + + // If setting an expected deprecation there is no need to be strict about + // testing nothing as this is an assertion. + $this->getTestResultObject() + ->beStrictAboutTestsThatDoNotTestAnything(FALSE); + + if ($trait = $this->getSymfonyTestListenerTrait()) { + // Add the expected deprecation message to the class property. + $reflection_class = new \ReflectionClass($trait); + $expected_deprecations_property = $reflection_class->getProperty('expectedDeprecations'); + $expected_deprecations_property->setAccessible(TRUE); + $expected_deprecations = $expected_deprecations_property->getValue($trait); + $expected_deprecations = array_merge($expected_deprecations, $messages); + $expected_deprecations_property->setValue($trait, $expected_deprecations); + + // Register the error handler if necessary. + $previous_error_handler_property = $reflection_class->getProperty('previousErrorHandler'); + $previous_error_handler_property->setAccessible(TRUE); + $previous_error_handler = $previous_error_handler_property->getValue($trait); + if (!$previous_error_handler) { + $previous_error_handler = set_error_handler([$trait, 'handleError']); + $previous_error_handler_property->setValue($trait, $previous_error_handler); + } + return; + } + } + + // Expected deprecations set by isolated tests need to be written to a file + // so that the test running process can take account of them. + if ($file = getenv('DRUPAL_EXPECTED_DEPRECATIONS_SERIALIZE')) { + $expected_deprecations = file_get_contents($file); + if ($expected_deprecations) { + $expected_deprecations = array_merge(unserialize($expected_deprecations), $messages); + } + else { + $expected_deprecations = $messages; + } + file_put_contents($file, serialize($expected_deprecations)); + return; + } + + throw new AssertionFailedError('Can not set an expected deprecation message because the Symfony\Bridge\PhpUnit\SymfonyTestsListener is not registered as a PHPUnit test listener.'); + } + + /** + * Gets the SymfonyTestsListenerTrait. + * + * @return \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait|null + * The SymfonyTestsListenerTrait object or NULL is a Symfony test listener + * is not present. + */ + private function getSymfonyTestListenerTrait() { + $test_result_object = $this->getTestResultObject(); + $reflection_class = new \ReflectionClass($test_result_object); + $reflection_property = $reflection_class->getProperty('listeners'); + $reflection_property->setAccessible(TRUE); + $listeners = $reflection_property->getValue($test_result_object); + foreach ($listeners as $listener) { + if ($listener instanceof SymfonyTestsListener || $listener instanceof LegacySymfonyTestsListener) { + $reflection_class = new \ReflectionClass($listener); + $reflection_property = $reflection_class->getProperty('trait'); + $reflection_property->setAccessible(TRUE); + return $reflection_property->getValue($listener); + } + } + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/AfterSymfonyListener.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/AfterSymfonyListener.php new file mode 100644 index 0000000000..9eface70d7 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/AfterSymfonyListener.php @@ -0,0 +1,24 @@ +xxxSetUp(); + } + else { + parent::setUp(); + } + } + + /** + * {@inheritdoc} + */ + protected function tearDown(): void { + if (method_exists($this, 'xxxTearDown')) { + $this->xxxTearDown(); + } + else { + parent::tearDown(); + } + } + + /** + * {@inheritdoc} + */ + public static function setUpBeforeClass(): void { + if (method_exists(self::class, 'xxxSetUpBeforeClass')) { + self::xxxSetUpBeforeClass(); + } + else { + parent::setUpBeforeClass(); + } + } + + /** + * {@inheritdoc} + */ + protected function assertPostConditions(): void { + if (method_exists($this, 'xxxAssertPostConditions')) { + $this->xxxAssertPostConditions(); + } + else { + parent::assertPostConditions(); + } + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/DrupalListener.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/DrupalListener.php new file mode 100644 index 0000000000..023a13e684 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/DrupalListener.php @@ -0,0 +1,40 @@ +deprecationStartTest($test); + } + + /** + * {@inheritdoc} + */ + public function endTest(Test $test, float $time): void { + $this->deprecationEndTest($test, $time); + $this->componentEndTest($test, $time); + $this->standardsEndTest($test, $time); + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/ExpectDeprecationTrait.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/ExpectDeprecationTrait.php new file mode 100644 index 0000000000..5e2b51b4bb --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/ExpectDeprecationTrait.php @@ -0,0 +1,18 @@ +printHtmlOutput(); + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/SimpletestUiPrinter.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/SimpletestUiPrinter.php new file mode 100644 index 0000000000..a987ebfb14 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/SimpletestUiPrinter.php @@ -0,0 +1,17 @@ +simpletestUiWrite($buffer); + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/StubTestSuiteBaseTrait.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/StubTestSuiteBaseTrait.php new file mode 100644 index 0000000000..5d7b8494a2 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/StubTestSuiteBaseTrait.php @@ -0,0 +1,22 @@ +testFiles. + $this->testFiles = array_merge($this->testFiles, $filenames); + } + +} diff --git a/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/TestCompatibilityTrait.php b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/TestCompatibilityTrait.php new file mode 100644 index 0000000000..3509c13c25 --- /dev/null +++ b/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit8/TestCompatibilityTrait.php @@ -0,0 +1,102 @@ +xxxSetUp(); + } + else { + parent::setUp(); + } + } + + /** + * {@inheritdoc} + */ + protected function tearDown(): void { + if (method_exists($this, 'xxxTearDown')) { + $this->xxxTearDown(); + } + else { + parent::tearDown(); + } + } + + /** + * {@inheritdoc} + */ + public static function setUpBeforeClass(): void { + if (method_exists(self::class, 'xxxSetUpBeforeClass')) { + self::xxxSetUpBeforeClass(); + } + else { + parent::setUpBeforeClass(); + } + } + + /** + * {@inheritdoc} + */ + protected function assertPostConditions(): void { + if (method_exists($this, 'xxxAssertPostConditions')) { + $this->xxxAssertPostConditions(); + } + else { + parent::assertPostConditions(); + } + } + + /** + * @todo deprecate this method override in + * https://www.drupal.org/project/drupal/issues/2742585 + * + * @see \Drupal\simpletest\TestBase::assertTrue() + */ + public static function assertTrue($actual, string $message = ''): void { + if (is_bool($actual)) { + parent::assertTrue($actual, $message); + } + else { + parent::assertNotEmpty($actual, $message); + } + } + + /** + * @todo deprecate this method override in + * https://www.drupal.org/project/drupal/issues/2742585 + * + * @see \Drupal\simpletest\TestBase::assertFalse() + */ + public static function assertFalse($actual, string $message = ''): void { + if (is_bool($actual)) { + parent::assertFalse($actual, $message); + } + else { + parent::assertEmpty($actual, $message); + } + } + + /** + * {@inheritdoc} + */ + public static function assertEquals($expected, $actual, string $message = '', float $delta = 0, int $maxDepth = 10, bool $canonicalize = FALSE, bool $ignoreCase = FALSE): void { + // Cast objects implementing MarkupInterface to string instead of + // relying on PHP casting them to string depending on what they are being + // comparing with. + if (method_exists(self::class, 'castSafeStrings')) { + $expected = self::castSafeStrings($expected); + $actual = self::castSafeStrings($actual); + } + parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase); + } + +} diff --git a/core/tests/Drupal/Tests/BaseTestCase.php b/core/tests/Drupal/Tests/BaseTestCase.php new file mode 100644 index 0000000000..beb02ddc9d --- /dev/null +++ b/core/tests/Drupal/Tests/BaseTestCase.php @@ -0,0 +1,15 @@ +setupBaseUrl(); @@ -454,7 +454,7 @@ protected function cleanupEnvironment() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { parent::tearDown(); // Destroy the testing kernel. diff --git a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php b/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php index c17accfc39..54c2e76a2e 100644 --- a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php +++ b/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryCachedTest.php @@ -4,6 +4,7 @@ use Drupal\Component\Annotation\Plugin\Discovery\AnnotatedClassDiscovery; use Drupal\Component\FileCache\FileCacheFactory; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -13,10 +14,12 @@ */ class AnnotatedClassDiscoveryCachedTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Ensure FileCacheFactory::DISABLE_CACHE is *not* set, since we're testing // integration with the file cache. diff --git a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php b/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php index 48dd303290..6ea81ae930 100644 --- a/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Component/Annotation/AnnotatedClassDiscoveryTest.php @@ -5,6 +5,7 @@ use Drupal\Component\Annotation\Plugin; use Drupal\Component\Annotation\Plugin\Discovery\AnnotatedClassDiscovery; use Drupal\Component\FileCache\FileCacheFactory; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -14,10 +15,12 @@ */ class AnnotatedClassDiscoveryTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Ensure the file cache is disabled. FileCacheFactory::setConfiguration([FileCacheFactory::DISABLE_CACHE => TRUE]); diff --git a/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php b/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php index e3723135c6..cec03e3efc 100644 --- a/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php +++ b/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\Component\Datetime; use Drupal\Component\Datetime\Time; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; @@ -17,6 +18,8 @@ */ class TimeTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The mocked request stack. * @@ -34,7 +37,7 @@ class TimeTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock(); diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php index f2fc10dd7b..71774db4be 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php @@ -8,6 +8,7 @@ namespace Drupal\Tests\Component\DependencyInjection; use Drupal\Component\Utility\Crypt; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; @@ -24,6 +25,8 @@ */ class ContainerTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The tested container. * @@ -55,7 +58,7 @@ class ContainerTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->machineFormat = TRUE; $this->containerClass = '\Drupal\Component\DependencyInjection\Container'; $this->containerDefinition = $this->getMockContainerDefinition(); diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index e1560787ac..f457f5d5bf 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -8,6 +8,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper { use Drupal\Component\Utility\Crypt; + use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; @@ -24,6 +25,8 @@ */ class OptimizedPhpArrayDumperTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The container builder instance. * @@ -62,7 +65,7 @@ class OptimizedPhpArrayDumperTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Setup a mock container builder. $this->containerBuilder = $this->prophesize('\Symfony\Component\DependencyInjection\ContainerBuilder'); $this->containerBuilder->getAliases()->willReturn([]); diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php index c107c1bd44..91990c0f4a 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/PhpArrayDumperTest.php @@ -13,10 +13,10 @@ class PhpArrayDumperTest extends OptimizedPhpArrayDumperTest { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->machineFormat = FALSE; $this->dumperClass = '\Drupal\Component\DependencyInjection\Dumper\PhpArrayDumper'; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php index 5baab114f9..a7ffdcc308 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/PhpArrayContainerTest.php @@ -13,7 +13,7 @@ class PhpArrayContainerTest extends ContainerTest { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->machineFormat = FALSE; $this->containerClass = '\Drupal\Component\DependencyInjection\PhpArrayContainer'; $this->containerDefinition = $this->getMockContainerDefinition(); diff --git a/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php b/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php index ebcfdcb475..31e48d8240 100644 --- a/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php @@ -5,6 +5,7 @@ use Drupal\Component\Discovery\DiscoveryException; use Drupal\Component\Discovery\YamlDirectoryDiscovery; use Drupal\Component\FileCache\FileCacheFactory; +use Drupal\Tests\PhpunitCompatibilityTrait; use org\bovigo\vfs\vfsStream; use PHPUnit\Framework\TestCase; @@ -17,10 +18,12 @@ */ class YamlDirectoryDiscoveryTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Ensure that FileCacheFactory has a prefix. FileCacheFactory::setPrefix('prefix'); } diff --git a/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php b/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php index 78cd169710..f3ee049cf5 100644 --- a/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php @@ -5,6 +5,7 @@ use Drupal\Component\Discovery\YamlDiscovery; use Drupal\Component\FileCache\FileCacheFactory; use Drupal\Component\Serialization\Exception\InvalidDataTypeException; +use Drupal\Tests\PhpunitCompatibilityTrait; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; use org\bovigo\vfs\vfsStreamWrapper; @@ -17,10 +18,12 @@ */ class YamlDiscoveryTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Ensure that FileCacheFactory has a prefix. FileCacheFactory::setPrefix('prefix'); } diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php index 766067c936..bcbee623a9 100644 --- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php @@ -4,6 +4,7 @@ use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -21,7 +22,10 @@ * * @group EventDispatcher */ -class ContainerAwareEventDispatcherTest extends TestCase { +class ContainerAwareEventDispatcherTest extends TestCase +{ + + use PhpunitCompatibilityTrait; /* Some pseudo events */ const PREFOO = 'pre.foo'; @@ -35,14 +39,16 @@ class ContainerAwareEventDispatcherTest extends TestCase { private $dispatcher; private $listener; - protected function setUp() { + protected function xxxSetUp() + { $this->dispatcher = $this->createEventDispatcher(); $this->listener = new TestEventListener(); } - protected function tearDown() { - $this->dispatcher = NULL; - $this->listener = NULL; + protected function xxxTearDown() + { + $this->dispatcher = null; + $this->listener = null; } protected function createEventDispatcher() { diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php index c3849efa86..b17b177764 100644 --- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php +++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php @@ -6,6 +6,7 @@ use Drupal\Component\FileCache\NullFileCache; use Drupal\Component\FileCache\FileCacheFactory; use Drupal\Component\Utility\Random; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -14,10 +15,12 @@ */ class FileCacheFactoryTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $configuration = [ diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php index 15ef1ac9de..f76d8f5ae0 100644 --- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php +++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\Component\FileCache; use Drupal\Component\FileCache\FileCache; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -11,6 +12,8 @@ */ class FileCacheTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * FileCache object used for the tests. * @@ -28,7 +31,7 @@ class FileCacheTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $this->fileCache = new FileCache('prefix', 'test', '\Drupal\Tests\Component\FileCache\StaticFileCacheBackend', ['bin' => 'llama']); diff --git a/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php b/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php index 90c50943ed..66bda551af 100644 --- a/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php +++ b/core/tests/Drupal/Tests/Component/Gettext/PoStreamWriterTest.php @@ -4,6 +4,7 @@ use Drupal\Component\Gettext\PoItem; use Drupal\Component\Gettext\PoStreamWriter; +use Drupal\Tests\PhpunitCompatibilityTrait; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamFile; use PHPUnit\Framework\TestCase; @@ -14,6 +15,8 @@ */ class PoStreamWriterTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The PO writer object under test. * @@ -31,7 +34,7 @@ class PoStreamWriterTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $this->poWriter = new PoStreamWriter(); diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php index 991006b5a2..8b06bd56e1 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php @@ -31,8 +31,8 @@ class FileStorageReadOnlyTest extends PhpStorageTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->standardSettings = [ 'directory' => $this->directory, diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php index 891a1dcceb..051ebd3eb9 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php @@ -24,8 +24,8 @@ class FileStorageTest extends PhpStorageTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->standardSettings = [ 'directory' => $this->directory, diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php index ad78951713..228ec4bacf 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php @@ -37,8 +37,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Random generator. $random = new Random(); diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php b/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php index cc0e79d0e0..a1d8f93d28 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php @@ -4,6 +4,7 @@ use Drupal\Component\PhpStorage\PhpStorageInterface; use Drupal\Component\Utility\Random; +use Drupal\Tests\PhpunitCompatibilityTrait; use org\bovigo\vfs\vfsStream; use PHPUnit\Framework\TestCase; @@ -12,6 +13,8 @@ */ abstract class PhpStorageTestBase extends TestCase { + use PhpunitCompatibilityTrait; + /** * A unique per test class directory path to test php storage. * @@ -22,7 +25,7 @@ /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); vfsStream::setup('exampleDir'); $this->directory = vfsStream::url('exampleDir'); diff --git a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php index 1b06ddef34..c831ecf266 100644 --- a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php +++ b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php @@ -8,6 +8,7 @@ namespace Drupal\Tests\Component\ProxyBuilder; use Drupal\Component\ProxyBuilder\ProxyBuilder; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -16,6 +17,8 @@ */ class ProxyBuilderTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The tested proxy builder. * @@ -26,7 +29,7 @@ class ProxyBuilderTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $this->proxyBuilder = new ProxyBuilder(); diff --git a/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php b/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php index 036fa66395..b353fec406 100644 --- a/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php +++ b/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\Component\Serialization; use Drupal\Component\Serialization\Json; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -11,6 +12,8 @@ */ class JsonTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * A test string with the full ASCII table. * @@ -35,7 +38,7 @@ class JsonTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Setup a string with the full ASCII table. diff --git a/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php b/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php index f68013bfdc..f11b8e1eec 100644 --- a/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php +++ b/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php @@ -7,6 +7,7 @@ use Drupal\Component\Serialization\Yaml; use Drupal\Component\Serialization\YamlPecl; use Drupal\Component\Serialization\YamlSymfony; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -15,12 +16,14 @@ */ class YamlTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * @var \PHPUnit\Framework\MockObject\MockObject */ protected $mockParser; - public function setUp() { + public function xxxSetUp() { parent::setUp(); $this->mockParser = $this->getMockBuilder('\stdClass') ->setMethods(['encode', 'decode', 'getFileExtension']) @@ -28,7 +31,7 @@ public function setUp() { YamlParserProxy::setMock($this->mockParser); } - public function tearDown() { + public function xxxTearDown() { YamlParserProxy::setMock(NULL); parent::tearDown(); } diff --git a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php index 207a487485..2671500d2c 100644 --- a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php @@ -16,13 +16,6 @@ */ class ArgumentsResolverTest extends TestCase { - /** - * {@inheritdoc} - */ - protected function setUp() { - parent::setUp(); - } - /** * Tests the getArgument() method. * diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php index ee3c5f66ba..be3af28d4e 100644 --- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php @@ -6,6 +6,7 @@ use Drupal\Component\Render\MarkupTrait; use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Random; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -17,10 +18,12 @@ */ class HtmlTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $property = new \ReflectionProperty('Drupal\Component\Utility\Html', 'seenIdsInit'); diff --git a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php index 4cdb1b62f0..89b59b492a 100644 --- a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\Component\Utility; use Drupal\Component\Utility\NestedArray; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -11,6 +12,8 @@ */ class NestedArrayTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * Form array to check. * @@ -28,7 +31,7 @@ class NestedArrayTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Create a form structure with a nested element. diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php index 4e2850fe23..712fe9170f 100644 --- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php @@ -12,6 +12,7 @@ use Drupal\Component\Render\MarkupInterface; use Drupal\Component\Render\MarkupTrait; use Drupal\Component\Utility\UrlHelper; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -23,10 +24,12 @@ */ class SafeMarkupTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { parent::tearDown(); UrlHelper::setAllowedProtocols(['http', 'https']); diff --git a/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/core/tests/Drupal/Tests/Component/Utility/XssTest.php index 695b4278ed..12513918cf 100644 --- a/core/tests/Drupal/Tests/Component/Utility/XssTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/XssTest.php @@ -5,6 +5,7 @@ use Drupal\Component\Utility\Html; use Drupal\Component\Utility\UrlHelper; use Drupal\Component\Utility\Xss; +use Drupal\Tests\PhpunitCompatibilityTrait; use PHPUnit\Framework\TestCase; /** @@ -22,10 +23,12 @@ */ class XssTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); $allowed_protocols = [ diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php index c8e18e1b03..34b05a427e 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php @@ -7,6 +7,7 @@ use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait; use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * Tests Composer Hooks that run scaffold operations. @@ -23,6 +24,7 @@ * @group Scaffold */ class ComposerHookTest extends TestCase { + use PhpunitCompatibilityTrait; use ExecTrait; use AssertUtilsTrait; @@ -60,7 +62,7 @@ class ComposerHookTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->fileSystem = new Filesystem(); $this->fixtures = new Fixtures(); $this->fixtures->createIsolatedComposerCacheDir(); @@ -70,7 +72,7 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { // Remove any temporary directories et. al. that were created. $this->fixtures->tearDown(); } diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php index c73faf74bd..e3d4c88d62 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php @@ -7,6 +7,7 @@ use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait; use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * Tests to see whether .gitignore files are correctly managed. @@ -18,6 +19,7 @@ * @group Scaffold */ class ManageGitIgnoreTest extends TestCase { + use PhpunitCompatibilityTrait; use ExecTrait; use AssertUtilsTrait; @@ -55,7 +57,7 @@ class ManageGitIgnoreTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->fileSystem = new Filesystem(); $this->fixtures = new Fixtures(); $this->fixtures->createIsolatedComposerCacheDir(); @@ -65,7 +67,7 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { // Remove any temporary directories et. al. that were created. $this->fixtures->tearDown(); } diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php index 948dd8aa12..73bc9ddab3 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php @@ -7,6 +7,7 @@ use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use Drupal\Tests\Composer\Plugin\Scaffold\ScaffoldTestResult; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * Tests Composer Scaffold. @@ -17,6 +18,7 @@ * @group Scaffold */ class ScaffoldTest extends TestCase { + use PhpunitCompatibilityTrait; use AssertUtilsTrait; /** @@ -53,7 +55,7 @@ class ScaffoldTest extends TestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->fileSystem = new Filesystem(); $this->fixtures = new Fixtures(); $this->fixtures->createIsolatedComposerCacheDir(); @@ -70,7 +72,7 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { // Remove any temporary directories et. al. that were created. $this->fixtures->tearDown(); } diff --git a/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/ConfigTest.php b/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/ConfigTest.php index 71b1c0ae10..06807d6202 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/ConfigTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/ConfigTest.php @@ -5,6 +5,7 @@ use Composer\Package\RootPackageInterface; use Drupal\Composer\Plugin\VendorHardening\Config; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * @coversDefaultClass Drupal\Composer\Plugin\VendorHardening\Config @@ -12,6 +13,8 @@ */ class ConfigTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * @covers ::getPathsForPackage */ diff --git a/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php b/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php index f98dd25b2d..ef45465129 100644 --- a/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php @@ -10,6 +10,7 @@ use Drupal\Composer\Plugin\VendorHardening\VendorHardeningPlugin; use org\bovigo\vfs\vfsStream; use PHPUnit\Framework\TestCase; +use Drupal\Tests\PhpunitCompatibilityTrait; /** * @coversDefaultClass Drupal\Composer\Plugin\VendorHardening\VendorHardeningPlugin @@ -17,8 +18,10 @@ */ class VendorHardeningPluginTest extends TestCase { - public function setUp() { - parent::setUp(); + use PhpunitCompatibilityTrait; + + public function xxxSetUp() { + parent::xxxSetUp(); vfsStream::setup('vendor', NULL, [ 'drupal' => [ 'package' => [ diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php index 01be76e5bf..856adc4a72 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php @@ -91,8 +91,8 @@ class AccessManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); diff --git a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php index c2ecf09263..adc47e0caf 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php @@ -33,8 +33,8 @@ class AccessResultTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php index 324d95b72d..f3e790aa62 100644 --- a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php @@ -35,7 +35,7 @@ class CsrfAccessCheckTest extends UnitTestCase { */ protected $routeMatch; - protected function setUp() { + protected function xxxSetUp() { $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php index b950a39e98..fe576381c8 100644 --- a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php @@ -39,8 +39,8 @@ class CsrfTokenGeneratorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->privateKey = $this->getMockBuilder('Drupal\Core\PrivateKey') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php index bc936d58c1..df578b7f6d 100644 --- a/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php @@ -47,8 +47,8 @@ class CustomAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->controllerResolver = $this->createMock('Drupal\Core\Controller\ControllerResolverInterface'); $this->argumentsResolverFactory = $this->createMock('Drupal\Core\Access\AccessArgumentsResolverFactoryInterface'); diff --git a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php index a4714c012b..4b75065239 100644 --- a/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php @@ -31,8 +31,8 @@ class DefaultAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->account = $this->createMock('Drupal\Core\Session\AccountInterface'); $this->accessChecker = new DefaultAccessCheck(); diff --git a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php index cc552fcc5b..38412b6f9e 100644 --- a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php +++ b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php @@ -28,7 +28,7 @@ class RouteProcessorCsrfTest extends UnitTestCase { */ protected $processor; - protected function setUp() { + protected function xxxSetUp() { $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php b/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php index a968e6a38e..ba24aca0e1 100644 --- a/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php +++ b/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php @@ -22,7 +22,7 @@ class AjaxResponseTest extends UnitTestCase { */ protected $ajaxResponse; - protected function setUp() { + protected function xxxSetUp() { $this->ajaxResponse = new AjaxResponse(); } diff --git a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php index d4988daccc..5c10c6f34c 100644 --- a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php +++ b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php @@ -22,7 +22,7 @@ class TranslationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->translationManager = $this->getStringTranslationStub(); } diff --git a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php index b865652809..70e6b99ea4 100644 --- a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php +++ b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php @@ -44,8 +44,8 @@ class AssertLegacyTraitTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->page = $this->prophesize(DocumentElement::class); $this->session = $this->prophesize(Session::class); diff --git a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php index f14eb3385f..3c3695f33f 100644 --- a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php @@ -71,8 +71,8 @@ class AssetResolverTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->libraryDiscovery = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscovery') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php index 3b56cbd5fc..dedec52d02 100644 --- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php @@ -19,8 +19,8 @@ class CssCollectionGrouperUnitTest extends UnitTestCase { */ protected $grouper; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->grouper = new CssCollectionGrouper(); } diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php index 199a6bc04d..771d9131d6 100644 --- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php @@ -33,8 +33,8 @@ class CssCollectionRendererUnitTest extends UnitTestCase { */ protected $state; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->state = $this->createMock('Drupal\Core\State\StateInterface'); diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php index 606cddb23b..9532fac6a7 100644 --- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php @@ -24,8 +24,8 @@ class CssOptimizerUnitTest extends UnitTestCase { */ protected $optimizer; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->optimizer = new CssOptimizer(); } diff --git a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php index 204c0bd4cc..48665d0bf3 100644 --- a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php @@ -22,8 +22,8 @@ class JsOptimizerUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->optimizer = new JsOptimizer(); } diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php index 9eb23fb0ed..09ac798de5 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php @@ -52,7 +52,7 @@ class LibraryDependencyResolverTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->libraryDiscovery = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscovery') ->disableOriginalConstructor() ->setMethods(['getLibrariesByExtension']) diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php index 69fb6508bf..47eeb28f05 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php @@ -68,7 +68,7 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); $this->themeManager = $this->getMockBuilder('Drupal\Core\Theme\ThemeManagerInterface') diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php index 222537e268..86ef4e7135 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php @@ -65,8 +65,8 @@ class LibraryDiscoveryParserTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php index b31505132f..8cf2991546 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php @@ -62,8 +62,8 @@ class LibraryDiscoveryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); $this->libraryDiscoveryCollector = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscoveryCollector') diff --git a/core/tests/Drupal/Tests/Core/Block/BlockManagerTest.php b/core/tests/Drupal/Tests/Core/Block/BlockManagerTest.php index 0f92b8efbc..683b5916b7 100644 --- a/core/tests/Drupal/Tests/Core/Block/BlockManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Block/BlockManagerTest.php @@ -34,8 +34,8 @@ class BlockManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_backend = $this->prophesize(CacheBackendInterface::class); $module_handler = $this->prophesize(ModuleHandlerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Bootstrap/DrupalGetProfileLegacyTest.php b/core/tests/Drupal/Tests/Core/Bootstrap/DrupalGetProfileLegacyTest.php index 4f8343e4e7..25e3ac0f34 100644 --- a/core/tests/Drupal/Tests/Core/Bootstrap/DrupalGetProfileLegacyTest.php +++ b/core/tests/Drupal/Tests/Core/Bootstrap/DrupalGetProfileLegacyTest.php @@ -26,8 +26,8 @@ class DrupalGetProfileLegacyTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); include $this->root . '/core/includes/bootstrap.inc'; } diff --git a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php index 2a94362e97..868b63efea 100644 --- a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php @@ -46,7 +46,7 @@ class BreadcrumbManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $this->breadcrumbManager = new BreadcrumbManager($this->moduleHandler); $this->breadcrumb = new Breadcrumb(); diff --git a/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php index 9509cc1de4..27785cbab9 100644 --- a/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php @@ -43,8 +43,8 @@ class BackendChainImplementationUnitTest extends UnitTestCase { */ protected $thirdBackend; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Set up three memory backends to be used in the chain. $this->firstBackend = new MemoryBackend(); diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php index a6cdb724d6..83558e3dfb 100644 --- a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php @@ -49,7 +49,7 @@ class CacheCollectorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->cacheBackend = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php index 17f0ab3fbb..597ffb4059 100644 --- a/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php @@ -34,7 +34,7 @@ class SessionCacheContextTest extends UnitTestCase { */ protected $session; - public function setUp() { + public function xxxSetUp() { $this->request = new Request(); $this->requestStack = new RequestStack(); diff --git a/core/tests/Drupal/Tests/Core/ClassLoader/ClassLoaderTest.php b/core/tests/Drupal/Tests/Core/ClassLoader/ClassLoaderTest.php index a9c15445cd..85690864fc 100644 --- a/core/tests/Drupal/Tests/Core/ClassLoader/ClassLoaderTest.php +++ b/core/tests/Drupal/Tests/Core/ClassLoader/ClassLoaderTest.php @@ -16,8 +16,8 @@ class ClassLoaderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new ContainerBuilder(); $container->set('app.root', $this->root); $class_loader = $this->prophesize(ClassLoader::class); diff --git a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php index 830eb0d5ce..5ed9f6a17d 100644 --- a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php +++ b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php @@ -4,6 +4,7 @@ use Drupal\Core\Test\TestDatabase; use Drupal\Tests\BrowserTestBase; +use Drupal\Tests\PhpunitCompatibilityTrait; use GuzzleHttp\Client; use GuzzleHttp\Cookie\CookieJar; use PHPUnit\Framework\TestCase; @@ -23,6 +24,8 @@ */ class QuickStartTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * The PHP executable path. * @@ -47,7 +50,7 @@ class QuickStartTest extends TestCase { /** * {@inheritdoc} */ - public function setUp() { + public function xxxSetUp() { parent::setUp(); $php_executable_finder = new PhpExecutableFinder(); $this->php = $php_executable_finder->find(); @@ -64,7 +67,7 @@ public function setUp() { /** * {@inheritdoc} */ - public function tearDown() { + public function xxxTearDown() { if ($this->testDb) { $test_site_directory = $this->root . DIRECTORY_SEPARATOR . $this->testDb->getTestSitePath(); if (file_exists($test_site_directory)) { diff --git a/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php b/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php index 407fa5bece..c6b80a253d 100644 --- a/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php +++ b/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php @@ -26,8 +26,8 @@ class DiffArrayTest extends UnitTestCase { */ protected $array2; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->array1 = [ 'same' => 'yes', diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php index 2eb364dfcd..473be8e1a7 100644 --- a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php @@ -51,7 +51,7 @@ class ConfigFactoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php index 18760dfc95..a0e397746a 100644 --- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php @@ -55,7 +55,7 @@ class ConfigTest extends UnitTestCase { */ protected $cacheTagsInvalidator; - protected function setUp() { + protected function xxxSetUp() { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php index 970a82900d..7f4b11a6d5 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php @@ -112,7 +112,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->id = $this->randomMachineName(); $values = [ 'id' => $this->id, diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php index 7ea179766f..80235b614a 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php @@ -103,8 +103,8 @@ class ConfigEntityStorageTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeId = 'test_entity_type'; diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php index b907187618..1802ff3f72 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php @@ -24,7 +24,7 @@ class ConfigEntityTypeTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->typedConfigManager = $this->createMock(TypedConfigManagerInterface::class); $container = new ContainerBuilder(); $container->set('config.typed', $this->typedConfigManager); diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php index 895ab253fa..bef36f1e84 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php @@ -50,7 +50,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityType = $this->randomMachineName(); $this->entityInfo = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface'); diff --git a/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php index 3b3c9752c8..ae6bee5962 100644 --- a/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php @@ -19,8 +19,8 @@ class ImmutableConfigTest extends UnitTestCase { */ protected $config; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $storage = $this->createMock('Drupal\Core\Config\StorageInterface'); $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); $typed_config = $this->createMock('Drupal\Core\Config\TypedConfigManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Config/ReadOnlyStorageTest.php b/core/tests/Drupal/Tests/Core/Config/ReadOnlyStorageTest.php index 06b3ab87d6..c8b11fd914 100644 --- a/core/tests/Drupal/Tests/Core/Config/ReadOnlyStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ReadOnlyStorageTest.php @@ -33,7 +33,7 @@ class ReadOnlyStorageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Set up a memory storage we can manipulate to set fixtures. $this->memory = new MemoryStorage(); // Wrap the memory storage in the read-only storage to test it. diff --git a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php index daccf12373..836923cd1f 100644 --- a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php +++ b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php @@ -36,7 +36,7 @@ class StorageComparerTest extends UnitTestCase { */ protected $configData; - protected function setUp() { + protected function xxxSetUp() { $this->sourceStorage = $this->createMock('Drupal\Core\Config\StorageInterface'); $this->targetStorage = $this->createMock('Drupal\Core\Config\StorageInterface'); $this->storageComparer = new StorageComparer($this->sourceStorage, $this->targetStorage); diff --git a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php index a439a61597..470627c493 100644 --- a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php @@ -32,7 +32,7 @@ class AjaxRendererTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $element_info_manager = $this->createMock('Drupal\Core\Render\ElementInfoManagerInterface'); $element_info_manager->expects($this->any()) ->method('getInfo') diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php index fdd81d9564..b71a8c378c 100644 --- a/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php @@ -18,7 +18,7 @@ class ControllerBaseTest extends UnitTestCase { */ protected $controllerBase; - protected function setUp() { + protected function xxxSetUp() { $this->controllerBase = $this->getMockForAbstractClass('Drupal\Core\Controller\ControllerBase'); } diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php index 745c4f3573..5a8f0ca5b4 100644 --- a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php @@ -53,8 +53,8 @@ class ControllerResolverTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $class_resolver = new ClassResolver(); diff --git a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php index ce79fe3920..d61fd0b26d 100644 --- a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php @@ -48,7 +48,7 @@ class TitleResolverTest extends UnitTestCase { */ protected $titleResolver; - protected function setUp() { + protected function xxxSetUp() { $this->controllerResolver = $this->createMock('\Drupal\Core\Controller\ControllerResolverInterface'); $this->translationManager = $this->createMock('\Drupal\Core\StringTranslation\TranslationInterface'); $this->argumentResolver = $this->createMock('\Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface'); diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php index d6ea4fbf4c..23bf537481 100644 --- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php +++ b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php @@ -21,8 +21,8 @@ class PostgresqlConnectionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->mockPdo = $this->createMock('Drupal\Tests\Core\Database\Stub\StubPDO'); } diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php index 57d1b5dd9d..116ffd3668 100644 --- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php +++ b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php @@ -21,8 +21,8 @@ class PostgresqlSchemaTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->connection = $this->getMockBuilder('\Drupal\Core\Database\Driver\pgsql\Connection') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Database/OrderByTest.php b/core/tests/Drupal/Tests/Core/Database/OrderByTest.php index bab257186b..f690f4dce8 100644 --- a/core/tests/Drupal/Tests/Core/Database/OrderByTest.php +++ b/core/tests/Drupal/Tests/Core/Database/OrderByTest.php @@ -22,7 +22,7 @@ class OrderByTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $connection = $this->getMockBuilder('Drupal\Core\Database\Connection') ->disableOriginalConstructor() ->getMockForAbstractClass(); diff --git a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php index b48e5c0514..3e03f76d40 100644 --- a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php +++ b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php @@ -24,8 +24,8 @@ class UrlConversionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $additional_class_loader = new ClassLoader(); $additional_class_loader->addPsr4("Drupal\\Driver\\Database\\fake\\", __DIR__ . "/fixtures/driver/fake"); $additional_class_loader->register(TRUE); diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php index 2bf19f2ec1..93ab2464e4 100644 --- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php +++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php @@ -58,8 +58,8 @@ class DateTest extends UnitTestCase { */ protected $dateFormatterStub; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $entity_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface'); diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php index a77ad09164..af213b9b32 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php @@ -29,7 +29,7 @@ class BackendCompilerPassTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->backendPass = new BackendCompilerPass(); } diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php index 63b94ff463..37eefa3ade 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php @@ -23,8 +23,8 @@ class ProxyServicesPassTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->proxyServicesPass = new ProxyServicesPass(); } diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/StackedKernelPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/StackedKernelPassTest.php index 017dedb93d..a7acb49447 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/StackedKernelPassTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/StackedKernelPassTest.php @@ -28,7 +28,7 @@ class StackedKernelPassTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->stackedKernelPass = new StackedKernelPass(); $this->containerBuilder = new ContainerBuilder(); } diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php index 4093b6a2eb..51be95af5d 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php @@ -17,8 +17,8 @@ class YamlFileLoaderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); FileCacheFactory::setPrefix('example'); } diff --git a/core/tests/Drupal/Tests/Core/Discovery/YamlDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Discovery/YamlDiscoveryTest.php index b5689ed5f7..b9556021b0 100644 --- a/core/tests/Drupal/Tests/Core/Discovery/YamlDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Discovery/YamlDiscoveryTest.php @@ -5,6 +5,7 @@ use Drupal\Component\FileCache\FileCacheFactory; use Drupal\Component\Serialization\Exception\InvalidDataTypeException; use Drupal\Core\Discovery\YamlDiscovery; +use Drupal\Tests\PhpunitCompatibilityTrait; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; use org\bovigo\vfs\vfsStreamWrapper; @@ -17,10 +18,12 @@ */ class YamlDiscoveryTest extends TestCase { + use PhpunitCompatibilityTrait; + /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Ensure that FileCacheFactory has a prefix. FileCacheFactory::setPrefix('prefix'); } diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php index 846bf7e78d..c6a0714a8d 100644 --- a/core/tests/Drupal/Tests/Core/DrupalTest.php +++ b/core/tests/Drupal/Tests/Core/DrupalTest.php @@ -30,8 +30,8 @@ class DrupalTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder') ->setMethods(['get']) ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php index 4d1883a447..2dd3817d85 100644 --- a/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php +++ b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php @@ -23,8 +23,8 @@ class EntityRevisionRouteEnhancerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->routeEnhancer = new EntityRevisionRouteEnhancer(); } diff --git a/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php b/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php index fa534890b1..ff7b3c7ac4 100644 --- a/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php +++ b/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php @@ -28,8 +28,8 @@ class ParamConversionEnhancerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->paramConverterManager = $this->createMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface'); $this->paramConversionEnhancer = new ParamConversionEnhancer($this->paramConverterManager); diff --git a/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php b/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php index f6c5effc65..69cb9665da 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php @@ -82,8 +82,8 @@ protected function getEntityTypeManager() { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->anon = $this->createMock(AccountInterface::class); $this->anon diff --git a/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php b/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php index 2b5d8ae804..6d99d07041 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php @@ -15,8 +15,8 @@ class EntityViewDisplayAccessControlHandlerTest extends EntityFormDisplayAccessC /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->member = $this->createMock(AccountInterface::class); $this->member diff --git a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php index 87a511cfdd..33bc647ed9 100644 --- a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php @@ -34,7 +34,7 @@ class BaseFieldDefinitionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Mock the field type manager and place it in the container. $field_type_manager = $this->createMock('Drupal\Core\Field\FieldTypePluginManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php index 1ce29a1199..d40963abee 100644 --- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php @@ -127,7 +127,7 @@ class ContentEntityBaseUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->id = 1; $values = [ 'id' => $this->id, diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php index daa9dcb56a..12492fd052 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php @@ -28,7 +28,7 @@ class EntityAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php index b9e48f058b..de25efea13 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php @@ -27,8 +27,8 @@ class EntityCreateAccessCheckTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php index 1ef003cb74..ebe458325f 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php @@ -145,8 +145,8 @@ class EntityFieldManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = $this->prophesize(ContainerInterface::class); \Drupal::setContainer($this->container->reveal()); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php index 08362a51a7..519198e469 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php @@ -35,8 +35,8 @@ class EntityFormBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->formBuilder = $this->createMock('Drupal\Core\Form\FormBuilderInterface'); $this->entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php index 6fd620c2d0..918ddbedc8 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php @@ -37,8 +37,8 @@ class EntityFormTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityForm = new EntityForm(); $this->entityType = new EntityType(['id' => 'entity_test']); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php index 54a30c79b3..f633a4584b 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php @@ -38,8 +38,8 @@ class EntityLinkTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->linkGenerator = $this->createMock('Drupal\Core\Utility\LinkGeneratorInterface'); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php index 10d9e97d80..b3106ebc28 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php @@ -80,8 +80,8 @@ class EntityListBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->role = $this->createMock('Drupal\user\RoleInterface'); $this->roleStorage = $this->createMock('\Drupal\user\RoleStorageInterface'); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php index c12a6b04d7..02397e1ca8 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php @@ -90,8 +90,8 @@ class EntityManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManager::class); $this->entityTypeRepository = $this->prophesize(EntityTypeRepositoryInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php index ad38b0e4e2..d8949d57af 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php @@ -49,8 +49,8 @@ class EntityRepositoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); $this->languageManager = $this->prophesize(LanguageManagerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php index 9199eb2203..0247982323 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php @@ -55,7 +55,7 @@ class EntityResolverManagerTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface'); $this->container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface'); $this->classResolver = $this->getClassResolverStub(); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php index 4eb2d13a09..97ae966e1b 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php @@ -76,8 +76,8 @@ class EntityTypeBundleInfoTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class); $this->moduleHandler->getImplementations('entity_type_build')->willReturn([]); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php index 4a89d0c5aa..fa3f335728 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php @@ -77,8 +77,8 @@ class EntityTypeManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class); $this->moduleHandler->getImplementations('entity_type_build')->willReturn([]); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php index c047f63a27..d6d92ddb0c 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php @@ -35,8 +35,8 @@ class EntityTypeRepositoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php index 2fc86a66f7..76dc9ae7b2 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php @@ -88,7 +88,7 @@ class EntityUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->values = [ 'id' => 1, 'langcode' => 'en', diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php index b74fd60d3a..19d2d36a07 100644 --- a/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php @@ -50,7 +50,7 @@ class FieldDefinitionTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->fieldType = $this->randomMachineName(); $this->fieldTypeDefinition = [ 'id' => $this->fieldType, diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php index dc109116b7..0de280b087 100644 --- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php @@ -84,8 +84,8 @@ class KeyValueEntityStorageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityType = $this->createMock('Drupal\Core\Entity\EntityTypeInterface'); } diff --git a/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php b/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php index aa4929e3dc..268906c84c 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php @@ -23,8 +23,8 @@ class QueryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $entity_type = new EntityType(['id' => 'example_entity_query']); $conjunction = 'AND'; $connection = $this->getMockBuilder('Drupal\Core\Database\Connection')->disableOriginalConstructor()->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php index 05de4c6516..a18a344156 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php @@ -50,8 +50,8 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php index 7af9ec3cb9..60fc7fc55d 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php @@ -23,8 +23,8 @@ class DefaultTableMappingTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityType = $this->createMock('\Drupal\Core\Entity\ContentEntityTypeInterface'); $this->entityType diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php index ce2293a3e0..3b6808dfb4 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php @@ -76,7 +76,7 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityTypeManager = $this->createMock(EntityTypeManager::class); $this->entityFieldManager = $this->createMock(EntityFieldManager::class); $this->entityLastInstalledSchemaRepository = $this->createMock(EntityLastInstalledSchemaRepositoryInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php index e97106baff..545cf816cf 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php @@ -114,7 +114,7 @@ class SqlContentEntityStorageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->entityType = $this->createMock('Drupal\Core\Entity\ContentEntityTypeInterface'); $this->entityType->expects($this->any()) ->method('id') diff --git a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php index deed1e0bc9..6e794c878d 100644 --- a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php @@ -120,7 +120,7 @@ class EntityAdapterUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->id = 1; $values = [ 'id' => $this->id, diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php index f33cd40d1c..c82c68f6d8 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php @@ -81,7 +81,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->configFactory = $this->getConfigFactoryStub(['system.site' => ['page.403' => '/access-denied-page', 'page.404' => '/not-found-page']]); $this->kernel = $this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'); @@ -119,7 +119,7 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { ini_set('error_log', $this->errorLog); } diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php index 783175cb3e..dfacd47c0e 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php @@ -21,7 +21,7 @@ class ModuleRouteSubscriberTest extends UnitTestCase { */ protected $moduleHandler; - protected function setUp() { + protected function xxxSetUp() { $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $value_map = [ diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php index 835e9ce9c0..ce562fcff4 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php @@ -31,7 +31,7 @@ class PathRootsSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->state = $this->createMock('Drupal\Core\State\StateInterface'); $this->pathRootsSubscriber = new PathRootsSubscriber($this->state); } diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php index bb13c5355a..d76cb4d826 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php @@ -28,7 +28,7 @@ class PsrResponseSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $factory = $this->getMockBuilder('Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php index ade6e7042a..aca5d3067e 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php @@ -38,8 +38,8 @@ class RedirectResponseSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestContext = $this->getMockBuilder('Drupal\Core\Routing\RequestContext') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Extension/ExtensionSerializationTest.php b/core/tests/Drupal/Tests/Core/Extension/ExtensionSerializationTest.php index 5f705d6cca..07ccf4bb29 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ExtensionSerializationTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ExtensionSerializationTest.php @@ -18,8 +18,8 @@ class ExtensionSerializationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); vfsStream::setup('dummy_app_root'); vfsStream::create([ 'core' => [ diff --git a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php index 75f30ca7a1..74473c6556 100644 --- a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php @@ -30,8 +30,8 @@ class InfoParserUnitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Use a fake DRUPAL_ROOT. $this->infoParser = new InfoParser('vfs:/'); } diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php index 655c99add3..2dae74c3aa 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php @@ -28,8 +28,8 @@ class ModuleHandlerTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // We can mock the cache handler here, but not the module handler. $this->cacheBackend = $this->createMock(CacheBackendInterface::class); } diff --git a/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php index a22a42eb91..9acf348702 100644 --- a/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php @@ -21,8 +21,8 @@ class RequiredModuleUninstallValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->uninstallValidator = $this->getMockBuilder('Drupal\Core\Extension\RequiredModuleUninstallValidator') ->disableOriginalConstructor() ->setMethods(['getModuleInfoByModule']) diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php index 99c6769477..75a6b02642 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php @@ -43,8 +43,8 @@ class ThemeHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->configFactory = $this->getConfigFactoryStub([ 'core.extension' => [ diff --git a/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php b/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php index c01f8d8d0b..d7e9c0f8c3 100644 --- a/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php +++ b/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php @@ -23,8 +23,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // getModuleAndPath() returns an array of the module name and directory. list($module_name, $module_dir) = $this->getModuleAndPath(); diff --git a/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php b/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php index 2177cd860a..dd7a7afcb4 100644 --- a/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php +++ b/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php @@ -60,8 +60,8 @@ class FieldDefinitionListenerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->keyValueFactory = $this->prophesize(KeyValueFactoryInterface::class); $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/File/FileSystemTest.php b/core/tests/Drupal/Tests/Core/File/FileSystemTest.php index c686966eb5..8150bc3ac9 100644 --- a/core/tests/Drupal/Tests/Core/File/FileSystemTest.php +++ b/core/tests/Drupal/Tests/Core/File/FileSystemTest.php @@ -38,8 +38,8 @@ class FileSystemTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $settings = new Settings([]); $this->streamWrapperManager = $this->createMock(StreamWrapperManagerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php index 89f36883b4..7eb47fc0c0 100644 --- a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php @@ -54,8 +54,8 @@ class FormAjaxSubscriberTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->httpKernel = $this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'); $this->formAjaxResponseBuilder = $this->createMock('Drupal\Core\Form\FormAjaxResponseBuilderInterface'); diff --git a/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php index 8381466213..412d7e660d 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php @@ -35,8 +35,8 @@ class FormAjaxResponseBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->renderer = $this->createMock('Drupal\Core\Render\MainContent\MainContentRendererInterface'); $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface'); $this->formAjaxResponseBuilder = new FormAjaxResponseBuilder($this->renderer, $this->routeMatch); diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php index a21ec29b98..b35d5bfa06 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php @@ -42,8 +42,8 @@ class FormBuilderTest extends FormTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); diff --git a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php index 1c3d17ff3f..bab938b76f 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php @@ -95,8 +95,8 @@ class FormCacheTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php b/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php index 3ba570dc99..a7b3d4b86f 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php @@ -29,8 +29,8 @@ class FormErrorHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->messenger = $this->createMock(MessengerInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php index 4fd1e15a4b..7957091a62 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php @@ -34,8 +34,8 @@ class FormStateDecoratorBaseTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->decoratedFormState = $this->prophesize(FormStateInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php index baa713d538..52da3f2a13 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php @@ -35,8 +35,8 @@ class FormSubmitterTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->urlGenerator = $this->createMock(UrlGeneratorInterface::class); $this->unroutedUrlAssembler = $this->createMock(UnroutedUrlAssemblerInterface::class); } diff --git a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php index f0cb2f22d6..85f89e0a8a 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php +++ b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php @@ -144,8 +144,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Add functions to the global namespace for testing. require_once __DIR__ . '/fixtures/form_base_test.inc'; @@ -195,7 +195,7 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { + protected function xxxTearDown() { Html::resetSeenIds(); (new FormState())->clearErrors(); } diff --git a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php index bf31b475e0..f1a81653a7 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php @@ -37,8 +37,8 @@ class FormValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->logger = $this->createMock('Psr\Log\LoggerInterface'); $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php b/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php index 60308ddf07..26ee965ef2 100644 --- a/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php +++ b/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php @@ -22,7 +22,7 @@ class ClientFactoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $stack = $this->getMockBuilder('GuzzleHttp\HandlerStack') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php index de5507ca37..8f4bcd598f 100644 --- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php +++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php @@ -46,7 +46,7 @@ class ImageTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Use the Druplicon image. $this->source = __DIR__ . '/../../../../../misc/druplicon.png'; } diff --git a/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php index 3de9078e91..126b308eaf 100644 --- a/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php @@ -54,8 +54,8 @@ class LayoutPluginManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->setUpFilesystem(); diff --git a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php index 5b6400ab71..9c22827dc9 100644 --- a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php +++ b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php @@ -17,7 +17,7 @@ class LockBackendAbstractTest extends UnitTestCase { */ protected $lock; - protected function setUp() { + protected function xxxSetUp() { $this->lock = $this->getMockForAbstractClass('Drupal\Core\Lock\LockBackendAbstract'); } diff --git a/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php b/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php index e1b7a6a675..c9206e052c 100644 --- a/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php @@ -81,8 +81,8 @@ class MailManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Prepare the default constructor arguments required by MailManager. $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); diff --git a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php index a9b4713b84..45bcdfdd25 100644 --- a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php @@ -50,8 +50,8 @@ class ContextualLinkDefaultTest extends UnitTestCase { */ protected $stringTranslation; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->stringTranslation = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface'); } diff --git a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php index 6285b10d33..7cc3da4dad 100644 --- a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php @@ -72,7 +72,7 @@ class ContextualLinkManagerTest extends UnitTestCase { */ protected $account; - protected function setUp() { + protected function xxxSetUp() { $this->contextualLinkManager = $this ->getMockBuilder('Drupal\Core\Menu\ContextualLinkManager') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php index 108236e774..25fdfbec73 100644 --- a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php @@ -66,8 +66,8 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->accessManager = $this->createMock('\Drupal\Core\Access\AccessManagerInterface'); $this->currentUser = $this->createMock('Drupal\Core\Session\AccountInterface'); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php index fb2cdcc2b8..11f35e8ef7 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php @@ -57,8 +57,8 @@ class LocalActionDefaultTest extends UnitTestCase { */ protected $routeProvider; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->stringTranslation = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface'); $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php index 7a4bce8eb0..4efd073751 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php @@ -109,7 +109,7 @@ class LocalActionManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->argumentResolver = $this->createMock('\Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface'); $this->request = $this->createMock('Symfony\Component\HttpFoundation\Request'); $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php index 9e4ae6ba48..d6ad66a7c8 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php @@ -64,8 +64,8 @@ class LocalTaskDefaultTest extends UnitTestCase { */ protected $routeProvider; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->stringTranslation = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface'); $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface'); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php index f90f918ef2..b12ea27485 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php @@ -40,8 +40,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $container = new ContainerBuilder(); $config_factory = $this->getConfigFactoryStub([]); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php index 474dc36946..064fe726d9 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php @@ -97,8 +97,8 @@ class LocalTaskManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->argumentResolver = $this->createMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface'); $this->request = new Request(); diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php index f197c45e07..06de596902 100644 --- a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php @@ -66,8 +66,8 @@ class MenuActiveTrailTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestStack = new RequestStack(); $this->currentRouteMatch = new CurrentRouteMatch($this->requestStack); diff --git a/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php b/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php index 1d804cd1cd..01036be1b9 100644 --- a/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php +++ b/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php @@ -27,7 +27,7 @@ class ChainRequestPolicyTest extends UnitTestCase { */ protected $request; - protected function setUp() { + protected function xxxSetUp() { $this->policy = new ChainRequestPolicy(); $this->request = new Request(); } diff --git a/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php b/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php index 051f2c2f1c..9fb225b80d 100644 --- a/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php +++ b/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php @@ -35,7 +35,7 @@ class ChainResponsePolicyTest extends UnitTestCase { */ protected $response; - protected function setUp() { + protected function xxxSetUp() { $this->policy = new ChainResponsePolicy(); $this->response = new Response(); $this->request = new Request(); diff --git a/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php b/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php index 4c552624df..13f00b3001 100644 --- a/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php +++ b/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php @@ -19,7 +19,7 @@ class CommandLineOrUnsafeMethodTest extends UnitTestCase { */ protected $policy; - protected function setUp() { + protected function xxxSetUp() { // Note that it is necessary to partially mock the class under test in // order to disable the isCli-check. $this->policy = $this->getMockBuilder('Drupal\Core\PageCache\RequestPolicy\CommandLineOrUnsafeMethod') diff --git a/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php b/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php index 644fe326b6..b7c07d4e22 100644 --- a/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php +++ b/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php @@ -27,7 +27,7 @@ class NoSessionOpenTest extends UnitTestCase { */ protected $policy; - protected function setUp() { + protected function xxxSetUp() { $this->sessionConfiguration = $this->createMock('Drupal\Core\Session\SessionConfigurationInterface'); $this->policy = new NoSessionOpen($this->sessionConfiguration); } diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php index 7da4867f70..ef001e0b11 100644 --- a/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php +++ b/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php @@ -53,8 +53,8 @@ class EntityConverterTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class); $this->entityRepository = $this->createMock(EntityRepositoryInterface::class); diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php index 212b533441..0d4d2593fd 100644 --- a/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php +++ b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php @@ -27,8 +27,8 @@ class EntityRevisionParamConverterTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->converter = new EntityRevisionParamConverter( $this->prophesize(EntityTypeManagerInterface::class)->reveal(), diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php index f6f2767516..04e0639666 100644 --- a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php +++ b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php @@ -23,8 +23,8 @@ class ParamConverterManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->manager = new ParamConverterManager(); } diff --git a/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php b/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php index 5870ce6b27..847bb46f16 100644 --- a/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php +++ b/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php @@ -57,8 +57,8 @@ class PasswordHashingTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->password = $this->randomMachineName(); $this->passwordHasher = new PhpassHashedPassword(1); $this->hashedPassword = $this->passwordHasher->hash($this->password); diff --git a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php index 5ef5061327..9b20b23ddf 100644 --- a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php +++ b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php @@ -21,7 +21,7 @@ class PathMatcherTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Create a stub config factory with all config settings that will be // checked during this test. $config_factory_stub = $this->getConfigFactoryStub( diff --git a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php index 2dfbea9068..4c63e0fa44 100644 --- a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php @@ -54,8 +54,8 @@ class PathValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->accessAwareRouter = $this->createMock('Drupal\Core\Routing\AccessAwareRouterInterface'); $this->accessUnawareRouter = $this->createMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface'); diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php index ce401b1255..a77e2ee316 100644 --- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php +++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php @@ -35,7 +35,7 @@ class PathProcessorTest extends UnitTestCase { */ protected $languageManager; - protected function setUp() { + protected function xxxSetUp() { // Set up some languages to be used by the language-based path processor. $languages = []; diff --git a/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php index 33835b95be..3ba1c3ce2a 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php @@ -29,7 +29,7 @@ class CategorizingPluginManagerTraitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $module_handler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $module_handler->expects($this->any()) ->method('getModuleList') diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php index fc517aa38d..b368cfbe36 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php @@ -25,8 +25,8 @@ class ContextDefinitionIsSatisfiedTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $namespaces = new \ArrayObject([ 'Drupal\\Core\\TypedData' => $this->root . '/core/lib/Drupal/Core/TypedData', diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php index c3dae33948..a9a754ea51 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php @@ -44,8 +44,8 @@ class ContextTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->typedDataManager = $this->createMock(TypedDataManagerInterface::class); } diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionDeprecationTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionDeprecationTest.php index fc861e8c62..2364bc433d 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionDeprecationTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionDeprecationTest.php @@ -41,8 +41,8 @@ class EntityContextDefinitionDeprecationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); // Mock container services needed for constraint validation. $constraint_manager = $this->prophesize(ConstraintManager::class); diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionIsSatisfiedTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionIsSatisfiedTest.php index 63d5491635..54e6d9258f 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionIsSatisfiedTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/EntityContextDefinitionIsSatisfiedTest.php @@ -45,8 +45,8 @@ class EntityContextDefinitionIsSatisfiedTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $namespaces = new \ArrayObject([ 'Drupal\\Core\\TypedData' => $this->root . '/core/lib/Drupal/Core/TypedData', diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php index dfdd12753d..a271a37537 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php @@ -24,8 +24,8 @@ class LazyContextRepositoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->container = new ContainerBuilder(); } diff --git a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php index 713ab526d9..2cf1cf7f71 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php @@ -42,8 +42,8 @@ class ContextHandlerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->contextHandler = new ContextHandler(); diff --git a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php index 7f5ca70145..3bc6702806 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php @@ -37,7 +37,7 @@ class DefaultPluginManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->expectedDefinitions = [ 'apple' => [ 'id' => 'apple', diff --git a/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php b/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php index 807c33ed74..5436da214d 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php @@ -5,7 +5,7 @@ use Drupal\Component\Plugin\ConfigurableInterface; use Drupal\Component\Plugin\PluginBase; use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection; -use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder; +use Drupal\TestTools\PhpUnitCompatibility\RunnerVersion; /** * @coversDefaultClass \Drupal\Core\Plugin\DefaultSingleLazyPluginCollection @@ -16,7 +16,15 @@ class DefaultSingleLazyPluginCollectionTest extends LazyPluginCollectionTestBase /** * {@inheritdoc} */ - protected function setupPluginCollection(InvokedRecorder $create_count = NULL) { + protected function setupPluginCollection($create_count = NULL) { + if ($create_count) { + if (RunnerVersion::getMajor() < 8) { + $this->assertInstanceOf('PHPUnit\Framework\MockObject\Matcher\InvokedRecorder', $create_count); + } + else { + $this->assertInstanceOf('PHPUnit\Framework\MockObject\Rule\InvocationOrder', $create_count); + } + } $definitions = $this->getPluginDefinitions(); $this->pluginInstances['apple'] = new ConfigurablePlugin(['id' => 'apple', 'key' => 'value'], 'apple', $definitions['apple']); $this->pluginInstances['banana'] = new ConfigurablePlugin(['id' => 'banana', 'key' => 'other_value'], 'banana', $definitions['banana']); diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php index 569c8e6f46..904a67ea29 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php @@ -26,7 +26,7 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->discoveryMain = $discovery_main = $this->createMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface'); } diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php index 75d85bff21..b3f14fdb0a 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php @@ -29,7 +29,7 @@ class HookDiscoveryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $this->hookDiscovery = new HookDiscovery($this->moduleHandler, 'test_plugin'); } diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php index 0880169af3..9b08b0a58a 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php @@ -33,8 +33,8 @@ class YamlDiscoveryDecoratorTest extends UnitTestCase { 'decorated_2' => 'decorated_test_2', ]; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $base_path = __DIR__ . '/Fixtures'; // Set up the directories to search. diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php index 04e686ae8b..b86211ce1d 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php @@ -32,8 +32,8 @@ class YamlDiscoveryTest extends UnitTestCase { 'test_2' => 'test_2_b', ]; - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $base_path = __DIR__ . '/Fixtures'; // Set up the directories to search. diff --git a/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php b/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php index 13bff00e58..9c33f37696 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php +++ b/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php @@ -4,7 +4,7 @@ use Drupal\Core\Plugin\DefaultLazyPluginCollection; use Drupal\Tests\UnitTestCase; -use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder; +use Drupal\TestTools\PhpUnitCompatibility\RunnerVersion; /** * Provides a base class for plugin collection tests. @@ -43,7 +43,7 @@ 'apple' => ['id' => 'apple', 'key' => 'value'], ]; - protected function setUp() { + protected function xxxSetUp() { $this->pluginManager = $this->createMock('Drupal\Component\Plugin\PluginManagerInterface'); $this->pluginManager->expects($this->any()) ->method('getDefinitions') @@ -59,7 +59,15 @@ protected function setUp() { * called. For example, $this->any(), $this->once(), $this->exactly(6). * Defaults to $this->never(). */ - protected function setupPluginCollection(InvokedRecorder $create_count = NULL) { + protected function setupPluginCollection($create_count = NULL) { + if ($create_count) { + if (RunnerVersion::getMajor() < 8) { + $this->assertInstanceOf('PHPUnit\Framework\MockObject\Matcher\InvokedRecorder', $create_count); + } + else { + $this->assertInstanceOf('PHPUnit\Framework\MockObject\Rule\InvocationOrder', $create_count); + } + } $this->pluginInstances = []; $map = []; foreach ($this->getPluginDefinitions() as $plugin_id => $definition) { diff --git a/core/tests/Drupal/Tests/Core/Plugin/PluginFormFactoryTest.php b/core/tests/Drupal/Tests/Core/Plugin/PluginFormFactoryTest.php index fbe886a773..a4921db019 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/PluginFormFactoryTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/PluginFormFactoryTest.php @@ -34,8 +34,8 @@ class PluginFormFactoryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->classResolver = $this->prophesize(ClassResolverInterface::class); $this->manager = new PluginFormFactory($this->classResolver->reveal()); diff --git a/core/tests/Drupal/Tests/Core/PrivateKeyTest.php b/core/tests/Drupal/Tests/Core/PrivateKeyTest.php index 3331d44076..88a2ce2b2f 100644 --- a/core/tests/Drupal/Tests/Core/PrivateKeyTest.php +++ b/core/tests/Drupal/Tests/Core/PrivateKeyTest.php @@ -37,8 +37,8 @@ class PrivateKeyTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->key = Crypt::randomBytesBase64(55); $this->state = $this->createMock('Drupal\Core\State\StateInterface'); diff --git a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php index 72a8aa88a1..4131205dae 100644 --- a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php @@ -26,8 +26,8 @@ class ProxyBuilderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->proxyBuilder = new ProxyBuilder(); } diff --git a/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php index 3b52f9a4a1..cd67534f9b 100644 --- a/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php +++ b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php @@ -33,8 +33,8 @@ class RenderElementTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestStack = new RequestStack(); $this->container = new ContainerBuilder(); diff --git a/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php b/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php index bc4e51c681..a373c0fa55 100644 --- a/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php @@ -57,8 +57,8 @@ class ElementInfoManagerTest extends UnitTestCase { * * @covers ::__construct */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); diff --git a/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php index 8adade40ee..a14bfdc2a6 100644 --- a/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php @@ -25,8 +25,8 @@ class MetadataBubblingUrlGeneratorTest extends UrlGeneratorTest { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->renderer = $this->createMock('\Drupal\Core\Render\RendererInterface'); $this->renderer->expects($this->any()) diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index 8085b7141d..f269e015da 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -22,12 +22,12 @@ class RendererBubblingTest extends RendererTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Disable the required cache contexts, so that this test can test just the // bubbling behavior. $this->rendererConfig['required_cache_contexts'] = []; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/tests/Drupal/Tests/Core/Render/RendererCallbackTest.php b/core/tests/Drupal/Tests/Core/Render/RendererCallbackTest.php index 4cc79a98a8..b426a8c1d5 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererCallbackTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererCallbackTest.php @@ -18,8 +18,8 @@ class RendererCallbackTest extends RendererTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->controllerResolver->expects($this->any()) ->method('getControllerFromDefinition') ->willReturnArgument(0); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php index 6e56588f25..1051da5743 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php @@ -25,12 +25,12 @@ class RendererPlaceholdersTest extends RendererTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { // Disable the required cache contexts, so that this test can test just the // placeholder replacement behavior. $this->rendererConfig['required_cache_contexts'] = []; - parent::setUp(); + parent::xxxSetUp(); } /** diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php index 0a2a74a6e6..f9634863a9 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php @@ -114,8 +114,8 @@ /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->controllerResolver = $this->createMock('Drupal\Core\Controller\ControllerResolverInterface'); $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php b/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php index 0a3a3d942a..79b6a62e56 100644 --- a/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php +++ b/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php @@ -21,7 +21,7 @@ class RouteProcessorManagerTest extends UnitTestCase { */ protected $processorManager; - protected function setUp() { + protected function xxxSetUp() { $this->processorManager = new RouteProcessorManager(); } diff --git a/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php b/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php index 595501727d..222bb9c702 100644 --- a/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php @@ -31,8 +31,8 @@ class AcceptHeaderMatcherTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->fixtures = new RoutingFixtures(); $this->matcher = new AcceptHeaderMatcher(); diff --git a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php index 6038ece5ff..861e0a2d4f 100644 --- a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php @@ -45,8 +45,8 @@ class AccessAwareRouterTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->route = new Route('test'); $this->accessManager = $this->createMock('Drupal\Core\Access\AccessManagerInterface'); $this->currentUser = $this->createMock('Drupal\Core\Session\AccountInterface'); diff --git a/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php b/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php index 1ae593bfda..77fd87e914 100644 --- a/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php @@ -34,8 +34,8 @@ class ContentTypeHeaderMatcherTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->fixtures = new RoutingFixtures(); $this->matcher = new ContentTypeHeaderMatcher(); diff --git a/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php b/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php index e7995cf1f2..226f1d143c 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php @@ -38,8 +38,8 @@ class RedirectDestinationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestStack = new RequestStack(); $this->urlGenerator = $this->createMock('Drupal\Core\Routing\UrlGeneratorInterface'); diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php index 3a12ff5642..195c00610a 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php @@ -77,7 +77,7 @@ class RouteBuilderTest extends UnitTestCase { */ protected $checkProvider; - protected function setUp() { + protected function xxxSetUp() { $this->dumper = $this->createMock('Drupal\Core\Routing\MatcherDumperInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); $this->dispatcher = $this->createMock('\Symfony\Component\EventDispatcher\EventDispatcherInterface'); diff --git a/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php b/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php index 8ccc3429ad..5deda02906 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php @@ -46,7 +46,7 @@ class RoutePreloaderTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->routeProvider = $this->createMock('Drupal\Core\Routing\PreloadableRouteProviderInterface'); $this->state = $this->createMock('\Drupal\Core\State\StateInterface'); $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php index c01aafac0d..78e19206a3 100644 --- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php @@ -78,7 +78,7 @@ class UrlGeneratorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php b/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php index e828de086e..9707324763 100644 --- a/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php +++ b/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php @@ -26,8 +26,8 @@ class RequestSanitizerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->errors = []; set_error_handler([$this, "errorHandler"]); } diff --git a/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php b/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php index f455e9485c..af22bc8515 100644 --- a/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php @@ -72,8 +72,8 @@ class PermissionsHashGeneratorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); new Settings(['hash_salt' => 'test']); diff --git a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php index 294dac8bfe..1acfb83919 100644 --- a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php +++ b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php @@ -54,8 +54,8 @@ protected function createUserSession(array $rids = [], $authenticated = FALSE) { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $roles = []; $roles['role_one'] = $this->getMockBuilder('Drupal\user\Entity\Role') diff --git a/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php b/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php index 0b70385a8d..328f0d59d8 100644 --- a/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php @@ -27,7 +27,7 @@ class WriteSafeSessionHandlerTest extends UnitTestCase { */ protected $sessionHandler; - protected function setUp() { + protected function xxxSetUp() { $this->wrappedSessionHandler = $this->createMock('SessionHandlerInterface'); $this->sessionHandler = new WriteSafeSessionHandler($this->wrappedSessionHandler); } diff --git a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php index c43bc99a52..25c3315df9 100644 --- a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php +++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php @@ -32,7 +32,7 @@ class SettingsTest extends UnitTestCase { /** * @covers ::__construct */ - protected function setUp() { + protected function xxxSetUp() { $this->config = [ 'one' => '1', 'two' => '2', diff --git a/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php b/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php index 7b5217d4c5..fd232c0a18 100644 --- a/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php +++ b/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php @@ -32,8 +32,8 @@ class NegotiationMiddlewareTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->app = $this->prophesize(HttpKernelInterface::class); $this->contentNegotiation = new StubNegotiationMiddleware($this->app->reveal()); diff --git a/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php index 18a882f19b..0379f3f743 100644 --- a/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php +++ b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php @@ -24,7 +24,7 @@ class ReverseProxyMiddlewareTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->mockHttpKernel = $this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface'); } diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php index 5e16fa88e6..8fc583f4de 100644 --- a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php +++ b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php @@ -32,7 +32,7 @@ class StringTranslationTraitTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->translation = $this->getObjectForTrait('\Drupal\Core\StringTranslation\StringTranslationTrait'); $mock = $this->prophesize(TranslationInterface::class); $mock->translate(Argument::cetera())->shouldNotBeCalled(); diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php index edc5b0207e..302b768291 100644 --- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php +++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php @@ -27,7 +27,7 @@ class TranslationManagerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->translationManager = new TestTranslationManager(); } diff --git a/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php index 16c521578c..d6f6569662 100644 --- a/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php +++ b/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php @@ -67,8 +67,8 @@ class PrivateTempStoreTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->keyValue = $this->createMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php index 3e519d184c..b9a71d4fde 100644 --- a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php +++ b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php @@ -68,8 +68,8 @@ class SharedTempStoreTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->keyValue = $this->createMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index 87d5397b31..4dece51cf1 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -58,8 +58,8 @@ class TwigExtensionTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->renderer = $this->createMock('\Drupal\Core\Render\RendererInterface'); $this->urlGenerator = $this->createMock('\Drupal\Core\Routing\UrlGeneratorInterface'); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php index 019acbe1dc..c1373ccd34 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php @@ -31,8 +31,8 @@ class TwigSandboxTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $loader = new StringLoader(); $this->twig = new \Twig_Environment($loader); diff --git a/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php b/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php index d593cd29b8..075382a58b 100644 --- a/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php +++ b/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php @@ -6,6 +6,7 @@ use Drupal\Tests\TestSuites\TestSuiteBase; use org\bovigo\vfs\vfsStream; use PHPUnit\Framework\TestCase; +use PHPUnit\Runner\Version; // The test suite class is not part of the autoloader, we need to include it // manually. diff --git a/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php index 24746c3b03..274850c21b 100644 --- a/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php +++ b/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php @@ -40,8 +40,8 @@ class AjaxBasePageNegotiatorTest extends UnitTestCase { /** * {@inheritdoc} */ - public function setUp() { - parent::setUp(); + public function xxxSetUp() { + parent::xxxSetUp(); $this->tokenGenerator = $this->prophesize(CsrfTokenGenerator::class); $config_factory = $this->getConfigFactoryStub(['system.theme' => ['default' => 'bartik']]); diff --git a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php index f16b26f931..908bdd9364 100644 --- a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php +++ b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php @@ -76,8 +76,8 @@ class RegistryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); @@ -92,8 +92,8 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function tearDown() { - parent::tearDown(); + protected function xxxTearDown() { + parent::xxxTearDown(); static::$functions = []; } diff --git a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php index 40281a9927..cdfc5ba472 100644 --- a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php +++ b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php @@ -46,7 +46,7 @@ class ThemeNegotiatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->themeAccessCheck = $this->getMockBuilder('\Drupal\Core\Theme\ThemeAccessCheck') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php index 6ef38bbc06..bef24b1c86 100644 --- a/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php @@ -56,8 +56,8 @@ class RecursiveContextualValidatorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $cache_backend = new NullBackend('cache'); $namespaces = new \ArrayObject([ diff --git a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php index 1e81b0bfff..d40287328a 100644 --- a/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php +++ b/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php @@ -45,8 +45,8 @@ class UnroutedUrlTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->urlAssembler = $this->createMock('Drupal\Core\Utility\UnroutedUrlAssemblerInterface'); $this->urlAssembler->expects($this->any()) diff --git a/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php b/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php index 64a6bad790..d19b69e865 100644 --- a/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php +++ b/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php @@ -22,8 +22,8 @@ class UpdateRegistryTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $settings = []; $settings['extension_discovery_scan_tests'] = TRUE; diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php index 4094a48d57..6d5c4dd0e6 100644 --- a/core/tests/Drupal/Tests/Core/UrlTest.php +++ b/core/tests/Drupal/Tests/Core/UrlTest.php @@ -70,8 +70,8 @@ class UrlTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $map = []; $map[] = ['view.frontpage.page_1', [], [], FALSE, '/node']; diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php index a91e9824a6..fda6184593 100644 --- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php @@ -67,8 +67,8 @@ class LinkGeneratorTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->urlGenerator = $this->getMockBuilder('\Drupal\Core\Routing\UrlGenerator') ->disableOriginalConstructor() diff --git a/core/tests/Drupal/Tests/Core/Utility/TokenTest.php b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php index ed2262e0c6..208e71c4a1 100644 --- a/core/tests/Drupal/Tests/Core/Utility/TokenTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php @@ -76,7 +76,7 @@ class TokenTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { $this->cache = $this->createMock('\Drupal\Core\Cache\CacheBackendInterface'); $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface'); diff --git a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php index f0511e0c49..1e8047b645 100644 --- a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php +++ b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php @@ -46,8 +46,8 @@ class UnroutedUrlAssemblerTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $this->requestStack = new RequestStack(); $this->pathProcessor = $this->createMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface'); diff --git a/core/tests/Drupal/Tests/Phpunit4CompatibilityTest.php b/core/tests/Drupal/Tests/Phpunit4CompatibilityTest.php index 639e6fa35f..1a6673ff48 100644 --- a/core/tests/Drupal/Tests/Phpunit4CompatibilityTest.php +++ b/core/tests/Drupal/Tests/Phpunit4CompatibilityTest.php @@ -2,6 +2,8 @@ namespace Drupal\Tests; +use Drupal\TestTools\PhpUnitCompatibility\RunnerVersion; + /** * Tests existence of the PHPUnit4 backward compatibility classes. * @@ -55,6 +57,9 @@ public function testFrameworkExpectationFailedException() { * Tests existence of \PHPUnit_Framework_MockObject_Matcher_InvokedRecorder. */ public function testFrameworkMockObjectMatcherInvokedRecorder() { + if (RunnerVersion::getMajor() >= 8) { + $this->markTestSkipped('PHPUnit\Framework\MockObject\Matcher\InvokedRecorder is no longer available in PHPUnit 8+.'); + } $this->assertTrue(class_exists('\PHPUnit_Framework_MockObject_Matcher_InvokedRecorder')); } diff --git a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php index 2762b8c68d..9e63e1f256 100644 --- a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php +++ b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php @@ -38,8 +38,8 @@ class TestSiteApplicationTest extends UnitTestCase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); + protected function xxxSetUp() { + parent::xxxSetUp(); $php_executable_finder = new PhpExecutableFinder(); $this->php = $php_executable_finder->find(); $this->root = dirname(dirname(substr(__DIR__, 0, -strlen(__NAMESPACE__)))); diff --git a/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php b/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php index 9145252209..46ced877a4 100644 --- a/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php +++ b/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php @@ -2,111 +2,6 @@ namespace Drupal\Tests\Traits; -use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener as LegacySymfonyTestsListener; -use Symfony\Bridge\PhpUnit\SymfonyTestsListener; -use PHPUnit\Framework\AssertionFailedError; -use PHPUnit\Framework\TestCase; -use PHPUnit\Util\Test; +use Drupal\TestTools\PhpUnitCompatibility\RunnerVersion; -/** - * Adds the ability to dynamically set expected deprecation messages in tests. - * - * @internal - * This class should only be used by Drupal core and will be removed once - * https://github.com/symfony/symfony/pull/25757 is resolved. - * - * @todo Remove once https://github.com/symfony/symfony/pull/25757 is resolved. - */ -trait ExpectDeprecationTrait { - - /** - * Sets an expected deprecation message. - * - * @param string $message - * The expected deprecation message. - */ - protected function expectDeprecation($message) { - $this->expectedDeprecations([$message]); - } - - /** - * Sets expected deprecation messages. - * - * @param string[] $messages - * The expected deprecation messages. - */ - public function expectedDeprecations(array $messages) { - if ($this instanceof TestCase) { - // Ensure the class or method is in the legacy group. - $groups = Test::getGroups(get_class($this), $this->getName(FALSE)); - if (!in_array('legacy', $groups, TRUE)) { - throw new AssertionFailedError('Only tests with the `@group legacy` annotation can call `setExpectedDeprecation()`.'); - } - - // If setting an expected deprecation there is no need to be strict about - // testing nothing as this is an assertion. - $this->getTestResultObject() - ->beStrictAboutTestsThatDoNotTestAnything(FALSE); - - if ($trait = $this->getSymfonyTestListenerTrait()) { - // Add the expected deprecation message to the class property. - $reflection_class = new \ReflectionClass($trait); - $expected_deprecations_property = $reflection_class->getProperty('expectedDeprecations'); - $expected_deprecations_property->setAccessible(TRUE); - $expected_deprecations = $expected_deprecations_property->getValue($trait); - $expected_deprecations = array_merge($expected_deprecations, $messages); - $expected_deprecations_property->setValue($trait, $expected_deprecations); - - // Register the error handler if necessary. - $previous_error_handler_property = $reflection_class->getProperty('previousErrorHandler'); - $previous_error_handler_property->setAccessible(TRUE); - $previous_error_handler = $previous_error_handler_property->getValue($trait); - if (!$previous_error_handler) { - $previous_error_handler = set_error_handler([$trait, 'handleError']); - $previous_error_handler_property->setValue($trait, $previous_error_handler); - } - return; - } - } - - // Expected deprecations set by isolated tests need to be written to a file - // so that the test running process can take account of them. - if ($file = getenv('DRUPAL_EXPECTED_DEPRECATIONS_SERIALIZE')) { - $expected_deprecations = file_get_contents($file); - if ($expected_deprecations) { - $expected_deprecations = array_merge(unserialize($expected_deprecations), $messages); - } - else { - $expected_deprecations = $messages; - } - file_put_contents($file, serialize($expected_deprecations)); - return; - } - - throw new AssertionFailedError('Can not set an expected deprecation message because the Symfony\Bridge\PhpUnit\SymfonyTestsListener is not registered as a PHPUnit test listener.'); - } - - /** - * Gets the SymfonyTestsListenerTrait. - * - * @return \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait|null - * The SymfonyTestsListenerTrait object or NULL is a Symfony test listener - * is not present. - */ - private function getSymfonyTestListenerTrait() { - $test_result_object = $this->getTestResultObject(); - $reflection_class = new \ReflectionClass($test_result_object); - $reflection_property = $reflection_class->getProperty('listeners'); - $reflection_property->setAccessible(TRUE); - $listeners = $reflection_property->getValue($test_result_object); - foreach ($listeners as $listener) { - if ($listener instanceof SymfonyTestsListener || $listener instanceof LegacySymfonyTestsListener) { - $reflection_class = new \ReflectionClass($listener); - $reflection_property = $reflection_class->getProperty('trait'); - $reflection_property->setAccessible(TRUE); - return $reflection_property->getValue($listener); - } - } - } - -} +class_alias("Drupal\TestTools\PhpUnitCompatibility\PhpUnit" . RunnerVersion::getMajor() . "\ExpectDeprecationTrait", ExpectDeprecationTrait::class); diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php index 4a2c012260..103f5e5706 100644 --- a/core/tests/Drupal/Tests/UnitTestCase.php +++ b/core/tests/Drupal/Tests/UnitTestCase.php @@ -9,14 +9,15 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\StringTranslation\PluralTranslatableMarkup; -use PHPUnit\Framework\TestCase; +//use PHPUnit\Framework\TestCase; +use Drupal\TestTools\PhpUnitCompatibility\PhpUnit6\BaseTestCase; /** * Provides a base class and helpers for Drupal unit tests. * * @ingroup testing */ -abstract class UnitTestCase extends TestCase { +abstract class UnitTestCase extends BaseTestCase { use PhpunitCompatibilityTrait; @@ -37,7 +38,7 @@ /** * {@inheritdoc} */ - protected function setUp() { + protected function xxxSetUp() { parent::setUp(); // Ensure that an instantiated container in the global state of \Drupal from // a previous test does not leak into this test. @@ -52,6 +53,13 @@ protected function setUp() { $this->root = dirname(dirname(substr(__DIR__, 0, -strlen(__NAMESPACE__)))); } + /** + * {@inheritdoc} + */ + protected function xxxTearDown() { + parent::tearDown(); + } + /** * Generates a unique random string containing letters and numbers. * diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php index 467e6af6e6..83ee9d5246 100644 --- a/core/tests/bootstrap.php +++ b/core/tests/bootstrap.php @@ -14,11 +14,11 @@ use PHPUnit\Framework\Error\Warning; use PHPUnit\Framework\ExpectationFailedException; use PHPUnit\Framework\Exception; -use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder; use PHPUnit\Framework\SkippedTestError; use PHPUnit\Framework\TestCase; use PHPUnit\Util\Test; use PHPUnit\Util\Xml; +use Drupal\TestTools\PhpUnitCompatibility\RunnerVersion; /** * Finds all valid extension directories recursively within a given directory. @@ -194,7 +194,9 @@ class_alias(Error::class, '\PHPUnit_Framework_Error'); class_alias(Warning::class, '\PHPUnit_Framework_Error_Warning'); class_alias(ExpectationFailedException::class, '\PHPUnit_Framework_ExpectationFailedException'); class_alias(Exception::class, '\PHPUnit_Framework_Exception'); -class_alias(InvokedRecorder::class, '\PHPUnit_Framework_MockObject_Matcher_InvokedRecorder'); +if (RunnerVersion::getMajor() < 8) { + class_alias('PHPUnit\Framework\MockObject\Matcher\InvokedRecorder', '\PHPUnit_Framework_MockObject_Matcher_InvokedRecorder'); +} class_alias(SkippedTestError::class, '\PHPUnit_Framework_SkippedTestError'); class_alias(TestCase::class, '\PHPUnit_Framework_TestCase'); class_alias(Test::class, '\PHPUnit_Util_Test');