Made Util::getCurrentTime() attempt DateTimeZone creation with whatever the timezone is, and fallback to GMT offset only on failure;

Changed Util::parseValue() to recognize not just dates, but also "datetime"s.

Author: boenrobot

RELEASE-1.0.0b6

@@ -7,7 +7,7 @@ Util stuff, mostly.
     - getCurrentTime()
     - newRequest()
 * Util::parseValue() now supports letter notation for time (1h2m3s), not just double colon notation (01:02:03), modeled after RouterOS. Related to that is also that leading zeroes, and zero minutes and seconds are now optional (e.g. "1:" is a valid way of saying 1 hour). Sub-second information is rounded up to the nearest second on current PHP versions (future versions are expected to support sub-second information in DateInterval by allowing seconds to be a double; The code currently attempts to give DateInterval a double, falling back to rounding to a second).
-* Util::parseValue() now recognizes dates in the "M/j/Y" format (used across RouterOS), and translates them to a DateTime object that is midnight UTC time at the specified date.
+* Util::parseValue() now recognizes dates in the "M/j/Y H:i:s" format (used across RouterOS), and turns that into a DateTime object for that time (or midnight if the time part is omitted) in UTC.
 * Util::getAll() now throws a NotSupportedException if the arguments "follow", "follow-only" or "count-only" are used. The first two, because PHP would hang (since Client::sendSync() is used under the hood), and the last one because it's unredable in the returned output (use Util::count() instead).
 * Util::setMenu() can now go back to the root menu.
 * Client::login() consumes the !done or !fatal response even when called on an already logged in connection.

src/PEAR2/Net/RouterOS/Util.php

@@ -196,19 +196,26 @@ public static function parseValue($value)
             //@codeCoverageIgnoreEnd
         } elseif (preg_match(
             '#^
-                (jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)
+                (?<mon>jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)
                 /
-                (\d\d?)
+                (?<day>\d\d?)
                 /
-                (\d{4})
+                (?<year>\d{4})
+                (?:
+                    \s+(?<time>\d{2}\:\d{2}:\d{2})
+                )?
             $#uix',
             $value,
             $date
         )) {
             try {
+                if (!isset($date['time'])) {
+                    $date['time'] = '00:00:00';
+                }
                 return DateTime::createFromFormat(
-                    'M/j/Y',
-                    ucfirst($date[1]) . '/' . (int)$date[2] . '/' . $date[3],
+                    'M/j/Y H:i:s',
+                    ucfirst($date['mon']) . '/' . (int)$date['day'] .
+                    "/{$date['year']} {$date['time']}",
                     new DateTimeZone('UTC')
                 );
             } catch (E $e) {
@@ -677,8 +684,9 @@ public function clearIdCache()
      * 
      * Gets the current time on the router, regardless of the current menu.
      * 
-     * If your router uses a "manual" timezone, the resulting object will use
-     * the "gmt-offset" as the timezone identifier.
+     * If the timezone is one known to both RouterOS and PHP, it will be used
+     * as the timezone identifier. Otherwise (e.g. "manual"), the current GMT
+     * offset will be used as a timezone, without any DST awareness.
      * 
      * @return DateTime The current time of the router, as a DateTime object.
      */
@@ -687,20 +695,20 @@ public function getCurrentTime()
         $clock = $this->client->sendSync(
             new Request('/system/clock/print')
         )->current();
-        $datetime = ucfirst($clock->getProperty('date')) . ' ' .
+        $datetime = ucfirst(strtolower($clock->getProperty('date'))) . ' ' .
             $clock->getProperty('time');
-        if ('manual' === $clock->getProperty('time-zone-name')) {
-            $result = DateTime::createFromFormat(
-                'M/j/Y H:i:s P',
-                $datetime . ' ' . $clock->getProperty('gmt-offset'),
-                new DateTimeZone('UTC')
-            );
-        } else {
+        try {
             $result = DateTime::createFromFormat(
                 'M/j/Y H:i:s',
                 $datetime,
                 new DateTimeZone($clock->getProperty('time-zone-name'))
             );
+        } catch (E $e) {
+            $result = DateTime::createFromFormat(
+                'M/j/Y H:i:s P',
+                $datetime . ' ' . $clock->getProperty('gmt-offset'),
+                new DateTimeZone('UTC')
+            );
         }
         return $result;
     }