Clean up of imports

Jean-Baptiste GOMOND · Jean-Baptiste GOMOND · commit c1583e3dde52 · 2015-04-09T00:59:04.000+02:00
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/knp-components.iml b/.idea/knp-components.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/QuerySubscriber/UsesPaginator.php b/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/QuerySubscriber/UsesPaginator.php
@@ -31,6 +31,7 @@ public function items(ItemsEvent $event)
         $event->target
             ->setFirstResult($event->getOffset())
             ->setMaxResults($event->getLimit())
+            ->setHint(CountWalker::HINT_DISTINCT, $event->options['distinct'])
         ;
 
         $fetchJoinCollection = true;
diff --git a/tests/Test/Pager/Pagination/AbstractPaginationTest.php b/tests/Test/Pager/Pagination/AbstractPaginationTest.php
@@ -4,7 +4,6 @@
 use Knp\Component\Pager\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Test\Mock\PaginationSubscriber as MockPaginationSubscriber;
-use Test\Mock\CustomParameterSubscriber;
 use Knp\Component\Pager\Event\Subscriber\Paginate\ArraySubscriber;
 
 class AbstractPaginationTest extends BaseTestCase
diff --git a/tests/Test/Pager/Pagination/SlidingTest.php b/tests/Test/Pager/Pagination/SlidingTest.php
@@ -2,9 +2,6 @@
 
 use Test\Tool\BaseTestCase;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Knp\Component\Pager\Pagination\PaginationInterface;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 
 class SlidingTest extends BaseTestCase
 {
diff --git a/tests/Test/Pager/Pagination/TraversableItemsTest.php b/tests/Test/Pager/Pagination/TraversableItemsTest.php
@@ -2,9 +2,6 @@
 
 use Test\Tool\BaseTestCase;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Knp\Component\Pager\Pagination\PaginationInterface;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 
 class TraversableItemsTest extends BaseTestCase
 {
diff --git a/tests/Test/Pager/PaginatorTest.php b/tests/Test/Pager/PaginatorTest.php
@@ -3,7 +3,6 @@
 use Test\Tool\BaseTestCase;
 use Knp\Component\Pager\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 
 class PaginatorTest extends BaseTestCase
diff --git a/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php b/tests/Test/Pager/Subscriber/Paginate/ArrayTest.php
@@ -2,12 +2,10 @@
 
 use Test\Tool\BaseTestCase;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Test\Mock\PaginationSubscriber as MockPaginationSubscriber;
 use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\ArraySubscriber;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 
 class ArrayTest extends BaseTestCase
 {
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/CollectionTest.php
@@ -2,12 +2,10 @@
 
 use Test\Tool\BaseTestCase;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Test\Mock\PaginationSubscriber as MockPaginationSubscriber;
 use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\CollectionSubscriber;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class CollectionTest extends BaseTestCase
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/AdvancedQueryTest.php
@@ -4,11 +4,7 @@
 
 use Test\Tool\BaseTestCaseORM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Test\Fixture\Entity\Shop\Product;
 use Test\Fixture\Entity\Shop\Tag;
 use Doctrine\ORM\Query;
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/CompositeKeyTest.php
@@ -4,8 +4,6 @@
 
 use Test\Tool\BaseTestCaseORM;
 use Knp\Component\Pager\Paginator;
-use Test\Fixture\Entity\Composite;
-use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber\UsesPaginator;
 use Doctrine\ORM\Query;
 
 class CompositeKeyTest extends BaseTestCaseORM
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest.php
@@ -4,7 +4,6 @@
 
 use Test\Tool\BaseTestCaseORM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber;
diff --git a/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest/UsesPaginatorTest.php b/tests/Test/Pager/Subscriber/Paginate/Doctrine/ORM/QueryTest/UsesPaginatorTest.php
@@ -4,15 +4,10 @@
 
 use Test\Tool\BaseTestCaseORM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Test\Fixture\Entity\Shop\Product;
 use Test\Fixture\Entity\Shop\Tag;
 use Doctrine\ORM\Query;
-use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber\UsesPaginator;
 
 class UsesPaginatorTest extends BaseTestCaseORM
 {
diff --git a/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php b/tests/Test/Pager/Subscriber/Paginate/SolariumQuerySubscriberTest.php
@@ -4,8 +4,6 @@
 
 use Knp\Component\Pager\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
-use Knp\Component\Pager\Event\Subscriber\Paginate\ArraySubscriber;
 use Knp\Component\Pager\Event\Subscriber\Paginate\SolariumQuerySubscriber;
 
 use Test\Mock\PaginationSubscriber as MockPaginationSubscriber;
diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/QueryTest.php
@@ -4,9 +4,7 @@
 
 use Test\Tool\BaseTestCaseMongoODM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Knp\Component\Pager\Event\Subscriber\Sortable\Doctrine\ODM\MongoDB\QuerySubscriber as Sortable;
 use Test\Fixture\Document\Article;
diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/WhitelistTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ODM/MongoDB/WhitelistTest.php
@@ -4,11 +4,6 @@
 
 use Test\Tool\BaseTestCaseMongoODM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
-use Knp\Component\Pager\Event\Subscriber\Sortable\Doctrine\ODM\MongoDB\QuerySubscriber as Sortable;
 use Test\Fixture\Document\Article;
 
 class WhitelistTest extends BaseTestCaseMongoODM
diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/QueryTest.php
@@ -6,12 +6,13 @@
 use Knp\Component\Pager\Paginator;
 use Knp\Component\Pager\Pagination\SlidingPagination;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber;
 use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Knp\Component\Pager\Event\Subscriber\Sortable\Doctrine\ORM\QuerySubscriber as Sortable;
 use Test\Fixture\Entity\Article;
-use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber\UsesPaginator;
+use \Doctrine\ORM\Configuration;
+use \Doctrine\Common\Cache\ApcCache;
+use \Doctrine\ORM\Tools\SchemaTool;
 
 class QueryTest extends BaseTestCaseORM
 {
@@ -23,9 +24,9 @@ function shouldHandleApcQueryCache()
         if (!extension_loaded('apc') || !ini_get('apc.enable_cli')) {
             $this->markTestSkipped('APC extension is not loaded.');
         }
-        $config = new \Doctrine\ORM\Configuration();
-        $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ApcCache);
-        $config->setQueryCacheImpl(new \Doctrine\Common\Cache\ApcCache);
+        $config = new Configuration();
+        $config->setMetadataCacheImpl(new ApcCache);
+        $config->setQueryCacheImpl(new ApcCache);
         $config->setProxyDir(__DIR__);
         $config->setProxyNamespace('Gedmo\Mapping\Proxy');
         $config->getAutoGenerateProxyClasses(false);
@@ -41,7 +42,7 @@ function shouldHandleApcQueryCache()
             return $em->getClassMetadata($class);
         }, (array)$this->getUsedEntityFixtures());
 
-        $schemaTool = new \Doctrine\ORM\Tools\SchemaTool($em);
+        $schemaTool = new SchemaTool($em);
         $schemaTool->dropSchema(array());
         $schemaTool->createSchema($schema);
         $this->populate($em);
diff --git a/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/WhitelistTest.php b/tests/Test/Pager/Subscriber/Sortable/Doctrine/ORM/WhitelistTest.php
@@ -4,12 +4,7 @@
 
 use Test\Tool\BaseTestCaseORM;
 use Knp\Component\Pager\Paginator;
-use Knp\Component\Pager\Pagination\SlidingPagination;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Paginate\Doctrine\ORM\QuerySubscriber;
-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
-use Knp\Component\Pager\Event\Subscriber\Sortable\Doctrine\ORM\QuerySubscriber as Sortable;
 use Test\Fixture\Entity\Article;
 
 class WhitelistTest extends BaseTestCaseORM
diff --git a/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php b/tests/Test/Pager/Subscriber/Sortable/SolariumQuerySubscriberTest.php
@@ -4,7 +4,6 @@
 
 use Knp\Component\Pager\Paginator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Event\Subscriber\Sortable\SolariumQuerySubscriber;
 
 use Test\Mock\PaginationSubscriber as MockPaginationSubscriber;
diff --git a/tests/Test/Tool/BaseTestCaseMongoODM.php b/tests/Test/Tool/BaseTestCaseMongoODM.php
@@ -2,7 +2,6 @@
 
 namespace Test\Tool;
 
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\Common\EventManager;
diff --git a/tests/Test/Tool/BaseTestCaseORM.php b/tests/Test/Tool/BaseTestCaseORM.php
@@ -2,7 +2,6 @@
 
 namespace Test\Tool;
 
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
diff --git a/tests/Test/Tool/QueryAnalyzer.php b/tests/Test/Tool/QueryAnalyzer.php
@@ -99,7 +99,7 @@ public function cleanUp()
      * Dump the statistics of executed queries
      *
      * @param boolean $dumpOnlySql
-     * @return void
+     * @return String
      */
     public function getOutput($dumpOnlySql = false)
     {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function items(ItemsEvent $event)`
`31`	`31`	`$event->target`
`32`	`32`	`->setFirstResult($event->getOffset())`
`33`	`33`	`->setMaxResults($event->getLimit())`
	`34`	`+ ->setHint(CountWalker::HINT_DISTINCT, $event->options['distinct'])`
`34`	`35`	`;`
`35`	`36`
`36`	`37`	`$fetchJoinCollection = true;`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`
`3`	`3`	`use Test\Tool\BaseTestCase;`
`4`	`4`	`use Knp\Component\Pager\Paginator;`
`5`		`-use Knp\Component\Pager\Pagination\SlidingPagination;`
`6`		`-use Knp\Component\Pager\Pagination\PaginationInterface;`
`7`		`-use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;`
`8`	`5`
`9`	`6`	`class SlidingTest extends BaseTestCase`
`10`	`7`	`{`