Merge pull request #1860 from alcaeus/doctrine-cs-5.0

Update to Doctrine CS 5.0

Author: alcaeus

composer.json

@@ -36,7 +36,7 @@
         "phpunit/phpunit": "^7.0",
         "jmikola/geojson": "^1.0",
         "phpstan/phpstan": "^0.10.3",
-        "doctrine/coding-standard": "^4.0"
+        "doctrine/coding-standard": "^5.0"
     },
     "autoload": {
         "psr-4": { "Doctrine\\ODM\\MongoDB\\": "lib/Doctrine/ODM/MongoDB" }

lib/Doctrine/ODM/MongoDB/APM/Command.php

@@ -9,6 +9,7 @@
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
 use MongoDB\Driver\Server;
+use Throwable;
 
 final class Command
 {
@@ -22,23 +23,23 @@ private function __construct()
     {
     }
 
-    public static function createForSucceededCommand(CommandStartedEvent $startedEvent, CommandSucceededEvent $succeededEvent): self
+    public static function createForSucceededCommand(CommandStartedEvent $startedEvent, CommandSucceededEvent $succeededEvent) : self
     {
         self::checkRequestIds($startedEvent, $succeededEvent);
 
-        $instance = new self();
-        $instance->startedEvent = $startedEvent;
+        $instance                = new self();
+        $instance->startedEvent  = $startedEvent;
         $instance->finishedEvent = $succeededEvent;
 
         return $instance;
     }
 
-    public static function createForFailedCommand(CommandStartedEvent $startedEvent, CommandFailedEvent $failedEvent): self
+    public static function createForFailedCommand(CommandStartedEvent $startedEvent, CommandFailedEvent $failedEvent) : self
     {
         self::checkRequestIds($startedEvent, $failedEvent);
 
-        $instance = new self();
-        $instance->startedEvent = $startedEvent;
+        $instance                = new self();
+        $instance->startedEvent  = $startedEvent;
         $instance->finishedEvent = $failedEvent;
 
         return $instance;
@@ -47,44 +48,44 @@ public static function createForFailedCommand(CommandStartedEvent $startedEvent,
     /**
      * @param CommandSucceededEvent|CommandFailedEvent $finishedEvent
      */
-    private static function checkRequestIds(CommandStartedEvent $startedEvent, $finishedEvent): void
+    private static function checkRequestIds(CommandStartedEvent $startedEvent, $finishedEvent) : void
     {
         if ($startedEvent->getRequestId() !== $finishedEvent->getRequestId()) {
             throw new LogicException('Cannot create APM command for events with different request IDs');
         }
     }
 
-    public function getCommandName(): string
+    public function getCommandName() : string
     {
         return $this->startedEvent->getCommandName();
     }
 
-    public function getCommand(): object
+    public function getCommand() : object
     {
         return $this->startedEvent->getCommand();
     }
 
-    public function getDurationMicros(): int
+    public function getDurationMicros() : int
     {
         return $this->finishedEvent->getDurationMicros();
     }
 
-    public function getRequestId(): string
+    public function getRequestId() : string
     {
         return $this->startedEvent->getRequestId();
     }
 
-    public function getServer(): Server
+    public function getServer() : Server
     {
         return $this->finishedEvent->getServer();
     }
 
-    public function getReply(): object
+    public function getReply() : object
     {
         return $this->finishedEvent->getReply();
     }
 
-    public function getError(): ?\Throwable
+    public function getError() : ?Throwable
     {
         return $this->finishedEvent instanceof CommandFailedEvent ? $this->finishedEvent->getError() : null;
     }

lib/Doctrine/ODM/MongoDB/APM/CommandLogger.php

@@ -24,7 +24,7 @@ final class CommandLogger implements Countable, CommandSubscriber
     /** @var bool */
     private $registered = false;
 
-    public function register(): void
+    public function register() : void
     {
         if ($this->registered) {
             return;
@@ -34,7 +34,7 @@ public function register(): void
         addSubscriber($this);
     }
 
-    public function unregister(): void
+    public function unregister() : void
     {
         if (! $this->registered) {
             return;
@@ -69,33 +69,33 @@ public function commandFailed(CommandFailedEvent $event)
         $this->logCommand(Command::createForFailedCommand($commandStartedEvent, $event));
     }
 
-    public function clear(): void
+    public function clear() : void
     {
         $this->commands = [];
     }
 
-    public function count(): int
+    public function count() : int
     {
         return count($this->commands);
     }
 
     /**
      * @return Command[]
      */
-    public function getAll(): array
+    public function getAll() : array
     {
         return $this->commands;
     }
 
-    private function findAndRemoveCommandStartedEvent(string $requestId): ?CommandStartedEvent
+    private function findAndRemoveCommandStartedEvent(string $requestId) : ?CommandStartedEvent
     {
         $startedEvent = $this->startedCommands[$requestId] ?? null;
         unset($this->startedCommands[$requestId]);
 
         return $startedEvent;
     }
 
-    private function logCommand(Command $command): void
+    private function logCommand(Command $command) : void
     {
         $this->commands[] = $command;
     }