mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-11 09:25:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3426 from wallabag/fix-migration-3373

Browse source 
Fix MySQL issue on mig from #3373
This commit is contained in:
Nicolas Lœuillet 2017-11-21 11:03:39 +01:00 committed by GitHub
commit fb258aeef0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/DoctrineMigrations/Version20171008195606.php
View file

@ -31,6 +31,7 @@ class Version20171008195606 extends AbstractMigration implements ContainerAwareI
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
break;
case 'postgresql':

2
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -983,7 +983,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertSame(false, $content['exists']);
$this->assertFalse($content['exists']);
}
public function testGetEntriesExistsWithNoUrl()

2
tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
View file

@ -68,7 +68,7 @@ class GrabySiteConfigBuilderTest extends \PHPUnit_Framework_TestCase
$config = $this->builder->buildForHost('www.example.com');
$this->assertSame('example.com', $config->getHost());
$this->assertSame(true, $config->requiresLogin());
$this->assertTrue($config->requiresLogin());
$this->assertSame('http://www.example.com/login', $config->getLoginUri());
$this->assertSame('login', $config->getUsernameField());
$this->assertSame('password', $config->getPasswordField());

2
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
View file

@ -51,7 +51,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$this->assertEmpty($entry->getMimetype());
$this->assertEmpty($entry->getLanguage());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame(null, $entry->getDomainName());
$this->assertNull($entry->getDomainName());
}
public function testWithEmptyContent()