Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3190820 by pavnish, WalkingDexter, ayushmishra206, durgeshs, daffie: Error: Call to a member function getTotalCount() on bool in statistics_tokens()

merge-requests/666/head
catch 2021-05-12 21:34:21 +01:00
parent 996b3578a4
commit d8bba172f9
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/modules/statistics/statistics.tokens.inc
View File

@ -40,22 +40,29 @@ function statistics_tokens($type, $tokens, array $data, array $options, Bubbleab
if ($type == 'node' & !empty($data['node'])) {
$node = $data['node'];
/** @var \Drupal\statistics\StatisticsStorageInterface $stats_storage */
$stats_storage = \Drupal::service('statistics.storage.node');
$node_view = NULL;
foreach ($tokens as $name => $original) {
if ($name == 'total-count') {
$replacements[$original] = $stats_storage->fetchView($node->id())->getTotalCount();
$node_view = $node_view ?? $stats_storage->fetchView($node->id());
$replacements[$original] = $node_view ? $node_view->getTotalCount() : 0;
}
elseif ($name == 'day-count') {
$replacements[$original] = $stats_storage->fetchView($node->id())->getDayCount();
$node_view = $node_view ?? $stats_storage->fetchView($node->id());
$replacements[$original] = $node_view ? $node_view->getDayCount() : 0;
}
elseif ($name == 'last-view') {
$replacements[$original] = \Drupal::service('date.formatter')->format($stats_storage->fetchView($node->id())->getTimestamp());
$node_view = $node_view ?? $stats_storage->fetchView($node->id());
$replacements[$original] = $node_view ? \Drupal::service('date.formatter')->format($node_view->getTimestamp()) : t('never');
}
}
if ($created_tokens = $token_service->findWithPrefix($tokens, 'last-view')) {
$replacements += $token_service->generate('date', $created_tokens, ['date' => $stats_storage->fetchView($node->id())->getTimestamp()], $options, $bubbleable_metadata);
$node_view = $node_view ?? $stats_storage->fetchView($node->id());
$replacements += $token_service->generate('date', $created_tokens, ['date' => $node_view ? $node_view->getTimestamp() : 0], $options, $bubbleable_metadata);
}
}

18
core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
View File

@ -28,6 +28,22 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
$this->drupalLogin($user);
$node = $this->drupalCreateNode(['type' => 'page', 'uid' => $user->id()]);
/** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
$date_formatter = $this->container->get('date.formatter');
$request_time = \Drupal::time()->getRequestTime();
// Generate and test tokens.
$tests = [];
$tests['[node:total-count]'] = 0;
$tests['[node:day-count]'] = 0;
$tests['[node:last-view]'] = t('never');
$tests['[node:last-view:short]'] = $date_formatter->format($request_time, 'short');
foreach ($tests as $input => $expected) {
$output = \Drupal::token()->replace($input, ['node' => $node], ['langcode' => $language_interface->getId()]);
$this->assertEqual($output, $expected, new FormattableMarkup('Statistics token %token replaced.', ['%token' => $input]));
}
// Hit the node.
$this->drupalGet('node/' . $node->id());
// Manually calling statistics.php, simulating ajax behavior.
@ -45,8 +61,6 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
$tests = [];
$tests['[node:total-count]'] = 1;
$tests['[node:day-count]'] = 1;
/** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
$date_formatter = $this->container->get('date.formatter');
$tests['[node:last-view]'] = $date_formatter->format($statistics->getTimestamp());
$tests['[node:last-view:short]'] = $date_formatter->format($statistics->getTimestamp(), 'short');