From 0b754d37fccda64d6dd556f77a60b47cd5154169 Mon Sep 17 00:00:00 2001 From: "Evgeniy V. Kokovikhin" Date: Thu, 17 Nov 2011 11:45:18 +0400 Subject: [PATCH 1/3] a bit optimize: don't needed to make Timestamp twice --- main/Messages/TextFileReceiver.class.php | 3 +-- main/Messages/TextMessage.class.php | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/Messages/TextFileReceiver.class.php b/main/Messages/TextFileReceiver.class.php index a249bf33b9..8a6b7e1d89 100644 --- a/main/Messages/TextFileReceiver.class.php +++ b/main/Messages/TextFileReceiver.class.php @@ -69,8 +69,7 @@ public function receive($uTimeout = null) Assert::isNotNull($time); - $result = TextMessage::create()-> - setTimestamp(Timestamp::create($time))-> + $result = TextMessage::create(Timestamp::create($time))-> setText($text); return $result; diff --git a/main/Messages/TextMessage.class.php b/main/Messages/TextMessage.class.php index f40b6fbad0..56ac9aaf9f 100644 --- a/main/Messages/TextMessage.class.php +++ b/main/Messages/TextMessage.class.php @@ -15,17 +15,17 @@ final class TextMessage implements Message private $timestamp = null; private $text = null; - public static function create() + public static function create(Timestamp $timestamp = null) { return new self; } - public function __construct() + public function __construct(Timestamp $timestamp = null) { - $this->timestamp = Timestamp::makeNow(); + $this->timestamp = $timestamp ?: Timestamp::makeNow(); } - public function setTimestamp($timestamp) + public function setTimestamp(Timestamp $timestamp) { $this->timestamp = $timestamp; From 2d0f009e130a3623e37d5291f48ac2f55052f560 Mon Sep 17 00:00:00 2001 From: "Evgeniy V. Kokovikhin" Date: Thu, 17 Nov 2011 11:50:16 +0400 Subject: [PATCH 2/3] typo --- main/Messages/TextMessage.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Messages/TextMessage.class.php b/main/Messages/TextMessage.class.php index 56ac9aaf9f..4fba2aaf63 100644 --- a/main/Messages/TextMessage.class.php +++ b/main/Messages/TextMessage.class.php @@ -17,7 +17,7 @@ final class TextMessage implements Message public static function create(Timestamp $timestamp = null) { - return new self; + return new self($timestamp); } public function __construct(Timestamp $timestamp = null) From fa32c363eda52d84da9dfb560bbc1d57fa3743cb Mon Sep 17 00:00:00 2001 From: "Evgeniy V. Kokovikhin" Date: Fri, 18 Nov 2011 10:57:45 +0400 Subject: [PATCH 3/3] + changelog --- doc/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index f27e7e4c7c..8af5d9093c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-18 Evgeny V. Kokovikhin + + * main/Messages/TextMessage.class.php, main/Messages/TextFileReceiver.class.php : + a bit optimize: don't needed to make Timestamp twice + 2011-11-14 Dmitry V. Snezhinskiy * main/Utils/AMQP/Pecl/AMQPPeclChannel.class.php :