summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-10-21 21:28:49 +0200
committerGitHub <noreply@github.com>2016-10-21 21:28:49 +0200
commite8adf53f7704c2805b0637eaf571d8cc59054c3e (patch)
tree4d099ec56b3b61f782c43e34972353f7b3eca3ed
parent1184ed6f6d78cac6a673a8c5db12b0a42d030eb1 (diff)
parenteaf152efebc1a75e5a61e8d8c362d9fe29841c5c (diff)
downloadnextcloud-server-e8adf53f7704c2805b0637eaf571d8cc59054c3e.tar.gz
nextcloud-server-e8adf53f7704c2805b0637eaf571d8cc59054c3e.zip
Merge pull request #1848 from nextcloud/php7.1-RC4
Bump to php7.1 RC4
-rw-r--r--.drone.yml4
-rw-r--r--tests/lib/Comments/ManagerTest.php8
-rw-r--r--tests/lib/Share20/DefaultShareProviderTest.php2
3 files changed, 7 insertions, 7 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:
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() {