' . format_plural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $type->name)) . '
'; + $caption = '' . format_plural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $type->id())) . '
'; $form['description'] = array('#markup' => $caption); return $form; } @@ -478,16 +325,12 @@ function node_type_delete_confirm($form, &$form_state, $type) { * Form submission handler for node_type_delete_confirm(). */ function node_type_delete_confirm_submit($form, &$form_state) { - node_type_delete($form_state['values']['type']); + $type = $form_state['entity']; + $type->delete(); - variable_del('node_preview_' . $form_state['values']['type']); - $t_args = array('%name' => $form_state['values']['name']); + $t_args = array('%name' => $type->label()); drupal_set_message(t('The content type %name has been deleted.', $t_args)); watchdog('node', 'Deleted content type %name.', $t_args, WATCHDOG_NOTICE); - node_types_rebuild(); - menu_router_rebuild(); - $form_state['redirect'] = 'admin/structure/types'; - return; } diff --git a/core/modules/node/content_types.js b/core/modules/node/content_types.js index 40d6422..f6a545b 100644 --- a/core/modules/node/content_types.js +++ b/core/modules/node/content_types.js @@ -18,10 +18,10 @@ Drupal.behaviors.contentTypes = { }); $context.find('#edit-workflow').drupalSetSummary(function(context) { var vals = []; - $(context).find("input[name^='node_options']:checked").parent().each(function() { + $(context).find("input[name^='settings[node][options']:checked").parent().each(function() { vals.push(Drupal.checkPlain($(this).text())); }); - if (!$(context).find('#edit-node-options-status').is(':checked')) { + if (!$(context).find('#edit-settings-node-options-status').is(':checked')) { vals.unshift(Drupal.t('Not published')); } return vals.join(', '); @@ -43,7 +43,7 @@ Drupal.behaviors.contentTypes = { $context.find('input:checked').next('label').each(function() { vals.push(Drupal.checkPlain($(this).text())); }); - if (!$context.find('#edit-node-submitted').is(':checked')) { + if (!$context.find('#edit-settings-node-submitted').is(':checked')) { vals.unshift(Drupal.t("Don't display post information")); } return vals.join(', '); diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php index 63b4189..7e1e0c3 100644 --- a/core/modules/node/lib/Drupal/node/NodeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeFormController.php @@ -17,6 +17,8 @@ */ class NodeFormController extends EntityFormController { + protected $settings; + /** * Prepares the node object. * @@ -27,13 +29,20 @@ class NodeFormController extends EntityFormController { */ protected function prepareEntity(EntityInterface $node) { // Set up default values, if required. - $node_options = variable_get('node_options_' . $node->type, array('status', 'promote')); + $type = entity_load('node_type', $node->bundle()); + $this->settings = $type->getNodeSettings('node'); + $this->settings += array( + 'options' => array('status', 'promote'), + 'preview' => DRUPAL_OPTIONAL, + 'submitted' => TRUE, + ); + // If this is a new node, fill in the default values. if (!isset($node->nid) || isset($node->is_new)) { foreach (array('status', 'promote', 'sticky') as $key) { // Multistep node forms might have filled in something already. if (!isset($node->$key)) { - $node->$key = (int) in_array($key, $node_options); + $node->$key = (int) in_array($key, $this->settings['options']); } } global $user; @@ -46,7 +55,7 @@ protected function prepareEntity(EntityInterface $node) { $node->log = NULL; } // Always use the default revision setting. - $node->setNewRevision(in_array('revision', $node_options)); + $node->setNewRevision(in_array('revision', $this->settings['options'])); node_invoke($node, 'prepare'); module_invoke_all('node_prepare', $node); @@ -237,7 +246,7 @@ public function form(array $form, array &$form_state, EntityInterface $node) { protected function actions(array $form, array &$form_state) { $element = parent::actions($form, $form_state); $node = $this->getEntity($form_state); - $preview_mode = variable_get('node_preview_' . $node->type, DRUPAL_OPTIONAL); + $preview_mode = $this->settings['preview']; $element['submit']['#access'] = $preview_mode != DRUPAL_REQUIRED || (!form_get_errors() && isset($form_state['node_preview'])); diff --git a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php new file mode 100644 index 0000000..f90c01b --- /dev/null +++ b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php @@ -0,0 +1,72 @@ +getEntity($form_state); + $actions = parent::actions($form, $form_state); + $actions['submit']['#value'] = t('Save content type'); + $actions['delete']['#value'] = t('Delete content type'); + $actions['delete']['#access'] = $type->custom && $type->id(); + return $actions; + } + + /** + * Overrides Drupal\Core\Entity\EntityFormController::validate(). + */ + public function validate(array $form, array &$form_state) { + parent::validate($form, $form_state); + // @todo Convert node_type_form(). + } + + /** + * Overrides Drupal\Core\Entity\EntityFormController::save(). + */ + public function save(array $form, array &$form_state) { + $type = $this->getEntity($form_state); + $type->type = trim($type->id()); + $type->name = trim($type->label()); + + // title_label is required in core; has_title will always be TRUE, unless a + // module alters the title field. + $type->has_title = ($type->title_label != ''); + + // @todo Convert node_type_form(). + node_type_form_submit($form, $form_state); + } + + /** + * Overrides Drupal\Core\Entity\EntityFormController::delete(). + */ + public function delete(array $form, array &$form_state) { + $type = $this->getEntity($form_state); + $form_state['redirect'] = 'admin/structure/types/manage/' . $type->id() . '/delete'; + } + +} diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/lib/Drupal/node/NodeTypeListController.php new file mode 100644 index 0000000..338501f --- /dev/null +++ b/core/modules/node/lib/Drupal/node/NodeTypeListController.php @@ -0,0 +1,83 @@ + t('Description'), + 'class' => array(RESPONSIVE_PRIORITY_MEDIUM), + ); + $row['operations'] = t('Operations'); + return $row; + } + + /** + * Overrides \Drupal\Core\Entity\EntityListController::buildRow(). + */ + public function buildRow(EntityInterface $entity) { + if (!node_hook($entity->id(), 'form')) { + return array(); + } + $row['title'] = array( + 'data' => check_plain($entity->label()), + 'class' => array('menu-label'), + ); + $row['description'] = filter_xss_admin($entity->description); + $row['operations']['data'] = $this->buildOperations($entity); + return $row; + } + + /** + * Overrides \Drupal\Core\Entity\EntityListController::getOperations(); + */ + public function getOperations(EntityInterface $entity) { + $operations = parent::getOperations($entity); + if (module_exists('field_ui') && user_access('administer node fields')) { + $uri = $entity->uri(); + $operations['manage-fields'] = array( + 'title' => t('Manage fields'), + 'href' => $uri['path'] . '/fields', + 'options' => $uri['options'], + 'weight' => 11, + ); + $operations['manage-display'] = array( + 'title' => t('Manage display'), + 'href' => $uri['path'] . '/display', + 'options' => $uri['options'], + 'weight' => 12, + ); + } + if (!$entity->custom) { + unset($operations['delete']); + } + return $operations; + } + + /** + * Overrides \Drupal\Core\Entity\EntityListController::render(); + */ + public function render() { + $build = parent::render(); + $build['#empty'] = t('No content types available. Add content type.', array( + '@link' => url('admin/structure/types/add'), + )); + return $build; + } + +} diff --git a/core/modules/node/lib/Drupal/node/NodeTypeStorageController.php b/core/modules/node/lib/Drupal/node/NodeTypeStorageController.php new file mode 100644 index 0000000..6f69a58 --- /dev/null +++ b/core/modules/node/lib/Drupal/node/NodeTypeStorageController.php @@ -0,0 +1,83 @@ + $entity) { + $entity->disabled = !module_exists($entity->module); + } + parent::attachLoad($queried_entities, $revision_id); + } + + /** + * Overrides \Drupal\Core\Config\Entity\ConfigStorageController::postSave(). + */ + protected function postSave(EntityInterface $entity, $update) { + parent::postSave($entity, $update); + + if (!$update) { + // Clear the node type cache, so the new type appears. + node_type_cache_reset(); + + field_attach_create_bundle('node_type', $entity->id()); + + // Unless disabled, automatically create a Body field for new node types. + if ($entity->get('create_body')) { + $label = $entity->get('create_body_label'); + node_add_body_field($entity, $label); + } + } + elseif ($entity->original->id() != $entity->id()) { + // Clear the node type cache to reflect the rename. + node_type_cache_reset(); + + $update_count = node_type_update_nodes($entity->original->id(), $entity->id()); + if ($update_count) { + drupal_set_message(format_plural($update_count, + 'Changed the content type of 1 post from %old-type to %type.', + 'Changed the content type of @count posts from %old-type to %type.', + array( + '%old-type' => $entity->original->id(), + '%type' => $entity->id(), + ))); + } + field_attach_rename_bundle('node_type', $entity->original->id(), $entity->id()); + } + else { + // Invalidate the cache tag of the updated node type only. + cache()->invalidateTags(array('node_type' => $entity->id())); + } + } + + /** + * Overrides \Drupal\Core\Config\Entity\ConfigStorageController::postDelete(). + */ + protected function postDelete($entities) { + parent::postDelete($entities); + + // Clear the node type cache to reflect the removal. + node_type_cache_reset(); + + foreach ($entities as $entity) { + field_attach_delete_bundle('node_type', $entity->id()); + } + } + +} diff --git a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php new file mode 100644 index 0000000..77f37ce --- /dev/null +++ b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/NodeType.php @@ -0,0 +1,199 @@ +type; + } + + /** + * Returns the configured Node settings of a given module, if any. + * + * @param string $module + * The name of the module whose settings to return. + * + * @return array + * An associative array containing the module's Node settings. Note that + * this can be empty, and default values do not necessarily exist. + */ + public function getNodeSettings($module) { + if (isset($this->settings[$module]) && is_array($this->settings[$module])) { + return $this->settings[$module]; + } + return array(); + } + +} diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php index 36baad2..3dc4838 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php @@ -107,7 +107,7 @@ function testUnpublishedNodeCreation() { config('system.site')->set('page.front', 'test-page')->save(); // Set "Basic page" content type to be unpublished by default. - variable_set('node_options_page', array()); + config('node.type.page')->set('settings.node.options', array())->save(); // Create a node. $edit = array(); diff --git a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php b/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php index ce48614..e97927c 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php @@ -34,7 +34,7 @@ function testPagePostInfo() { // Set "Basic page" content type to display post information. $edit = array(); - $edit['node_submitted'] = TRUE; + $edit['settings[node][submitted]'] = TRUE; $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); // Create a node. @@ -48,16 +48,11 @@ function testPagePostInfo() { $node = $this->drupalGetNodeByTitle($edit["title"]); $elements = $this->xpath('//*[contains(@class,:class)]', array(':class' => 'submitted')); $this->assertEqual(count($elements), 1, 'Post information is displayed.'); - } - - /** - * Confirms absence of post information on a new node. - */ - function testPageNotPostInfo() { + $node->delete(); // Set "Basic page" content type to display post information. $edit = array(); - $edit['node_submitted'] = FALSE; + $edit['settings[node][submitted]'] = FALSE; $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); // Create a node. diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php index d8fa419..64c74fc 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php @@ -22,6 +22,22 @@ public static function getInfo() { } /** + * Resets module_list() without rebuilding it. + * + * Required since this test enables Forum module via the internal browser, but + * subsequently loads the forum node type in the test runner process to verify + * the $disabled flag of the node type. + * + * @todo Use HTTP response headers during testing to communicate required + * cache resets. + */ + protected function resetModuleListCache() { + drupal_static_reset('system_list'); + cache('bootstrap')->deleteMultiple(array('system_list')); + module_list_reset(); + } + + /** * Tests that node type customizations persist through disable and uninstall. */ function testNodeTypeCustomizationPersistence() { @@ -34,9 +50,9 @@ function testNodeTypeCustomizationPersistence() { // Enable forum and verify that the node type is in the DB and is not // disabled. $this->drupalPost('admin/modules', $forum_enable, t('Save configuration')); - $disabled = db_query('SELECT disabled FROM {node_type} WHERE type = :type', array(':type' => 'forum'))->fetchField(); - $this->assertNotIdentical($disabled, FALSE, 'Forum node type found in the database'); - $this->assertEqual($disabled, 0, 'Forum node type is not disabled'); + $forum = entity_load('node_type', 'forum'); + $this->assertTrue($forum->id(), 'Forum node type found.'); + $this->assertFalse($forum->disabled, 'Forum node type is not disabled'); // Check that forum node type (uncustomized) shows up. $this->drupalGet('node/add'); @@ -53,17 +69,18 @@ function testNodeTypeCustomizationPersistence() { // Disable forum and check that the node type gets disabled. $this->drupalPost('admin/modules', $forum_disable, t('Save configuration')); - $disabled = db_query('SELECT disabled FROM {node_type} WHERE type = :type', array(':type' => 'forum'))->fetchField(); - $this->assertEqual($disabled, 1, 'Forum node type is disabled'); + $forum = entity_load('node_type', 'forum'); + $this->assertTrue($forum->disabled, 'Forum node type is disabled'); $this->drupalGet('node/add'); $this->assertNoText('forum', 'forum type is not found on node/add'); // Reenable forum and check that the customization survived the module // disable. $this->drupalPost('admin/modules', $forum_enable, t('Save configuration')); - $disabled = db_query('SELECT disabled FROM {node_type} WHERE type = :type', array(':type' => 'forum'))->fetchField(); - $this->assertNotIdentical($disabled, FALSE, 'Forum node type found in the database'); - $this->assertEqual($disabled, 0, 'Forum node type is not disabled'); + $this->resetModuleListCache(); + $forum = entity_load('node_type', 'forum'); + $this->assertTrue($forum->id(), 'Forum node type found.'); + $this->assertFalse($forum->disabled, 'Forum node type is not disabled'); $this->drupalGet('node/add'); $this->assertText($description, 'Customized description found'); @@ -72,8 +89,9 @@ function testNodeTypeCustomizationPersistence() { $edit = array('uninstall[forum]' => 'forum'); $this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall')); $this->drupalPost(NULL, array(), t('Uninstall')); - $disabled = db_query('SELECT disabled FROM {node_type} WHERE type = :type', array(':type' => 'forum'))->fetchField(); - $this->assertTrue($disabled, 'Forum node type is in the database and is disabled'); + $this->resetModuleListCache(); + $forum = entity_load('node_type', 'forum'); + $this->assertTrue($forum->disabled, 'Forum node type is in the database and is disabled'); $this->drupalGet('node/add'); $this->assertNoText('forum', 'forum type is no longer found on node/add'); diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php index 64fa105..4f2805f 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php @@ -43,7 +43,6 @@ function testNodeTypeGetFunctions() { $this->assertEqual($node_types['article'], node_type_load('article'), 'Correct node type has been returned.'); $this->assertEqual($node_types['article']->name, node_type_get_label('article'), 'Correct node type name has been returned.'); - $this->assertEqual($node_types['page']->base, node_type_get_base('page'), 'Correct node type base has been returned.'); } /** @@ -53,7 +52,7 @@ function testNodeTypeCreation() { // Create a content type programmaticaly. $type = $this->drupalCreateContentType(); - $type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => $type->type))->fetchField(); + $type_exists = (bool) entity_load('node_type', $type->type); $this->assertTrue($type_exists, 'The new content type has been created in the database.'); // Login a test user. @@ -72,7 +71,7 @@ function testNodeTypeCreation() { 'type' => 'foo', ); $this->drupalPost('admin/structure/types/add', $edit, t('Save content type')); - $type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => 'foo'))->fetchField(); + $type_exists = (bool) entity_load('node_type', 'foo'); $this->assertTrue($type_exists, 'The new content type has been created in the database.'); } diff --git a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php b/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php index b429e07..1cf2db9 100644 --- a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php @@ -52,13 +52,15 @@ function testPagePreview() { /** * Checks the node preview functionality, when using revisions. + * + * @todo This test passes even with revisioning disabled. */ function testPagePreviewWithRevisions() { $langcode = LANGUAGE_NOT_SPECIFIED; $title_key = "title"; $body_key = "body[$langcode][0][value]"; // Force revision on "Basic page" content. - variable_set('node_options_page', array('status', 'revision')); + config('node.type.page')->set('settings.node.options', array('status', 'revision'))->save(); // Fill in node creation form and preview node. $edit = array(); diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index d5e396c..96bdda4 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -1038,44 +1038,35 @@ function hook_ranking() { /** * Respond to node type creation. * - * This hook is invoked from node_type_save() after the node type is added to - * the database. - * - * @param $info - * The node type object that is being created. + * @param \Drupal\node\Plugin\Core\Entity\NodeType $type + * The node type entity that was created. */ -function hook_node_type_insert($info) { - drupal_set_message(t('You have just created a content type with a machine name %type.', array('%type' => $info->type))); +function hook_node_type_insert(\Drupal\node\Plugin\Core\Entity\NodeType $type) { + drupal_set_message(t('You have just created a content type with a machine name %type.', array('%type' => $type->id()))); } /** * Respond to node type updates. * - * This hook is invoked from node_type_save() after the node type is updated in - * the database. - * - * @param $info - * The node type object that is being updated. + * @param \Drupal\node\Plugin\Core\Entity\NodeType $type + * The node type entity that was updated. */ -function hook_node_type_update($info) { - if (!empty($info->old_type) && $info->old_type != $info->type) { - $setting = variable_get('comment_' . $info->old_type, COMMENT_NODE_OPEN); - variable_del('comment_' . $info->old_type); - variable_set('comment_' . $info->type, $setting); +function hook_node_type_update(\Drupal\node\Plugin\Core\Entity\NodeType $type) { + if ($type->original->id() != $type->id()) { + $setting = variable_get('comment_' . $type->original->id(), COMMENT_NODE_OPEN); + variable_del('comment_' . $type->original->id()); + variable_set('comment_' . $type->id(), $setting); } } /** * Respond to node type deletion. * - * This hook is invoked from node_type_delete() after the node type is removed - * from the database. - * - * @param $info - * The node type object that is being deleted. + * @param \Drupal\node\Plugin\Core\Entity\NodeType $type + * The node type entity that was deleted. */ -function hook_node_type_delete($info) { - variable_del('comment_' . $info->type); +function hook_node_type_delete(\Drupal\node\Plugin\Core\Entity\NodeType $type) { + variable_del('comment_' . $type->id()); } /** diff --git a/core/modules/node/node.install b/core/modules/node/node.install index ebbce13..4faf6b6 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -5,6 +5,8 @@ * Install, update and uninstall functions for the node module. */ +use Drupal\Component\Uuid\Uuid; + /** * Implements hook_schema(). */ @@ -34,7 +36,7 @@ function node_schema() { 'default' => NULL, ), 'type' => array( - 'description' => 'The {node_type}.type of this node.', + 'description' => 'The type of this node.', 'type' => 'varchar', 'length' => 32, 'not null' => TRUE, @@ -281,100 +283,6 @@ function node_schema() { ), ); - $schema['node_type'] = array( - 'description' => 'Stores information about all defined {node} types.', - 'fields' => array( - 'type' => array( - 'description' => 'The machine-readable name of this type.', - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - ), - 'name' => array( - 'description' => 'The human-readable name of this type.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - 'base' => array( - 'description' => 'The base string used to construct callbacks corresponding to this node type.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - 'module' => array( - 'description' => 'The module defining this node type.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - 'description' => array( - 'description' => 'A brief description of this type.', - 'type' => 'text', - 'not null' => TRUE, - 'size' => 'medium', - ), - 'help' => array( - 'description' => 'Help information shown to the user when creating a {node} of this type.', - 'type' => 'text', - 'not null' => TRUE, - 'size' => 'medium', - ), - 'has_title' => array( - 'description' => 'Boolean indicating whether this type uses the {node}.title field.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'title_label' => array( - 'description' => 'The label displayed for the title field on the edit form.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - 'custom' => array( - 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via Add content type (TRUE).', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - ), - 'modified' => array( - 'description' => 'A boolean indicating whether this type has been modified by an administrator; currently not used in any way.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - ), - 'locked' => array( - 'description' => 'A boolean indicating whether the administrator can change the machine name of this type.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - ), - 'disabled' => array( - 'description' => 'A boolean indicating whether the node type is disabled.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny' - ), - 'orig_type' => array( - 'description' => 'The original machine-readable name of this node type. This may be different from the current type name if the locked field is 0.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - ), - 'primary key' => array('type'), - ); - - return $schema; } @@ -403,17 +311,9 @@ function node_install() { */ function node_uninstall() { // Delete node type variables. - $types = db_query('SELECT type FROM {node_type}')->fetchCol(); - foreach ($types as $type) { - db_delete('variable') - ->condition(db_or() - ->condition('name', 'node_preview_' . $type) - ->condition('name', 'node_options_' . $type) - ->condition('name', 'node_submitted_' . $type) - ->condition('name', 'node_permissions_' . $type) - ->condition('name', 'node_type_language_translation_enabled_' . $type) - ) - ->execute(); + $types = config_get_storage_names_with_prefix('node.type.'); + foreach ($types as $config_name) { + $type = config($config_name)->get('type'); config('language.settings')->clear('node. ' . $type . '.language.default_configuration')->save(); } @@ -710,6 +610,50 @@ function node_update_8014() { } /** + * Convert node types into configuration. + * + * @ingroup config_upgrade + */ +function node_update_8015() { + $uuid = new Uuid(); + // Note: {node_type}.name was the label, .type the machine name. + $result = db_query('SELECT * FROM {node_type}') + ->fetchAllAssoc('type', PDO::FETCH_ASSOC); + foreach ($result as $id => $node_type) { + $config = config('node.type.' . $id); + // Node type. + $config->setData($node_type); + $config->set('uuid', $uuid->generate()); + $config->set('langcode', LANGUAGE_NOT_SPECIFIED); + + // Node type settings. + $variables = db_query('SELECT name, value FROM {variable} WHERE name IN (:names)', array( + ':names' => array( + 'node_submitted_' . $id, + 'node_preview_' . $id, + 'node_options_' . $id, + ), + ))->fetchAllKeyed(); + $variables = array_map('unserialize', $variables); + // There are not necessarily values for all settings, so pollute defaults. + $variables += array( + 'node_submitted_' . $id => TRUE, + 'node_preview_' . $id => 1, // DRUPAL_OPTIONAL + 'node_options_' . $id => array('status', 'promote'), + ); + foreach ($variables as $name => $value) { + // Turn e.g. 'node_submitted_ID' into 'submitted'. + $name = str_replace(array('node_', '_' . $id), '', $name); + $config->set('settings.node.' . $name, $value); + + update_variable_del($name); + } + $config->save(); + update_config_manifest_add('node.type', array($id)); + } +} + +/** * @} End of "addtogroup updates-7.x-to-8.x" * The next series of updates should start at 9000. */ diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 0b7262c..d980c85 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -15,10 +15,11 @@ use Drupal\Core\Database\Query\SelectExtender; use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Datetime\DrupalDateTime; +use Drupal\node\Plugin\Core\Entity\NodeType; +use Drupal\file\Plugin\Core\Entity\File; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Template\Attribute; use Drupal\entity\Plugin\Core\Entity\EntityDisplay; -use Drupal\file\Plugin\Core\Entity\File; /** * Denotes that the node is not published. @@ -223,12 +224,12 @@ function node_entity_bundle_info() { // Bundles must provide a human readable name so we can create help and error // messages, and the path to attach Field admin pages to. node_type_cache_reset(); - foreach (node_type_get_names() as $type => $name) { - $bundles['node'][$type] = array( - 'label' => $name, + foreach (node_type_get_names() as $id => $label) { + $bundles['node']['bundles'][$id] = array( + 'label' => $label, 'admin' => array( 'path' => 'admin/structure/types/manage/%node_type', - 'real path' => 'admin/structure/types/manage/' . $type, + 'real path' => 'admin/structure/types/manage/' . $id, 'bundle argument' => 4, ), ); @@ -254,6 +255,21 @@ function node_entity_display_alter(EntityDisplay $display, $context) { /** * Entity URI callback. * + * @param \Drupal\node\Plugin\Core\Entity\NodeType $type + * A node type entity. + * + * @return array + * An array with 'path' as the key and the path to the entity as its value. + */ +function node_type_uri(NodeType $type) { + return array( + 'path' => 'admin/structure/types/manage/' . $type->id(), + ); +} + +/** + * Entity URI callback. + * * @param \Drupal\Core\Entity\EntityInterface $node * A node entity. * @@ -347,51 +363,44 @@ function node_mark($nid, $timestamp) { * Returns a list of all the available node types. * * This list can include types that are queued for addition or deletion. - * See _node_types_build() for details. * - * @return - * An array of node types, as objects, keyed by the type. + * @return array + * An array of node type entities, keyed by ID. * - * @see _node_types_build() * @see node_type_load() */ function node_type_get_types() { - return _node_types_build()->types; -} - -/** - * Returns the node type base of the passed node or node type string. - * - * The base indicates which module implements this node type and is used to - * execute node-type-specific hooks. For types defined in the user interface - * and managed by node.module, the base is 'node_content'. - * - * @param string $type - * A string that indicates the node type to return. - * - * @return string|false - * The node type base or FALSE if the node type is not found. - * - * @see node_invoke() - */ -function node_type_get_base($type) { - $types = _node_types_build()->types; - return isset($types[$type]) && isset($types[$type]->base) ? $types[$type]->base : FALSE; + return entity_load_multiple('node_type'); } /** * Returns a list of available node type names. * * This list can include types that are queued for addition or deletion. - * See _node_types_build() for details. * - * @return + * @return array * An array of node type labels, keyed by the node type name. - * - * @see _node_types_build() */ function node_type_get_names() { - return _node_types_build()->names; + $cid = 'node_type:names:' . language(LANGUAGE_TYPE_INTERFACE)->langcode; + if ($cache = cache()->get($cid)) { + return $cache->data; + } + // Not using node_type_get_types() or entity_load_multiple() here, to allow + // this function being used in hook_entity_info() implementations. + // @todo Consider to convert this into a generic config entity helper. + $config_names = config_get_storage_names_with_prefix('node.type.'); + $names = array(); + foreach ($config_names as $config_name) { + $config = config($config_name); + $names[$config->get('type')] = $config->get('name'); + } + cache()->set($cid, $names, CacheBackendInterface::CACHE_PERMANENT, array( + 'node_type' => array_keys($names), + // @see node_type_cache_reset() + 'node_types' => TRUE, + )); + return $names; } /** @@ -402,9 +411,11 @@ function node_type_get_names() { * * @return string|false * The node type label or FALSE if the node type is not found. + * + * @todo D8: Remove this. */ function node_type_get_label($name) { - $types = _node_types_build()->names; + $types = node_type_get_names(); return isset($types[$name]) ? $types[$name] : FALSE; } @@ -416,50 +427,35 @@ function node_type_get_label($name) { * * @return string|false * The node type label or FALSE if the node type is not found. - */ -function node_get_type_label(EntityInterface $node) { - $types = _node_types_build()->names; - return isset($types[$node->type]) ? $types[$node->type] : FALSE; -} - -/** - * Title callback: Returns the sanitized node type name. - * - * @param $node_type - * The node type object. * - * @return - * The node type name that is safe for printing. + * @todo D8: Add this as generic helper method for config entities representing + * entity bundles. */ -function node_type_get_clean_name($node_type) { - return check_plain($node_type->name); +function node_get_type_label(Entityinterface $node) { + $types = node_type_get_names(); + return isset($types[$node->type]) ? $types[$node->type] : FALSE; } /** * Description callback: Returns the node type description. * - * @param $node_type + * @param \Drupal\node\Plugin\Core\Entity\NodeType $node_type * The node type object. * - * @return + * @return string * The node type description. */ -function node_type_get_description($node_type) { +function node_type_get_description(NodeType $node_type) { return $node_type->description; } /** - * Updates the database cache of node types. - * - * All new module-defined node types are saved to the database via a call to - * node_type_save(), and obsolete ones are deleted via a call to - * node_type_delete(). See _node_types_build() for an explanation of the new - * and obsolete types. + * Updates the cache of node types. * - * @see _node_types_build() + * @todo D8: Replace all instances with node_type_cache_reset(). */ function node_types_rebuild() { - _node_types_build(TRUE); + node_type_cache_reset(); } /** @@ -468,94 +464,11 @@ function node_types_rebuild() { * @param $name * The machine name of a node type to load. * - * @return + * @return \Drupal\node\Plugin\Core\Entity\NodeType * A node type object or FALSE if $name does not exist. */ function node_type_load($name) { - $types = _node_types_build()->types; - return isset($types[$name]) ? $types[$name] : FALSE; -} - -/** - * Saves a node type to the database. - * - * @param object $info - * The node type to save; an object with the following properties: - * - type: A string giving the machine name of the node type. - * - name: A string giving the human-readable name of the node type. - * - base: A string that indicates the base string for hook functions. For - * example, 'node_content' is the value used by the UI when creating a new - * node type. - * - description: A string that describes the node type. - * - help: A string giving the help information shown to the user when - * creating a node of this type. - * - custom: TRUE or FALSE indicating whether this type is defined by a module - * (FALSE) or by a user (TRUE) via Add Content Type. - * - modified: TRUE or FALSE indicating whether this type has been modified by - * an administrator. Currently not used in any way. - * - locked: TRUE or FALSE indicating whether the administrator can change the - * machine name of this type. - * - disabled: TRUE or FALSE indicating whether this type has been disabled. - * - has_title: TRUE or FALSE indicating whether this type uses the node title - * field. - * - title_label: A string containing the label for the title. - * - module: A string giving the module defining this type of node. - * - orig_type: A string giving the original machine-readable name of this - * node type. This may be different from the current type name if the locked - * field is 0. - * - * @return int - * A status flag indicating the outcome of the operation, either SAVED_NEW or - * SAVED_UPDATED. - */ -function node_type_save($info) { - $existing_type = !empty($info->old_type) ? $info->old_type : $info->type; - $is_existing = (bool) db_query_range('SELECT 1 FROM {node_type} WHERE type = :type', 0, 1, array(':type' => $existing_type))->fetchField(); - $type = node_type_set_defaults($info); - - $fields = array( - 'type' => (string) $type->type, - 'name' => (string) $type->name, - 'base' => (string) $type->base, - 'has_title' => (int) $type->has_title, - 'title_label' => (string) $type->title_label, - 'description' => (string) $type->description, - 'help' => (string) $type->help, - 'custom' => (int) $type->custom, - 'modified' => (int) $type->modified, - 'locked' => (int) $type->locked, - 'disabled' => (int) $type->disabled, - 'module' => $type->module, - ); - - if ($is_existing) { - db_update('node_type') - ->fields($fields) - ->condition('type', $existing_type) - ->execute(); - - if (!empty($type->old_type) && $type->old_type != $type->type) { - field_attach_rename_bundle('node', $type->old_type, $type->type); - } - module_invoke_all('node_type_update', $type); - $status = SAVED_UPDATED; - } - else { - $fields['orig_type'] = (string) $type->orig_type; - db_insert('node_type') - ->fields($fields) - ->execute(); - - field_attach_create_bundle('node', $type->type); - - module_invoke_all('node_type_insert', $type); - $status = SAVED_NEW; - } - - // Clear the node type cache. - node_type_cache_reset(); - - return $status; + return entity_load('node_type', $name); } /** @@ -569,10 +482,10 @@ function node_type_save($info) { * @return * Body field instance. */ -function node_add_body_field($type, $label = 'Body') { +function node_add_body_field(NodeType $type, $label = 'Body') { // Add or remove the body field, as needed. $field = field_info_field('body'); - $instance = field_info_instance('node', 'body', $type->type); + $instance = field_info_instance('node', 'body', $type->id()); if (empty($field)) { $field = array( 'field_name' => 'body', @@ -585,7 +498,7 @@ function node_add_body_field($type, $label = 'Body') { $instance = array( 'field_name' => 'body', 'entity_type' => 'node', - 'bundle' => $type->type, + 'bundle' => $type->id(), 'label' => $label, 'widget' => array('type' => 'text_textarea_with_summary'), 'settings' => array('display_summary' => TRUE), @@ -653,195 +566,32 @@ function node_field_extra_fields() { } /** - * Deletes a node type from the database. - * - * @param $name - * The machine name of the node type to delete. - */ -function node_type_delete($name) { - $type = node_type_load($name); - db_delete('node_type') - ->condition('type', $name) - ->execute(); - field_attach_delete_bundle('node', $name); - module_invoke_all('node_type_delete', $type); - - // Clear the node type cache. - node_type_cache_reset(); -} - -/** * Updates all nodes of one type to be of another type. * - * @param $old_type + * @param $old_id * The current node type of the nodes. - * @param $type + * @param $new_id * The new node type of the nodes. * - * @return + * @return int * The number of nodes whose node type field was modified. */ -function node_type_update_nodes($old_type, $type) { +function node_type_update_nodes($old_id, $new_id) { return db_update('node') - ->fields(array('type' => $type)) - ->condition('type', $old_type) + ->fields(array('type' => $new_id)) + ->condition('type', $old_id) ->execute(); } /** - * Builds and returns the list of available node types. - * - * The list of types is built by invoking hook_node_info() on all modules and - * comparing this information with the node types in the {node_type} table. - * These two information sources are not synchronized during module installation - * until node_types_rebuild() is called. - * - * @param $rebuild - * (optional) TRUE to rebuild node types. Equivalent to calling - * node_types_rebuild(). Defaults to FALSE. - * - * @return - * An object with two properties: - * - names: Associative array of the names of node types, keyed by the type. - * - types: Associative array of node type objects, keyed by the type. - * Both of these arrays will include new types that have been defined by - * hook_node_info() implementations but not yet saved in the {node_type} - * table. These are indicated in the type object by $type->is_new being set - * to the value 1. These arrays will also include obsolete types: types that - * were previously defined by modules that have now been disabled, or for - * whatever reason are no longer being defined in hook_node_info() - * implementations, but are still in the database. These are indicated in the - * type object by $type->disabled being set to TRUE. - */ -function _node_types_build($rebuild = FALSE) { - $cid = 'node_types:' . language(LANGUAGE_TYPE_INTERFACE)->langcode; - - if (!$rebuild) { - $_node_types = &drupal_static(__FUNCTION__); - if (isset($_node_types)) { - return $_node_types; - } - if ($cache = cache()->get($cid)) { - $_node_types = $cache->data; - return $_node_types; - } - } - - $_node_types = (object) array('types' => array(), 'names' => array()); - - foreach (module_implements('node_info') as $module) { - $info_array = module_invoke($module, 'node_info'); - foreach ($info_array as $type => $info) { - $info['type'] = $type; - $_node_types->types[$type] = node_type_set_defaults($info); - $_node_types->types[$type]->module = $module; - $_node_types->names[$type] = $info['name']; - } - } - $query = db_select('node_type', 'nt') - ->addTag('node_type_access') - ->fields('nt') - ->orderBy('nt.type', 'ASC'); - if (!$rebuild) { - $query->condition('disabled', 0); - } - foreach ($query->execute() as $type_object) { - $type_db = $type_object->type; - // Original disabled value. - $disabled = $type_object->disabled; - // Check for node types from disabled modules and mark their types for removal. - // Types defined by the node module in the database (rather than by a separate - // module using hook_node_info) have a base value of 'node_content'. The isset() - // check prevents errors on old (pre-Drupal 7) databases. - if (isset($type_object->base) && $type_object->base != 'node_content' && empty($_node_types->types[$type_db])) { - $type_object->disabled = TRUE; - } - if (isset($_node_types->types[$type_db])) { - $type_object->disabled = FALSE; - } - if (!isset($_node_types->types[$type_db]) || $type_object->modified) { - $_node_types->types[$type_db] = $type_object; - $_node_types->names[$type_db] = $type_object->name; - - if ($type_db != $type_object->orig_type) { - unset($_node_types->types[$type_object->orig_type]); - unset($_node_types->names[$type_object->orig_type]); - } - } - $_node_types->types[$type_db]->disabled = $type_object->disabled; - $_node_types->types[$type_db]->disabled_changed = $disabled != $type_object->disabled; - } - - if ($rebuild) { - foreach ($_node_types->types as $type => $type_object) { - if (!empty($type_object->is_new) || !empty($type_object->disabled_changed)) { - node_type_save($type_object); - } - } - } - - asort($_node_types->names); - - cache()->set($cid, $_node_types, CacheBackendInterface::CACHE_PERMANENT, array('node_types' => TRUE)); - - return $_node_types; -} - -/** * Clears the node type cache. */ function node_type_cache_reset() { + // @see node_type_get_names() + // @see NodeType::postSave() cache()->deleteTags(array('node_types' => TRUE)); - drupal_static_reset('_node_types_build'); -} - -/** - * Sets the default values for a node type. - * - * The defaults are appropriate for a type defined through hook_node_info(), - * since 'custom' is TRUE for types defined in the user interface, and FALSE - * for types defined by modules. (The 'custom' flag prevents types from being - * deleted through the user interface.) Also, the default for 'locked' is TRUE, - * which prevents users from changing the machine name of the type. - * - * @param $info - * (optional) An object or array containing values to override the defaults. - * See hook_node_info() for details on what the array elements mean. Defaults - * to an empty array. - * - * @return - * A node type object, with missing values in $info set to their defaults. - * - * @see hook_node_ifo() - */ -function node_type_set_defaults($info = array()) { - $info = (array) $info; - $new_type = $info + array( - 'type' => '', - 'name' => '', - 'base' => '', - 'description' => '', - 'help' => '', - 'custom' => 0, - 'modified' => 0, - 'locked' => 1, - 'disabled' => 0, - 'is_new' => 1, - 'has_title' => 1, - 'title_label' => 'Title', - ); - $new_type = (object) $new_type; - - // If the type has no title, set an empty label. - if (!$new_type->has_title) { - $new_type->title_label = ''; - } - if (empty($new_type->module)) { - $new_type->module = $new_type->base == 'node_content' ? 'node' : ''; - } - $new_type->orig_type = isset($info['type']) ? $info['type'] : ''; - - return $new_type; + // @todo Possibly needless: + entity_get_controller('node_type')->resetCache(); } /** @@ -894,16 +644,23 @@ function node_rdf_mapping() { /** * Determines whether a node hook exists. * - * @param string $type - * A string containing the node type. + * @param string $id + * A string containing the node type ID. * @param $hook * A string containing the name of the hook. * * @return string|false * A string containing the function name or FALSE if it isn't found. */ -function node_hook($type, $hook) { - $base = node_type_get_base($type); +function node_hook($id, $hook) { + // $id can be NULL for nodes that have been created without a type. + if (!isset($id)) { + return FALSE; + } + if (!$type = entity_load('node_type', $id)) { + return FALSE; + } + $base = $type->get('base'); return module_hook($base, $hook) ? $base . '_' . $hook : FALSE; } @@ -1178,7 +935,9 @@ function template_preprocess_node(&$variables) { field_attach_preprocess($node, $variables['content'], $variables); // Display post information only on certain node types. - if (variable_get('node_submitted_' . $node->type, TRUE)) { + // Avoid loading the entire node type config entity here. + $submitted = config('node.type.' . $node->type)->get('settings.node.submitted'); + if (!isset($submitted) || $submitted) { $variables['display_submitted'] = TRUE; $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date'])); if (theme_get_setting('toggle_node_user_picture')) { @@ -1688,18 +1447,17 @@ function node_menu() { ); $items['admin/structure/types/add'] = array( 'title' => 'Add content type', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('node_type_form'), + 'page callback' => 'node_type_add', 'access arguments' => array('administer content types'), 'type' => MENU_LOCAL_ACTION, 'file' => 'content_types.inc', ); $items['admin/structure/types/manage/%node_type'] = array( 'title' => 'Edit content type', - 'title callback' => 'node_type_page_title', + 'title callback' => 'entity_page_label', 'title arguments' => array(4), - 'page callback' => 'drupal_get_form', - 'page arguments' => array('node_type_form', 4), + 'page callback' => 'node_type_edit', + 'page arguments' => array(4), 'access arguments' => array('administer content types'), 'file' => 'content_types.inc', ); @@ -1709,6 +1467,7 @@ function node_menu() { ); $items['admin/structure/types/manage/%node_type/delete'] = array( 'title' => 'Delete', + 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_delete_confirm', 4), 'access arguments' => array('administer content types'), 'file' => 'content_types.inc', @@ -1720,7 +1479,7 @@ function node_menu() { 'file' => 'node.pages.inc', ); $items['node/add/%node_type'] = array( - 'title callback' => 'node_type_get_clean_name', + 'title callback' => 'entity_page_label', 'title arguments' => array(2), 'page callback' => 'node_add', 'page arguments' => array(2), @@ -1818,21 +1577,6 @@ function node_menu_local_tasks(&$data, $router_item, $root_path) { } /** - * Title callback: Provides the title for a node type edit form. - * - * @param $type - * The node type object. - * - * @return string - * An unsanitized string that is the title of the node type edit form. - * - * @see node_menu() - */ -function node_type_page_title($type) { - return $type->name; -} - -/** * Title callback: Displays the node's title. * * @param \Drupal\Core\Entity\EntityInterface $node @@ -2012,6 +1756,27 @@ function node_form_block_form_alter(&$form, &$form_state) { } /** + * Implements hook_modules_uninstalled(). + */ +function node_modules_uninstalled($modules) { + // Remove module-specific settings from all node types. + $config_names = config_get_storage_names_with_prefix('node.type.'); + foreach ($config_names as $config_name) { + $config = config($config_name); + $changed = FALSE; + foreach ($modules as $module) { + if ($config->get('settings.' . $module)) { + $config->clear('settings.' . $module); + $changed = TRUE; + } + } + if ($changed) { + $config->save(); + } + } +} + +/** * Implements hook_block_access(). * * Checks the content type specific visibility settings and removes the block @@ -2715,7 +2480,8 @@ function node_list_permissions($type) { function node_permissions_get_configured_types() { $configured_types = array(); foreach (node_type_get_types() as $name => $type) { - if (variable_get('node_permissions_' . $name, 1)) { + $node_settings = $type->getNodeSettings('node'); + if (!isset($node_settings['permissions']) || !empty($node_settings['permissions'])) { $configured_types[$name] = $type; } } diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php index 2bed8ba..6feb8d9 100644 --- a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php +++ b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php @@ -29,6 +29,12 @@ public static function getInfo() { ); } + function setUp() { + parent::setUp(); + // Create necessarily entity bundles. + $this->drupalCreateContentType(array('type' => 'article')); + } + /** * Tests several valid and invalid delete requests on all entity types. */ diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php index 6cbfbd8..15bc5f9 100644 --- a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php +++ b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php @@ -143,6 +143,11 @@ protected function entityValues($entity_type) { ); case 'node': return array('title' => $this->randomString(), 'type' => $this->randomString()); + case 'node_type': + return array( + 'type' => 'article', + 'name' => $this->randomName(), + ); case 'user': return array('name' => $this->randomName()); default: diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index 95c8254..cfc4f92 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -284,48 +284,31 @@ protected function drupalCreateNode(array $settings = array()) { /** * Creates a custom content type based on default settings. * - * @param $settings + * @param array $values * An array of settings to change from the defaults. * Example: 'type' => 'foo'. - * @return + * @return \Drupal\node\Plugin\Core\Entity\NodeType * Created content type. */ - protected function drupalCreateContentType($settings = array()) { + protected function drupalCreateContentType($values = array()) { // Find a non-existent random type name. - do { - $name = strtolower($this->randomName(8)); - } while (node_type_load($name)); - - // Populate defaults array. - $defaults = array( - 'type' => $name, - 'name' => $name, - 'base' => 'node_content', - 'description' => '', - 'help' => '', - 'title_label' => 'Title', - 'body_label' => 'Body', - 'has_title' => 1, - 'has_body' => 1, - ); - // Imposed values for a custom type. - $forced = array( - 'orig_type' => '', - 'old_type' => '', - 'module' => 'node', - 'custom' => 1, - 'modified' => 1, - 'locked' => 0, + if (!isset($values['type'])) { + do { + $id = strtolower($this->randomName(8)); + } while (node_type_load($id)); + } + else { + $id = $values['type']; + } + $values += array( + 'type' => $id, + 'name' => $id, ); - $type = $forced + $settings + $defaults; - $type = (object) $type; - - $saved_type = node_type_save($type); - node_types_rebuild(); + $type = entity_create('node_type', $values); + $status = $type->save(); menu_router_rebuild(); - node_add_body_field($type); - $this->assertEqual($saved_type, SAVED_NEW, t('Created content type %type.', array('%type' => $type->type))); + $this->assertEqual($status, SAVED_NEW, t('Created content type %type.', array('%type' => $type->id()))); // Reset permissions so that permissions for this content type are available. $this->checkPermissions(array(), TRUE); diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index ac8bac3..00238cd 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -2463,7 +2463,7 @@ function hook_schema() { 'default' => 0, ), 'type' => array( - 'description' => 'The {node_type} of this node.', + 'description' => 'The type of this node.', 'type' => 'varchar', 'length' => 32, 'not null' => TRUE, diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php index 5f98990..fa8f675 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php @@ -66,14 +66,9 @@ function setUp() { * @see http://drupal.org/node/1708692 */ protected function mockStandardInstall() { - $type = array( + $type = $this->drupalCreateContentType(array( 'type' => 'article', - ); - - $type = node_type_set_defaults($type); - node_type_save($type); - node_add_body_field($type); - + )); // Create the vocabulary for the tag field. $this->vocabulary = entity_create('taxonomy_vocabulary', array( 'name' => 'Views testing tags', diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module index 41d8e83..e75136e 100644 --- a/core/modules/translation/translation.module +++ b/core/modules/translation/translation.module @@ -162,7 +162,7 @@ function translation_form_node_type_form_alter(&$form, &$form_state) { $form['language']['node_type_language_translation_enabled'] = array( '#type' => 'checkbox', '#title' => t('Enable translation'), - '#default_value' => variable_get('node_type_language_translation_enabled_' . $form['#node_type']->type, FALSE), + '#default_value' => variable_get('node_type_language_translation_enabled_' . $form_state['entity']->id(), FALSE), '#element_validate' => array('translation_node_type_language_translation_enabled_validate'), '#prefix' => "", ); diff --git a/core/profiles/standard/config/node.type.article.yml b/core/profiles/standard/config/node.type.article.yml new file mode 100644 index 0000000..36b80db --- /dev/null +++ b/core/profiles/standard/config/node.type.article.yml @@ -0,0 +1,8 @@ +type: article +name: Article +description: 'Use articles for time-sensitive content like news, press releases or blog posts.' +help: '' +has_title: '1' +title_label: Title +settings: { } +langcode: und diff --git a/core/profiles/standard/config/node.type.page.yml b/core/profiles/standard/config/node.type.page.yml new file mode 100644 index 0000000..0a30efc --- /dev/null +++ b/core/profiles/standard/config/node.type.page.yml @@ -0,0 +1,14 @@ +type: page +name: 'Basic page' +description: 'Use basic pages for your static content, such as an ''About us'' page.' +help: '' +has_title: '1' +title_label: Title +settings: + node: + # Not promoted to front page. + options: + - status + # Hide author/submission info. + submitted: FALSE +langcode: und diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install index 13463b9..b15a93a 100644 --- a/core/profiles/standard/standard.install +++ b/core/profiles/standard/standard.install @@ -24,36 +24,6 @@ function standard_install() { // Set front page to "node". config('system.site')->set('page.front', 'node')->save(); - // Insert default pre-defined node types into the database. For a complete - // list of available node type attributes, refer to the node type API - // documentation at: http://api.drupal.org/api/HEAD/function/hook_node_info. - $types = array( - array( - 'type' => 'page', - 'name' => st('Basic page'), - 'base' => 'node_content', - 'description' => st("Use basic pages for your static content, such as an 'About us' page."), - 'custom' => 1, - 'modified' => 1, - 'locked' => 0, - ), - array( - 'type' => 'article', - 'name' => st('Article'), - 'base' => 'node_content', - 'description' => st('Use articles for time-sensitive content like news, press releases or blog posts.'), - 'custom' => 1, - 'modified' => 1, - 'locked' => 0, - ), - ); - - foreach ($types as $type) { - $type = node_type_set_defaults($type); - node_type_save($type); - node_add_body_field($type); - } - // Insert default pre-defined RDF mapping into the database. $rdf_mappings = array( array( @@ -83,12 +53,8 @@ function standard_install() { } // Default "Basic page" to not be promoted and have comments disabled. - variable_set('node_options_page', array('status')); variable_set('comment_page', COMMENT_NODE_HIDDEN); - // Don't display date and author information for "Basic page" nodes by default. - variable_set('node_submitted_page', FALSE); - // Allow visitor account creation with administrative approval. $user_settings = config('user.settings'); $user_settings->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save();