Make the class variables protected for NodeType

I would like to get this fixed. So I will do a good review for posted patches.

@claudiu.cristea: Please do not change the class variables names. You only have to make them protected. I have looked at your patch and the functions that I would add are getName(), getDescription() and getHelp(). There is already a function id(). In case that you have no setVariableName() function you can use the build in function set('variable_name', $value) or get('variable_name') instead of getVariableName().

+++ b/core/modules/node/src/Entity/NodeType.php
@@ -104,6 +104,71 @@ public function id() {
+  /**
+   * Sets the name of the node.
+   *
+   * @param string $name
+   *   Help information shown to the user when creating a Node of this type.
+   *
+   * @return $this
+   */
+  public function setName($name) {
+    $this->name = $name;
+    return $this;
+  }
...
+  /**
+   * Sets the description of the node.
+   *
+   * @param string $description
+   *   A brief description of this node type.
+   *
+   * @return $this
+   */
+  public function setDescription($description) {
+    $this->description = $description;
+    return $this;
+  }
...
+  /**
+   * Sets the help information of the node.
+   *
+   * @param string $help
+   *   A brief description of this node type.
+   *
+   * @return $this
+   */
+  public function setHelp($help) {
+    $this->help = $help;
+  }

These function are probably not used. Maybe only in testing. You can remove them and use set('name', $value), set('description', $value) and set('help', $value).
The other added functions need to be added to the NodeTypeInterface.

The reason that your patch failed testing is that outside the NodeType class the class variables are no longer accessible. And it will result in an error. Use the created methods to fix this. If you need the set a variable use set('variableName', $value).

+++ b/core/modules/node/src/NodeTypeInterface.php
@@ -56,6 +56,30 @@ public function displaySubmitted();
+   * Returns the help information of the node.
+   *
+   * @return string
+   *   The help text for the node.
+   */
+  public function getHelp();
+
+  /**
+   * Returns the description of the node.
+   *
+   * @return string
+   *   The description text of the node.
+   */
+  public function getDescription();
+
+  /**
+   * Returns the name of the node.
+   *
+   * @return string
+   *   The name of the node.
+   */
+  public function getName();
+

You are editing the NodeTypeInterface not the NodeInterface. So do "of the nodetype" and not "of the node".

+++ b/core/modules/node/node.module
@@ -334,14 +334,14 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
-    entity_get_display('node', $type->type, 'default')
+    entity_get_display('node', $type->get('type'), 'default')

@@ -352,7 +352,7 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
-      entity_get_display('node', $type->type, 'teaser')
+      entity_get_display('node', $type->get('type'), 'teaser')

@@ -378,22 +378,22 @@ function node_entity_extra_field_info() {
-        $extra['node'][$bundle->type]['form']['langcode'] = array(
+        $extra['node'][$bundle->get('type')]['form']['langcode'] = array(

Use id() not get('type').

+++ b/core/modules/locale/src/Tests/LocaleContentTest.php
@@ -81,24 +81,24 @@ public function testContentTypeLanguageConfiguration() {
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type2->name)));
...
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type2->get('name'))));

@@ -154,12 +154,12 @@ public function testContentTypeDirLang() {
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type->name)));
...
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type->get('name'))));

+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -39,7 +39,7 @@ function testNodeTypeGetFunctions() {
-    $this->assertEqual($node_types['article']->name, $article->label(), 'Correct node type name has been returned.');
+    $this->assertEqual($node_types['article']->get('name'), $article->label(), 'Correct node type name has been returned.');

@@ -49,14 +49,14 @@ function testNodeTypeCreation() {
-    $web_user = $this->drupalCreateUser(array('create ' . $type->name . ' content'));
+    $web_user = $this->drupalCreateUser(array('create ' . $type->get('name') . ' content'));

@@ -137,11 +137,11 @@ function testNodeTypeDeletion() {
-    $this->drupalGet('admin/structure/types/manage/' . $type->name . '/delete');
+    $this->drupalGet('admin/structure/types/manage/' . $type->get('name') . '/delete');

@@ -149,9 +149,9 @@ function testNodeTypeDeletion() {
-    $this->drupalGet('admin/structure/types/manage/' . $type->name . '/delete');
+    $this->drupalGet('admin/structure/types/manage/' . $type->get('name') . '/delete');
...
-      t('Are you sure you want to delete the content type %type?', array('%type' => $type->name)),
+      t('Are you sure you want to delete the content type %type?', array('%type' => $type->get('name'))),

Use label() not get('name').

@rpayanm: Can you first start at changing the nodetype variables in the file NodeController.php. This will solve a lot of fails.

From 364 fails and 370 exceptions to 149 fails and 55 exceptions. :-)

Can you add an interdiff.txt file. It is easier to follow what you changed.

Super minor documentation change. See added file interdiff.txt.

The patch in comment #44 looks good to me.
I have one little documentation change. See the added interdiff.txt file.
I the patch are two new functions added: getHelp() and getDescription().
Both are also added to the NodeTypeInterface.
The problem described is the issue summary is fixed with the patch.
Despite the minor change to the patch file from me, I am giving the patch a RTBC.

@alexpott: You want to add the least number of new getter and setter functions.
This is fine by me, but this will result in some strange code constructions.
There are no setId() or setLabel() functions. What do you want to do?

+++ b/core/modules/node/src/NodeTypeForm.php
@@ -220,8 +220,8 @@ public function validate(array $form, FormStateInterface $form_state) {
-    $type->type = trim($type->id());
-    $type->name = trim($type->name);
+    $type->set('type', trim($type->id()));
+    $type->set('name', trim($type->label()));

@tadityar: Can you add an interdiff.txt file with your patch. It is for other people very convenient to see what the changes are between your patch and the previous one.

+++ b/core/modules/node/node.module
@@ -367,6 +369,27 @@ function node_entity_extra_field_info() {
+    // Add the 'language' select if Language module is enabled and the bundle
+    // has multilingual support.
+    // Visibility of the ordering of the language selector is the same as on the
+    // node/add form.
+    if ($module_language_enabled) {
+      $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', $bundle->id());
+      if ($configuration->isLanguageAlterable()) {
+        $extra['node'][$bundle->id()]['form']['langcode'] = array(
+          'label' => t('Language'),
+          'description' => $description,
+          'weight' => 0,
+        );
+      }
+    }
+    $extra['node'][$bundle->id()]['display']['langcode'] = array(
+      'label' => t('Language'),
+      'description' => $description,
+      'weight' => 0,
+      'visible' => FALSE,
+    );
+    $extra['node'][$bundle->id()]['display']['links'] = array(

I think something went wrong here. Did you do "git reset --hard" before start working on this patch?

@berdir: The idea is good, but I see a problem. In the nodetype annotation there are two links: "edit-form" and "delete-form". The same for the node annotation. There is no link to "node.add". Maybe I am missing something. If so please tell me.

It all looks good to me.
There are 2 methods added: getHelp() and getDescription().
Both are added to the interface.
All documentation is in order.
It gets a RTBC for me.

Good reroll. Back to RTBC.
I was unable to create an interdiff.txt file.
Thanks hussainweb!

It all looks good to me.
The patch fixes the problem as described in the issue summary.
There are two new methods added to the class NodeType: getHelp() and getDescription().
All documentation is in order.
Good reroll! Back to RTBC.

Sorry about breaking head!

The patch looks good.
The breaking of head is fixed and a test is added.
It gets a RTBC from me.