Add support for Laravel 6 (#8)

.travis.yml

@@ -4,8 +4,6 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.1
-      env: STATIC_ANALYSIS=true VALIDATE_CODING_STYLE=true
     - php: 7.2
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: 7.3

composer.json

@@ -11,14 +11,14 @@
   "require": {
     "php": ">=7.2",
     "bschmitt/laravel-amqp": "^2.0",
-    "laravel/framework": "5.8.*"
+    "laravel/framework": "^5.8 || ^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^8.0",
     "friendsofphp/php-cs-fixer": "^2.15",
-    "mockery/mockery": "^1",
-    "orchestra/testbench": "^3.8",
-    "orchestra/database": "^3.8",
+    "mockery/mockery": "^1.2",
+    "orchestra/testbench": "^4.0",
+    "orchestra/database": "^4.0",
     "php-mock/php-mock-mockery": "^1.3"
   },
   "autoload": {
@@ -32,7 +32,7 @@
     }
   },
   "scripts": {
-    "test": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
+    "tests": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
     "phpunit": "phpunit --coverage-text",
     "phpcs": "php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
     "fix-cs": "php-cs-fixer fix -v --diff --allow-risky=yes;"

database/factories/DomainEventFactory.php

@@ -1,7 +1,7 @@
 <?php
 
-use Softonic\TransactionalEventPublisher\Model\DomainEvent;
 use Softonic\TransactionalEventPublisher\CustomEventMessage;
+use Softonic\TransactionalEventPublisher\Model\DomainEvent;
 use Softonic\TransactionalEventPublisher\TestModel;
 
 $factory->define(DomainEvent::class, function () {

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     volumes:
       - ./:/app
     image: ricc/composer-prestissimo:latest
-    command: composer run test
+    command: composer run tests
 
   fixcs:
     volumes:
@@ -28,4 +28,4 @@ services:
       volumes:
         - ./:/app
       image: ricc/composer-prestissimo:latest
-      command: composer phpunit
+      command: composer phpunit

src/Contracts/EventMessageContract.php

@@ -3,19 +3,20 @@
 namespace Softonic\TransactionalEventPublisher\Contracts;
 
 use Illuminate\Database\Eloquent\Model;
+use JsonSerializable;
 
 /**
  * Interface EventMessageContract
  *
  * @package Softonic\TransactionalEventPublisher\Contracts
  */
-interface EventMessageContract extends \JsonSerializable
+interface EventMessageContract extends JsonSerializable
 {
     /**
      * EventMessageContract constructor.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param                                     $eventType
+     * @param Model $model
+     * @param       $eventType
      */
     public function __construct(Model $model, $eventType);
 

src/Contracts/EventStoreMiddlewareContract.php

@@ -12,7 +12,7 @@ interface EventStoreMiddlewareContract
     /**
      * Stores in the message-oriented middleware.
      *
-     * @param \Softonic\TransactionalEventPublisher\Contracts\EventMessageContract $message
+     * @param EventMessageContract $message
      *
      * @return mixed
      */

src/EventStoreMiddlewares/AmqpMiddleware.php

@@ -3,6 +3,7 @@
 namespace Softonic\TransactionalEventPublisher\EventStoreMiddlewares;
 
 use Bschmitt\Amqp\Amqp;
+use Exception;
 use Psr\Log\LoggerInterface;
 use Softonic\TransactionalEventPublisher\Contracts\EventMessageContract;
 use Softonic\TransactionalEventPublisher\Contracts\EventStoreMiddlewareContract;
@@ -29,10 +30,10 @@ class AmqpMiddleware implements EventStoreMiddlewareContract
     /**
      * AmqpMiddleware constructor.
      *
-     * @param \Softonic\TransactionalEventPublisher\Factories\AmqpMessageFactory $messageFactory
-     * @param \Bschmitt\Amqp\Amqp                                                $amqp
-     * @param array                                                              $properties
-     * @param LoggerInterface                                                    $logger
+     * @param AmqpMessageFactory $messageFactory
+     * @param Amqp               $amqp
+     * @param array              $properties
+     * @param LoggerInterface    $logger
      */
     public function __construct(
         AmqpMessageFactory $messageFactory,
@@ -63,8 +64,9 @@ public function store(EventMessageContract $message)
             );
 
             return true;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error($e->getMessage());
+
             return false;
         }
     }

src/EventStoreMiddlewares/AsyncAmqpMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace Softonic\TransactionalEventPublisher\EventStoreMiddlewares;
 
+use Exception;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Softonic\TransactionalEventPublisher\Contracts\EventMessageContract;
 use Softonic\TransactionalEventPublisher\Contracts\EventStoreMiddlewareContract;
@@ -22,7 +23,7 @@ public function __construct(Dispatcher $dispatcher)
     /**
      * Stores in the message-oriented middleware.
      *
-     * @param \Softonic\TransactionalEventPublisher\Contracts\EventMessageContract $message
+     * @param EventMessageContract $message
      *
      * @return mixed
      */
@@ -34,7 +35,7 @@ public function store(EventMessageContract $message)
             $this->dispatcher->dispatch($job);
 
             return true;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
     }

src/EventStoreMiddlewares/DatabaseMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace Softonic\TransactionalEventPublisher\EventStoreMiddlewares;
 
+use Exception;
 use Softonic\TransactionalEventPublisher\Contracts\EventMessageContract;
 use Softonic\TransactionalEventPublisher\Contracts\EventStoreMiddlewareContract;
 use Softonic\TransactionalEventPublisher\Model\DomainEvent;
@@ -26,7 +27,7 @@ public function store(EventMessageContract $message)
             DomainEvent::create(compact('message'));
 
             return true;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
     }

src/Exceptions/EventStoreFailedException.php

@@ -2,11 +2,13 @@
 
 namespace Softonic\TransactionalEventPublisher\Exceptions;
 
+use RuntimeException;
+
 /**
  * Class EventStoreFailedException
  *
  * @package Softonic\TransactionalEventPublisher\Exceptions
  */
-class EventStoreFailedException extends \RuntimeException
+class EventStoreFailedException extends RuntimeException
 {
 }

src/Factories/AmqpMessageFactory.php

@@ -2,6 +2,7 @@
 
 namespace Softonic\TransactionalEventPublisher\Factories;
 
+use LogicException;
 use PhpAmqpLib\Message\AMQPMessage;
 use Softonic\TransactionalEventPublisher\Contracts\EventMessageContract;
 
@@ -18,7 +19,7 @@ class AmqpMessageFactory
      * @param EventMessageContract $eventMessage
      * @param array                $properties
      *
-     * @return \PhpAmqpLib\Message\AMQPMessage
+     * @return AMQPMessage
      */
     public function make(EventMessageContract $eventMessage, array $properties = null)
     {
@@ -30,7 +31,7 @@ public function make(EventMessageContract $eventMessage, array $properties = nul
     private function checkMessage(array $message)
     {
         if (empty(array_filter($message))) {
-            throw new \LogicException('No message provided');
+            throw new LogicException('No message provided');
         }
     }
 }

src/Jobs/SendDomainEvents.php

@@ -2,13 +2,15 @@
 
 namespace Softonic\TransactionalEventPublisher\Jobs;
 
+use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Softonic\TransactionalEventPublisher\Contracts\EventMessageContract;
 use Softonic\TransactionalEventPublisher\EventStoreMiddlewares\AmqpMiddleware;
 
@@ -57,7 +59,7 @@ public function handle(AmqpMiddleware $amqpMiddleware, Dispatcher $dispatcher, L
 
         try {
             $this->sendEvent();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->waitExponentialBackOff();
             $this->retry();
         }
@@ -69,7 +71,7 @@ protected function sendEvent(): void
             $errorMessage = "The event could't be sent. Retrying message: " . json_encode($this->eventMessage);
             $this->logger->alert($errorMessage);
 
-            throw new \RuntimeException($errorMessage);
+            throw new RuntimeException($errorMessage);
         }
     }
 

src/Observers/ModelObserver.php

@@ -2,6 +2,7 @@
 
 namespace Softonic\TransactionalEventPublisher\Observers;
 
+use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Softonic\TransactionalEventPublisher\Contracts\EventStoreMiddlewareContract;
 use Softonic\TransactionalEventPublisher\Exceptions\EventStoreFailedException;
@@ -34,9 +35,9 @@ public function __construct(
     /**
      * Handles the model creating event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function creating(Model $model)
     {
@@ -46,7 +47,7 @@ public function creating(Model $model)
     /**
      * Handles the model created event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
      * @return bool
      */
@@ -60,9 +61,9 @@ public function created(Model $model)
     /**
      * Handles the model updating event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function updating(Model $model)
     {
@@ -72,7 +73,7 @@ public function updating(Model $model)
     /**
      * Handles the model updated event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
      * @return bool
      */
@@ -86,9 +87,9 @@ public function updated(Model $model)
     /**
      * Handles the model deleting event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function deleting(Model $model)
     {
@@ -98,7 +99,7 @@ public function deleting(Model $model)
     /**
      * Handles the model deleted event.
      *
-     * @param \Illuminate\Database\Eloquent\Model $model
+     * @param Model $model
      *
      * @return bool
      */

src/ValueObjects/EventMessage.php

@@ -21,11 +21,11 @@ class EventMessage implements EventMessageContract
 
     public function __construct(Model $model, $eventType)
     {
-        $this->service = config('transactional-event-publisher.service');
+        $this->service   = config('transactional-event-publisher.service');
         $this->eventType = $eventType;
         $this->modelName = class_basename($model);
         $this->eventName = $this->buildEventName($this->modelName, $eventType);
-        $this->payload = $model->toArray();
+        $this->payload   = $model->toArray();
         $this->createdAt = date('Y-m-d H:i:s');
     }
 
@@ -53,10 +53,10 @@ public function jsonSerialize()
     public function toArray()
     {
         return [
-            'service' => $this->service,
+            'service'   => $this->service,
             'eventName' => $this->eventName,
             'createdAt' => $this->createdAt,
-            'payload' => $this->payload,
+            'payload'   => $this->payload,
         ];
     }
 }

tests/Console/Commands/EmitAllEventsTest.php

@@ -5,7 +5,6 @@
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Softonic\TransactionalEventPublisher\Jobs\SendDomainEvents;
 use Softonic\TransactionalEventPublisher\Model\DomainEvent;
-
 use Softonic\TransactionalEventPublisher\TestCase;
 
 class EmitAllEventsTest extends TestCase