[Pkg-owncloud-commits] [php-sabre-vobject] 69/128: Removed everything related to multiple values.

[David Prévot]

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

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

commit 058df9a87a3d1e74175ba0d4c3d4dff1bd29623e
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Feb 28 21:30:54 2014 -0500

    Removed everything related to multiple values.
---
 lib/Sabre/VObject/Property/VCard/DateAndOrTime.php | 86 ++++++----------------
 1 file changed, 21 insertions(+), 65 deletions(-)

diff --git a/lib/Sabre/VObject/Property/VCard/DateAndOrTime.php b/lib/Sabre/VObject/Property/VCard/DateAndOrTime.php
index 97f628e..322daa3 100644
--- a/lib/Sabre/VObject/Property/VCard/DateAndOrTime.php
+++ b/lib/Sabre/VObject/Property/VCard/DateAndOrTime.php
@@ -70,10 +70,8 @@ class DateAndOrTime extends Property {
      */
     public function setValue($value) {
 
-        if (is_array($value) && isset($value[0]) && $value[0] instanceof \DateTime) {
-            $this->setDateTimes($value);
-        } elseif ($value instanceof \DateTime) {
-            $this->setDateTimes(array($value));
+        if ($value instanceof \DateTime) {
+            $this->setDateTime(array($value));
         } else {
             parent::setValue($value);
         }
@@ -88,42 +86,22 @@ class DateAndOrTime extends Property {
      */
     public function setDateTime(\DateTime $dt) {
 
-        $this->setDateTimes(array($dt), $isFloating);
-
-    }
-
-    /**
-     * Sets the property as multiple date-time objects.
-     *
-     * The first value will be used as a reference for the timezones, and all
-     * the otehr values will be adjusted for that timezone
-     *
-     * @param \DateTime[] $dt
-     * @param bool isFloating If set to true, timezones will be ignored.
-     * @return void
-     */
-    public function setDateTimes(array $dt) {
-
         $values = array();
 
         $tz = null;
         $isUtc = false;
 
-        foreach($dt as $d) {
-
-            $tz = $d->getTimeZone();
-            $isUtc = in_array($tz->getName() , array('UTC', 'GMT', 'Z'));
-
-            if ($isUtc) {
-                $values[] = $d->format('Ymd\\THis\\Z');
-            } else {
-                // Calculating the offset.
-                $values[] = $d->format('Ymd\\THisO');
-            }
+        $tz = $dt->getTimeZone();
+        $isUtc = in_array($tz->getName() , array('UTC', 'GMT', 'Z'));
 
+        if ($isUtc) {
+            $value = $dt->format('Ymd\\THis\\Z');
+        } else {
+            // Calculating the offset.
+            $value = $dt->format('Ymd\\THisO');
         }
 
-        $this->value = $values;
+        $this->value = $value;
 
     }
 
@@ -145,46 +123,24 @@ class DateAndOrTime extends Property {
      */
     public function getDateTime() {
 
-        $dt = $this->getDateTimes();
-        if (!$dt) return null;
-
-        return $dt[0];
-
-    }
-
-    /**
-     * Returns multiple date-time values.
-     *
-     * If no time was specified, we will always use midnight (in the default
-     * timezone) as the time.
-     *
-     * If parts of the date were omitted, such as the year, we will grab the
-     * current values for those. So at the time of writing, if the year was
-     * omitted, we would have filled in 2014.
-     *
-     * @return \DateTime[]
-     */
-    public function getDateTimes() {
-
         $dts = array();
         $now = new DateTime();
         $tzFormat = $nowParts->getTimezone()->getOffset()===0?'\\Z':'O';
         $nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This' + $tzFormat));
 
-        foreach($this->getParts() as $part) {
-            $dateParts = DateTimeParser::parseVCardDateTime($part);
+        $value = $this->getValue();
+
+        $dateParts = DateTimeParser::parseVCardDateTime($part);
 
-            // This sets all the missing parts to the current date/time.
-            // So if the year was missing for a birthday, we're making it 'this
-            // year'.
-            foreach($dateParts as $k=>$v) {
-                if (is_null($v)) {
-                    $dateParts[$k] = $nowParts[$k];
-                }
+        // This sets all the missing parts to the current date/time.
+        // So if the year was missing for a birthday, we're making it 'this
+        // year'.
+        foreach($dateParts as $k=>$v) {
+            if (is_null($v)) {
+                $dateParts[$k] = $nowParts[$k];
             }
-            $dts[] = new DateTime("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
         }
-        return $dts;
+        return new DateTime("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
 
     }
 
@@ -302,7 +258,7 @@ class DateAndOrTime extends Property {
      */
     public function setRawMimeDirValue($val) {
 
-        $this->setValue(explode($this->delimiter, $val));
+        $this->setValue($val);
 
     }
 

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