Remove unsed things

src/Wallabag/CoreBundle/Controller/StaticController.php

@@ -28,12 +28,4 @@ class StaticController extends Controller
             array()
         );
     }
-
-    /**
-     * @Route("/", name="homepage")
-     */
-    public function apiAction()
-    {
-        return $this->redirect($this->generateUrl('nelmio_api_doc_index'));
-    }
 }

src/Wallabag/CoreBundle/Entity/Entry.php

@@ -7,7 +7,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Hateoas\Configuration\Annotation as Hateoas;
 use JMS\Serializer\Annotation\XmlRoot;
-use Wallabag\CoreBundle\Helper\Tools;
+use Wallabag\CoreBundle\Tools\Utils;
 
 /**
  * Entry.
@@ -265,7 +265,7 @@ class Entry
     public function setContent($content)
     {
         $this->content = $content;
-        $this->readingTime = Tools::getReadingTime($content);
+        $this->readingTime = Utils::getReadingTime($content);
         $this->domainName = parse_url($this->url, PHP_URL_HOST);
 
         return $this;

src/Wallabag/CoreBundle/Helper/Entry.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Helper;
-
-class Entry
-{
-}

src/Wallabag/CoreBundle/Helper/Tools.php

@@ -1,133 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Helper;
-
-final class Tools
-{
-    /**
-     * Download a file (typically, for downloading pictures on web server).
-     *
-     * @param $url
-     *
-     * @return bool|mixed|string
-     */
-    public static function getFile($url)
-    {
-        $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())) {
-            # Fetch feed from URL
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $url);
-            curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
-            if (!ini_get('open_basedir') && !ini_get('safe_mode')) {
-                curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-            }
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-            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);
-
-            # FeedBurner requires a proper USER-AGENT...
-            curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
-            curl_setopt($curl, CURLOPT_ENCODING, 'gzip, deflate');
-            curl_setopt($curl, CURLOPT_USERAGENT, $useragent);
-
-            $data = curl_exec($curl);
-            $httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            $httpcodeOK = isset($httpcode) and ($httpcode == 200 or $httpcode == 301);
-            curl_close($curl);
-        } else {
-            # create http context and add timeout and user-agent
-            $context = stream_context_create(
-                array(
-                    'http' => array(
-                        'timeout' => $timeout,
-                        'header' => 'User-Agent: '.$useragent,
-                        'follow_location' => true,
-                    ),
-                    'ssl' => array(
-                        'verify_peer' => false,
-                        'allow_self_signed' => true,
-                    ),
-                )
-            );
-
-            # only download page lesser than 4MB
-            $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));
-            }
-        }
-
-        # 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);
-
-            # if meta tag is found
-            if (!empty($meta[0])) {
-                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';
-                }
-            } 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);
-
-            return $data;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Encode a URL by using a salt.
-     *
-     * @param $string
-     *
-     * @return string
-     */
-    public static function encodeString($string)
-    {
-        return sha1($string.SALT);
-    }
-
-    public static function generateToken()
-    {
-        if (ini_get('open_basedir') === '') {
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                // alternative to /dev/urandom for Windows
-                $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-            } else {
-                $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
-            }
-        } else {
-            $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
-        }
-
-        return str_replace('+', '', $token);
-    }
-
-    /**
-     * For a given text, we calculate reading time for an article.
-     *
-     * @param $text
-     *
-     * @return float
-     */
-    public static function getReadingTime($text)
-    {
-        return floor(str_word_count(strip_tags($text)) / 200);
-    }
-}

src/Wallabag/CoreBundle/Resources/config/routing.yml

@@ -1,7 +0,0 @@
-entry:
-    resource: "@WallabagCoreBundle/Controller/EntryController.php"
-    type:     annotation
-
-config:
-    resource: "@WallabagCoreBundle/Controller/ConfigController.php"
-    type:     annotation

src/Wallabag/CoreBundle/Tools/Utils.php

@@ -25,4 +25,17 @@ class Utils
         // remove character which can broken the url
         return str_replace(array('+', '/'), '', $token);
     }
+
+    /**
+     * For a given text, we calculate reading time for an article
+     * based on 200 words per minute
+     *
+     * @param $text
+     *
+     * @return float
+     */
+    public static function getReadingTime($text)
+    {
+        return floor(str_word_count(strip_tags($text)) / 200);
+    }
 }