Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3126969 by mondrake, longwave, alexpott, daffie: Replace usage of assertAttributeInstanceOf() that is deprecated

merge-requests/2419/head
Alex Pott 2020-04-17 13:01:06 +01:00
parent 701a778095
commit de981ef81e
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
View File

@ -243,8 +243,8 @@ class EntityTypeManagerTest extends UnitTestCase {
$apple_form = $this->entityTypeManager->getFormObject('apple', 'default'); $apple_form = $this->entityTypeManager->getFormObject('apple', 'default');
$this->assertInstanceOf(TestEntityForm::class, $apple_form); $this->assertInstanceOf(TestEntityForm::class, $apple_form);
$this->assertAttributeInstanceOf(ModuleHandlerInterface::class, 'moduleHandler', $apple_form); $this->assertInstanceOf(ModuleHandlerInterface::class, $apple_form->moduleHandler);
$this->assertAttributeInstanceOf(TranslationInterface::class, 'stringTranslation', $apple_form); $this->assertInstanceOf(TranslationInterface::class, $apple_form->stringTranslation);
$banana_form = $this->entityTypeManager->getFormObject('banana', 'default'); $banana_form = $this->entityTypeManager->getFormObject('banana', 'default');
$this->assertInstanceOf(TestEntityFormInjected::class, $banana_form); $this->assertInstanceOf(TestEntityFormInjected::class, $banana_form);
@ -272,7 +272,7 @@ class EntityTypeManagerTest extends UnitTestCase {
* @covers ::getHandler * @covers ::getHandler
*/ */
public function testGetHandler() { public function testGetHandler() {
$class = $this->getTestHandlerClass(); $class = get_class($this->getMockForAbstractClass(TestEntityHandlerBase::class));
$apple = $this->prophesize(EntityTypeInterface::class); $apple = $this->prophesize(EntityTypeInterface::class);
$apple->getHandlerClass('storage')->willReturn($class); $apple->getHandlerClass('storage')->willReturn($class);
@ -282,8 +282,8 @@ class EntityTypeManagerTest extends UnitTestCase {
$apple_controller = $this->entityTypeManager->getHandler('apple', 'storage'); $apple_controller = $this->entityTypeManager->getHandler('apple', 'storage');
$this->assertInstanceOf($class, $apple_controller); $this->assertInstanceOf($class, $apple_controller);
$this->assertAttributeInstanceOf(ModuleHandlerInterface::class, 'moduleHandler', $apple_controller); $this->assertInstanceOf(ModuleHandlerInterface::class, $apple_controller->moduleHandler);
$this->assertAttributeInstanceOf(TranslationInterface::class, 'stringTranslation', $apple_controller); $this->assertInstanceOf(TranslationInterface::class, $apple_controller->stringTranslation);
} }
/** /**
@ -312,8 +312,8 @@ class EntityTypeManagerTest extends UnitTestCase {
$apple_route_provider = $this->entityTypeManager->getRouteProviders('apple'); $apple_route_provider = $this->entityTypeManager->getRouteProviders('apple');
$this->assertInstanceOf(TestRouteProvider::class, $apple_route_provider['default']); $this->assertInstanceOf(TestRouteProvider::class, $apple_route_provider['default']);
$this->assertAttributeInstanceOf(ModuleHandlerInterface::class, 'moduleHandler', $apple_route_provider['default']); $this->assertInstanceOf(ModuleHandlerInterface::class, $apple_route_provider['default']->moduleHandler);
$this->assertAttributeInstanceOf(TranslationInterface::class, 'stringTranslation', $apple_route_provider['default']); $this->assertInstanceOf(TranslationInterface::class, $apple_route_provider['default']->stringTranslation);
} }
/** /**
@ -396,6 +396,26 @@ class EntityTypeManagerTest extends UnitTestCase {
} }
/**
* Provides a test entity handler.
*/
abstract class TestEntityHandlerBase extends EntityHandlerBase {
/**
* {@inheritdoc}
*/
public $moduleHandler;
/**
* {@inheritdoc}
*/
public $stringTranslation;
}
/**
* Provides a test entity type manager.
*/
class TestEntityTypeManager extends EntityTypeManager { class TestEntityTypeManager extends EntityTypeManager {
/** /**
@ -415,6 +435,16 @@ class TestEntityTypeManager extends EntityTypeManager {
*/ */
class TestEntityForm extends EntityHandlerBase { class TestEntityForm extends EntityHandlerBase {
/**
* {@inheritdoc}
*/
public $moduleHandler;
/**
* {@inheritdoc}
*/
public $stringTranslation;
/** /**
* The entity type manager. * The entity type manager.
* *
@ -496,4 +526,14 @@ class TestEntityFormInjected extends TestEntityForm implements ContainerInjectio
*/ */
class TestRouteProvider extends EntityHandlerBase { class TestRouteProvider extends EntityHandlerBase {
/**
* {@inheritdoc}
*/
public $moduleHandler;
/**
* {@inheritdoc}
*/
public $stringTranslation;
} }

1
core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
View File

@ -26,7 +26,6 @@ trait PHPUnit8Warnings {
'readAttribute() is deprecated and will be removed in PHPUnit 9.', 'readAttribute() is deprecated and will be removed in PHPUnit 9.',
'getObjectAttribute() is deprecated and will be removed in PHPUnit 9.', 'getObjectAttribute() is deprecated and will be removed in PHPUnit 9.',
'assertAttributeEquals() is deprecated and will be removed in PHPUnit 9.', 'assertAttributeEquals() is deprecated and will be removed in PHPUnit 9.',
'assertAttributeInstanceOf() is deprecated and will be removed in PHPUnit 9.',
]; ];
/** /**