diff options
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 44f95dcb..47db4c07 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -156,7 +156,7 @@ class EntryRepository extends EntityRepository | |||
156 | $entryAlias = 'e' . $i; | 156 | $entryAlias = 'e' . $i; |
157 | $tagAlias = 't' . $i; | 157 | $tagAlias = 't' . $i; |
158 | 158 | ||
159 | // Complexe queries to ensure multiple tags is associated to an entry | 159 | // Complexe queries to ensure multiple tags are associated to an entry |
160 | // https://stackoverflow.com/a/6638146/569101 | 160 | // https://stackoverflow.com/a/6638146/569101 |
161 | $qb->andWhere($qb->expr()->in( | 161 | $qb->andWhere($qb->expr()->in( |
162 | 'e.id', | 162 | 'e.id', |
diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php index 02ad26ae..ab7f23cc 100644 --- a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php | |||
@@ -239,7 +239,8 @@ class ExportControllerTest extends WallabagCoreTestCase | |||
239 | $this->assertSame($contentInDB->getLanguage(), $content[0]['language']); | 239 | $this->assertSame($contentInDB->getLanguage(), $content[0]['language']); |
240 | $this->assertSame($contentInDB->getReadingtime(), $content[0]['reading_time']); | 240 | $this->assertSame($contentInDB->getReadingtime(), $content[0]['reading_time']); |
241 | $this->assertSame($contentInDB->getDomainname(), $content[0]['domain_name']); | 241 | $this->assertSame($contentInDB->getDomainname(), $content[0]['domain_name']); |
242 | $this->assertSame(['baz', 'foo'], $content[0]['tags']); | 242 | $this->assertContains('baz', $content[0]['tags']); |
243 | $this->assertContains('foo', $content[0]['tags']); | ||
243 | } | 244 | } |
244 | 245 | ||
245 | public function testXmlExport() | 246 | public function testXmlExport() |