Enhance tokens performance

T

+++ b/feeds.tokens.inc
@@ -29,21 +29,18 @@ function feeds_tokens($type, $tokens, array $data, array $options) {
+    if (isset($tokens['feed-source'])) {
...
+      if ($feed_nid && $feed_source = node_load($feed_nid)) {

This could result into a undefined variable error. If $tokens['feeds-source'] does not exist or the feed node failed to load, then $feeds_source is undefined.

But the variable is used here in the patch:

+++ b/feeds.tokens.inc
@@ -29,21 +29,18 @@ function feeds_tokens($type, $tokens, array $data, array $options) {
+    // Chained node token relationships.
+    if ($feed_source_tokens = token_find_with_prefix($tokens, 'feed-source')) {
+      $replacements += token_generate('node', $feed_source_tokens, array('node' => $feed_source), $options);

I think that this needs a test for token replacement, to ensure that tokens like [node:feed-source] and [node:feed-source:field_link] are replaced.

I wonder though if these feed-source tokens are an exact copy of the feed-node tokens. The feed-node tokens become available when the entity module is installed. But existing sites may use these tokens, so I think we can not just delete them.

Here is the updated patch which is free from these problems.

Great! Thanks for the patch. I've created two tests for this issue: one to ensure tokens get replaced and one to check if there is a performance gain with the provided patch.

Two patches. The first is only the tests, for which FeedsTokenTest::testPerformance() should fail, but FeedsTokenTest::testFeedsTokens() should pass. The second is with the fix included.

I realized the automated test did not include token replacement for [node:feeds-source], so I added that one to FeedsTokenTest::testFeedsTokens() as well.

While I'm at it, the foreach loop could be killed as well. There is no need to go through the whole list of tokens if we are only looking for one in particular.

Thank you tests! I indeed made a mistake in the last patch.

Committed #9. And thanks for creating the fix, maximpodorov!