Merge pull request #1037 from j0k3r/refactor-cs

CS

47 files changed, 153 insertions, 183 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 25f18711..377a45ae 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -8,14 +8,12 @@ use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Repository;
 use Wallabag\CoreBundle\Entity\Entries;
 use Wallabag\CoreBundle\Service\Extractor;
-use Wallabag\CoreBundle\Helper\Tools;
 use Wallabag\CoreBundle\Helper\Url;
 
 class EntryController extends Controller
 {
-
     /**
-     * @param Request $request
+     * @param  Request                                    $request
      * @Route("/new", name="new_entry")
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -32,7 +30,6 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-
             $content = Extractor::extract($entry->getUrl());
 
             $entry->setTitle($content->getTitle());
@@ -115,7 +112,7 @@ class EntryController extends Controller
     /**
      * Shows entry content
      *
-     * @param Entries $entry
+     * @param  Entries                                    $entry
      * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -130,8 +127,8 @@ class EntryController extends Controller
     /**
      * Changes read status for an entry
      *
-     * @param Request $request
-     * @param Entries $entry
+     * @param  Request                                            $request
+     * @param  Entries                                            $entry
      * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -151,8 +148,8 @@ class EntryController extends Controller
     /**
      * Changes favorite status for an entry
      *
-     * @param Request $request
-     * @param Entries $entry
+     * @param  Request                                            $request
+     * @param  Entries                                            $entry
      * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -172,8 +169,8 @@ class EntryController extends Controller
     /**
      * Deletes entry
      *
-     * @param Request $request
-     * @param Entries $entry
+     * @param  Request                                            $request
+     * @param  Entries                                            $entry
      * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
diff --git a/src/Wallabag/CoreBundle/Controller/SecurityController.php b/src/Wallabag/CoreBundle/Controller/SecurityController.php
index 51f9cc26..c2901da2 100644
--- a/src/Wallabag/CoreBundle/Controller/SecurityController.php
+++ b/src/Wallabag/CoreBundle/Controller/SecurityController.php
@@ -18,10 +18,11 @@ class SecurityController extends Controller
             $error = $session->get(SecurityContext::AUTHENTICATION_ERROR);
             $session->remove(SecurityContext::AUTHENTICATION_ERROR);
         }
+
         return $this->render('WallabagCoreBundle:Security:login.html.twig', array(
             // last username entered by the user
             'last_username' => $session->get(SecurityContext::LAST_USERNAME),
             'error'         => $error,
         ));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index 8e018e88..5668d934 100644
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -3,7 +3,6 @@
 namespace Wallabag\CoreBundle\Controller;
 
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use FOS\RestBundle\Controller\Annotations\View;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Entries;
@@ -12,7 +11,6 @@ use Wallabag\CoreBundle\Service\Extractor;
 
 class WallabagRestController extends Controller
 {
-
     /**
      * Retrieve all entries. It could be filtered by many options.
      *
@@ -44,14 +42,13 @@ class WallabagRestController extends Controller
         $entries = $this
             ->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entries')
-            ->findEntries(1, (int)$isArchived, (int)$isStarred, (int)$isDeleted, $sort, $order);
+            ->findEntries(1, (int) $isArchived, (int) $isStarred, (int) $isDeleted, $sort, $order);
 
-        if(!is_array($entries)) {
+        if (!is_array($entries)) {
             throw $this->createNotFoundException();
         }
 
         return $entries;
-
     }
 
     /**
@@ -119,7 +116,6 @@ class WallabagRestController extends Controller
      */
     public function patchEntriesAction(Entries $entry)
     {
-
     }
 
     /**
@@ -133,10 +129,8 @@ class WallabagRestController extends Controller
      */
     public function deleteEntriesAction(Entries $entry)
     {
-
     }
 
-
     /**
      * Retrieve all tags for an entry
      *
@@ -146,8 +140,8 @@ class WallabagRestController extends Controller
      *      }
      * )
      */
-    public function getEntriesTagsAction(Entries $entry) {
-
+    public function getEntriesTagsAction(Entries $entry)
+    {
     }
 
     /**
@@ -162,8 +156,8 @@ class WallabagRestController extends Controller
      *       }
      * )
      */
-    public function postEntriesTagsAction(Entries $entry) {
-
+    public function postEntriesTagsAction(Entries $entry)
+    {
     }
 
     /**
@@ -178,7 +172,6 @@ class WallabagRestController extends Controller
      */
     public function deleteEntriesTagsAction(Entries $entry, Tags $tag)
     {
-
     }
 
     /**
@@ -187,8 +180,8 @@ class WallabagRestController extends Controller
      * @ApiDoc(
      * )
      */
-    public function getTagsAction() {
-
+    public function getTagsAction()
+    {
     }
 
     /**
@@ -200,8 +193,8 @@ class WallabagRestController extends Controller
      *       }
      * )
      */
-    public function getTagAction(Tags $tag) {
-
+    public function getTagAction(Tags $tag)
+    {
     }
 
     /**
@@ -215,6 +208,5 @@ class WallabagRestController extends Controller
      */
     public function deleteTagAction(Tags $tag)
     {
-
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Security/Factory/WsseFactory.php b/src/Wallabag/CoreBundle/DependencyInjection/Security/Factory/WsseFactory.php
index 9807fe9a..0b5bdb40 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/Security/Factory/WsseFactory.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Security/Factory/WsseFactory.php
@@ -37,4 +37,4 @@ class WsseFactory implements SecurityFactoryInterface
     public function addConfiguration(NodeDefinition $node)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index d60b2df0..045ca308 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -35,12 +35,10 @@ class Config
      */
     private $value;
 
-
-
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -50,7 +48,7 @@ class Config
     /**
      * Set name
      *
-     * @param string $name
+     * @param  string $name
      * @return Config
      */
     public function setName($name)
@@ -63,7 +61,7 @@ class Config
     /**
      * Get name
      *
-     * @return string 
+     * @return string
      */
     public function getName()
     {
@@ -73,7 +71,7 @@ class Config
     /**
      * Set value
      *
-     * @param string $value
+     * @param  string $value
      * @return Config
      */
     public function setValue($value)
@@ -86,7 +84,7 @@ class Config
     /**
      * Get value
      *
-     * @return string 
+     * @return string
      */
     public function getValue()
     {
diff --git a/src/Wallabag/CoreBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php
index 3c061a37..9da5102c 100644
--- a/src/Wallabag/CoreBundle/Entity/Entries.php
+++ b/src/Wallabag/CoreBundle/Entity/Entries.php
@@ -66,12 +66,10 @@ class Entries
      */
     private $userId;
 
-
-
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -81,7 +79,7 @@ class Entries
     /**
      * Set title
      *
-     * @param string $title
+     * @param  string  $title
      * @return Entries
      */
     public function setTitle($title)
@@ -94,7 +92,7 @@ class Entries
     /**
      * Get title
      *
-     * @return string 
+     * @return string
      */
     public function getTitle()
     {
@@ -104,7 +102,7 @@ class Entries
     /**
      * Set url
      *
-     * @param string $url
+     * @param  string  $url
      * @return Entries
      */
     public function setUrl($url)
@@ -117,7 +115,7 @@ class Entries
     /**
      * Get url
      *
-     * @return string 
+     * @return string
      */
     public function getUrl()
     {
@@ -127,7 +125,7 @@ class Entries
     /**
      * Set isRead
      *
-     * @param string $isRead
+     * @param  string  $isRead
      * @return Entries
      */
     public function setIsRead($isRead)
@@ -140,7 +138,7 @@ class Entries
     /**
      * Get isRead
      *
-     * @return string 
+     * @return string
      */
     public function getIsRead()
     {
@@ -150,13 +148,14 @@ class Entries
     public function toggleArchive()
     {
         $this->isRead = $this->getIsRead() ^ 1;
+
         return $this;
     }
 
     /**
      * Set isFav
      *
-     * @param string $isFav
+     * @param  string  $isFav
      * @return Entries
      */
     public function setIsFav($isFav)
@@ -169,7 +168,7 @@ class Entries
     /**
      * Get isFav
      *
-     * @return string 
+     * @return string
      */
     public function getIsFav()
     {
@@ -186,7 +185,7 @@ class Entries
     /**
      * Set content
      *
-     * @param string $content
+     * @param  string  $content
      * @return Entries
      */
     public function setContent($content)
@@ -199,7 +198,7 @@ class Entries
     /**
      * Get content
      *
-     * @return string 
+     * @return string
      */
     public function getContent()
     {
@@ -209,7 +208,7 @@ class Entries
     /**
      * Set userId
      *
-     * @param string $userId
+     * @param  string  $userId
      * @return Entries
      */
     public function setUserId($userId)
@@ -222,7 +221,7 @@ class Entries
     /**
      * Get userId
      *
-     * @return string 
+     * @return string
      */
     public function getUserId()
     {
diff --git a/src/Wallabag/CoreBundle/Entity/Tags.php b/src/Wallabag/CoreBundle/Entity/Tags.php
index 6fe16a53..eab91ba0 100644
--- a/src/Wallabag/CoreBundle/Entity/Tags.php
+++ b/src/Wallabag/CoreBundle/Entity/Tags.php
@@ -28,12 +28,10 @@ class Tags
      */
     private $value;
 
-
-
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -43,7 +41,7 @@ class Tags
     /**
      * Set value
      *
-     * @param string $value
+     * @param  string $value
      * @return Tags
      */
     public function setValue($value)
@@ -56,7 +54,7 @@ class Tags
     /**
      * Get value
      *
-     * @return string 
+     * @return string
      */
     public function getValue()
     {
diff --git a/src/Wallabag/CoreBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
index ad01cf57..6b0cea0d 100644
--- a/src/Wallabag/CoreBundle/Entity/TagsEntries.php
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -35,12 +35,10 @@ class TagsEntries
      */
     private $tagId;
 
-
-
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -50,7 +48,7 @@ class TagsEntries
     /**
      * Set entryId
      *
-     * @param integer $entryId
+     * @param  integer     $entryId
      * @return TagsEntries
      */
     public function setEntryId($entryId)
@@ -63,7 +61,7 @@ class TagsEntries
     /**
      * Get entryId
      *
-     * @return integer 
+     * @return integer
      */
     public function getEntryId()
     {
@@ -73,7 +71,7 @@ class TagsEntries
     /**
      * Set tagId
      *
-     * @param integer $tagId
+     * @param  integer     $tagId
      * @return TagsEntries
      */
     public function setTagId($tagId)
@@ -86,7 +84,7 @@ class TagsEntries
     /**
      * Get tagId
      *
-     * @return integer 
+     * @return integer
      */
     public function getTagId()
     {
diff --git a/src/Wallabag/CoreBundle/Entity/Users.php b/src/Wallabag/CoreBundle/Entity/Users.php
index 96867bd6..e0b1fb39 100644
--- a/src/Wallabag/CoreBundle/Entity/Users.php
+++ b/src/Wallabag/CoreBundle/Entity/Users.php
@@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\User\EquatableInterface;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 
 /**
@@ -71,7 +70,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -81,7 +80,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Set username
      *
-     * @param string $username
+     * @param  string $username
      * @return Users
      */
     public function setUsername($username)
@@ -94,7 +93,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Get username
      *
-     * @return string 
+     * @return string
      */
     public function getUsername()
     {
@@ -120,7 +119,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Set password
      *
-     * @param string $password
+     * @param  string $password
      * @return Users
      */
     public function setPassword($password)
@@ -133,7 +132,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Get password
      *
-     * @return string 
+     * @return string
      */
     public function getPassword()
     {
@@ -143,7 +142,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Set name
      *
-     * @param string $name
+     * @param  string $name
      * @return Users
      */
     public function setName($name)
@@ -156,7 +155,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Get name
      *
-     * @return string 
+     * @return string
      */
     public function getName()
     {
@@ -166,7 +165,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Set email
      *
-     * @param string $email
+     * @param  string $email
      * @return Users
      */
     public function setEmail($email)
@@ -179,7 +178,7 @@ class Users implements AdvancedUserInterface, \Serializable
     /**
      * Get email
      *
-     * @return string 
+     * @return string
      */
     public function getEmail()
     {
@@ -208,7 +207,7 @@ class Users implements AdvancedUserInterface, \Serializable
      */
     public function unserialize($serialized)
     {
-        list (
+        list(
             $this->id,
             ) = unserialize($serialized);
     }
diff --git a/src/Wallabag/CoreBundle/Entity/UsersConfig.php b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
index 26fb44ee..0742edbc 100644
--- a/src/Wallabag/CoreBundle/Entity/UsersConfig.php
+++ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
@@ -42,12 +42,10 @@ class UsersConfig
      */
     private $value;
 
-
-
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -57,7 +55,7 @@ class UsersConfig
     /**
      * Set userId
      *
-     * @param string $userId
+     * @param  string      $userId
      * @return UsersConfig
      */
     public function setUserId($userId)
@@ -70,7 +68,7 @@ class UsersConfig
     /**
      * Get userId
      *
-     * @return string 
+     * @return string
      */
     public function getUserId()
     {
@@ -80,7 +78,7 @@ class UsersConfig
     /**
      * Set name
      *
-     * @param string $name
+     * @param  string      $name
      * @return UsersConfig
      */
     public function setName($name)
@@ -93,7 +91,7 @@ class UsersConfig
     /**
      * Get name
      *
-     * @return string 
+     * @return string
      */
     public function getName()
     {
@@ -103,7 +101,7 @@ class UsersConfig
     /**
      * Set value
      *
-     * @param string $value
+     * @param  string      $value
      * @return UsersConfig
      */
     public function setValue($value)
@@ -116,7 +114,7 @@ class UsersConfig
     /**
      * Get value
      *
-     * @return string 
+     * @return string
      */
     public function getValue()
     {
diff --git a/src/Wallabag/CoreBundle/Helper/Content.php b/src/Wallabag/CoreBundle/Helper/Content.php
index 81acbad7..1cc5e4cf 100644
--- a/src/Wallabag/CoreBundle/Helper/Content.php
+++ b/src/Wallabag/CoreBundle/Helper/Content.php
@@ -8,8 +8,8 @@ class Content
 
     private $body;
 
-    public function __constructor() {
-
+    public function __constructor()
+    {
     }
 
     public function getTitle()
@@ -31,4 +31,4 @@ class Content
     {
         $this->body = $body;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Helper/Entries.php b/src/Wallabag/CoreBundle/Helper/Entries.php
index a54c3a74..6eeca4ff 100644
--- a/src/Wallabag/CoreBundle/Helper/Entries.php
+++ b/src/Wallabag/CoreBundle/Helper/Entries.php
@@ -2,9 +2,6 @@
 
 namespace Wallabag\CoreBundle\Helper;
 
-
-class Entries {
-
-
-
-}
\ No newline at end of file
+class Entries
+{
+}
diff --git a/src/Wallabag/CoreBundle/Helper/Tools.php b/src/Wallabag/CoreBundle/Helper/Tools.php
index c932f880..0fd5f259 100755
--- a/src/Wallabag/CoreBundle/Helper/Tools.php
+++ b/src/Wallabag/CoreBundle/Helper/Tools.php
@@ -2,9 +2,6 @@
 
 namespace Wallabag\CoreBundle\Helper;
 
-use \RecursiveIteratorIterator;
-use \RecursiveDirectoryIterator;
-
 final class Tools
 {
     /**
@@ -18,7 +15,7 @@ final class Tools
         $timeout = 15;
         $useragent = "Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/20100101 Firefox/18.0";
 
-        if (in_array ('curl', get_loaded_extensions())) {
+        if (in_array('curl', get_loaded_extensions())) {
             # Fetch feed from URL
             $curl = curl_init();
             curl_setopt($curl, CURLOPT_URL, $url);
@@ -30,8 +27,8 @@ final class Tools
             curl_setopt($curl, CURLOPT_HEADER, false);
 
             # for ssl, do not verified certificate
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
-            curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($curl, CURLOPT_AUTOREFERER, true);
 
             # FeedBurner requires a proper USER-AGENT...
             curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
@@ -48,13 +45,13 @@ final class Tools
                 array(
                     'http' => array(
                         'timeout' => $timeout,
-                        'header' => "User-Agent: " . $useragent,
-                        'follow_location' => true
+                        'header' => "User-Agent: ".$useragent,
+                        'follow_location' => true,
                     ),
                     'ssl' => array(
                         'verify_peer' => false,
-                        'allow_self_signed' => true
-                    )
+                        'allow_self_signed' => true,
+                    ),
                 )
             );
 
@@ -62,13 +59,12 @@ final class Tools
             $data = @file_get_contents($url, false, $context, -1, 4000000);
 
             if (isset($http_response_header) and isset($http_response_header[0])) {
-                $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== FALSE) or (strpos($http_response_header[0], '301 Moved Permanently') !== FALSE));
+                $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== false) or (strpos($http_response_header[0], '301 Moved Permanently') !== false));
             }
         }
 
         # if response is not empty and response is OK
         if (isset($data) and isset($httpcodeOK) and $httpcodeOK) {
-
             # take charset of page and get it
             preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
 
@@ -77,19 +73,20 @@ final class Tools
                 preg_match('#charset="?(.*)"#si', $meta[0], $encoding);
                 # if charset is found set it otherwise, set it to utf-8
                 $html_charset = (!empty($encoding[1])) ? strtolower($encoding[1]) : 'utf-8';
-                if (empty($encoding[1])) $encoding[1] = 'utf-8';
+                if (empty($encoding[1])) {
+                    $encoding[1] = 'utf-8';
+                }
             } else {
                 $html_charset = 'utf-8';
                 $encoding[1] = '';
             }
 
             # replace charset of url to charset of page
-            $data = str_replace('charset=' . $encoding[1], 'charset=' . $html_charset, $data);
+            $data = str_replace('charset='.$encoding[1], 'charset='.$html_charset, $data);
 
             return $data;
-        }
-        else {
-            return FALSE;
+        } else {
+            return false;
         }
     }
 
@@ -101,7 +98,7 @@ final class Tools
      */
     public static function encodeString($string)
     {
-        return sha1($string . SALT);
+        return sha1($string.SALT);
     }
 
     public static function generateToken()
@@ -113,12 +110,10 @@ final class Tools
             } else {
                 $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
             }
-        }
-        else {
+        } else {
             $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
         }
 
         return str_replace('+', '', $token);
     }
-
 }
diff --git a/src/Wallabag/CoreBundle/Helper/Url.php b/src/Wallabag/CoreBundle/Helper/Url.php
index b076e7c7..35eb260d 100644
--- a/src/Wallabag/CoreBundle/Helper/Url.php
+++ b/src/Wallabag/CoreBundle/Helper/Url.php
@@ -6,20 +6,23 @@ class Url
 {
     public $url;
 
-    function __construct($url)
+    public function __construct($url)
     {
         $this->url = base64_decode($url);
     }
 
-    public function getUrl() {
+    public function getUrl()
+    {
         return $this->url;
     }
 
-    public function setUrl($url) {
+    public function setUrl($url)
+    {
         $this->url = $url;
     }
 
-    public function isCorrect() {
-        return filter_var($this->url, FILTER_VALIDATE_URL) !== FALSE;
+    public function isCorrect()
+    {
+        return filter_var($this->url, FILTER_VALIDATE_URL) !== false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
index e63c67e2..d87eb373 100644
--- a/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
@@ -6,7 +6,6 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Wallabag\CoreBundle\Entity\Entries;
-use Wallabag\CoreBundle\Service\Extractor;
 
 class EntriesRepository extends EntityRepository
 {
@@ -15,7 +14,7 @@ class EntriesRepository extends EntityRepository
      *
      * @param $userId
      * @param $firstResult
-     * @param int $maxResults
+     * @param  int       $maxResults
      * @return Paginator
      */
     public function findUnreadByUser($userId, $firstResult, $maxResults = 12)
@@ -38,7 +37,7 @@ class EntriesRepository extends EntityRepository
      *
      * @param $userId
      * @param $firstResult
-     * @param int $maxResults
+     * @param  int       $maxResults
      * @return Paginator
      */
     public function findArchiveByUser($userId, $firstResult, $maxResults = 12)
@@ -61,7 +60,7 @@ class EntriesRepository extends EntityRepository
      *
      * @param $userId
      * @param $firstResult
-     * @param int $maxResults
+     * @param  int       $maxResults
      * @return Paginator
      */
     public function findStarredByUser($userId, $firstResult, $maxResults = 12)
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing.yml b/src/Wallabag/CoreBundle/Resources/config/routing.yml
index 327d49d8..ec1d23cc 100644
--- a/src/Wallabag/CoreBundle/Resources/config/routing.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/routing.yml
@@ -1,3 +1,3 @@
 _wllbg:
     resource: "@WallabagCoreBundle/Controller/EntryController.php"
-    type:     annotation
\ No newline at end of file
+    type:     annotation
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml b/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
index c876adfb..d3af6b72 100644
--- a/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/routing_rest.yml
@@ -1,4 +1,4 @@
 entries:
   type: rest
   resource:     "WallabagCoreBundle:WallabagRest"
-  name_prefix:  api_
\ No newline at end of file
+  name_prefix:  api_
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.xml b/src/Wallabag/CoreBundle/Resources/config/services.xml
index d5bc5cca..859665ca 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.xml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.xml
@@ -25,5 +25,3 @@
     </services>
 
 </container>
-
-
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 78dfa7c0..edb15d55 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -101,4 +101,4 @@
             });
         });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index df6926a0..b6de7d23 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -8,4 +8,4 @@
 
 {% block content %}
     {{ form(form) }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index 0585ecca..b8d3c7b6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -30,11 +30,11 @@
     <p>{% trans %}wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted.{% endtrans %}</p>
 
     <h2>{% trans %}Getting help{% endtrans %}</h2>
-    
+
     <dl>
         <dt>{% trans %}Documentation{% endtrans %}</dt>
         <dd><a href="https://doc.wallabag.org/">Online documentation</a></dd>
-        
+
         <dt>{% trans %}Support{% endtrans %}</dt>
         <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
     </dl>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
index d432909a..fd662c19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
@@ -1,3 +1,3 @@
         <script type="text/javascript">
           top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
-        </script>
\ No newline at end of file
+        </script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
index c897a97e..26411da9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
@@ -1,3 +1,3 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
-        </footer>
\ No newline at end of file
+        </footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index 7ef79a2f..f123183b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
@@ -37,4 +37,3 @@
         <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
         <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
         <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
-
diff --git a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
index 3065ce44..2e3b6d08 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
@@ -12,4 +12,3 @@
                 <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
                 <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
             </ul>
-
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
index 6031f489..c5c07d49 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
@@ -160,7 +160,7 @@
                 </div>
                 </fieldset>
             </form>
-            
+
             <h2>{% trans "Delete account" %}</h2>
             {% if not only_user %}<form method="post" action="?deluser">
             <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
index 4078fbb0..ae3f086c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
@@ -28,4 +28,4 @@
         </div>
 {% include '_footer.twig' %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
index 58290e9c..d4eb46d2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
@@ -17,7 +17,7 @@
                                                 <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
                                         </div>
                                         <div class="row">
-                                                
+
                                                 <div class="col">
                                                         <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
                                                         <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
index 61996353..c7e2f66e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
@@ -1,3 +1,3 @@
         <script type="text/javascript">
           top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
-        </script>
\ No newline at end of file
+        </script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
index 213a4aca..25539f6b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
             {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
-        </footer>
\ No newline at end of file
+        </footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
index c59b7a15..63a2d3e2 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
@@ -2,7 +2,7 @@
 <!--
   $(document).ready(function() {
         $("body").css("cursor", "wait");
-        
+
     setTimeout(function(){
       window.location = './?import';
     }, {{ import.delay }} );
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
index eedf84f1..83fa3717 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
@@ -11,4 +11,3 @@
             </ul>
             {% include '_pocheit-form.twig' %}
             {% include '_search-form.twig' %}
-
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
index 679aa098..b8481494 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
@@ -1 +1 @@
-                {{ messages | raw }}
\ No newline at end of file
+                {{ messages | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
index 0cf6097a..70f97356 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
@@ -1,4 +1,4 @@
-<div id="search-form" class="messages info">                    
+<div id="search-form" class="messages info">
 <form method="get" action="index.php">
     <p>
                 <input type="hidden" name="view" value="search"></input>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/default/about.twig
index 50ffd8ef..7ddb19d6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/about.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/about.twig
@@ -70,5 +70,5 @@
 
         <dt>PHPePub</dt>
         <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd>
-    </dl> 
+    </dl>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/default/config.twig
index b7d91937..6769da74 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/config.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/config.twig
@@ -45,7 +45,7 @@
               {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
             </p>
             {% endif %}
-            
+
             <h2>{% trans "Change your theme" %}</h2>
             <form method="post" action="?updatetheme" name="changethemeform">
                 <fieldset class="w500p inline">
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/default/export.twig
index 4adb9540..18a98a87 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/export.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/export.twig
@@ -1 +1 @@
-{{ export }}
\ No newline at end of file
+{{ export }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
index dfebc3ea..d32395a2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
@@ -28,4 +28,4 @@
         </div>
 {% include '_footer.twig' %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
index e5be748e..47359ed1 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
@@ -15,4 +15,4 @@
 
     {% endfor %}
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/default/view.twig
index 8f3a26c3..154de1e4 100755
--- a/src/Wallabag/CoreBundle/Resources/views/default/view.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/default/view.twig
@@ -42,7 +42,7 @@
         <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
         <script type="text/javascript">
         $(document).ready(function() {
-        
+
                         // toggle read property of current article
                         $('#markAsRead').click(function(){
                                 $("body").css("cursor", "wait");
@@ -50,11 +50,11 @@
                                             function( data ) {
                                         if ( data == '1' ) {
                                                 if ( $('#markAsRead').hasClass("archive-off") ) {
-                                                        $('#markAsRead').removeClass("archive-off");    
+                                                        $('#markAsRead').removeClass("archive-off");
                                                         $('#markAsRead').addClass("archive");
                                                 }
                                                 else {
-                                                        $('#markAsRead').removeClass("archive");        
+                                                        $('#markAsRead').removeClass("archive");
                                                         $('#markAsRead').addClass("archive-off");
                                                 }
                                         }
@@ -64,7 +64,7 @@
                                       });
                                             $("body").css("cursor", "auto");
                                           });
-                                          
+
                                           // toggle favorite property of current article
                         $('#setFav').click(function(){
                                 $("body").css("cursor", "wait");
@@ -72,11 +72,11 @@
                                             function( data ) {
                                         if ( data == '1' ) {
                                                 if ( $('#setFav').hasClass("fav-off") ) {
-                                                        $('#setFav').removeClass("fav-off");    
+                                                        $('#setFav').removeClass("fav-off");
                                                         $('#setFav').addClass("fav");
                                                 }
                                                 else {
-                                                        $('#setFav').removeClass("fav");        
+                                                        $('#setFav').removeClass("fav");
                                                         $('#setFav').addClass("fav-off");
                                                 }
                                         }
@@ -86,8 +86,8 @@
                                       });
                                             $("body").css("cursor", "auto");
                                           });
-        
-                                                // set percent of read on startup       
+
+                                                // set percent of read on startup
                         if ( $(document).height() <= $(window).innerHeight() ) {
                           pp = 100;
                         }
@@ -95,7 +95,7 @@
                                 pp = 0;
                         }
                         $('#readLeftPercent').text( pp + '%' );
-                        
+
 
             $(window).scroll(function(e){
                 var scrollTop = $(window).scrollTop();
@@ -103,7 +103,7 @@
                 var scrollPercent = (scrollTop) / (docHeight);
                 var scrollPercentRounded = Math.round(scrollPercent*100)/100;
                 savePercent({{ entry.id|e }}, scrollPercentRounded);
-                
+
                 // change percent of read on scroll
                 pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() ));
                 $('#readLeftPercent').text( pp + '%' );
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
index 9c39ea9f..d1aacc47 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
@@ -23,4 +23,4 @@
         </div>
         {% include "WallabagCoreBundle::_footer.html.twig" %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index 1f1753a4..f062672c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -30,4 +30,4 @@
     </div>
     {% include "WallabagCoreBundle::_footer.html.twig" %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/Wallabag/CoreBundle/Security/Authentication/Provider/WsseProvider.php b/src/Wallabag/CoreBundle/Security/Authentication/Provider/WsseProvider.php
index ac57e27d..5499f400 100644
--- a/src/Wallabag/CoreBundle/Security/Authentication/Provider/WsseProvider.php
+++ b/src/Wallabag/CoreBundle/Security/Authentication/Provider/WsseProvider.php
@@ -56,4 +56,4 @@ class WsseProvider implements AuthenticationProviderInterface
     {
         return $token instanceof WsseUserToken;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Security/Authentication/Token/WsseUserToken.php b/src/Wallabag/CoreBundle/Security/Authentication/Token/WsseUserToken.php
index b189e22a..ea6fb9bf 100644
--- a/src/Wallabag/CoreBundle/Security/Authentication/Token/WsseUserToken.php
+++ b/src/Wallabag/CoreBundle/Security/Authentication/Token/WsseUserToken.php
@@ -20,4 +20,4 @@ class WsseUserToken extends AbstractToken
     {
         return '';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php b/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
index b2474785..4d4f2145 100644
--- a/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
+++ b/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
@@ -52,7 +52,6 @@ class WsseListener implements ListenerInterface
             $response = new Response();
             $response->setStatusCode(403);
             $event->setResponse($response);
-
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Service/Extractor.php b/src/Wallabag/CoreBundle/Service/Extractor.php
index 1c6ff0ae..d38b0d76 100644
--- a/src/Wallabag/CoreBundle/Service/Extractor.php
+++ b/src/Wallabag/CoreBundle/Service/Extractor.php
@@ -7,29 +7,30 @@ use Wallabag\CoreBundle\Helper\Url;
 
 final class Extractor
 {
-    public static function extract($url) {
+    public static function extract($url)
+    {
         $pageContent = Extractor::getPageContent(new Url(base64_encode($url)));
         $title = ($pageContent['rss']['channel']['item']['title'] != '') ? $pageContent['rss']['channel']['item']['title'] : _('Untitled');
         $body = $pageContent['rss']['channel']['item']['description'];
 
         $content = new Content();
         $content->setTitle($title);
-        $content->setBody($body);;
+        $content->setBody($body);
 
         return $content;
     }
     /**
      * Get the content for a given URL (by a call to FullTextFeed)
      *
-     * @param Url $url
+     * @param  Url   $url
      * @return mixed
      */
     public static function getPageContent(Url $url)
     {
         // Saving and clearing context
         $REAL = array();
-        foreach( $GLOBALS as $key => $value ) {
-            if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
+        foreach ($GLOBALS as $key => $value) {
+            if ($key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS') {
                 $GLOBALS[$key]  = array();
                 $REAL[$key]     = $value;
             }
@@ -37,38 +38,39 @@ final class Extractor
         // Saving and clearing session
         if (isset($_SESSION)) {
             $REAL_SESSION = array();
-            foreach( $_SESSION as $key => $value ) {
+            foreach ($_SESSION as $key => $value) {
                 $REAL_SESSION[$key] = $value;
                 unset($_SESSION[$key]);
             }
         }
 
         // Running code in different context
-        $scope = function() {
-            extract( func_get_arg(1) );
+        $scope = function () {
+            extract(func_get_arg(1));
             $_GET = $_REQUEST = array(
                 "url" => $url->getUrl(),
                 "max" => 5,
                 "links" => "preserve",
                 "exc" => "",
                 "format" => "json",
-                "submit" => "Create Feed"
+                "submit" => "Create Feed",
             );
             ob_start();
             require func_get_arg(0);
             $json = ob_get_contents();
             ob_end_clean();
+
             return $json;
         };
 
         // Silence $scope function to avoid
         // issues with FTRSS when error_reporting is to high
         // FTRSS generates PHP warnings which break output
-        $json = @$scope(__DIR__ . "/../../../../vendor/wallabag/Fivefilters_Libraries/makefulltextfeed.php", array("url" => $url));
+        $json = @$scope(__DIR__."/../../../../vendor/wallabag/Fivefilters_Libraries/makefulltextfeed.php", array("url" => $url));
 
         // Clearing and restoring context
         foreach ($GLOBALS as $key => $value) {
-            if($key != "GLOBALS" && $key != "_SESSION" ) {
+            if ($key != "GLOBALS" && $key != "_SESSION") {
                 unset($GLOBALS[$key]);
             }
         }
@@ -78,15 +80,15 @@ final class Extractor
 
         // Clearing and restoring session
         if (isset($REAL_SESSION)) {
-            foreach($_SESSION as $key => $value) {
+            foreach ($_SESSION as $key => $value) {
                 unset($_SESSION[$key]);
             }
 
-            foreach($REAL_SESSION as $key => $value) {
+            foreach ($REAL_SESSION as $key => $value) {
                 $_SESSION[$key] = $value;
             }
         }
 
         return json_decode($json, true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
index 0b004a30..92406865 100644
--- a/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
@@ -38,4 +38,4 @@ class WallabagExtension extends \Twig_Extension
     {
         return 'wallabag_extension';
     }
-}
\ No newline at end of file
+}