diff --git a/core/modules/config/src/Tests/ConfigImportRecreateTest.php b/core/modules/config/src/Tests/ConfigImportRecreateTest.php index 34aa441..163389f 100644 --- a/core/modules/config/src/Tests/ConfigImportRecreateTest.php +++ b/core/modules/config/src/Tests/ConfigImportRecreateTest.php @@ -63,10 +63,10 @@ protected function setUp() { public function testRecreateEntity() { $type_name = Unicode::strtolower($this->randomMachineName(16)); - $content_type = entity_create('node_type', array( + $content_type = NodeType::create([ 'type' => $type_name, 'name' => 'Node type one', - )); + ]); $content_type->save(); node_add_body_field($content_type); /** @var \Drupal\Core\Config\StorageInterface $active */ @@ -82,10 +82,10 @@ public function testRecreateEntity() { $content_type->delete(); $this->assertFalse($active->exists($config_name), 'Content type\'s old name does not exist active store.'); // Recreate with the same type - this will have a different UUID. - $content_type = entity_create('node_type', array( + $content_type = NodeType::create([ 'type' => $type_name, 'name' => 'Node type two', - )); + ]); $content_type->save(); node_add_body_field($content_type); diff --git a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php index c461f30..fe4df02 100644 --- a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php +++ b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php @@ -13,6 +13,7 @@ use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Config\ConfigImporterException; use Drupal\Core\Config\StorageComparer; +use Drupal\node\Entity\NodeType; use Drupal\simpletest\KernelTestBase; /** @@ -85,11 +86,11 @@ public function testRenameValidation() { $test_entity->delete(); // Create a content type with a matching UUID in the active storage. - $content_type = entity_create('node_type', array( + $content_type = NodeType::create([ 'type' => Unicode::strtolower($this->randomMachineName(16)), 'name' => $this->randomMachineName(), 'uuid' => $uuid, - )); + ]); $content_type->save(); // Confirm that the staged configuration is detected as a rename since the diff --git a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php index b563f04..1d9e079 100644 --- a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php +++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php @@ -8,6 +8,7 @@ namespace Drupal\datetime\Tests\Views; use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem; +use Drupal\node\Entity\NodeType; use Drupal\views\Tests\Handler\HandlerTestBase; use Drupal\views\Tests\ViewTestData; use Drupal\field\Entity\FieldStorageConfig; @@ -45,7 +46,7 @@ protected function setUp() { parent::setUp(); // Add a date field to page nodes. - $node_type = entity_create('node_type', [ + $node_type = NodeType::create([ 'type' => 'page', 'name' => 'page' ]); diff --git a/core/modules/editor/src/Tests/EditorFileUsageTest.php b/core/modules/editor/src/Tests/EditorFileUsageTest.php index 2d115d1..b4c892a 100644 --- a/core/modules/editor/src/Tests/EditorFileUsageTest.php +++ b/core/modules/editor/src/Tests/EditorFileUsageTest.php @@ -8,6 +8,7 @@ namespace Drupal\editor\Tests; use Drupal\editor\Entity\Editor; +use Drupal\node\Entity\NodeType; use Drupal\system\Tests\Entity\EntityUnitTestBase; use Drupal\field\Entity\FieldStorageConfig; use Drupal\Core\Field\FieldStorageDefinitionInterface; @@ -55,7 +56,7 @@ protected function setUp() { $editor->save(); // Create a node type for testing. - $type = entity_create('node_type', array('type' => 'page', 'name' => 'page')); + $type = NodeType::create(['type' => 'page', 'name' => 'page']); $type->save(); node_add_body_field($type); } diff --git a/core/modules/field/src/Tests/Views/FieldTestBase.php b/core/modules/field/src/Tests/Views/FieldTestBase.php index 9019f03..e0c2d26 100644 --- a/core/modules/field/src/Tests/Views/FieldTestBase.php +++ b/core/modules/field/src/Tests/Views/FieldTestBase.php @@ -19,6 +19,7 @@ namespace Drupal\field\Tests\Views; +use Drupal\node\Entity\NodeType; use Drupal\views\Tests\ViewTestBase; use Drupal\views\Tests\ViewTestData; use Drupal\field\Entity\FieldStorageConfig; @@ -54,10 +55,10 @@ protected function setUp() { parent::setUp(); // Ensure the page node type exists. - entity_create('node_type', array( + NodeType::create([ 'type' => 'page', 'name' => 'page', - ))->save(); + ])->save(); ViewTestData::createTestViews(get_class($this), array('field_test_views')); } diff --git a/core/modules/hal/src/Tests/EntityTest.php b/core/modules/hal/src/Tests/EntityTest.php index ef0698b..002df90 100644 --- a/core/modules/hal/src/Tests/EntityTest.php +++ b/core/modules/hal/src/Tests/EntityTest.php @@ -9,6 +9,7 @@ use Drupal\comment\Tests\CommentTestTrait; use Drupal\comment\Entity\Comment; +use Drupal\node\Entity\NodeType; /** * Tests that nodes and terms are correctly normalized and denormalized. @@ -43,7 +44,7 @@ protected function setUp() { * Tests the normalization of nodes. */ public function testNode() { - $node_type = entity_create('node_type', array('type' => 'example_type')); + $node_type = NodeType::create(['type' => 'example_type']); $node_type->save(); $user = entity_create('user', array('name' => $this->randomMachineName())); @@ -139,7 +140,7 @@ public function testTerm() { * Tests the normalization of comments. */ public function testComment() { - $node_type = entity_create('node_type', array('type' => 'example_type')); + $node_type = NodeType::create(['type' => 'example_type']); $node_type->save(); $account = entity_create('user', array('name' => $this->randomMachineName())); diff --git a/core/modules/node/src/Tests/Condition/NodeConditionTest.php b/core/modules/node/src/Tests/Condition/NodeConditionTest.php index a3839c6..6af1d77 100644 --- a/core/modules/node/src/Tests/Condition/NodeConditionTest.php +++ b/core/modules/node/src/Tests/Condition/NodeConditionTest.php @@ -8,6 +8,7 @@ namespace Drupal\node\Tests\Condition; use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; use Drupal\system\Tests\Entity\EntityUnitTestBase; /** @@ -23,11 +24,11 @@ protected function setUp() { parent::setUp(); // Create the node bundles required for testing. - $type = entity_create('node_type', array('type' => 'page', 'name' => 'page')); + $type = NodeType::create(['type' => 'page', 'name' => 'page']); $type->save(); - $type = entity_create('node_type', array('type' => 'article', 'name' => 'article')); + $type = NodeType::create(['type' => 'article', 'name' => 'article']); $type->save(); - $type = entity_create('node_type', array('type' => 'test', 'name' => 'test')); + $type = NodeType::create(['type' => 'test', 'name' => 'test']); $type->save(); } diff --git a/core/modules/node/src/Tests/NodeCacheTagsTest.php b/core/modules/node/src/Tests/NodeCacheTagsTest.php index 82b01b7..b10bcb6 100644 --- a/core/modules/node/src/Tests/NodeCacheTagsTest.php +++ b/core/modules/node/src/Tests/NodeCacheTagsTest.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase; /** @@ -28,10 +29,10 @@ class NodeCacheTagsTest extends EntityWithUriCacheTagsTestBase { */ protected function createEntity() { // Create a "Camelids" node type. - entity_create('node_type', array( + NodeType::create([ 'name' => 'Camelids', 'type' => 'camelids', - ))->save(); + ])->save(); // Create a "Llama" node. $node = Node::create(['type' => 'camelids']); diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php index b71fe22..9050de9 100644 --- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php +++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php @@ -11,6 +11,7 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Render\BubbleableMetadata; use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; use Drupal\system\Tests\System\TokenReplaceUnitTestBase; /** @@ -35,7 +36,7 @@ protected function setUp() { parent::setUp(); $this->installConfig(array('filter', 'node')); - $node_type = entity_create('node_type', array('type' => 'article', 'name' => 'Article')); + $node_type = NodeType::create(['type' => 'article', 'name' => 'Article']); $node_type->save(); node_add_body_field($node_type); } diff --git a/core/modules/node/src/Tests/NodeValidationTest.php b/core/modules/node/src/Tests/NodeValidationTest.php index 77f20fb..c6e26cc 100644 --- a/core/modules/node/src/Tests/NodeValidationTest.php +++ b/core/modules/node/src/Tests/NodeValidationTest.php @@ -8,6 +8,7 @@ namespace Drupal\node\Tests; use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; use Drupal\system\Tests\Entity\EntityUnitTestBase; /** @@ -31,7 +32,7 @@ protected function setUp() { parent::setUp(); // Create a node type for testing. - $type = entity_create('node_type', array('type' => 'page', 'name' => 'page')); + $type = NodeType::create(['type' => 'page', 'name' => 'page']); $type->save(); } diff --git a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php index a6b3121..46fbb23 100644 --- a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php +++ b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php @@ -7,6 +7,7 @@ namespace Drupal\node\Tests\Views; use Drupal\node\Entity\Node; +use Drupal\node\Entity\NodeType; /** * Tests replacement of Views tokens supplied by the Node module. @@ -29,7 +30,7 @@ class NodeFieldTokensTest extends NodeTestBase { public function testViewsTokenReplacement() { // Create the Article content type with a standard body field. /* @var $node_type \Drupal\node\NodeTypeInterface */ - $node_type = entity_create('node_type', ['type' => 'article', 'name' => 'Article']); + $node_type = NodeType::create(['type' => 'article', 'name' => 'Article']); $node_type->save(); node_add_body_field($node_type); diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php index 4b04e6b..866ffcc 100644 --- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php +++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php @@ -13,6 +13,7 @@ use Drupal\Core\Database\Database; use Drupal\Core\Language\LanguageInterface; use Drupal\block\Entity\Block; +use Drupal\node\Entity\NodeType; use Drupal\taxonomy\Entity\Term; use Drupal\node\Entity\Node; use Drupal\taxonomy\Entity\Vocabulary; @@ -142,10 +143,10 @@ public function testBlockHooks() { */ public function testCommentHooks() { $account = $this->createUser(); - entity_create('node_type', array( + NodeType::create([ 'type' => 'article', 'name' => 'Article', - ))->save(); + ])->save(); $this->addDefaultCommentField('node', 'article', 'comment', CommentItemInterface::OPEN); $node = entity_create('node', array( diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php index 253ea18..4a32b10 100644 --- a/core/modules/system/src/Tests/Module/UninstallTest.php +++ b/core/modules/system/src/Tests/Module/UninstallTest.php @@ -10,6 +10,7 @@ use Drupal\Core\Cache\Cache; use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Entity\EntityMalformedException; +use Drupal\node\Entity\NodeType; use Drupal\simpletest\WebTestBase; /** @@ -46,7 +47,7 @@ function testUninstallPage() { $this->drupalLogin($account); // Create a node type. - $node_type = entity_create('node_type', array('type' => 'uninstall_blocker', 'name' => 'Uninstall blocker')); + $node_type = NodeType::create(['type' => 'uninstall_blocker', 'name' => 'Uninstall blocker']); // Create a dependency that can be fixed. $node_type->setThirdPartySetting('module_test', 'key', 'value'); $node_type->save(); diff --git a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php index a46e509..d0d1356 100644 --- a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php +++ b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\node\Entity\NodeType; use Drupal\views\Tests\ViewTestData; use Drupal\views\Tests\ViewKernelTestBase; use Drupal\views\Views; @@ -53,10 +54,10 @@ protected function setUp() { )); $comment_type->save(); - $content_type = entity_create('node_type', array( + $content_type = NodeType::create([ 'type' => $this->randomMachineName(), 'name' => $this->randomString(), - )); + ]); $content_type->save(); $field_storage = FieldStorageConfig::create(array( 'field_name' => Unicode::strtolower($this->randomMachineName()), diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php index e4f17b5..e28f11d 100644 --- a/core/modules/views/src/Tests/ViewExecutableTest.php +++ b/core/modules/views/src/Tests/ViewExecutableTest.php @@ -9,6 +9,7 @@ use Drupal\comment\Tests\CommentTestTrait; use Drupal\Component\Utility\Xss; +use Drupal\node\Entity\NodeType; use Drupal\views\Entity\View; use Drupal\views\Views; use Drupal\views\ViewExecutable; @@ -87,10 +88,10 @@ protected function setUpFixtures() { $this->installSchema('comment', array('comment_entity_statistics')); $this->installConfig(array('system', 'field', 'node', 'comment')); - entity_create('node_type', array( + NodeType::create([ 'type' => 'page', 'name' => 'Page', - ))->save(); + ])->save(); $this->addDefaultCommentField('node', 'page'); parent::setUpFixtures();