@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Illuminate\Database\QueryException; |
| 7 | 7 | use SmoothPhp\Contracts\Domain\DomainEventStream; |
| 8 | 8 | use SmoothPhp\Contracts\Domain\DomainMessage; |
| 9 | -use SmoothPhp\Contracts\EventStore\DomainEventStreamInterface; |
|
| 10 | 9 | use SmoothPhp\Contracts\EventStore\EventStore; |
| 11 | 10 | use SmoothPhp\Contracts\EventStore\EventStreamNotFound; |
| 12 | 11 | use SmoothPhp\Contracts\Serialization\Serializer; |
@@ -53,10 +53,10 @@ discard block |
||
| 53 | 53 | public function load($id) |
| 54 | 54 | { |
| 55 | 55 | $rows = $this->db->table($this->eventStoreTableName) |
| 56 | - ->select(['uuid', 'playhead', 'metadata', 'payload', 'recorded_on']) |
|
| 57 | - ->where('uuid', $id) |
|
| 58 | - ->orderBy('playhead', 'asc') |
|
| 59 | - ->get(); |
|
| 56 | + ->select(['uuid', 'playhead', 'metadata', 'payload', 'recorded_on']) |
|
| 57 | + ->where('uuid', $id) |
|
| 58 | + ->orderBy('playhead', 'asc') |
|
| 59 | + ->get(); |
|
| 60 | 60 | $events = []; |
| 61 | 61 | |
| 62 | 62 | foreach ($rows as $row) { |
@@ -99,16 +99,16 @@ discard block |
||
| 99 | 99 | private function insertEvent(DomainMessage $domainMessage) |
| 100 | 100 | { |
| 101 | 101 | $this->db->table($this->eventStoreTableName) |
| 102 | - ->insert( |
|
| 103 | - [ |
|
| 104 | - 'uuid' => (string)$domainMessage->getId(), |
|
| 105 | - 'playhead' => $domainMessage->getPlayHead(), |
|
| 106 | - 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
|
| 107 | - 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
|
| 108 | - 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 109 | - 'type' => $domainMessage->getType(), |
|
| 110 | - ] |
|
| 111 | - ); |
|
| 102 | + ->insert( |
|
| 103 | + [ |
|
| 104 | + 'uuid' => (string)$domainMessage->getId(), |
|
| 105 | + 'playhead' => $domainMessage->getPlayHead(), |
|
| 106 | + 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
|
| 107 | + 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
|
| 108 | + 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 109 | + 'type' => $domainMessage->getType(), |
|
| 110 | + ] |
|
| 111 | + ); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -146,12 +146,12 @@ discard block |
||
| 146 | 146 | public function getEventsByType($eventTypes, $skip, $take) |
| 147 | 147 | { |
| 148 | 148 | $rows = $this->db->table($this->eventStoreTableName) |
| 149 | - ->select(['uuid', 'playhead', 'metadata', 'payload', 'recorded_on']) |
|
| 150 | - ->whereIn('type', $eventTypes) |
|
| 151 | - ->skip($skip) |
|
| 152 | - ->take($take) |
|
| 153 | - ->orderBy('recorded_on', 'asc') |
|
| 154 | - ->get(); |
|
| 149 | + ->select(['uuid', 'playhead', 'metadata', 'payload', 'recorded_on']) |
|
| 150 | + ->whereIn('type', $eventTypes) |
|
| 151 | + ->skip($skip) |
|
| 152 | + ->take($take) |
|
| 153 | + ->orderBy('recorded_on', 'asc') |
|
| 154 | + ->get(); |
|
| 155 | 155 | $events = []; |
| 156 | 156 | |
| 157 | 157 | foreach ($rows as $row) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function append($id, DomainEventStream $eventStream) |
| 78 | 78 | { |
| 79 | - $id = (string)$id; //Used to thrown errors if ID will not cast to string |
|
| 79 | + $id = (string) $id; //Used to thrown errors if ID will not cast to string |
|
| 80 | 80 | |
| 81 | 81 | $this->db->beginTransaction(); |
| 82 | 82 | |
@@ -101,11 +101,11 @@ discard block |
||
| 101 | 101 | $this->db->table($this->eventStoreTableName) |
| 102 | 102 | ->insert( |
| 103 | 103 | [ |
| 104 | - 'uuid' => (string)$domainMessage->getId(), |
|
| 104 | + 'uuid' => (string) $domainMessage->getId(), |
|
| 105 | 105 | 'playhead' => $domainMessage->getPlayHead(), |
| 106 | 106 | 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
| 107 | 107 | 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
| 108 | - 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 108 | + 'recorded_on' => (string) $domainMessage->getRecordedOn(), |
|
| 109 | 109 | 'type' => $domainMessage->getType(), |
| 110 | 110 | ] |
| 111 | 111 | ); |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | public function fire($job, $data) |
| 37 | 37 | { |
| 38 | - $payload = (json_decode($data['payload'],true)); |
|
| 38 | + $payload = (json_decode($data['payload'], true)); |
|
| 39 | 39 | |
| 40 | 40 | $event = call_user_func([ |
| 41 | 41 | str_replace('.', '\\', $data['type']), |
@@ -37,13 +37,13 @@ |
||
| 37 | 37 | public function handle(DomainMessage $domainMessage) |
| 38 | 38 | { |
| 39 | 39 | $this->queue->push(QueueToEventDispatcher::class, |
| 40 | - [ |
|
| 41 | - 'uuid' => (string)$domainMessage->getId(), |
|
| 42 | - 'playhead' => $domainMessage->getPlayHead(), |
|
| 43 | - 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
|
| 44 | - 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
|
| 45 | - 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 46 | - 'type' => $domainMessage->getType(), |
|
| 47 | - ]); |
|
| 40 | + [ |
|
| 41 | + 'uuid' => (string)$domainMessage->getId(), |
|
| 42 | + 'playhead' => $domainMessage->getPlayHead(), |
|
| 43 | + 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
|
| 44 | + 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
|
| 45 | + 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 46 | + 'type' => $domainMessage->getType(), |
|
| 47 | + ]); |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | \ No newline at end of file |
@@ -38,11 +38,11 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $this->queue->push(QueueToEventDispatcher::class, |
| 40 | 40 | [ |
| 41 | - 'uuid' => (string)$domainMessage->getId(), |
|
| 41 | + 'uuid' => (string) $domainMessage->getId(), |
|
| 42 | 42 | 'playhead' => $domainMessage->getPlayHead(), |
| 43 | 43 | 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
| 44 | 44 | 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
| 45 | - 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 45 | + 'recorded_on' => (string) $domainMessage->getRecordedOn(), |
|
| 46 | 46 | 'type' => $domainMessage->getType(), |
| 47 | 47 | ]); |
| 48 | 48 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | |
| 59 | 59 | Schema::connection($this->config->get('cqrses.eventstore_connection')) |
| 60 | 60 | ->create($this->config->get('cqrses.eventstore_table'), |
| 61 | - function (Blueprint $table) { |
|
| 61 | + function(Blueprint $table) { |
|
| 62 | 62 | $table->increments('id'); |
| 63 | 63 | $table->string('uuid', 56); |
| 64 | 64 | $table->integer('playhead')->unsigned(); |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | public function handle() |
| 49 | 49 | { |
| 50 | 50 | if ($this->option('force') == 'true' || $this->confirm("Are you sure you want to make a new table '{$this->config->get('cqrses.eventstore_table')}'" |
| 51 | - . " on connection '{$this->config->get('cqrses.eventstore_connection')}'" |
|
| 52 | - . " Do you wish to continue?") |
|
| 51 | + . " on connection '{$this->config->get('cqrses.eventstore_connection')}'" |
|
| 52 | + . " Do you wish to continue?") |
|
| 53 | 53 | ) { |
| 54 | 54 | return $this->buildEventStoreTable(); |
| 55 | 55 | } |
@@ -62,16 +62,16 @@ discard block |
||
| 62 | 62 | protected function buildEventStoreTable() |
| 63 | 63 | { |
| 64 | 64 | Schema::connection($this->config->get('cqrses.eventstore_connection')) |
| 65 | - ->create($this->config->get('cqrses.eventstore_table'), |
|
| 66 | - function (Blueprint $table) { |
|
| 67 | - $table->increments('id'); |
|
| 68 | - $table->string('uuid', 56); |
|
| 69 | - $table->integer('playhead')->unsigned(); |
|
| 70 | - $table->text('metadata'); |
|
| 71 | - $table->text('payload'); |
|
| 72 | - $table->string('recorded_on', 32); |
|
| 73 | - $table->text('type'); |
|
| 74 | - $table->unique(['uuid', 'playhead']); |
|
| 75 | - }); |
|
| 65 | + ->create($this->config->get('cqrses.eventstore_table'), |
|
| 66 | + function (Blueprint $table) { |
|
| 67 | + $table->increments('id'); |
|
| 68 | + $table->string('uuid', 56); |
|
| 69 | + $table->integer('playhead')->unsigned(); |
|
| 70 | + $table->text('metadata'); |
|
| 71 | + $table->text('payload'); |
|
| 72 | + $table->string('recorded_on', 32); |
|
| 73 | + $table->text('type'); |
|
| 74 | + $table->unique(['uuid', 'playhead']); |
|
| 75 | + }); |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | \ No newline at end of file |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | - * @param $branch |
|
| 82 | + * @param string|null $branch |
|
| 83 | 83 | */ |
| 84 | 84 | protected function replaceEnvConfig($branch) |
| 85 | 85 | { |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected function getGitBranch() |
| 69 | 69 | { |
| 70 | 70 | $shellOutput = []; |
| 71 | - exec('git branch | ' . "grep ' * '", $shellOutput); |
|
| 71 | + exec('git branch | '."grep ' * '", $shellOutput); |
|
| 72 | 72 | foreach ($shellOutput as $line) { |
| 73 | 73 | if (strpos($line, '* ') !== false) { |
| 74 | 74 | return trim(strtolower(str_replace(['* ', '/'], ['', '-'], $line))); |
@@ -83,9 +83,9 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function replaceEnvConfig($branch) |
| 85 | 85 | { |
| 86 | - $envFilePath = base_path() . '/.env'; |
|
| 86 | + $envFilePath = base_path().'/.env'; |
|
| 87 | 87 | |
| 88 | - $rebuildFunction = function ($data) use ($branch) { |
|
| 88 | + $rebuildFunction = function($data) use ($branch) { |
|
| 89 | 89 | if (stristr($data, 'DB_TABLE_EVENTSTORE')) { |
| 90 | 90 | return "DB_TABLE_EVENTSTORE={$branch}\n"; |
| 91 | 91 | } |
@@ -93,8 +93,8 @@ discard block |
||
| 93 | 93 | return $data; |
| 94 | 94 | }; |
| 95 | 95 | |
| 96 | - $contentArray = array_map($rebuildFunction,file($envFilePath)); |
|
| 96 | + $contentArray = array_map($rebuildFunction, file($envFilePath)); |
|
| 97 | 97 | |
| 98 | - file_put_contents($envFilePath, implode('',$contentArray)); |
|
| 98 | + file_put_contents($envFilePath, implode('', $contentArray)); |
|
| 99 | 99 | } |
| 100 | 100 | } |
@@ -46,11 +46,11 @@ |
||
| 46 | 46 | $this->queue->push( |
| 47 | 47 | QueueToEventDispatcherWithCommandId::class, |
| 48 | 48 | [ |
| 49 | - 'uuid' => (string)$domainMessage->getId(), |
|
| 49 | + 'uuid' => (string) $domainMessage->getId(), |
|
| 50 | 50 | 'playhead' => $domainMessage->getPlayHead(), |
| 51 | 51 | 'metadata' => json_encode($this->serializer->serialize($domainMessage->getMetadata())), |
| 52 | 52 | 'payload' => json_encode($this->serializer->serialize($domainMessage->getPayload())), |
| 53 | - 'recorded_on' => (string)$domainMessage->getRecordedOn(), |
|
| 53 | + 'recorded_on' => (string) $domainMessage->getRecordedOn(), |
|
| 54 | 54 | 'type' => $domainMessage->getType(), |
| 55 | 55 | 'command_id' => $this->notificationsCommandBus->getLastCommandId(), |
| 56 | 56 | ] |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * PushEventsThroughQueue constructor. |
| 28 | 28 | * @param Queue $queue |
| 29 | 29 | * @param Serializer $serializer |
| 30 | - * @param StrongConsistencyCommandBusMiddleware|CommandBus $notificationsCommandBus |
|
| 30 | + * @param StrongConsistencyCommandBusMiddleware $notificationsCommandBus |
|
| 31 | 31 | */ |
| 32 | 32 | public function __construct( |
| 33 | 33 | Queue $queue, |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | foreach ($commands as $command) { |
| 19 | - while (!Cache::has((string)$command)) { |
|
| 19 | + while (!Cache::has((string) $command)) { |
|
| 20 | 20 | usleep(1000); |
| 21 | 21 | |
| 22 | 22 | if ($i > 8000) { |
@@ -33,6 +33,6 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function uuid() |
| 35 | 35 | { |
| 36 | - return (string)\Ramsey\Uuid\Uuid::uuid4(); |
|
| 36 | + return (string) \Ramsey\Uuid\Uuid::uuid4(); |
|
| 37 | 37 | } |
| 38 | 38 | } |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | public function execute(Command $command) |
| 35 | 35 | { |
| 36 | - $this->lastCommandId = (string)$command; |
|
| 36 | + $this->lastCommandId = (string) $command; |
|
| 37 | 37 | $this->commandBus->execute($command); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -29,9 +29,9 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function handle(DomainMessage $domainMessage) |
| 31 | 31 | { |
| 32 | - $name = explode('.',$domainMessage->getType()); |
|
| 32 | + $name = explode('.', $domainMessage->getType()); |
|
| 33 | 33 | |
| 34 | 34 | $name = preg_replace('/(?!^)[A-Z]{2,}(?=[A-Z][a-z])|[A-Z][a-z]/', ' $0', end($name)); |
| 35 | - $this->log->debug(trim(ucwords($name)) . " ({$domainMessage->getType()})"); |
|
| 35 | + $this->log->debug(trim(ucwords($name))." ({$domainMessage->getType()})"); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |