From 41d45c6122f61e01a370233d26a2633836094d5c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 12 Jun 2017 16:46:33 +0200 Subject: Fix empty language and preview pics --- src/Wallabag/CoreBundle/Helper/ContentProxy.php | 4 ++-- tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index 0c971863..51bb2ca2 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php @@ -120,12 +120,12 @@ class ContentProxy $this->validateAndSetLanguage( $entry, - isset($content['language']) ? $content['language'] : '' + isset($content['language']) ? $content['language'] : null ); $this->validateAndSetPreviewPicture( $entry, - isset($content['open_graph']['og_image']) ? $content['open_graph']['og_image'] : '' + isset($content['open_graph']['og_image']) ? $content['open_graph']['og_image'] : null ); // if content is an image, define it as a preview too diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php index 95dd75ba..dbddbc5c 100644 --- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php @@ -206,7 +206,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase $this->assertEquals('http://1.1.1.1', $entry->getUrl()); $this->assertEquals('this is my title', $entry->getTitle()); $this->assertContains('this is my content', $entry->getContent()); - $this->assertEmpty($entry->getPreviewPicture()); + $this->assertNull($entry->getPreviewPicture()); $this->assertEquals('text/html', $entry->getMimetype()); $this->assertEquals('fr', $entry->getLanguage()); $this->assertEquals('200', $entry->getHttpStatus()); @@ -252,7 +252,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase $this->assertEquals('this is my title', $entry->getTitle()); $this->assertContains('this is my content', $entry->getContent()); $this->assertEquals('text/html', $entry->getMimetype()); - $this->assertEmpty($entry->getLanguage()); + $this->assertNull($entry->getLanguage()); $this->assertEquals('200', $entry->getHttpStatus()); $this->assertEquals(4.0, $entry->getReadingTime()); $this->assertEquals('1.1.1.1', $entry->getDomainName()); @@ -300,7 +300,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase $this->assertEquals('http://1.1.1.1', $entry->getUrl()); $this->assertEquals('this is my title', $entry->getTitle()); $this->assertContains('this is my content', $entry->getContent()); - $this->assertEmpty($entry->getPreviewPicture()); + $this->assertNull($entry->getPreviewPicture()); $this->assertEquals('text/html', $entry->getMimetype()); $this->assertEquals('fr', $entry->getLanguage()); $this->assertEquals('200', $entry->getHttpStatus()); -- cgit v1.2.3