Remove _node_extract_type() and node_type_get_name()

Blocker has been committed.

#2: drupal8.node-type-name.2.patch queued for re-testing.

Reroll of #2.

I don't think this patch will work anymore. Looks like a lot of the code has been reshuffled.

sorry I did not see the re-roll. Marking it as needs review again.

#6: node-type-name-1564832-6.patch queued for re-testing.

I re-worked some parts of the patch.

Man, I wish I'd written this into the post two weeks ago. It was late. I think I just wanted to go to bed. I'll check the patches over again in the morning and create an interdiff, but here's the gist:

The patch in #2 originally failed because it changed the first argument of node_type_get_base(), requiring it to be a node object. Previously the first argument could be a string with the type name OR a node object. The problem is that node_type_get_base() is called by functions that don't have any node objects. They just want to know what the base is for a given type. See NodeTypeTest.php.

So node_type_get_base() has to be called with a type name string argument. The part I "reworked" between #2 and #12 was to make node_type_get_base() take a string and NOT a node object. Anywhere it's currently called with a node object, I changed that from $node to $node->type.

I also changed node_hook() in the same way for the same reasons.

@sun
Ok, yeah I had eliminated node_get_type_label(), the first use case mentioned in #15. It seemed redundant, given that if you have a node object, $node, then we can just call node_type_get_label() with $node->type. They're practically the same function. Is there a reason that both are necessary? Sorry for asking you to explain. I'm still a newbie.

Ok, thank you for explaining.

#18: drupal8.node-type-name.18.patch queued for re-testing.

The only confusing thing I found was that on CRUD actions we use the friendly name for drupal_set_message(), yet log the raw node type to watchdog. But that's pre-existing behavior, and there's probably a reason for it. Patch looks good to me, and this change makes sense.

It'd be nice to get rid of hook_node_type() and all the fake node hooks altogether, but yeah in the interim this is a good cleanup. Since we're removing a public function this should have a change notice. Committed/pushed to 8.x.

We are now over thresholds on critical tasks, so this and other issues with outstanding change notices are blocking features in D8. Please fix.

+++ b/core/modules/forum/forum.moduleundefined
@@ -180,7 +180,7 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
-              'title' => t('Add new @node_type', array('@node_type' => node_type_get_name($type))),
+              'title' => t('Add new @node_type', array('@node_type' => node_type_get_label($type))),

Just a change for function name

+++ b/core/modules/node/node.moduleundefined
@@ -436,16 +423,15 @@ function node_type_get_types() {
-function node_type_get_base($node) {
-  $type = _node_extract_type($node);
+function node_type_get_base($type) {

only a string now passed

+++ b/core/modules/node/node.moduleundefined
@@ -457,25 +443,38 @@ function node_type_get_base($node) {
+function node_type_get_label($name) {
...
-function node_type_get_name($node) {
-  $type = _node_extract_type($node);
+function node_get_type_label($node) {
   $types = _node_types_build()->names;

2 new functions

+++ b/core/modules/node/node.moduleundefined
@@ -972,24 +971,24 @@ function node_rdf_mapping() {
-function node_hook($node, $hook) {
-  $base = node_type_get_base($node);
-  return module_hook($base, $hook);
+function node_hook($type, $hook) {

And parameter changes

tagging

Change notification waiting for review http://drupal.org/node/1802786

Looks great to me. The only thing I noticed is that node_type_get_base() is not a new API function, but rather received an API change, so I slightly adjusted the text http://drupal.org/node/1802786/revisions/view/2381780/2381852

With that this looks fixed to me. Thanks a bunch!