[Pkg-owncloud-commits] [php-sabre-vobject] 46/65: discard millisecond values in DateTimeParser (if present)
David Prévot
taffit at moszumanska.debian.org
Tue Feb 24 23:57:18 UTC 2015
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 e062757eddb65a29a56ba065037a34c5c639c6cf
Author: Armin Hackmann <armin at fruux.com>
Date: Mon Feb 9 23:32:21 2015 +0100
discard millisecond values in DateTimeParser (if present)
---
lib/DateTimeParser.php | 14 ++++++--------
tests/VObject/DateTimeParserTest.php | 18 ------------------
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/lib/DateTimeParser.php b/lib/DateTimeParser.php
index 4b9a8d1..e690e54 100644
--- a/lib/DateTimeParser.php
+++ b/lib/DateTimeParser.php
@@ -199,7 +199,7 @@ class DateTimeParser {
* This method returns an array, not a DateTime value.
*
* The elements in the array are in the following order:
- * year, month, date, hour, minute, second, millisecond, timezone
+ * year, month, date, hour, minute, second, timezone
*
* Almost any part of the string may be omitted. It's for example legal to
* just specify seconds, leave out the year, etc.
@@ -260,7 +260,7 @@ class DateTimeParser {
(?P<minute> [0-9]{2} | -)?
(?P<second> [0-9]{2})?
- (?: \.(?P<millisecond> [0-9]{3}))?
+ (?: \.[0-9]{3})?
(?P<timezone> # timezone offset
Z | (?: \+|-)(?: [0-9]{4})
@@ -285,7 +285,7 @@ class DateTimeParser {
(?: (?P<minute> [0-9]{2}) : | -)?
(?P<second> [0-9]{2})?
- (?: \.(?P<millisecond> [0-9]{3}))?
+ (?: \.[0-9]{3})?
(?P<timezone> # timezone offset
Z | (?: \+|-)(?: [0-9]{2}:[0-9]{2})
@@ -307,7 +307,6 @@ class DateTimeParser {
'hour',
'minute',
'second',
- 'millisecond',
'timezone'
);
@@ -334,7 +333,7 @@ class DateTimeParser {
* This method returns an array, not a DateTime value.
*
* The elements in the array are in the following order:
- * hour, minute, second, millisecond, timezone
+ * hour, minute, second, timezone
*
* Almost any part of the string may be omitted. It's for example legal to
* just specify seconds, leave out the hour etc.
@@ -376,7 +375,7 @@ class DateTimeParser {
(?P<minute> [0-9]{2} | -)?
(?P<second> [0-9]{2})?
- (?: \.(?P<millisecond> [0-9]{3}))?
+ (?: \.[0-9]{3})?
(?P<timezone> # timezone offset
Z | (?: \+|-)(?: [0-9]{4})
@@ -393,7 +392,7 @@ class DateTimeParser {
(?: (?P<minute> [0-9]{2}) : | -)?
(?P<second> [0-9]{2})?
- (?: \.(?P<millisecond> [0-9]{3}))?
+ (?: \.[0-9]{3})?
(?P<timezone> # timezone offset
Z | (?: \+|-)(?: [0-9]{2}:[0-9]{2})
@@ -410,7 +409,6 @@ class DateTimeParser {
'hour',
'minute',
'second',
- 'millisecond',
'timezone'
);
diff --git a/tests/VObject/DateTimeParserTest.php b/tests/VObject/DateTimeParserTest.php
index 03e9836..4b90d87 100644
--- a/tests/VObject/DateTimeParserTest.php
+++ b/tests/VObject/DateTimeParserTest.php
@@ -196,7 +196,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 14,
"minute" => 00,
"second" => 00,
- "millisecond" => null,
"timezone" => null
),
),
@@ -209,7 +208,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 14,
"minute" => 00,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -222,7 +220,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 14,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -235,7 +232,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -248,7 +244,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -261,7 +256,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -274,7 +268,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -287,7 +280,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -300,7 +292,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 10,
"minute" => 22,
"second" => 0,
- "millisecond" => null,
"timezone" => null
),
),
@@ -313,7 +304,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 10,
"minute" => 22,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -326,7 +316,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 10,
"minute" => null,
"second" => null,
- "millisecond" => null,
"timezone" => null
),
),
@@ -339,7 +328,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => 22,
"second" => 00,
- "millisecond" => null,
"timezone" => null
),
),
@@ -352,7 +340,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => null,
"minute" => null,
"second" => 00,
- "millisecond" => null,
"timezone" => null
),
),
@@ -365,7 +352,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 10,
"minute" => 22,
"second" => 00,
- "millisecond" => null,
"timezone" => 'Z'
),
),
@@ -378,7 +364,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 10,
"minute" => 22,
"second" => 00,
- "millisecond" => null,
"timezone" => '-0800'
),
),
@@ -393,7 +378,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 15,
"minute" => 10,
"second" => 53,
- "millisecond" => null,
"timezone" => 'Z'
),
),
@@ -408,7 +392,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 15,
"minute" => 10,
"second" => 53,
- "millisecond" => 123,
"timezone" => 'Z'
),
),
@@ -423,7 +406,6 @@ class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
"hour" => 15,
"minute" => 10,
"second" => 53,
- "millisecond" => 123,
"timezone" => 'Z'
),
),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list