From b85b14994fdee06d5aa3ea276ad23baee67619ea Mon Sep 17 00:00:00 2001 From: Maks Rafalko Date: Tue, 31 Jan 2017 00:33:24 +0300 Subject: [PATCH 1/4] Reuse trait instead of duplicating code --- src/Recorder/PublicMessageRecorder.php | 28 +------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/Recorder/PublicMessageRecorder.php b/src/Recorder/PublicMessageRecorder.php index b33bd7b..9d6376a 100644 --- a/src/Recorder/PublicMessageRecorder.php +++ b/src/Recorder/PublicMessageRecorder.php @@ -4,31 +4,5 @@ class PublicMessageRecorder implements RecordsMessages { - private $messages = []; - - /** - * {@inheritdoc} - */ - public function recordedMessages() - { - return $this->messages; - } - - /** - * {@inheritdoc} - */ - public function eraseMessages() - { - $this->messages = []; - } - - /** - * Record a message. - * - * @param object $message - */ - public function record($message) - { - $this->messages[] = $message; - } + use PrivateMessageRecorderCapabilities; } From d078477c5f2efa66c22913608f559d7a79e0c5be Mon Sep 17 00:00:00 2001 From: Maks Rafalko Date: Tue, 31 Jan 2017 00:42:09 +0300 Subject: [PATCH 2/4] Change protected to public for code reusing --- src/Recorder/PrivateMessageRecorderCapabilities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Recorder/PrivateMessageRecorderCapabilities.php b/src/Recorder/PrivateMessageRecorderCapabilities.php index ba09e21..36e42d4 100644 --- a/src/Recorder/PrivateMessageRecorderCapabilities.php +++ b/src/Recorder/PrivateMessageRecorderCapabilities.php @@ -32,7 +32,7 @@ public function eraseMessages() * * @param object $message */ - protected function record($message) + public function record($message) { $this->messages[] = $message; } From 50842a9838106f7317fcc28cd2e535d41fd7fd5f Mon Sep 17 00:00:00 2001 From: Maks Rafalko Date: Tue, 31 Jan 2017 00:59:10 +0300 Subject: [PATCH 3/4] Change the visibility of method from trait --- src/Recorder/PublicMessageRecorder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Recorder/PublicMessageRecorder.php b/src/Recorder/PublicMessageRecorder.php index 9d6376a..fed2621 100644 --- a/src/Recorder/PublicMessageRecorder.php +++ b/src/Recorder/PublicMessageRecorder.php @@ -4,5 +4,5 @@ class PublicMessageRecorder implements RecordsMessages { - use PrivateMessageRecorderCapabilities; + use PrivateMessageRecorderCapabilities { record as public; } } From d0bc478752fabb01aa5262047269c0fe99ba60fe Mon Sep 17 00:00:00 2001 From: Maks Rafalko Date: Tue, 31 Jan 2017 00:59:42 +0300 Subject: [PATCH 4/4] Revert the visibility change --- src/Recorder/PrivateMessageRecorderCapabilities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Recorder/PrivateMessageRecorderCapabilities.php b/src/Recorder/PrivateMessageRecorderCapabilities.php index 36e42d4..ba09e21 100644 --- a/src/Recorder/PrivateMessageRecorderCapabilities.php +++ b/src/Recorder/PrivateMessageRecorderCapabilities.php @@ -32,7 +32,7 @@ public function eraseMessages() * * @param object $message */ - public function record($message) + protected function record($message) { $this->messages[] = $message; }