restructure folders

.gitignore

@@ -1,3 +1,4 @@
+.idea
 .DS_Store
 .vagrant
 app/assets/*

app/cache/.gitignore

@@ -1 +0,0 @@
-!.htaccess

app/cache/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

app/config/config.inc.default.php

@@ -67,7 +67,7 @@
 @define ('DEFAULT_THEME', 'baggy');
 
 @define ('THEME', ROOT . '/themes');
-@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations/locale');
+@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations');
 @define ('CACHE', ROOT . '/app/cache');
 
 @define ('PAGINATION', '12');

composer.json

@@ -75,7 +75,7 @@
         "phpunit/phpunit": "~3.7"
     },
     "autoload": {
-        "psr-0": { "Wallabag\\Wallabag": "src/" }
+        "psr-4": { "Wallabag\\": "src/Wallabag" }
     },
     "config": {
         "bin-dir": "bin"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7915fd3c1343f447145fb167b0bb4d36",
+    "hash": "6fa216371c9d7577a117526db6f07407",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",

src/Wallabag/Wallabag/Database.php

@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \PDO;
+
 class Database {
 
     var $handle;

src/Wallabag/Wallabag/Language.php

@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \Session;
+
 class Language
 {
     protected $wallabag;
@@ -38,7 +40,7 @@ class Language
         $pocheUser = Session::getParam('poche_user');
         $language  = (is_null($pocheUser) ? LANG : $pocheUser->getConfigValue('language'));
 
-        @putenv('LC_ALL=' . $language);
+        putenv('LC_ALL=' . $language);
         setlocale(LC_ALL, $language);
         bindtextdomain($language, LOCALE);
         textdomain($language);

src/Wallabag/Wallabag/Template.php

@@ -10,6 +10,13 @@
 
 namespace Wallabag\Wallabag;
 
+use \Twig_Environment;
+use \Session;
+use \Twig_Loader_Chain;
+use \Twig_Loader_Filesystem;
+use \Twig_Extensions_Extension_I18n;
+use \Twig_SimpleFilter;
+
 class Template extends Twig_Environment
 {
     protected $wallabag;
@@ -117,11 +124,11 @@ class Template extends Twig_Environment
         $this->addExtension(new Twig_Extensions_Extension_I18n());
 
         # filter to display domain name of an url
-        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+        $filter = new Twig_SimpleFilter('getDomain', 'Wallabag\\Wallabag\\Tools::getDomain');
         $this->addFilter($filter);
 
         # filter for reading time
-        $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
+        $filter = new Twig_SimpleFilter('getReadingTime', 'Wallabag\\Wallabag\\Tools::getReadingTime');
         $this->addFilter($filter);
     }
 

src/Wallabag/Wallabag/Tools.php

@@ -10,6 +10,9 @@
 
 namespace Wallabag\Wallabag;
 
+use \RecursiveIteratorIterator;
+use \RecursiveDirectoryIterator;
+
 final class Tools
 {
     /**

src/Wallabag/Wallabag/Wallabag.php

@@ -10,6 +10,11 @@
 
 namespace Wallabag\Wallabag;
 
+use \Paginator;
+use \Session;
+use \Messages;
+use \FeedWriter;
+
 class Wallabag
 {
     /**
@@ -50,7 +55,7 @@ class Wallabag
     {
         Tools::initPhp();
 
-        $pocheUser = Session::getParam('poche_user');
+        $pocheUser = \Session::getParam('poche_user');
 
         if ($pocheUser && $pocheUser != array()) {
             $this->user = $pocheUser;

themes/baggy/about.twig

@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <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." %}</p>

themes/baggy/config.twig

@@ -178,7 +178,7 @@
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>

themes/dark/public/public

@@ -0,0 +1 @@
+../../themes/default/public

themes/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('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% 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>

themes/default/about.twig

@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <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." %}</p>

themes/default/config.twig

@@ -179,7 +179,7 @@
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>