aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-11-21 11:03:39 +0100
committerGitHub <noreply@github.com>2017-11-21 11:03:39 +0100
commitfb258aeef0a28ce9aaebac8f337b9970bd99e70d (patch)
treee132e2834e11c8d0dcdc001dfe08fd053ed2fe87
parentf4f7994c40ca57c7e6f8ca0a3d298c50c4e5f813 (diff)
parent64a5a6cfc5211a42b267a623588ddb3c0b527aa4 (diff)
downloadwallabag-fb258aeef0a28ce9aaebac8f337b9970bd99e70d.tar.gz
wallabag-fb258aeef0a28ce9aaebac8f337b9970bd99e70d.tar.zst
wallabag-fb258aeef0a28ce9aaebac8f337b9970bd99e70d.zip
Merge pull request #3426 from wallabag/fix-migration-3373
Fix MySQL issue on mig from #3373
-rw-r--r--app/DoctrineMigrations/Version20171008195606.php1
-rw-r--r--tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php2
-rw-r--r--tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php2
-rw-r--r--tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php2
4 files changed, 4 insertions, 3 deletions
diff --git a/app/DoctrineMigrations/Version20171008195606.php b/app/DoctrineMigrations/Version20171008195606.php
index c190f4ed..f09726c8 100644
--- a/app/DoctrineMigrations/Version20171008195606.php
+++ b/app/DoctrineMigrations/Version20171008195606.php
@@ -31,6 +31,7 @@ class Version20171008195606 extends AbstractMigration implements ContainerAwareI
31 31
32 switch ($this->connection->getDatabasePlatform()->getName()) { 32 switch ($this->connection->getDatabasePlatform()->getName()) {
33 case 'mysql': 33 case 'mysql':
34 $this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
34 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;'); 35 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
35 break; 36 break;
36 case 'postgresql': 37 case 'postgresql':
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 65a3ccd9..b0d4c4e1 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -983,7 +983,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
983 983
984 $content = json_decode($this->client->getResponse()->getContent(), true); 984 $content = json_decode($this->client->getResponse()->getContent(), true);
985 985
986 $this->assertSame(false, $content['exists']); 986 $this->assertFalse($content['exists']);
987 } 987 }
988 988
989 public function testGetEntriesExistsWithNoUrl() 989 public function testGetEntriesExistsWithNoUrl()
diff --git a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
index 5d6a29fe..5aee9f5c 100644
--- a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
+++ b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
@@ -68,7 +68,7 @@ class GrabySiteConfigBuilderTest extends \PHPUnit_Framework_TestCase
68 $config = $this->builder->buildForHost('www.example.com'); 68 $config = $this->builder->buildForHost('www.example.com');
69 69
70 $this->assertSame('example.com', $config->getHost()); 70 $this->assertSame('example.com', $config->getHost());
71 $this->assertSame(true, $config->requiresLogin()); 71 $this->assertTrue($config->requiresLogin());
72 $this->assertSame('http://www.example.com/login', $config->getLoginUri()); 72 $this->assertSame('http://www.example.com/login', $config->getLoginUri());
73 $this->assertSame('login', $config->getUsernameField()); 73 $this->assertSame('login', $config->getUsernameField());
74 $this->assertSame('password', $config->getPasswordField()); 74 $this->assertSame('password', $config->getPasswordField());
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index f94c2137..0731a0c0 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -51,7 +51,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
51 $this->assertEmpty($entry->getMimetype()); 51 $this->assertEmpty($entry->getMimetype());
52 $this->assertEmpty($entry->getLanguage()); 52 $this->assertEmpty($entry->getLanguage());
53 $this->assertSame(0.0, $entry->getReadingTime()); 53 $this->assertSame(0.0, $entry->getReadingTime());
54 $this->assertSame(null, $entry->getDomainName()); 54 $this->assertNull($entry->getDomainName());
55 } 55 }
56 56
57 public function testWithEmptyContent() 57 public function testWithEmptyContent()