aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--app/config/config.yml10
-rw-r--r--app/config/config_dev.yml4
-rw-r--r--app/config/config_prod.yml4
l---------bin/phpunit1
-rw-r--r--composer.json8
-rw-r--r--phpunit.xml.dist16
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php2
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php24
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml8
-rw-r--r--tests/Wallabag/AnnotationBundle/Controller/AnnotationControllerTest.php (renamed from src/Wallabag/AnnotationBundle/Tests/Controller/AnnotationControllerTest.php)4
-rw-r--r--tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php (renamed from src/Wallabag/AnnotationBundle/Tests/WallabagAnnotationTestCase.php)2
-rw-r--r--tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php (renamed from src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php)4
-rw-r--r--tests/Wallabag/ApiBundle/WallabagApiTestCase.php (renamed from src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Command/InstallCommandTest.php (renamed from src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php)6
-rw-r--r--tests/Wallabag/CoreBundle/Command/TagAllCommandTest.php (renamed from src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/DeveloperControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php)40
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/RssControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/SettingsControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/StaticControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/Controller/TagControllerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php)4
-rw-r--r--tests/Wallabag/CoreBundle/EventListener/LocaleListenerTest.php (renamed from src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListenerTest.php (renamed from src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/EventListener/UserLocaleListenerTest.php (renamed from src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php (renamed from src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Helper/RedirectTest.php (renamed from src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php (renamed from src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Mock/InstallCommandMock.php (renamed from src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php)2
-rw-r--r--tests/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverterTest.php (renamed from src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Subscriber/TablePrefixSubscriberTest.php (renamed from src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/Twig/WallabagExtensionTest.php (renamed from src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php)2
-rw-r--r--tests/Wallabag/CoreBundle/WallabagCoreTestCase.php (renamed from src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php)2
-rw-r--r--tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php (renamed from src/Wallabag/ImportBundle/Tests/Controller/ImportControllerTest.php)4
-rw-r--r--tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php (renamed from src/Wallabag/ImportBundle/Tests/Controller/PocketControllerTest.php)4
-rw-r--r--tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php (renamed from src/Wallabag/ImportBundle/Tests/Controller/WallabagV1ControllerTest.php)4
-rw-r--r--tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php (renamed from src/Wallabag/ImportBundle/Tests/Controller/WallabagV2ControllerTest.php)4
-rw-r--r--tests/Wallabag/ImportBundle/Import/ImportChainTest.php (renamed from src/Wallabag/ImportBundle/Tests/Import/ImportChainTest.php)2
-rw-r--r--tests/Wallabag/ImportBundle/Import/ImportCompilerPassTest.php (renamed from src/Wallabag/ImportBundle/Tests/Import/ImportCompilerPassTest.php)2
-rw-r--r--tests/Wallabag/ImportBundle/Import/PocketImportTest.php (renamed from src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php)2
-rw-r--r--tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php (renamed from src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php)2
-rw-r--r--tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php (renamed from src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php)2
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/test.html (renamed from src/Wallabag/ImportBundle/Tests/fixtures/test.html)0
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/test.txt (renamed from src/Wallabag/ImportBundle/Tests/fixtures/test.txt)0
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json (renamed from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1-read.json)0
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/wallabag-v1.json (renamed from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v1.json)0
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json (renamed from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2-read.json)0
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json (renamed from src/Wallabag/ImportBundle/Tests/fixtures/wallabag-v2.json)0
-rw-r--r--tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php (renamed from src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php)2
-rw-r--r--web/app.php10
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:
67script: 67script:
68 - travis_wait bash install.sh 68 - travis_wait bash install.sh
69 - ant prepare-$DB 69 - ant prepare-$DB
70 - bin/phpunit -v 70 - phpunit -v
71 - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 71 - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
72 - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 72 - 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:
156 156
157 path_patterns: 157 path_patterns:
158 bundle_resource: 158 bundle_resource:
159 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 159 - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
160 160
161fos_user: 161fos_user:
162 db_driver: orm 162 db_driver: orm
@@ -164,9 +164,9 @@ fos_user:
164 user_class: Wallabag\UserBundle\Entity\User 164 user_class: Wallabag\UserBundle\Entity\User
165 registration: 165 registration:
166 confirmation: 166 confirmation:
167 enabled: %fosuser_confirmation% 167 enabled: "%fosuser_confirmation%"
168 from_email: 168 from_email:
169 address: %from_email% 169 address: "%from_email%"
170 sender_name: wallabag 170 sender_name: wallabag
171fos_oauth_server: 171fos_oauth_server:
172 db_driver: orm 172 db_driver: orm
@@ -184,8 +184,8 @@ scheb_two_factor:
184 cookie_lifetime: 2592000 184 cookie_lifetime: 2592000
185 185
186 email: 186 email:
187 enabled: %twofactor_auth% 187 enabled: "%twofactor_auth%"
188 sender_email: %twofactor_sender% 188 sender_email: "%twofactor_sender%"
189 digits: 6 189 digits: 6
190 template: WallabagUserBundle:Authentication:form.html.twig 190 template: WallabagUserBundle:Authentication:form.html.twig
191 mailer: wallabag_user.auth_code_mailer 191 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:
17 type: stream 17 type: stream
18 path: "%kernel.logs_dir%/%kernel.environment%.log" 18 path: "%kernel.logs_dir%/%kernel.environment%.log"
19 level: debug 19 level: debug
20 channels: [!event] 20 channels: ['!event']
21 console: 21 console:
22 type: console 22 type: console
23 bubble: false 23 bubble: false
24 verbosity_levels: 24 verbosity_levels:
25 VERBOSITY_VERBOSE: INFO 25 VERBOSITY_VERBOSE: INFO
26 VERBOSITY_VERY_VERBOSE: DEBUG 26 VERBOSITY_VERY_VERBOSE: DEBUG
27 channels: [!event, !doctrine] 27 channels: ['!event', '!doctrine']
28 console_very_verbose: 28 console_very_verbose:
29 type: console 29 type: console
30 bubble: false 30 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:
2 - { resource: config.yml } 2 - { resource: config.yml }
3 3
4#framework: 4#framework:
5# validation: 5# cache:
6# cache: apc 6# system: cache.adapter.apcu
7 7
8#doctrine: 8#doctrine:
9# orm: 9# orm:
diff --git a/bin/phpunit b/bin/phpunit
deleted file mode 120000
index 4ba32564..00000000
--- a/bin/phpunit
+++ /dev/null
@@ -1 +0,0 @@
1../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 @@
43 "ext-iconv": "*", 43 "ext-iconv": "*",
44 "ext-tokenizer": "*", 44 "ext-tokenizer": "*",
45 "ext-pdo": "*", 45 "ext-pdo": "*",
46 "symfony/symfony": "3.0.*", 46 "symfony/symfony": "3.1.*",
47 "doctrine/orm": "^2.5", 47 "doctrine/orm": "^2.5",
48 "doctrine/doctrine-bundle": "^1.6", 48 "doctrine/doctrine-bundle": "^1.6",
49 "doctrine/doctrine-cache-bundle": "^1.2", 49 "doctrine/doctrine-cache-bundle": "^1.2",
@@ -85,9 +85,10 @@
85 }, 85 },
86 "require-dev": { 86 "require-dev": {
87 "doctrine/doctrine-fixtures-bundle": "~2.2", 87 "doctrine/doctrine-fixtures-bundle": "~2.2",
88 "doctrine/data-fixtures": "~1.1.1",
88 "sensio/generator-bundle": "^3.0", 89 "sensio/generator-bundle": "^3.0",
89 "phpunit/phpunit": "~4.4", 90 "phpunit/phpunit": "~4.4",
90 "symfony/phpunit-bridge": "^2.7", 91 "symfony/phpunit-bridge": "^3.0",
91 "friendsofphp/php-cs-fixer": "~1.9" 92 "friendsofphp/php-cs-fixer": "~1.9"
92 }, 93 },
93 "scripts": { 94 "scripts": {
@@ -119,6 +120,9 @@
119 "psr-4": { "Wallabag\\": "src/Wallabag/" }, 120 "psr-4": { "Wallabag\\": "src/Wallabag/" },
120 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] 121 "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
121 }, 122 },
123 "autoload-dev": {
124 "psr-4": { "Tests\\": "tests/" }
125 },
122 "config": { 126 "config": {
123 "bin-dir": "bin" 127 "bin-dir": "bin"
124 }, 128 },
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2 2
3<phpunit backupGlobals="false" 3<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 backupStaticAttributes="false" 4 xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
5 backupGlobals="false"
5 colors="true" 6 colors="true"
6 convertErrorsToExceptions="true"
7 convertNoticesToExceptions="true"
8 convertWarningsToExceptions="true"
9 processIsolation="false"
10 stopOnFailure="false"
11 syntaxCheck="false"
12 bootstrap="app/autoload.php" 7 bootstrap="app/autoload.php"
13 > 8>
14 9
15 <testsuites> 10 <testsuites>
16 <testsuite name="wallabag Test Suite"> 11 <testsuite name="wallabag Test Suite">
17 <directory>src/Wallabag/*Bundle/Tests</directory> 12 <directory>tests</directory>
18 </testsuite> 13 </testsuite>
19 </testsuites> 14 </testsuites>
20 15
21 <php> 16 <php>
17 <ini name="error_reporting" value="-1" />
22 <server name="KERNEL_DIR" value="app/" /> 18 <server name="KERNEL_DIR" value="app/" />
23 </php> 19 </php>
24 20
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
32 $builder 32 $builder
33 ->add('theme', ChoiceType::class, [ 33 ->add('theme', ChoiceType::class, [
34 'choices' => array_flip($this->themes), 34 'choices' => array_flip($this->themes),
35 'choices_as_values' => true,
36 'label' => 'config.form_settings.theme_label', 35 'label' => 'config.form_settings.theme_label',
37 ]) 36 ])
38 ->add('items_per_page', null, [ 37 ->add('items_per_page', null, [
@@ -49,7 +48,6 @@ class ConfigType extends AbstractType
49 ]) 48 ])
50 ->add('language', ChoiceType::class, [ 49 ->add('language', ChoiceType::class, [
51 'choices' => array_flip($this->languages), 50 'choices' => array_flip($this->languages),
52 'choices_as_values' => true,
53 'label' => 'config.form_settings.language_label', 51 'label' => 'config.form_settings.language_label',
54 ]) 52 ])
55 ->add('save', SubmitType::class, [ 53 ->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
36 $builder 36 $builder
37 ->add('readingTime', NumberRangeFilterType::class, [ 37 ->add('readingTime', NumberRangeFilterType::class, [
38 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { 38 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
39 $value = $values['value']; 39 $lower = $values['value']['left_number'][0];
40 $upper = $values['value']['right_number'][0];
41
42 $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
43 $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
40 44
41 if (null === $value['left_number'][0] || null === $value['right_number'][0]) { 45 if (null === $lower && null === $upper) {
46 // no value? no filter
42 return; 47 return;
48 } elseif (null === $lower && null !== $upper) {
49 // only lower value is defined: query all entries with reading LOWER THAN this value
50 $expression = $filterQuery->getExpr()->lte($field, $max);
51 } elseif (null !== $lower && null === $upper) {
52 // only upper value is defined: query all entries with reading GREATER THAN this value
53 $expression = $filterQuery->getExpr()->gte($field, $min);
54 } else {
55 // both value are defined, perform a between
56 $expression = $filterQuery->getExpr()->between($field, $min, $max);
43 } 57 }
44 58
45 $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed());
46 $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed());
47
48 $expression = $filterQuery->getExpr()->between($field, $min, $max);
49
50 return $filterQuery->createCondition($expression); 59 return $filterQuery->createCondition($expression);
51 }, 60 },
52 'label' => 'entry.filters.reading_time.label', 61 'label' => 'entry.filters.reading_time.label',
@@ -113,7 +122,6 @@ class EntryFilterType extends AbstractType
113 ]) 122 ])
114 ->add('language', ChoiceFilterType::class, [ 123 ->add('language', ChoiceFilterType::class, [
115 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())), 124 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
116 'choices_as_values' => true,
117 'label' => 'entry.filters.language_label', 125 'label' => 'entry.filters.language_label',
118 ]) 126 ])
119 ; 127 ;
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:
268 tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles' 268 tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles'
269 admin: 269 admin:
270 title: 'Administration' 270 title: 'Administration'
271 description: "En tant qu'adminitrasteur sur wallabag, vous avez des privilèges qui vous permette de :" 271 description: "En tant qu'administrateur sur wallabag, vous avez des privilèges qui vous permettent de :"
272 new_user: 'Créer un nouvel utilisateur' 272 new_user: 'Créer un nouvel utilisateur'
273 analytics: 'Configurer les statistiques' 273 analytics: 'Configurer les statistiques'
274 sharing: 'Activer des paramètres de partages' 274 sharing: 'Activer des paramètres de partages'
275 export: 'Configurer les export' 275 export: "Configurer les formats d'export"
276 import: 'Configurer les import' 276 import: "Configurer l'import"
277 first_steps: 277 first_steps:
278 title: 'Premiers pas' 278 title: 'Premiers pas'
279 new_article: 'Ajoutez votre premier article' 279 new_article: 'Ajoutez votre premier article'
@@ -289,7 +289,7 @@ quickstart:
289 create_application: 'Créer votre application tierce' 289 create_application: 'Créer votre application tierce'
290 docs: 290 docs:
291 title: 'Documentation complète' 291 title: 'Documentation complète'
292 annotate: 'Annotater votre article' 292 annotate: 'Annoter votre article'
293 export: 'Convertissez vos articles en ePub ou en PDF' 293 export: 'Convertissez vos articles en ePub ou en PDF'
294 search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse" 294 search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
295 fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?" 295 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\AnnotationBundle\Tests\Controller; 3namespace Tests\AnnotationBundle\Controller;
4 4
5use Wallabag\AnnotationBundle\Tests\WallabagAnnotationTestCase; 5use Tests\Wallabag\AnnotationBundle\WallabagAnnotationTestCase;
6 6
7class AnnotationControllerTest extends WallabagAnnotationTestCase 7class AnnotationControllerTest extends WallabagAnnotationTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\AnnotationBundle\Tests; 3namespace Tests\Wallabag\AnnotationBundle;
4 4
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
6use Symfony\Component\BrowserKit\Cookie; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ApiBundle\Tests\Controller; 3namespace Tests\Wallabag\ApiBundle\Controller;
4 4
5use Wallabag\ApiBundle\Tests\WallabagApiTestCase; 5use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
6 6
7class WallabagRestControllerTest extends WallabagApiTestCase 7class WallabagRestControllerTest extends WallabagApiTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ApiBundle\Tests; 3namespace Tests\Wallabag\ApiBundle;
4 4
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
6use Symfony\Component\BrowserKit\Cookie; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Command; 3namespace Tests\Wallabag\CoreBundle\Command;
4 4
5use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand; 5use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
6use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand; 6use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
@@ -9,8 +9,8 @@ use Symfony\Component\Console\Input\ArrayInput;
9use Symfony\Component\Console\Output\NullOutput; 9use Symfony\Component\Console\Output\NullOutput;
10use Symfony\Component\Console\Tester\CommandTester; 10use Symfony\Component\Console\Tester\CommandTester;
11use Wallabag\CoreBundle\Command\InstallCommand; 11use Wallabag\CoreBundle\Command\InstallCommand;
12use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock; 12use Tests\Wallabag\CoreBundle\Mock\InstallCommandMock;
13use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 13use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
14 14
15class InstallCommandTest extends WallabagCoreTestCase 15class InstallCommandTest extends WallabagCoreTestCase
16{ 16{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Command; 3namespace Tests\Wallabag\CoreBundle\Command;
4 4
5use Symfony\Bundle\FrameworkBundle\Console\Application; 5use Symfony\Bundle\FrameworkBundle\Console\Application;
6use Symfony\Component\Console\Tester\CommandTester; 6use Symfony\Component\Console\Tester\CommandTester;
7use Wallabag\CoreBundle\Command\TagAllCommand; 7use Wallabag\CoreBundle\Command\TagAllCommand;
8use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 8use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
9 9
10class TagAllCommandTest extends WallabagCoreTestCase 10class TagAllCommandTest extends WallabagCoreTestCase
11{ 11{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class ConfigControllerTest extends WallabagCoreTestCase 7class ConfigControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class DeveloperControllerTest extends WallabagCoreTestCase 7class DeveloperControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6use Wallabag\CoreBundle\Entity\Entry; 6use Wallabag\CoreBundle\Entity\Entry;
7 7
8class EntryControllerTest extends WallabagCoreTestCase 8class EntryControllerTest extends WallabagCoreTestCase
@@ -499,6 +499,42 @@ class EntryControllerTest extends WallabagCoreTestCase
499 $this->assertCount(1, $crawler->filter('div[class=entry]')); 499 $this->assertCount(1, $crawler->filter('div[class=entry]'));
500 } 500 }
501 501
502 public function testFilterOnReadingTimeOnlyUpper()
503 {
504 $this->logInAs('admin');
505 $client = $this->getClient();
506
507 $crawler = $client->request('GET', '/unread/list');
508
509 $form = $crawler->filter('button[id=submit-filter]')->form();
510
511 $data = [
512 'entry_filter[readingTime][right_number]' => 22,
513 ];
514
515 $crawler = $client->submit($form, $data);
516
517 $this->assertCount(2, $crawler->filter('div[class=entry]'));
518 }
519
520 public function testFilterOnReadingTimeOnlyLower()
521 {
522 $this->logInAs('admin');
523 $client = $this->getClient();
524
525 $crawler = $client->request('GET', '/unread/list');
526
527 $form = $crawler->filter('button[id=submit-filter]')->form();
528
529 $data = [
530 'entry_filter[readingTime][left_number]' => 22,
531 ];
532
533 $crawler = $client->submit($form, $data);
534
535 $this->assertCount(4, $crawler->filter('div[class=entry]'));
536 }
537
502 public function testFilterOnUnreadStatus() 538 public function testFilterOnUnreadStatus()
503 { 539 {
504 $this->logInAs('admin'); 540 $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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class ExportControllerTest extends WallabagCoreTestCase 7class ExportControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class RssControllerTest extends WallabagCoreTestCase 7class RssControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class SecurityControllerTest extends WallabagCoreTestCase 7class SecurityControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7/** 7/**
8 * The controller `SettingsController` does not exist. 8 * 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class StaticControllerTest extends WallabagCoreTestCase 7class StaticControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Tests\Wallabag\CoreBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class TagControllerTest extends WallabagCoreTestCase 7class TagControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\EventListener; 3namespace Tests\Wallabag\CoreBundle\EventListener;
4 4
5use Symfony\Component\EventDispatcher\EventDispatcher; 5use Symfony\Component\EventDispatcher\EventDispatcher;
6use Symfony\Component\HttpFoundation\Request; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\EventListener; 3namespace Tests\Wallabag\CoreBundle\EventListener;
4 4
5use FOS\UserBundle\Event\FilterUserResponseEvent; 5use FOS\UserBundle\Event\FilterUserResponseEvent;
6use FOS\UserBundle\FOSUserEvents; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\EventListener; 3namespace Tests\Wallabag\CoreBundle\EventListener;
4 4
5use Symfony\Component\HttpFoundation\Request; 5use Symfony\Component\HttpFoundation\Request;
6use Symfony\Component\HttpFoundation\Session\Session; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Form\DataTransformer; 3namespace Tests\Wallabag\CoreBundle\Form\DataTransformer;
4 4
5use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer; 5use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Helper; 3namespace Tests\Wallabag\CoreBundle\Helper;
4 4
5use Psr\Log\NullLogger; 5use Psr\Log\NullLogger;
6use Wallabag\CoreBundle\Helper\ContentProxy; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Helper; 3namespace Tests\Wallabag\CoreBundle\Helper;
4 4
5use Wallabag\CoreBundle\Helper\Redirect; 5use Wallabag\CoreBundle\Helper\Redirect;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Helper; 3namespace Tests\Wallabag\CoreBundle\Helper;
4 4
5use Wallabag\CoreBundle\Entity\Config; 5use Wallabag\CoreBundle\Entity\Config;
6use Wallabag\CoreBundle\Entity\Entry; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Mock; 3namespace Tests\Wallabag\CoreBundle\Mock;
4 4
5use Wallabag\CoreBundle\Command\InstallCommand; 5use Wallabag\CoreBundle\Command\InstallCommand;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Command; 3namespace Tests\Wallabag\CoreBundle\Command;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
6use Symfony\Component\HttpFoundation\Request; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Subscriber; 3namespace Tests\Wallabag\CoreBundle\Subscriber;
4 4
5use Doctrine\Common\EventManager; 5use Doctrine\Common\EventManager;
6use Doctrine\ORM\Event\LoadClassMetadataEventArgs; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests\Twig; 3namespace Tests\Wallabag\CoreBundle\Twig;
4 4
5use Wallabag\CoreBundle\Twig\WallabagExtension; 5use Wallabag\CoreBundle\Twig\WallabagExtension;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\CoreBundle\Tests; 3namespace Tests\Wallabag\CoreBundle;
4 4
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Controller; 3namespace Tests\Wallabag\ImportBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class ImportControllerTest extends WallabagCoreTestCase 7class ImportControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Controller; 3namespace Tests\Wallabag\ImportBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6 6
7class PocketControllerTest extends WallabagCoreTestCase 7class PocketControllerTest extends WallabagCoreTestCase
8{ 8{
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Controller; 3namespace Tests\Wallabag\ImportBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6use Symfony\Component\HttpFoundation\File\UploadedFile; 6use Symfony\Component\HttpFoundation\File\UploadedFile;
7 7
8class WallabagV1ControllerTest extends WallabagCoreTestCase 8class 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Controller; 3namespace Tests\Wallabag\ImportBundle\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
6use Symfony\Component\HttpFoundation\File\UploadedFile; 6use Symfony\Component\HttpFoundation\File\UploadedFile;
7 7
8class WallabagV2ControllerTest extends WallabagCoreTestCase 8class 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Import; 3namespace Tests\Wallabag\ImportBundle\Import;
4 4
5use Wallabag\ImportBundle\Import\ImportChain; 5use Wallabag\ImportBundle\Import\ImportChain;
6 6
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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Import; 3namespace Tests\Wallabag\ImportBundle\Import;
4 4
5use Symfony\Component\DependencyInjection\ContainerBuilder; 5use Symfony\Component\DependencyInjection\ContainerBuilder;
6use Wallabag\ImportBundle\Import\ImportCompilerPass; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Import; 3namespace Tests\Wallabag\ImportBundle\Import;
4 4
5use Wallabag\UserBundle\Entity\User; 5use Wallabag\UserBundle\Entity\User;
6use Wallabag\CoreBundle\Entity\Entry; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Import; 3namespace Tests\Wallabag\ImportBundle\Import;
4 4
5use Wallabag\ImportBundle\Import\WallabagV1Import; 5use Wallabag\ImportBundle\Import\WallabagV1Import;
6use Wallabag\UserBundle\Entity\User; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\ImportBundle\Tests\Import; 3namespace Tests\Wallabag\ImportBundle\Import;
4 4
5use Wallabag\ImportBundle\Import\WallabagV2Import; 5use Wallabag\ImportBundle\Import\WallabagV2Import;
6use Wallabag\UserBundle\Entity\User; 6use 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 @@
1<?php 1<?php
2 2
3namespace Wallabag\UserBundle\Tests\Mailer; 3namespace Tests\Wallabag\UserBundle\Mailer;
4 4
5use Wallabag\UserBundle\Entity\User; 5use Wallabag\UserBundle\Entity\User;
6use Wallabag\UserBundle\Mailer\AuthCodeMailer; 6use 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;
8$loader = require __DIR__.'/../app/autoload.php'; 8$loader = require __DIR__.'/../app/autoload.php';
9include_once __DIR__.'/../var/bootstrap.php.cache'; 9include_once __DIR__.'/../var/bootstrap.php.cache';
10 10
11// Enable APC for autoloading to improve performance.
12// You should change the ApcClassLoader first argument to a unique prefix
13// in order to prevent cache key conflicts with other applications
14// also using APC.
15/*
16$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
17$loader->unregister();
18$apcLoader->register(true);
19*/
20
21$kernel = new AppKernel('prod', false); 11$kernel = new AppKernel('prod', false);
22$kernel->loadClassCache(); 12$kernel->loadClassCache();
23//$kernel = new AppCache($kernel); 13//$kernel = new AppCache($kernel);