Selectable-Adapter->count() ignores Criteria

[Blaimi]

diff --git a/src/DoctrineModule/Paginator/Adapter/Selectable.php b/src/DoctrineModule/Paginator/Adapter/Selectable.php
index 5984449..1f35c7d 100644
--- a/src/DoctrineModule/Paginator/Adapter/Selectable.php
+++ b/src/DoctrineModule/Paginator/Adapter/Selectable.php
@@ -73,6 +73,6 @@
      */
     public function count()
     {
-        return count($this->selectable->matching(new Criteria()));
+        return count($this->selectable->matching($this->criteria));
     }
 }

[Ocramius]

Ping @bakura10

[Ocramius]

@Blaimi now that I think of it, it's:

$criteria = clone $this->criteria;
$criteria->setFirstResult(null);
$criteria->setMaxResults(null);
return $this->selectable->matching($this->criteria)->count();

[Blaimi]

If I’m using it with paginator, I’m getting the wrong amount of total Items

$adapter = new SelectableAdapter($repository, $criteria);
$paginator = new Paginator($adapter);
echo $paginator->getTotalItemCount();

[Ocramius]

@Blaimi yes, was aware of that - any suggestions on the snippet I pasted?

[Blaimi]

Ah, sorry, I found the bug in my patch (and in my brain :D ).

diff --git a/src/DoctrineModule/Paginator/Adapter/Selectable.php b/src/DoctrineModule/Paginator/Adapter/Selectable.php
index 5984449..2f6b156 100644
--- a/src/DoctrineModule/Paginator/Adapter/Selectable.php
+++ b/src/DoctrineModule/Paginator/Adapter/Selectable.php
@@ -73,6 +73,9 @@
      */
     public function count()
     {
-        return count($this->selectable->matching(new Criteria()));
+        $criteria = clone $this->criteria;
+        $criteria->setFirstResult(null);
+        $criteria->setMaxResults(null);
+        return $this->selectable->matching($this->criteria)->count();
     }
 }

[Ocramius]

@Blaimi any chance to make a PR with a test?

[Blaimi]

I’ll try it tonight. I’m not yet that firm with the git-hub-handling.

[Ocramius]

@Blaimi ok. Otherwise ping me and I'll do it

[Ocramius]

News on this one?

[Blaimi]

@Ocramius sorry, I can’t find any time atm. Can you make the PR?

there’s another error on the return line

diff --git a/src/DoctrineModule/Paginator/Adapter/Selectable.php b/src/DoctrineModule/Paginator/Adapter/Selectable.php
index 5984449..2f6b156 100644
--- a/src/DoctrineModule/Paginator/Adapter/Selectable.php
+++ b/src/DoctrineModule/Paginator/Adapter/Selectable.php
@@ -73,6 +73,9 @@
      */
     public function count()
     {
-        return count($this->selectable->matching(new Criteria()));
+        $criteria = clone $this->criteria;
+        $criteria->setFirstResult(null);
+        $criteria->setMaxResults(null);
+        return $this->selectable->matching($criteria)->count();
     }
 }

[Ocramius]

Can do