From da0a9e01e9b6ef52656aa47367bfc30b1905fe40 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 11 Feb 2016 13:39:21 +0100 Subject: [PATCH] CS --- src/Wallabag/ImportBundle/Import/WallabagV1Import.php | 7 +++---- .../ImportBundle/Tests/Import/WallabagV1ImportTest.php | 3 +-- .../ImportBundle/Tests/Import/WallabagV2ImportTest.php | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php index 82b52ad3f..023273125 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php @@ -10,7 +10,6 @@ use Wallabag\UserBundle\Entity\User; use Wallabag\CoreBundle\Tools\Utils; use Wallabag\CoreBundle\Helper\ContentProxy; - class WallabagV1Import implements ImportInterface { protected $user; @@ -127,10 +126,10 @@ class WallabagV1Import implements ImportInterface protected function parseEntries($entries) { $i = 1; - /** + /* * Untitled in all languages from v1. This should never have been translated */ - $untitled = array('Untitled','Sans titre','podle nadpisu','Sin título','با عنوان','per titolo','Sem título','Без названия','po naslovu','Без назви'); + $untitled = array('Untitled', 'Sans titre', 'podle nadpisu', 'Sin título', 'با عنوان', 'per titolo', 'Sem título', 'Без названия', 'po naslovu', 'Без назви'); foreach ($entries as $importedEntry) { $existingEntry = $this->em @@ -145,7 +144,7 @@ class WallabagV1Import implements ImportInterface // @see ContentProxy->updateEntry $entry = new Entry($this->user); $entry->setUrl($importedEntry['url']); - if (in_array($importedEntry['title'],$untitled)) { + if (in_array($importedEntry['title'], $untitled)) { $entry = $this->contentProxy->updateEntry($entry, $entry->getUrl()); } else { $entry->setContent($importedEntry['content']); diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php index 78cc19b6b..093420f92 100644 --- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php +++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php @@ -14,7 +14,6 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase protected $logHandler; protected $contentProxy; - private function getWallabagV1Import($unsetUser = false) { $this->user = new User(); @@ -27,7 +26,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); - $wallabag = new WallabagV1Import($this->em,$this->contentProxy); + $wallabag = new WallabagV1Import($this->em, $this->contentProxy); $this->logHandler = new TestHandler(); $logger = new Logger('test', array($this->logHandler)); diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php index 0b33afb61..ebabb8f75 100644 --- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php +++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php @@ -26,7 +26,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); - $wallabag = new WallabagV2Import($this->em,$this->contentProxy); + $wallabag = new WallabagV2Import($this->em, $this->contentProxy); $this->logHandler = new TestHandler(); $logger = new Logger('test', array($this->logHandler));