PHP 7 (#317)

* require PHP 7

* declare(strict_types=1);

* type hints

* minor cs fixes

* minor improvements

.php_cs

@@ -6,5 +6,6 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
+        'declare_strict_types' => true,
     ])
     ->setFinder($finder);

.travis.yml

@@ -9,9 +9,8 @@ cache:
 
 matrix:
     include:
-        - php: 5.5
-        - php: 5.6
-        - php: 7
+        - php: 7.0
+        - php: 7.1
         - php: hhvm
     fast_finish: true
     allow_failures:

composer.json

@@ -6,7 +6,7 @@
     "require": {
         "beberlei/assert": "~2.0",
         "broadway/uuid-generator": "~0.4.0",
-        "php": ">=5.5.9"
+        "php": "^7.0"
     },
     "authors": [
       {

examples/auditing/log-command-status.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 /*
@@ -58,8 +60,8 @@ class ExampleFailureCommand extends BaseCommand
 $commandAuditLogger = new Broadway\Auditing\CommandLogger($logger, $commandSerializer);
 
 // register the command logger with the event dispatcher of the command bus
-$eventDispatcher->addListener("broadway.command_handling.command_success", [$commandAuditLogger, "onCommandHandlingSuccess"]);
-$eventDispatcher->addListener("broadway.command_handling.command_failure", [$commandAuditLogger, "onCommandHandlingFailure"]);
+$eventDispatcher->addListener('broadway.command_handling.command_success', [$commandAuditLogger, 'onCommandHandlingSuccess']);
+$eventDispatcher->addListener('broadway.command_handling.command_failure', [$commandAuditLogger, 'onCommandHandlingFailure']);
 
 echo "Dispatching the command that will succeed.\n";
 $command = new ExampleCommand('Hi from command!');

examples/bootstrap.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 if (file_exists($file = __DIR__ . '/../vendor/autoload.php')) {
     $loader = require_once $file;
 } else {

examples/command-handling/command-handling.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 /**

examples/event-dispatcher/event-dispatcher.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 $eventDispatcher = new Broadway\EventDispatcher\CallableEventDispatcher();

examples/event-handling/event-handling.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 // An event listener implements the handle method

examples/event-sourced-child-entity/Parts.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 /**

examples/event-sourced-child-entity/PartsTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/Parts.php';
 
 /**

examples/event-sourced-domain-with-tests/InvitationCommandHandlerTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/Invites.php';
 
 /**

examples/event-sourced-domain-with-tests/Invites.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 /**

examples/event-sourced-domain-with-tests/InvitesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/Invites.php';
 
 /**.

examples/event-sourced-multiple-dyanmic-child-entities/JobSeekers.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 /**

examples/event-sourced-multiple-dyanmic-child-entities/JobSeekersTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/JobSeekers.php';
 
 /**

examples/serializer/serializer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../bootstrap.php';
 
 class SerializeMe implements Broadway\Serializer\Serializable

src/Broadway/Auditing/CommandLogger.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\Auditing;
 
 use Exception;
@@ -64,7 +66,7 @@ public function onCommandHandlingFailure($command, Exception $exception)
         $this->logger->info(json_encode($messageData));
     }
 
-    private function getCommandData($command)
+    private function getCommandData($command): array
     {
         return [
             'class' => get_class($command),

src/Broadway/Auditing/CommandSerializer.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\Auditing;
 
 /**
@@ -21,5 +23,5 @@ interface CommandSerializer
      *
      * @return array
      */
-    public function serialize($command);
+    public function serialize($command): array;
 }

src/Broadway/Auditing/NullByteCommandSerializer.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\Auditing;
 
 /**
@@ -22,7 +24,7 @@ final class NullByteCommandSerializer implements CommandSerializer
     /**
      * {@inheritDoc}
      */
-    public function serialize($command)
+    public function serialize($command): array
     {
         $serializedCommand = [];
         foreach ((array) $command as $key => $value) {

src/Broadway/CommandHandling/ClosureCommandHandler.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the broadway/broadway package.
  *

src/Broadway/CommandHandling/CommandBus.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling;
 
 /**

src/Broadway/CommandHandling/CommandHandler.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling;
 
 /**

src/Broadway/CommandHandling/EventDispatchingCommandBus.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling;
 
 use Broadway\EventDispatcher\EventDispatcher;

src/Broadway/CommandHandling/Exception/ClosureParameterNotAnObjectException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the broadway/broadway package.
  *

src/Broadway/CommandHandling/Exception/CommandNotAnObjectException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling\Exception;
 
 use InvalidArgumentException;

src/Broadway/CommandHandling/SimpleCommandBus.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling;
 
 /**

src/Broadway/CommandHandling/SimpleCommandHandler.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling;
 
 use Broadway\CommandHandling\Exception\CommandNotAnObjectException;
@@ -37,7 +39,7 @@ public function handle($command)
         $this->$method($command);
     }
 
-    private function getHandleMethod($command)
+    private function getHandleMethod($command): string
     {
         if (! is_object($command)) {
             throw new CommandNotAnObjectException();

src/Broadway/CommandHandling/Testing/CommandHandlerScenarioTestCase.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling\Testing;
 
 use Broadway\CommandHandling\CommandHandler;
@@ -37,7 +39,7 @@ public function setUp()
     /**
      * @return Scenario
      */
-    protected function createScenario()
+    protected function createScenario(): Scenario
     {
         $eventStore     = new TraceableEventStore(new InMemoryEventStore());
         $eventBus       = new SimpleEventBus();
@@ -54,5 +56,5 @@ protected function createScenario()
      *
      * @return CommandHandler
      */
-    abstract protected function createCommandHandler(EventStore $eventStore, EventBus $eventBus);
+    abstract protected function createCommandHandler(EventStore $eventStore, EventBus $eventBus): CommandHandler;
 }

src/Broadway/CommandHandling/Testing/Scenario.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling\Testing;
 
 use Broadway\CommandHandling\CommandHandler;
@@ -43,14 +45,15 @@ public function __construct(
         $this->testCase       = $testCase;
         $this->eventStore     = $eventStore;
         $this->commandHandler = $commandHandler;
-        $this->aggregateId    = 1;
+        $this->aggregateId    = '1';
     }
 
     /**
-     * @param  string $aggregateId
+     * @param string $aggregateId
+     *
      * @return Scenario
      */
-    public function withAggregateId($aggregateId)
+    public function withAggregateId(string $aggregateId): Scenario
     {
         $this->aggregateId = $aggregateId;
 
@@ -62,7 +65,7 @@ public function withAggregateId($aggregateId)
      *
      * @return Scenario
      */
-    public function given(array $events = null)
+    public function given(array $events = null): Scenario
     {
         if ($events === null) {
             return $this;
@@ -85,7 +88,7 @@ public function given(array $events = null)
      *
      * @return Scenario
      */
-    public function when($command)
+    public function when($command): Scenario
     {
         $this->eventStore->trace();
 
@@ -99,7 +102,7 @@ public function when($command)
      *
      * @return Scenario
      */
-    public function then(array $events)
+    public function then(array $events): Scenario
     {
         $this->testCase->assertEquals($events, $this->eventStore->getEvents());
 

src/Broadway/CommandHandling/Testing/TraceableCommandBus.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\CommandHandling\Testing;
 
 use Broadway\CommandHandling\CommandBus;
@@ -46,7 +48,7 @@ public function dispatch($command)
     /**
      * @return array
      */
-    public function getRecordedCommands()
+    public function getRecordedCommands(): array
     {
         return $this->commands;
     }

src/Broadway/Domain/AggregateRoot.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Broadway\Domain;
 
 /**
@@ -19,10 +21,10 @@ interface AggregateRoot
     /**
      * @return DomainEventStream
      */
-    public function getUncommittedEvents();
+    public function getUncommittedEvents(): DomainEventStream;
 
     /**
      * @return string
      */
-    public function getAggregateRootId();
+    public function getAggregateRootId(): string;
 }