From 13168ffbbaaa52fed52b2c0b83298ede2fd369c7 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 21 Oct 2016 11:37:08 +0200 Subject: Bump to php7.1 RC4 Signed-off-by: Roeland Jago Douma --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 78cdefd82b4..2b5407e0df6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -100,7 +100,7 @@ pipeline: DB: NODB PHP: "7.0" nodb-php7.1: - image: nextcloudci/php7.1:php7.1-5 + image: nextcloudci/php7.1:php7.1-6 commands: - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite when: @@ -124,7 +124,7 @@ pipeline: DB: sqlite PHP: "7.0" sqlite-php7.1: - image: nextcloudci/php7.1:php7.1-5 + image: nextcloudci/php7.1:php7.1-6 commands: - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite when: -- cgit v1.2.3 From eaf152efebc1a75e5a61e8d8c362d9fe29841c5c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 21 Oct 2016 13:43:39 +0200 Subject: Fix DateTime comparisson Datetime now returns microseconds. But if the database doesn't store those comparing them for equality most likely fails. Signed-off-by: Roeland Jago Douma --- tests/lib/Comments/ManagerTest.php | 8 ++++---- tests/lib/Share20/DefaultShareProviderTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index 71c918af6c7..5bacc794ba7 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -111,7 +111,7 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getVerb(), 'comment'); $this->assertSame($comment->getObjectType(), 'files'); $this->assertSame($comment->getObjectId(), 'file64'); - $this->assertEquals($comment->getCreationDateTime(), $creationDT); + $this->assertEquals($comment->getCreationDateTime()->getTimestamp(), $creationDT->getTimestamp()); $this->assertEquals($comment->getLatestChildDateTime(), $latestChildDT); } @@ -373,7 +373,7 @@ class ManagerTest extends TestCase { $loadedComment = $manager->get($comment->getId()); $this->assertSame($comment->getMessage(), $loadedComment->getMessage()); - $this->assertEquals($comment->getCreationDateTime(), $loadedComment->getCreationDateTime()); + $this->assertEquals($comment->getCreationDateTime()->getTimestamp(), $loadedComment->getCreationDateTime()->getTimestamp()); } public function testSaveUpdate() { @@ -444,7 +444,7 @@ class ManagerTest extends TestCase { $this->assertSame($comment->getTopmostParentId(), strval($id)); $parentComment = $manager->get(strval($id)); $this->assertSame($parentComment->getChildrenCount(), $i + 1); - $this->assertEquals($parentComment->getLatestChildDateTime(), $comment->getCreationDateTime()); + $this->assertEquals($parentComment->getLatestChildDateTime()->getTimestamp(), $comment->getCreationDateTime()->getTimestamp()); } } @@ -577,7 +577,7 @@ class ManagerTest extends TestCase { $dateTimeGet = $manager->getReadMark('robot', '36', $user); - $this->assertEquals($dateTimeGet, $dateTimeSet); + $this->assertEquals($dateTimeGet->getTimestamp(), $dateTimeSet->getTimestamp()); } public function testSetMarkReadUpdate() { diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 0ae2ef922fc..778c1cb5722 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -743,7 +743,7 @@ class DefaultShareProviderTest extends \Test\TestCase { $this->assertSame($path, $share2->getNode()); $this->assertSame('password', $share2->getPassword()); $this->assertSame('token', $share2->getToken()); - $this->assertEquals($expireDate, $share2->getExpirationDate()); + $this->assertEquals($expireDate->getTimestamp(), $share2->getExpirationDate()->getTimestamp()); } public function testGetShareByToken() { -- cgit v1.2.3