[Pkg-owncloud-commits] [php-sabre-vobject] 17/38: scheduleStatus() returns just the status code

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch upstream
in repository php-sabre-vobject.

commit 89d161bf261150b608f9c235ab33d8fdd734f7e8
Author: Dominik Tobschall <dominik at fruux.com>
Date:   Tue Sep 16 02:53:10 2014 +0200

    scheduleStatus() returns just the status code
---
 lib/ITip/Message.php               | 18 ++++++------------
 tests/VObject/ITip/MessageTest.php | 10 ++--------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/lib/ITip/Message.php b/lib/ITip/Message.php
index ff8b4a9..9c55b25 100644
--- a/lib/ITip/Message.php
+++ b/lib/ITip/Message.php
@@ -116,13 +116,12 @@ class Message {
     public $significantChange = true;
 
     /**
-     * Returns the schedule status as an array:
-     * [
-     *     0 => '1.2',
-     *     1 => 'Delivered',
-     * ]
+     * Returns the schedule status as a string.
      *
-     * @return mixed bool|array
+     * For example:
+     * 1.2
+     *
+     * @return mixed bool|string
      */
     public function getScheduleStatus() {
 
@@ -132,12 +131,7 @@ class Message {
 
         } else {
 
-            $scheduleStatus = explode(';', $this->scheduleStatus);
-
-            if(!isset($scheduleStatus[1])) {
-                $scheduleStatus[1]='';
-            }
-
+            list($scheduleStatus) = explode(';', $this->scheduleStatus);
             return $scheduleStatus;
 
         }
diff --git a/tests/VObject/ITip/MessageTest.php b/tests/VObject/ITip/MessageTest.php
index 7bc7405..735d9e9 100644
--- a/tests/VObject/ITip/MessageTest.php
+++ b/tests/VObject/ITip/MessageTest.php
@@ -16,10 +16,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase {
         $message = new Message();
         $message->scheduleStatus = '1.2;Delivered';
 
-        list($scheduleStatusCode, $scheduleStatusMessage) = $message->getScheduleStatus();
-
-        $this->assertEquals('1.2', $scheduleStatusCode);
-        $this->assertEquals('Delivered', $scheduleStatusMessage);
+        $this->assertEquals('1.2', $message->getScheduleStatus());
 
     }
 
@@ -28,10 +25,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase {
         $message = new Message();
         $message->scheduleStatus = '9.9.9';
 
-        list($scheduleStatusCode, $scheduleStatusMessage) = $message->getScheduleStatus();
-
-        $this->assertEquals('9.9.9', $scheduleStatusCode);
-        $this->assertEquals('', $scheduleStatusMessage);
+        $this->assertEquals('9.9.9', $message->getScheduleStatus());
 
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git