import latest version of EventStoreManager

Controller/EventStoreManagerBundleController.php

@@ -11,9 +11,9 @@
 namespace SimpleEventStoreManager\Bundle\Controller;
 
 use JMS\Serializer\SerializerBuilder;
-use SimpleEventStoreManager\Application\EventsQuery;
+use SimpleEventStoreManager\Application\EventQuery;
 use SimpleEventStoreManager\Bundle\Service\Manager;
-use SimpleEventStoreManager\Infrastructure\DataTransformer\JsonEventDataTransformer;
+use SimpleEventStoreManager\Infrastructure\DataTransformers\JsonEventDataTransformer;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -30,7 +30,7 @@ public function indexAction(Request $request, $page = null)
         /** @var Manager $manager */
         $manager = $this->container->get('simple_event_store_manager');
         $eventStore = $manager->getMananger()->eventStore();
-        $eventsQuery = new EventsQuery(
+        $eventsQuery = new EventQuery(
             $eventStore,
             new JsonEventDataTransformer(
                 SerializerBuilder::create()->build(),
@@ -39,6 +39,6 @@ public function indexAction(Request $request, $page = null)
             )
         );
 
-        return $eventsQuery->query($currentPage);
+        return $eventsQuery->paginate($currentPage);
     }
 }

Service/Manager.php

@@ -10,12 +10,12 @@
 
 namespace SimpleEventStoreManager\Bundle\Service;
 
-use SimpleEventStoreManager\Application\EventsManager;
+use SimpleEventStoreManager\Application\EventManager;
 
 class Manager
 {
     /**
-     * @var EventsManager
+     * @var EventManager
      */
     private $manager;
 
@@ -34,10 +34,10 @@ public function __construct(array $config = [])
      */
     private function setMananger($config)
     {
-        $this->manager = new EventsManager($config['driver'], $config['parameters']);
+        $this->manager = new EventManager($config['driver'], $config['parameters']);
     }
     /**
-     * @return EventsManager
+     * @return EventManager
      */
     public function getMananger()
     {