Changed count() on Cursor

Author: Tomasz Cyrankowski

Grid/Source/Document.php

@@ -268,12 +268,7 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
         // I really don't know if Cursor is the right type returned (I mean, every single type).
         // As I didn't find out this information, I'm gonna test it with Cursor returned only.
         $cursor = $this->query->getQuery()->execute();
-
-        if ($cursor instanceof \Countable) {
-            $this->count = $cursor->count();
-        } else {
-            $this->count = count($cursor->toArray());
-        }
+        $this->count = $cursor->count();
 
         foreach ($cursor as $resource) {
             $row = new Row();
@@ -313,19 +308,13 @@ protected function addReferencedColumn(array $subColumn, Column $column)
 
                 $cursor = $helperQuery->getQuery()->execute();
 
-                if ($cursor instanceof \Countable) {
-                    $count = $cursor->count();
-                } else {
-                    $count = count($cursor->toArray());
-                }
-
                 foreach ($cursor as $resource) {
                     // Is this case possible? I don't think so
-                    if ($count > 0) {
+                    if ($cursor->count() > 0) {
                         $this->query->select($subColumn[0]);
                     }
 
-                    if ($count == 1) {
+                    if ($cursor->count() === 1) {
                         $this->query->field($subColumn[0])->references($resource);
                     } else {
                         $this->query->addOr($this->query->expr()->field($subColumn[0])->references($resource));