From ddb7ae08a66beef95287162fef7f513586cd9871 Mon Sep 17 00:00:00 2001 From: nekosune Date: Mon, 9 Apr 2018 15:39:36 +0000 Subject: [PATCH] Made requested changes --- src/Game.php | 4 ++-- src/GameBuilder.php | 23 ++++++++++++----------- src/MessageManager.php | 13 +++---------- src/Models/Message.php | 3 +-- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/Game.php b/src/Game.php index 347ac99..8d00e75 100644 --- a/src/Game.php +++ b/src/Game.php @@ -199,9 +199,9 @@ class Game * Sets the Message Manager * @param MessageManager $messageManager */ - public function setMessageManager(MessageManager $messageManager) : void + public function setMessageManager(MessageManager $messageManager): void { - $this->messageManager=$messageManager; + $this->messageManager = $messageManager; } /** diff --git a/src/GameBuilder.php b/src/GameBuilder.php index 2a21aaf..55226ec 100644 --- a/src/GameBuilder.php +++ b/src/GameBuilder.php @@ -28,6 +28,7 @@ class GameBuilder private $eventManagerClass; private $diceBagClass; private $messageManagerClass; + /** * Creates the game instance with the prepared parameters. * @return Game @@ -111,6 +112,17 @@ class GameBuilder return $this; } + /** + * Sets the fqcn for the message manager to be used + * @param string $messageManagerFqcn + * @return self + */ + public function withMessageManager(string $messageManagerFqcn): self + { + $this->messageManagerClass=$messageManagerFqcn; + return $this; + } + /** * Sets the fqcn for the module manager to be used. * @param string $moduleManagerFqcn @@ -133,17 +145,6 @@ class GameBuilder return $this; } - /** - * Sets the fqcn for the message manager to be used - * @param string $messageManagerFqcn - * @return self - */ - public function useMessageManager(string $messageManagerFqcn): self - { - $this->messageManagerClass=$messageManagerFqcn; - return $this; - } - /** * Sets the fqcn for the event manager to be used. * @param string $eventManagerFqcn diff --git a/src/MessageManager.php b/src/MessageManager.php index 90896f1..6778513 100644 --- a/src/MessageManager.php +++ b/src/MessageManager.php @@ -1,14 +1,8 @@ addMessage($message); return $message; } - /** * Sends a system message to a MessageThread * @param string $message @@ -54,7 +47,7 @@ class MessageManager string $message, MessageThread $thread ) { - $message=new Message(SystemCharacter::getInstance(), $message, $thread, true); + $message = new Message(SystemCharacter::getInstance(), $message, $thread, true); $thread->addMessage($message); return $message; } diff --git a/src/Models/Message.php b/src/Models/Message.php index 87939f4..501231e 100644 --- a/src/Models/Message.php +++ b/src/Models/Message.php @@ -44,8 +44,7 @@ class Message /** * Constructs the message. - * - * Use the static methods self::send() and self::sendSystemMessage() instead. + * Use the Message Manager methods send() and sendSystemMessage() instead. * @param CharacterInterface $from * @param string $message * @param MessageThread $thread