diff --git a/core/modules/statistics/migrations/statistics_node_counter.yml b/core/modules/statistics/migrations/statistics_node_counter.yml index bdb63ef..f0f1685 100644 --- a/core/modules/statistics/migrations/statistics_node_counter.yml +++ b/core/modules/statistics/migrations/statistics_node_counter.yml @@ -1,5 +1,5 @@ id: statistics_node_counter -label: Drupal 6 Node Counter +label: Node counter migration_tags: - Drupal 6 - Drupal 7 diff --git a/core/modules/statistics/src/StatisticsViewsResult.php b/core/modules/statistics/src/StatisticsViewsResult.php index 3b92470..ef0db97 100644 --- a/core/modules/statistics/src/StatisticsViewsResult.php +++ b/core/modules/statistics/src/StatisticsViewsResult.php @@ -23,9 +23,9 @@ class StatisticsViewsResult { protected $timestamp; public function __construct($total_count, $day_count, $timestamp) { - $this->totalCount = (int) $total_count; - $this->dayCount = (int) $day_count; - $this->timestamp = (int) $timestamp; + $this->totalCount = $total_count; + $this->dayCount = $day_count; + $this->timestamp = $timestamp; } /** diff --git a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php index 8ac0014..09565ae 100644 --- a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php +++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php @@ -125,7 +125,7 @@ public function testLogging() { $post = ['nid' => $this->node->id()]; $this->client->post($base_root . $stats_path, ['form_params' => $post]); $node_counter = statistics_get($this->node->id()); - $this->assertIdentical($node_counter['totalcount'], 1); + $this->assertIdentical($node_counter['totalcount'], '1'); // Try fetching statistics for an invalid node ID and verify it returns // FALSE. diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php index 3a6dc4e..ebd7766 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php @@ -68,9 +68,10 @@ public function testStatisticsSettings() { protected function assertNodeCounter($nid, $total_count, $day_count, $timestamp) { /** @var \Drupal\statistics\StatisticsViewsResult $statistics */ $statistics = $this->container->get('statistics.storage.node')->fetchView($nid); - $this->assertSame($total_count, $statistics->getTotalCount()); - $this->assertSame($day_count, $statistics->getDayCount()); - $this->assertSame($timestamp, $statistics->getTimestamp()); + // @todo Remove casting after https://www.drupal.org/node/2926069 lands. + $this->assertSame($total_count, (int) $statistics->getTotalCount()); + $this->assertSame($day_count, (int) $statistics->getDayCount()); + $this->assertSame($timestamp, (int) $statistics->getTimestamp()); } } diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php index 3415537..8cdb9e7 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php @@ -64,9 +64,10 @@ public function testStatisticsSettings() { protected function assertNodeCounter($nid, $total_count, $day_count, $timestamp) { /** @var \Drupal\statistics\StatisticsViewsResult $statistics */ $statistics = $this->container->get('statistics.storage.node')->fetchView($nid); - $this->assertSame($total_count, $statistics->getTotalCount()); - $this->assertSame($day_count, $statistics->getDayCount()); - $this->assertSame($timestamp, $statistics->getTimestamp()); + // @todo Remove casting after https://www.drupal.org/node/2926069 lands. + $this->assertSame($total_count, (int) $statistics->getTotalCount()); + $this->assertSame($day_count, (int) $statistics->getDayCount()); + $this->assertSame($timestamp, (int) $statistics->getTimestamp()); } }