Merge pull request prooph#7 from basz/patch-2

phpspec/prophecy#332
basz · Mar 4, 2017 · 6dbacf0 · 6dbacf0
2 parents 070251e + b2f0da2
commit 6dbacf0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
     },
     "require-dev": {
         "prooph/pdo-event-store": "1.0.x-dev",
-        "phpunit/phpunit": "^5.7",
-        "phpspec/prophecy": "dev-patch-1 as 1.6.2",
+        "phpunit/phpunit": "^6.0",
+        "phpspec/prophecy": "^1.7",
         "prooph/php-cs-fixer-config": "^0.1.1",
         "satooshi/php-coveralls": "^1.0",
         "malukenho/docheader": "^0.1.4",
@@ -46,11 +46,5 @@
             "ProophTest\\StandardProjections\\": "tests/",
             "ProophTest\\EventStore\\": "vendor/prooph/event-store/tests/"
         }
-    },
-    "repositories": [
-      {
-        "type": "git",
-        "url": "https://github.com/prolic/prophecy.git"
-      }
-    ]
+    }
 }
diff --git a/src/AllStreamProjectionRunner.php b/src/AllStreamProjectionRunner.php
@@ -12,31 +12,24 @@
 
 namespace Prooph\StandardProjections;
 
-use Prooph\EventStore\EventStore;
-use Prooph\EventStore\Projection\ProjectionOptions;
+use Prooph\EventStore\Projection\ProjectionManager;
 
 class AllStreamProjectionRunner
 {
     /**
-     * @var EventStore
+     * @var ProjectionManager
      */
-    private $eventStore;
+    private $projectionManager;
 
-    /**
-     * @var ProjectionOptions|null
-     */
-    private $projectionOptions;
-
-    public function __construct(EventStore $eventStore, ProjectionOptions $projectionOptions = null)
+    public function __construct(ProjectionManager $projectionManager)
     {
-        $this->eventStore = $eventStore;
-        $this->projectionOptions = $projectionOptions;
+        $this->projectionManager = $projectionManager;
     }
 
     public function __invoke(bool $keepRunning = true): void
     {
-        $this->eventStore
-            ->createProjection('$all', $this->projectionOptions)
+        $this->projectionManager
+            ->createProjection('$all')
             ->fromAll()
             ->whenAny(function ($state, $event): void {
                 $this->emit($event);

diff --git a/src/CategoryStreamProjectionRunner.php b/src/CategoryStreamProjectionRunner.php
@@ -12,31 +12,24 @@
 
 namespace Prooph\StandardProjections;
 
-use Prooph\EventStore\EventStore;
-use Prooph\EventStore\Projection\ProjectionOptions;
+use Prooph\EventStore\Projection\ProjectionManager;
 
 class CategoryStreamProjectionRunner
 {
     /**
-     * @var EventStore
+     * @var ProjectionManager
      */
-    private $eventStore;
+    private $projectionManager;
 
-    /**
-     * @var ProjectionOptions|null
-     */
-    private $projectionOptions;
-
-    public function __construct(EventStore $eventStore, ProjectionOptions $projectionOptions = null)
+    public function __construct(ProjectionManager $projectionManager)
     {
-        $this->eventStore = $eventStore;
-        $this->projectionOptions = $projectionOptions;
+        $this->projectionManager = $projectionManager;
     }
 
     public function __invoke(bool $keepRunning = true): void
     {
-        $this->eventStore
-            ->createProjection('$by_category', $this->projectionOptions)
+        $this->projectionManager
+            ->createProjection('$by_category')
             ->fromAll()
             ->whenAny(function ($state, $event): void {
                 $streamName = $this->streamName();

diff --git a/src/MessageNameStreamProjectionRunner.php b/src/MessageNameStreamProjectionRunner.php
@@ -13,31 +13,24 @@
 namespace Prooph\StandardProjections;
 
 use Prooph\Common\Messaging\Message;
-use Prooph\EventStore\EventStore;
-use Prooph\EventStore\Projection\ProjectionOptions;
+use Prooph\EventStore\Projection\ProjectionManager;
 
 class MessageNameStreamProjectionRunner
 {
     /**
-     * @var EventStore
+     * @var ProjectionManager
      */
-    private $eventStore;
+    private $projectionManager;
 
-    /**
-     * @var ProjectionOptions|null
-     */
-    private $projectionOptions;
-
-    public function __construct(EventStore $eventStore, ProjectionOptions $projectionOptions = null)
+    public function __construct(ProjectionManager $projectionManager)
     {
-        $this->eventStore = $eventStore;
-        $this->projectionOptions = $projectionOptions;
+        $this->projectionManager = $projectionManager;
     }
 
     public function __invoke(bool $keepRunning = true): void
     {
-        $this->eventStore
-            ->createProjection('$by_message_name', $this->projectionOptions)
+        $this->projectionManager
+            ->createProjection('$by_message_name')
             ->fromAll()
             ->whenAny(function ($state, Message $event): void {
                 $messageName = $event->messageName();

diff --git a/tests/AllStreamProjectionRunnerTest.php b/tests/AllStreamProjectionRunnerTest.php
@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Event\ProophActionEventEmitter;
 use Prooph\EventStore\InMemoryEventStore;
+use Prooph\EventStore\Projection\InMemoryProjectionManager;
 use Prooph\EventStore\Stream;
 use Prooph\EventStore\StreamName;
 use Prooph\StandardProjections\AllStreamProjectionRunner;
@@ -69,7 +70,8 @@ public function it_emits_events_for_all_streams()
 
         $eventStore->commit();
 
-        $allStreamProjection = new AllStreamProjectionRunner($eventStore);
+        $projectionManager = new InMemoryProjectionManager($eventStore);
+        $allStreamProjection = new AllStreamProjectionRunner($projectionManager);
         $allStreamProjection(false);
 
         $this->assertTrue($eventStore->hasStream(new StreamName('$all')));

diff --git a/tests/CategoryStreamProjectionRunnerTest.php b/tests/CategoryStreamProjectionRunnerTest.php
@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Event\ProophActionEventEmitter;
 use Prooph\EventStore\InMemoryEventStore;
+use Prooph\EventStore\Projection\InMemoryProjectionManager;
 use Prooph\EventStore\Stream;
 use Prooph\EventStore\StreamName;
 use Prooph\StandardProjections\CategoryStreamProjectionRunner;
@@ -83,7 +84,8 @@ public function it_emits_events_for_all_streams()
 
         $eventStore->commit();
 
-        $categoryStreamProjection = new CategoryStreamProjectionRunner($eventStore);
+        $projectionManager = new InMemoryProjectionManager($eventStore);
+        $categoryStreamProjection = new CategoryStreamProjectionRunner($projectionManager);
         $categoryStreamProjection(false);
 
         $this->assertTrue($eventStore->hasStream(new StreamName('$ct-foo')));

diff --git a/tests/MessageNameStreamProjectionRunnerTest.php b/tests/MessageNameStreamProjectionRunnerTest.php
@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Event\ProophActionEventEmitter;
 use Prooph\EventStore\InMemoryEventStore;
+use Prooph\EventStore\Projection\InMemoryProjectionManager;
 use Prooph\EventStore\Stream;
 use Prooph\EventStore\StreamName;
 use Prooph\StandardProjections\MessageNameStreamProjectionRunner;
@@ -53,7 +54,8 @@ public function it_emits_events_for_all_streams()
 
         $eventStore->commit();
 
-        $categoryStreamProjection = new MessageNameStreamProjectionRunner($eventStore);
+        $projectionManager = new InMemoryProjectionManager($eventStore);
+        $categoryStreamProjection = new MessageNameStreamProjectionRunner($projectionManager);
         $categoryStreamProjection(false);
 
         $this->assertTrue($eventStore->hasStream(new StreamName('$mn-event-a')));