54 files changed, 133 insertions, 102 deletions

diff --git a/.travis.yml b/.travis.yml
index 0e72d207..17c3abaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,6 +67,6 @@ before_install:
 script:
     - travis_wait bash install.sh
     - ant prepare-$DB
-    - bin/phpunit -v
+    - phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
     - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
diff --git a/app/config/config.yml b/app/config/config.yml
index c371cf73..29847820 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -156,7 +156,7 @@ liip_theme:
 
     path_patterns:
         bundle_resource:
-            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+            - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
 
 fos_user:
     db_driver: orm
@@ -164,9 +164,9 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: %fosuser_confirmation%
+            enabled: "%fosuser_confirmation%"
     from_email:
-        address:        %from_email%
+        address:        "%from_email%"
         sender_name:    wallabag
 fos_oauth_server:
     db_driver:           orm
@@ -184,8 +184,8 @@ scheb_two_factor:
         cookie_lifetime: 2592000
 
     email:
-        enabled: %twofactor_auth%
-        sender_email: %twofactor_sender%
+        enabled: "%twofactor_auth%"
+        sender_email: "%twofactor_sender%"
         digits: 6
         template: WallabagUserBundle:Authentication:form.html.twig
         mailer: wallabag_user.auth_code_mailer
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 410d5a6c..f3030ff1 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -17,14 +17,14 @@ monolog:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
-            channels: [!event]
+            channels: ['!event']
         console:
             type:   console
             bubble: false
             verbosity_levels:
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: [!event, !doctrine]
+            channels: ['!event', '!doctrine']
         console_very_verbose:
             type:   console
             bubble: false
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
index 342837a0..65b040cc 100644
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@@ -2,8 +2,8 @@ imports:
     - { resource: config.yml }
 
 #framework:
-#    validation:
-#        cache: apc
+#    cache:
+#        system: cache.adapter.apcu
 
 #doctrine:
 #    orm:
diff --git a/bin/phpunit b/bin/phpunit
deleted file mode 120000
index 4ba32564..00000000
--- a/bin/phpunit
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a8ab2a59..7beb9bd9 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "ext-iconv": "*",
         "ext-tokenizer": "*",
         "ext-pdo": "*",
-        "symfony/symfony": "3.0.*",
+        "symfony/symfony": "3.1.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
@@ -85,9 +85,10 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "^2.7",
+        "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9"
     },
     "scripts": {
@@ -119,6 +120,9 @@
         "psr-4": { "Wallabag\\": "src/Wallabag/" },
         "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "Tests\\": "tests/" }
+    },
     "config": {
         "bin-dir": "bin"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e68df9de..38880908 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="app/autoload.php"
-        >
+>
 
     <testsuites>
         <testsuite name="wallabag Test Suite">
-            <directory>src/Wallabag/*Bundle/Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
     <php>
+        <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="app/" />
     </php>
 
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 4cf22200..74c53bf0 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -32,7 +32,6 @@ class ConfigType extends AbstractType
         $builder
             ->add('theme', ChoiceType::class, [
                 'choices' => array_flip($this->themes),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.theme_label',
             ])
             ->add('items_per_page', null, [
@@ -49,7 +48,6 @@ class ConfigType extends AbstractType
             ])
             ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.language_label',
             ])
             ->add('save', SubmitType::class, [
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index f3f848e9..3c597b5d 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -36,17 +36,26 @@ class EntryFilterType extends AbstractType
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
-                    $value = $values['value'];
+                    $lower = $values['value']['left_number'][0];
+                    $upper = $values['value']['right_number'][0];
+
+                    $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
+                    $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
 
-                    if (null === $value['left_number'][0] || null === $value['right_number'][0]) {
+                    if (null === $lower && null === $upper) {
+                        // no value? no filter
                         return;
+                    } elseif (null === $lower && null !== $upper) {
+                        // only lower value is defined: query all entries with reading LOWER THAN this value
+                        $expression = $filterQuery->getExpr()->lte($field, $max);
+                    } elseif (null !== $lower && null === $upper) {
+                        // only upper value is defined: query all entries with reading GREATER THAN this value
+                        $expression = $filterQuery->getExpr()->gte($field, $min);
+                    } else {
+                        // both value are defined, perform a between
+                        $expression = $filterQuery->getExpr()->between($field, $min, $max);
                     }
 
-                    $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed());
-                    $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed());
-
-                    $expression = $filterQuery->getExpr()->between($field, $min, $max);
-
                     return $filterQuery->createCondition($expression);
                 },
                 'label' => 'entry.filters.reading_time.label',
@@ -113,7 +122,6 @@ class EntryFilterType extends AbstractType
             ])
             ->add('language', ChoiceFilterType::class, [
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
-                'choices_as_values' => true,
                 'label' => 'entry.filters.language_label',
             ])
         ;
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 9fc8ca2a..94300596 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -268,12 +268,12 @@ quickstart:
         tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles'
     admin:
         title: 'Administration'
-        description: "En tant qu'adminitrasteur sur wallabag, vous avez des privilèges qui vous permette de :"
+        description: "En tant qu'administrateur sur wallabag, vous avez des privilèges qui vous permettent de :"
         new_user: 'Créer un nouvel utilisateur'
         analytics: 'Configurer les statistiques'
         sharing: 'Activer des paramètres de partages'
-        export: 'Configurer les export'
-        import: 'Configurer les import'
+        export: "Configurer les formats d'export"
+        import: "Configurer l'import"
     first_steps:
         title: 'Premiers pas'
         new_article: 'Ajoutez votre premier article'
@@ -289,7 +289,7 @@ quickstart:
         create_application: 'Créer votre application tierce'
     docs:
         title: 'Documentation complète'
-        annotate: 'Annotater votre article'
+        annotate: 'Annoter votre article'
         export: 'Convertissez vos articles en ePub ou en PDF'
         search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
         fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?"
diff --git a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
index 3eba7193..70849f74 100644
--- a/src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php
+++ b/tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Tests\Controller;
+namespace Tests\AnnotationBundle\Controller;
 
-use Wallabag\AnnotationBundle\Tests\WallabagAnnotationTestCase;
+use Tests\Wallabag\AnnotationBundle\WallabagAnnotationTestCase;
 
 class AnnotationControllerTest extends WallabagAnnotationTestCase
 {
diff --git a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
index a9035acc..82790a5c 100644
--- a/src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php
+++ b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Tests;
+namespace Tests\Wallabag\AnnotationBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
index c50e4d02..c39cc357 100644
--- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ApiBundle\Tests\Controller;
+namespace Tests\Wallabag\ApiBundle\Controller;
 
-use Wallabag\ApiBundle\Tests\WallabagApiTestCase;
+use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class WallabagRestControllerTest extends WallabagApiTestCase
 {
diff --git a/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
index 13d72d2c..cf9b3347 100644
--- a/src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php
+++ b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Tests;
+namespace Tests\Wallabag\ApiBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
index 249672a6..2413d735 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
 use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
@@ -9,8 +9,8 @@ use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Tester\CommandTester;
 use Wallabag\CoreBundle\Command\InstallCommand;
-use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\Mock\InstallCommandMock;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class InstallCommandTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php b/tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php
index 4f544c1d..ec31708f 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Wallabag\CoreBundle\Command\TagAllCommand;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class TagAllCommandTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 8cdedfda..7193f9b0 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ConfigControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php b/tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php
index fc220b85..79452ace 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class DeveloperControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 5ce893c1..5c739c78 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 
 class EntryControllerTest extends WallabagCoreTestCase
@@ -499,6 +499,42 @@ class EntryControllerTest extends WallabagCoreTestCase
         $this->assertCount(1, $crawler->filter('div[class=entry]'));
     }
 
+    public function testFilterOnReadingTimeOnlyUpper()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/unread/list');
+
+        $form = $crawler->filter('button[id=submit-filter]')->form();
+
+        $data = [
+            'entry_filter[readingTime][right_number]' => 22,
+        ];
+
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(2, $crawler->filter('div[class=entry]'));
+    }
+
+    public function testFilterOnReadingTimeOnlyLower()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/unread/list');
+
+        $form = $crawler->filter('button[id=submit-filter]')->form();
+
+        $data = [
+            'entry_filter[readingTime][left_number]' => 22,
+        ];
+
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(4, $crawler->filter('div[class=entry]'));
+    }
+
     public function testFilterOnUnreadStatus()
     {
         $this->logInAs('admin');
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
index 76c98055..b22156c3 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ExportControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php b/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
index 87a01b8e..fb6fe06a 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class RssControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
index 2910fa4f..f503ff4b 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class SecurityControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php b/tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php
index fd698b3e..9b8b5702 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 /**
  * The controller `SettingsController` does not exist.
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php b/tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php
index 6d7976c4..98a37b50 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class StaticControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 8af37ea4..a019d36c 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class TagControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php b/tests/Wallabag/CoreBundle/EventListener/LocaleListenerTest.php
index b4c022d5..2a7f9390 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
+++ b/tests/Wallabag/CoreBundle/EventListener/LocaleListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/tests/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListenerTest.php
index 7039dc61..e45722fa 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
+++ b/tests/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\FOSUserEvents;
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php b/tests/Wallabag/CoreBundle/EventListener/UserLocaleListenerTest.php
index d9ffe30e..e9ac7c1d 100644
--- a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
+++ b/tests/Wallabag/CoreBundle/EventListener/UserLocaleListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\EventListener;
+namespace Tests\Wallabag\CoreBundle\EventListener;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
diff --git a/src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php b/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php
index 6b1e8613..0ec98c1f 100644
--- a/src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php
+++ b/tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Form\DataTransformer;
+namespace Tests\Wallabag\CoreBundle\Form\DataTransformer;
 
 use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
 
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 9d7b0f36..7abb0737 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Psr\Log\NullLogger;
 use Wallabag\CoreBundle\Helper\ContentProxy;
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
index f4aecc80..f339f75e 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Wallabag\CoreBundle\Helper\Redirect;
 
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php
index e9025b45..17b08c2a 100644
--- a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Helper;
+namespace Tests\Wallabag\CoreBundle\Helper;
 
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\Entry;
diff --git a/src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php b/tests/Wallabag/CoreBundle/Mock/InstallCommandMock.php
index ff9cdafd..5806bd4d 100644
--- a/src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php
+++ b/tests/Wallabag/CoreBundle/Mock/InstallCommandMock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Mock;
+namespace Tests\Wallabag\CoreBundle\Mock;
 
 use Wallabag\CoreBundle\Command\InstallCommand;
 
diff --git a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php
index ee10938a..e29b58b5 100644
--- a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
+++ b/tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Command;
+namespace Tests\Wallabag\CoreBundle\Command;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php b/tests/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriberTest.php
index e5eafab1..4ae76703 100644
--- a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
+++ b/tests/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriberTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Subscriber;
+namespace Tests\Wallabag\CoreBundle\Subscriber;
 
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
diff --git a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
index 9af8fad8..8ec2a75a 100644
--- a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
+++ b/tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests\Twig;
+namespace Tests\Wallabag\CoreBundle\Twig;
 
 use Wallabag\CoreBundle\Twig\WallabagExtension;
 
diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 05450c0b..c69e8330 100644
--- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Tests;
+namespace Tests\Wallabag\CoreBundle;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
index 9f38fa82..96b5300b 100644
--- a/src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class ImportControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/ImportBundle/Tests/Controller/PocketControllerTest.php b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
index 403fe9b0..6aaf1b57 100644
--- a/src/Wallabag/ImportBundle/Tests/Controller/PocketControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 
 class PocketControllerTest extends WallabagCoreTestCase
 {
diff --git a/src/Wallabag/ImportBundle/Tests/Controller/WallabagV1ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
index f7de3fef..c1025b41 100644
--- a/src/Wallabag/ImportBundle/Tests/Controller/WallabagV1ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class WallabagV1ControllerTest extends WallabagCoreTestCase
diff --git a/src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
index 15251ae7..d8d2c8bf 100644
--- a/src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Controller;
+namespace Tests\Wallabag\ImportBundle\Controller;
 
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class WallabagV2ControllerTest extends WallabagCoreTestCase
diff --git a/src/Wallabag/ImportBundle/Tests/Import/ImportChainTest.php b/tests/Wallabag/ImportBundle/Import/ImportChainTest.php
index 702d2a9b..32568ce5 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/ImportChainTest.php
+++ b/tests/Wallabag/ImportBundle/Import/ImportChainTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\ImportChain;
 
diff --git a/src/Wallabag/ImportBundle/Tests/Import/ImportCompilerPassTest.php b/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php
index b22fcfbc..71a007a9 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/ImportCompilerPassTest.php
+++ b/tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Wallabag\ImportBundle\Import\ImportCompilerPass;
diff --git a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
index cb171572..41f9b51f 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\CoreBundle\Entity\Entry;
diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
index 8c967e1b..bdc47dac 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\WallabagV1Import;
 use Wallabag\UserBundle\Entity\User;
diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
index e287d8e2..8ec66b12 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Tests\Import;
+namespace Tests\Wallabag\ImportBundle\Import;
 
 use Wallabag\ImportBundle\Import\WallabagV2Import;
 use Wallabag\UserBundle\Entity\User;
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/test.html b/tests/Wallabag/ImportBundle/fixtures/test.html
index e69de29b..e69de29b 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/test.html
+++ b/tests/Wallabag/ImportBundle/fixtures/test.html
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/test.txt b/tests/Wallabag/ImportBundle/fixtures/test.txt
index e69de29b..e69de29b 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/test.txt
+++ b/tests/Wallabag/ImportBundle/fixtures/test.txt
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1-read.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json
index c4d1cf58..c4d1cf58 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1-read.json
+++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1.json
index f298469f..f298469f 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1.json
+++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1.json
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2-read.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json
index 3fa0bddf..3fa0bddf 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2-read.json
+++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json
diff --git a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json
index 37c59668..37c59668 100644
--- a/src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2.json
+++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json
diff --git a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index 00967051..f670c925 100644
--- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Tests\Mailer;
+namespace Tests\Wallabag\UserBundle\Mailer;
 
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\UserBundle\Mailer\AuthCodeMailer;
diff --git a/web/app.php b/web/app.php
index 5c5ee03b..4c2c4650 100644
--- a/web/app.php
+++ b/web/app.php
@@ -8,16 +8,6 @@ use Symfony\Component\HttpFoundation\Request;
 $loader = require __DIR__.'/../app/autoload.php';
 include_once __DIR__.'/../var/bootstrap.php.cache';
 
-// Enable APC for autoloading to improve performance.
-// You should change the ApcClassLoader first argument to a unique prefix
-// in order to prevent cache key conflicts with other applications
-// also using APC.
-/*
-$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
-$loader->unregister();
-$apcLoader->register(true);
-*/
-
 $kernel = new AppKernel('prod', false);
 $kernel->loadClassCache();
 //$kernel = new AppCache($kernel);