projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.5. Core Media not yet in use.
[yaffs-website]
/
web
/
core
/
modules
/
block
/
tests
/
src
/
Unit
/
BlockConfigEntityUnitTest.php
diff --git
a/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
b/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
index 8df0e93a2744340d543c15a8ee91789e01e74cde..921b5d2fbbf4ec6d815cb1706beb4abcf3d7a483 100644
(file)
--- a/
web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
+++ b/
web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
@@
-3,6
+3,7
@@
namespace Drupal\Tests\block\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
namespace Drupal\Tests\block\Unit;
use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
use Drupal\Tests\UnitTestCase;
use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
use Drupal\Tests\UnitTestCase;
@@
-20,11
+21,11
@@
class BlockConfigEntityUnitTest extends UnitTestCase {
protected $entityType;
/**
protected $entityType;
/**
- * The entity manager used for testing.
+ * The entity
type
manager used for testing.
*
*
- * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\Entity\Entity
Type
ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
*/
- protected $entityManager;
+ protected $entity
Type
Manager;
/**
* The ID of the type of the entity under test.
/**
* The ID of the type of the entity under test.
@@
-51,8
+52,8
@@
class BlockConfigEntityUnitTest extends UnitTestCase {
->method('getProvider')
->will($this->returnValue('block'));
->method('getProvider')
->will($this->returnValue('block'));
- $this->entity
Manager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface'
);
- $this->entityManager->expects($this->any())
+ $this->entity
TypeManager = $this->getMock(EntityTypeManagerInterface::class
);
+ $this->entity
Type
Manager->expects($this->any())
->method('getDefinition')
->with($this->entityTypeId)
->will($this->returnValue($this->entityType));
->method('getDefinition')
->with($this->entityTypeId)
->will($this->returnValue($this->entityType));
@@
-60,7
+61,7
@@
class BlockConfigEntityUnitTest extends UnitTestCase {
$this->uuid = $this->getMock('\Drupal\Component\Uuid\UuidInterface');
$container = new ContainerBuilder();
$this->uuid = $this->getMock('\Drupal\Component\Uuid\UuidInterface');
$container = new ContainerBuilder();
- $container->set('entity
.manager', $this->entity
Manager);
+ $container->set('entity
_type.manager', $this->entityType
Manager);
$container->set('uuid', $this->uuid);
\Drupal::setContainer($container);
}
$container->set('uuid', $this->uuid);
\Drupal::setContainer($container);
}