Request 3128 (accepted)

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.3.22.tar.gz/composer.json-dist -> kolab-syncroton-2.3.23.tar.gz/composer.json-dist Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Command/GetAttachment.php -> kolab-syncroton-2.3.23.tar.gz/lib/ext/Syncroton/Command/GetAttachment.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Command/Sync.php -> kolab-syncroton-2.3.23.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Command/Wbxml.php -> kolab-syncroton-2.3.23.tar.gz/lib/ext/Syncroton/Command/Wbxml.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/Syncroton/Model/AEntry.php -> kolab-syncroton-2.3.23.tar.gz/lib/ext/Syncroton/Model/AEntry.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/ext/rtf.php -> kolab-syncroton-2.3.23.tar.gz/lib/ext/rtf.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.3.23.tar.gz/lib/kolab_sync_backend.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_data.php -> kolab-syncroton-2.3.23.tar.gz/lib/kolab_sync_data.php Changed

@@ -675,7 +675,7 @@
      */
     protected function getChangesByRelations($folderid, $filter)
     {
-        if (!$this->tag_categories) {
+        if (isset($this->tag_categories) && !$this->tag_categories) {
             return;
         }
 
@@ -1011,7 +1011,7 @@
         }
 
         // convert categories into tags, save them after creating an object
-        if ($this->tag_categories) {
+        if (isset($this->tag_categories) && $this->tag_categories) {
             $tags = $data'categories';
             unset($data'categories');
         }
@@ -1045,7 +1045,7 @@
             $folder = $this->getFolderObject($object'_mailbox');
 
             // convert categories into tags, save them after updating an object
-            if ($this->tag_categories && array_key_exists('categories', $data)) {
+            if (isset($this->tag_categories) && $this->tag_categories && array_key_exists('categories', $data)) {
                 $tags = (array) $data'categories';
                 unset($data'categories');
             }
@@ -1077,7 +1077,7 @@
             $folder = $this->getFolderObject($object'_mailbox');
 
             if ($folder && $folder->valid && $folder->delete($object'uid')) {
-                if ($this->tag_categories) {
+                if (isset($this->tag_categories) && $this->tag_categories) {
                     $this->setKolabTags($object'uid', null);
                 }
 
@@ -1522,7 +1522,7 @@
         $real_length = $body_length = strlen($body);
 
         // truncate the body if needed
-        if (($truncateAt = $prefs$type'truncationSize') && $body_length > $truncateAt) {
+        if (isset($prefs$type) && ($truncateAt = $prefs$type'truncationSize') && $body_length > $truncateAt) {
             $body        = mb_strcut($body, 0, $truncateAt);
             $body_length = strlen($body);

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.23.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -194,7 +194,7 @@
             if ($timezone && ($tz_name = $timezone->getName()) != 'UTC') {
                 $tzc = kolab_sync_timezone_converter::getInstance();
 
-                if ($tz_name = $tzc->encodeTimezone($tz_name)) {
+                if ($tz_name = $tzc->encodeTimezone($tz_name, $event'start'->format('Y-m-d'))) {
                     $result'timezone' = $tz_name;
                 }
             }
@@ -236,10 +236,16 @@
                 break;
 
             case 'sensitivity':
+                if (empty($value)) {
+                    continue;
+                }
                 $value = intval($this->sensitivityMap$value);
                 break;
 
             case 'free_busy':
+                if (empty($value)) {
+                    continue;
+                }
                 $value = $this->busyStatusMap$value;
                 break;
 
@@ -374,6 +380,7 @@
                 $timezone = new DateTimeZone($timezone);
             }
             catch (Exception $e) {
+                $this->logger->warn('Failed to convert the timezone information. UID: ' . $event'uid' . 'Timezone: ' . $data->timezone);
                 $timezone = null;
             }
         }

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_data_email.php -> kolab-syncroton-2.3.23.tar.gz/lib/kolab_sync_data_email.php Changed

kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_timezone_converter.php -> kolab-syncroton-2.3.23.tar.gz/lib/kolab_sync_timezone_converter.php Changed

@@ -57,6 +57,14 @@
         )
     );
 
+
+    protected $_legacyTimezones = array(
+        # This is an outdated timezone that outlook keeps sending because of an outdate timezone database on windows
+        'Lv///0kAcgBhAG4AIABTAHQAYQBuAGQAYQByAGQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkABAADABcAOwA7AOcDAAAAAEkAcgBhAG4AIABEAGEAeQBsAGkAZwBoAHQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAwAEAAAAAAAAAAAAxP///w==' => array(
+            'Asia/Tehran' => '+0330'
+        )
+    );
+
     /**
      * don't use the constructor. Use the singleton.
      *
@@ -140,6 +148,9 @@
         if (is_string($_offsets) && isset($this->_knownTimezones$_offsets)) {
             $timezones = $this->_knownTimezones$_offsets;
         }
+        elseif (is_string($_offsets) && isset($this->_legacyTimezones$_offsets)) {
+            $timezones = $this->_legacyTimezones$_offsets;
+        }
         else {
             if (is_string($_offsets)) {
                 // unpack timezone info to array
@@ -151,18 +162,12 @@
             }
             $this->_setDefaultStartDateIfEmpty($_offsets);
 
-            $cacheId   = $this->_getCacheId('timezones', $_offsets);
-            $timezones = $this->_loadFromCache($cacheId);
-
-            if (!is_array($timezones)) {
-                $timezones = array();
-                foreach (DateTimeZone::listIdentifiers() as $timezoneIdentifier) {
-                    $timezone = new DateTimeZone($timezoneIdentifier);
-                    if (false !== ($matchingTransition = $this->_checkTimezone($timezone, $_offsets))) {
-                        $timezones$timezoneIdentifier = $matchingTransition'abbr';
-                    }
+            $timezones = array();
+            foreach (DateTimeZone::listIdentifiers() as $timezoneIdentifier) {
+                $timezone = new DateTimeZone($timezoneIdentifier);
+                if (false !== ($matchingTransition = $this->_checkTimezone($timezone, $_offsets))) {
+                    $timezones$timezoneIdentifier = $matchingTransition'abbr';
                 }
-                $this->_saveInCache($timezones, $cacheId);
             }
         }
 
@@ -224,36 +229,30 @@
     {
         $this->_setStartDate($_startDate);
 
-        $cacheId = $this->_getCacheId('offsets', array($_timezone));
-
-        if (!($offsets = $this->_loadFromCache($cacheId))) {
-            $offsets = $this->_getOffsetsTemplate();
+        $offsets = $this->_getOffsetsTemplate();
 
-            try {
-                $timezone = new DateTimeZone($_timezone);
-            }
-            catch (Exception $e) {
-                return null;
-            }
+        try {
+            $timezone = new DateTimeZone($_timezone);
+        }
+        catch (Exception $e) {
+            return null;
+        }
 
-            list($standardTransition, $daylightTransition) = $this->_getTransitionsForTimezoneAndYear($timezone, $this->_startDate'year');
+        list($standardTransition, $daylightTransition) = $this->_getTransitionsForTimezoneAndYear($timezone, $this->_startDate'year');
 
-            if ($standardTransition) {
-                $offsets'bias' = $standardTransition'offset'/60*-1;
-                if ($daylightTransition) {
-                    $offsets = $this->_generateOffsetsForTransition($offsets, $standardTransition, 'standard', $timezone);
-                    $offsets = $this->_generateOffsetsForTransition($offsets, $daylightTransition, 'daylight', $timezone);
+        if ($standardTransition) {
+            $offsets'bias' = $standardTransition'offset'/60*-1;
+            if ($daylightTransition) {
+                $offsets = $this->_generateOffsetsForTransition($offsets, $standardTransition, 'standard', $timezone);
+                $offsets = $this->_generateOffsetsForTransition($offsets, $daylightTransition, 'daylight', $timezone);
 
-                    //@todo how do we get the standardBias (is usually 0)?
-                    //$offsets'standardBias' = ...
+                //@todo how do we get the standardBias (is usually 0)?
+                //$offsets'standardBias' = ...
 
-                    $offsets'daylightBias' = ($daylightTransition'offset' - $standardTransition'offset')/60*-1;
-                    $offsets'standardHour' -= $offsets'daylightBias' / 60;
-                    $offsets'daylightHour' += $offsets'daylightBias' / 60;
-                }
+                $offsets'daylightBias' = ($daylightTransition'offset' - $standardTransition'offset')/60*-1;
+                $offsets'standardHour' -= $offsets'daylightBias' / 60;
+                $offsets'daylightHour' += $offsets'daylightBias' / 60;
             }
-
-            $this->_saveInCache($offsets, $cacheId);
         }
 
         return $offsets;
@@ -539,7 +538,7 @@
         }
         else if (is_int($_startDate)) {
             $startDateParsed'ts'     = $_startDate;
-            $startDateParsed'string' = strftime('%F', $_startDate);
+            $startDateParsed'string' = date('Y-m-d', $_startDate);
         }
         else {
             $this->_setDefaultStartDateIfEmpty();
@@ -618,8 +617,8 @@
         }
 
         foreach ($transitions as $index => $transition) {
-            if (strftime('%Y', $transition'ts') == $_year) {
-                if (isset($transitions$index+1) && strftime('%Y', $transitions$index'ts') == strftime('%Y', $transitions$index+1'ts')) {
+            if (date('Y', $transition'ts') == $_year) {
+                if (isset($transitions$index+1) && date('Y', $transitions$index'ts') == date('Y', $transitions$index+1'ts')) {
                     $daylightTransition = $transition'isdst' ? $transition : $transitions$index+1;
                     $standardTransition = $transition'isdst' ? $transitions$index+1 : $transition;
                 }
@@ -636,39 +635,4 @@
 
         return array($standardTransition, $daylightTransition);
     }
-
-    protected function _getCacheId($_prefix, $_offsets)
-    {
-        return $_prefix . md5(serialize($_offsets));
-    }
-
-    protected function _loadFromCache($key)
-    {
-        if ($cache = $this->getCache()) {
-            return $cache->get($key);
-        }
-
-        return false;
-    }
-
-    protected function _saveInCache($value, $key)
-    {
-        if ($cache = $this->getCache()) {
-            $cache->set($key, $value);
-        }
-    }
-
-    /**
-     * Getter for the cache engine object
-     */
-    protected function getCache()
-    {
-        if ($this->cache === null) {
-            $rcube = rcube::get_instance();
-            $cache = $rcube->get_cache_shared('activesync');
-            $this->cache = $cache ? $cache : false;
-        }
-
-        return $this->cache;
-    }
 }

kolab-syncroton-2.3.22.tar.gz/tests/body_converter.php -> kolab-syncroton-2.3.23.tar.gz/tests/body_converter.php Changed

kolab-syncroton-2.3.22.tar.gz/tests/message.php -> kolab-syncroton-2.3.23.tar.gz/tests/message.php Changed

kolab-syncroton-2.3.22.tar.gz/tests/timezone_converter.php -> kolab-syncroton-2.3.23.tar.gz/tests/timezone_converter.php Changed

@@ -2,69 +2,74 @@
 
 class timezone_converter extends PHPUnit\Framework\TestCase
 {
-    function setUp()
-    {
-    }
-
-
     function test_list_timezones()
     {
 //        date_default_timezone_set('America/Los_Angeles');
 
-        $converter = timezone_converter_test::getInstance();
+        $converter = kolab_sync_timezone_converter::getInstance();
         $output = $converter->getListOfTimezones('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAEAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAEAAAAAAAAAxP///w==');
 
         $this->assertTrue(is_array($output));
         $this->assertSame(array(), $output);
 
-        $converter = timezone_converter_test::getInstance();
+        $converter = kolab_sync_timezone_converter::getInstance();
         $output    = $converter->getListOfTimezones('xP///0MAZQBuAHQAcgBhAGwAIABFAHUAcgBvAHAAZQAgAFMAdABhAG4AZABhAHIAZAAgAFQAaQBtAGUAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAEMAZQBuAHQAcgBhAGwAIABFAHUAcgBvAHAAZQAgAEQAYQB5AGwAaQBnAGgAdAAgAFQAaQBtAGUAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w==');
 
         $this->assertTrue(is_array($output));
         $this->assertTrue(isset($output'Europe/Warsaw'));
 
-        $converter = timezone_converter_test::getInstance();
+        $converter = kolab_sync_timezone_converter::getInstance();
         $output    = $converter->getListOfTimezones('4AEAAFAAYQBjAGkAZgBpAGMAIABTAHQAYQBuAGQAYQByAGQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAFAAYQBjAGkAZgBpAGMAIABEAGEAeQBsAGkAZwBoAHQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==');
 
         $this->assertTrue(is_array($output));
         $this->assertTrue(isset($output'America/Los_Angeles'));
 
-        $converter = timezone_converter_test::getInstance();
-        $output = $converter->getListOfTimezones('Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAwADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAgAEAAAAAAAAAAAAxP///w==');
+        $converter = kolab_sync_timezone_converter::getInstance();
+        $output = $converter->getListOfTimezones('Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==');
 
         $this->assertTrue(is_array($output));
         $this->assertTrue(isset($output'Asia/Tehran'));
-    }
-
-    function test_get_timezone()
-    {
-        date_default_timezone_set('America/Los_Angeles');
 
-        $converter = timezone_converter_test::getInstance();
-        $datetime  = new DateTime('2017-01-01T12:00:00Z');
+        # As seen in outlook
+        $converter = kolab_sync_timezone_converter::getInstance();
+        $output = $converter->getListOfTimezones('Lv///0kAcgBhAG4AIABTAHQAYQBuAGQAYQByAGQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkABAADABcAOwA7AOcDAAAAAEkAcgBhAG4AIABEAGEAeQBsAGkAZwBoAHQAIABUAGkAbQBlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAwAEAAAAAAAAAAAAxP///w==');
 
-        $offsets = $converter->getOffsetsForTimezone('UTC', $datetime);
-        $output  = $converter->getTimezone($offsets, 'UTC');
-
-        $this->assertSame('UTC', $output);
+        $this->assertTrue(is_array($output));
+        $this->assertTrue(isset($output'Asia/Tehran'));
+    }
 
-        $offsets = $converter->getOffsetsForTimezone('Europe/Warsaw', $datetime);
-        $output  = $converter->getTimezone($offsets, 'Europe/Warsaw');
+    function data_get_timezone()
+    {
+        return 
+            'UTC',
+            'Europe/Warsaw',
+            'Europe/Zurich',
+            'America/Los_Angeles',
+            'Asia/Tehran',
+        ;
+    }
 
-        $this->assertSame('Europe/Warsaw', $output);
+    /**
+     * @dataProvider data_get_timezone
+     */
+    function test_get_timezone($tzName)
+    {
+        date_default_timezone_set('America/Los_Angeles');
 
-        $offsets = $converter->getOffsetsForTimezone('America/Los_Angeles', $datetime);
-        $output  = $converter->getTimezone($offsets, 'America/Los_Angeles');
+        $converter = kolab_sync_timezone_converter::getInstance();
+        $datetime  = '2017-01-01T12:00:00Z';
 
-        $this->assertSame('America/Los_Angeles', $output);
+        $offsets = $converter->getOffsetsForTimezone($tzName, $datetime);
+        $output  = $converter->getTimezone($offsets, $tzName);
+        $this->assertSame($tzName, $output);
     }
 
     function test_get_offsets_for_timezone()
     {
         date_default_timezone_set('America/Los_Angeles');
 
-        $converter = timezone_converter_test::getInstance();
-        $datetime  = new DateTime('2017-01-01T12:00:00Z');
+        $converter = kolab_sync_timezone_converter::getInstance();
+        $datetime  = '2017-01-01T12:00:00Z';
 
         $output = $converter->getOffsetsForTimezone('UTC', $datetime);
 
@@ -109,37 +114,55 @@
         $this->assertSame($output'daylightWeek', 5);
         $this->assertSame($output'daylightHour', 0);
 
+        //Check before dst change
         $output = $converter->getOffsetsForTimezone('Asia/Tehran', $datetime);
 
         $this->assertSame($output'bias', -210);
         $this->assertSame($output'standardBias', 0);
         $this->assertSame($output'standardMonth', 9);
         $this->assertSame($output'standardWeek', 3);
-        $this->assertSame($output'standardDayOfWeek', 3);
+        $this->assertSame($output'standardDayOfWeek', 4);
         $this->assertSame($output'standardHour', 24);
         $this->assertSame($output'daylightBias', -60);
         $this->assertSame($output'daylightMonth', 3);
         $this->assertSame($output'daylightWeek', 4);
-        $this->assertSame($output'daylightDayOfWeek', 2);
+        $this->assertSame($output'daylightDayOfWeek', 3);
+        $this->assertSame($output'daylightHour', 0);
+
+        //Check after dst change
+        $output = $converter->getOffsetsForTimezone('Asia/Tehran', '2023-01-01T12:00:00Z');
+
+        $this->assertSame($output'bias', -210);
+        $this->assertSame($output'standardBias', 0);
+        $this->assertSame($output'standardMonth', 0);
+        $this->assertSame($output'standardWeek', 0);
+        $this->assertSame($output'standardDayOfWeek', 0);
+        $this->assertSame($output'standardHour', 0);
+        $this->assertSame($output'daylightBias', 0);
+        $this->assertSame($output'daylightMonth', 0);
+        $this->assertSame($output'daylightWeek', 0);
+        $this->assertSame($output'daylightDayOfWeek', 0);
         $this->assertSame($output'daylightHour', 0);
     }
 
     function data_timezone_conversion()
     {
         return array(
-            array('Asia/Tehran', 'Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAwADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAgAEAAAAAAAAAAAAxP///w=='),
-            array('Pacific/Pago_Pago', 'lAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
-            array('Europe/Warsaw', 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w=='),
+            //Pre dst change
+            array('Asia/Tehran', 'Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAgADABcAOwA7AOcDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAQAEAAAAAAAAAAAAxP///w==', '2021-07-01T12:00:00Z'),
+            //Post dst change
+            array('Asia/Tehran', 'Lv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==', '2023-04-01T12:00:00Z'),
+            array('Pacific/Pago_Pago', 'lAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==', '2021-07-01T12:00:00Z'),
+            array('Europe/Warsaw', 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w==', '2021-07-01T12:00:00Z'),
         );
     }
 
     /**
      * @dataProvider data_timezone_conversion
      */
-    function test_timezone_conversion($tz, $expected)
+    function test_timezone_conversion($tz, $expected, $datetime)
     {
-        $datetime  = new DateTime('2021-07-01T12:00:00Z');
-        $converter = timezone_converter_test::getInstance();
+        $converter = kolab_sync_timezone_converter::getInstance();
         $output = $converter->encodeTimezone($tz, $datetime);
 
         $this->assertSame($expected, $output);
@@ -150,12 +173,3 @@
         $this->assertTrue(isset($output$tz));
     }
 }
-
-class timezone_converter_test extends kolab_sync_timezone_converter
-{
-    // disable cache
-    function getCache()
-    {
-        return null;
-    }
-}

kolab-syncroton.dsc Changed

Overview

Request 3128 (accepted)

Request History