Release wallabag 2.0.0-alpha.2

Few fixes

.gitignore

@@ -1,25 +1,20 @@
-# Cache and logs (Symfony2)
+# Cache, logs & sessions
-/app/cache/*
+/var/*
-/app/logs/*
+!/var/cache
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Cache and logs (Symfony3)
 /var/cache/*
-/var/logs/*
 !var/cache/.gitkeep
+!/var/logs
+/var/logs/*
 !var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
 
 # Parameters
 /app/config/parameters.yml
-/app/config/parameters.ini
 
 # Managed by Composer
-/app/bootstrap.php.cache
-/var/bootstrap.php.cache
-/bin/*
-!bin/console
-!bin/symfony_requirements
 /vendor/
 
 # Assets and user uploads
@@ -36,3 +31,10 @@
 # Data for wallabag
 data/assets/*
 data/db/wallabag*.sqlite
+
+# Docker container logs and data
+docker/logs/
+docker/data/
+
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock

.scrutinizer.yml

@@ -4,6 +4,7 @@ filter:
     excluded_paths:
         - 'vendor/*'
         - 'app/*'
+        - 'var/*'
         - 'web/*'
         - 'src/Wallabag/*Bundle/Tests/*'
         - '*Test.php'

.travis.yml

@@ -3,6 +3,12 @@ language: php
 # faster builds on docker-container setup
 sudo: false
 
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
 # cache vendor dirs
 cache:
     directories:
@@ -10,36 +16,36 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
-    - nightly
+
+env:
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
 
 matrix:
     fast_finish: true
+    exclude:
+        - php: hhvm
+          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
         - php: hhvm
-        - php: nightly
 
 branches:
     only:
         - v2
 
-install:
+before_script:
-    - composer self-update
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
-# build coverage only on one build, to speed up results feedbacks
+    - composer self-update --no-progress
-# before_script:
+    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
 
 script:
-    - ant prepare
+    - travis_wait composer update --no-interaction --no-progress
-    - bin/phpunit --exclude-group command-doctrine --debug $PHPUNIT_FLAGS
+    - ant prepare-$DB
-
+    - bin/phpunit -v
-# after_script:
-    # - |
-        # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
-            # wget https://scrutinizer-ci.com/ocular.phar
-            # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-        # fi

COPYING.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 Nicolas Lœuillet
+Copyright (c) 2013-2016 Nicolas Lœuillet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

CREDITS.md

@@ -1,6 +1,3 @@
-wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
 
-Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).
-
-Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
-).

Capfile

@@ -1,3 +1,6 @@
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/deploy'
+
 # Load DSL and set up stages
 require 'capistrano/setup'
 
@@ -6,24 +9,5 @@ require 'capistrano/deploy'
 
 require 'capistrano/symfony'
 
-# Include tasks from other gems included in your Gemfile
-#
-# For documentation on these, see for example:
-#
-#   https://github.com/capistrano/rvm
-#   https://github.com/capistrano/rbenv
-#   https://github.com/capistrano/chruby
-#   https://github.com/capistrano/bundler
-#   https://github.com/capistrano/rails
-#   https://github.com/capistrano/passenger
-#
-# require 'capistrano/rvm'
-# require 'capistrano/rbenv'
-# require 'capistrano/chruby'
-# require 'capistrano/bundler'
-# require 'capistrano/rails/assets'
-# require 'capistrano/rails/migrations'
-# require 'capistrano/passenger'
-
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

GUIDELINES.md

@@ -1,53 +0,0 @@
-# Guidelines for wallabag
-
-If you want to contribute to wallabag, you have some rules to respect. These rules were defined by [PHP Framework Interop Group](http://www.php-fig.org).
-
-## Basic Coding Standard (PSR-1)
-
-This section of the standard comprises what should be considered the standard coding elements that are required to ensure a high level of technical interoperability between shared PHP code.
-
-* Files MUST use only `<?php` and `<?=` tags.
-
-* Files MUST use only UTF-8 without BOM for PHP code.
-
-* Files SHOULD either declare symbols (classes, functions, constants, etc.) or cause side-effects (e.g. generate output, change .ini settings, etc.) but SHOULD NOT do both.
-
-* Namespaces and classes MUST follow [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md).
-
-* Class names MUST be declared in `StudlyCaps`.
-
-* Class constants MUST be declared in all upper case with underscore separators.
-
-* Method names MUST be declared in `camelCase`.
-
-You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-1/).
-
-## Coding Style Guide (PSR-2)
-
-This guide extends and expands on PSR-1, the basic coding standard.
-
-The intent of this guide is to reduce cognitive friction when scanning code from different authors. It does so by enumerating a shared set of rules and expectations about how to format PHP code.
-
-The style rules herein are derived from commonalities among the various member projects. When various authors collaborate across multiple projects, it helps to have one set of guidelines to be used among all those projects. Thus, the benefit of this guide is not in the rules themselves, but in the sharing of those rules.
-
-* Code MUST follow PSR-1.
-
-* Code MUST use 4 spaces for indenting, not tabs.
-
-* There MUST NOT be a hard limit on line length; the soft limit MUST be 120 characters; lines SHOULD be 80 characters or less.
-
-* There MUST be one blank line after the `namespace` declaration, and there MUST be one blank line after the block of `use` declarations.
-
-* Opening braces for classes MUST go on the next line, and closing braces MUST go on the next line after the body.
-
-* Opening braces for methods MUST go on the next line, and closing braces MUST go on the next line after the body.
-
-* Visibility MUST be declared on all properties and methods; `abstract` and `final` MUST be declared before the visibility; `static` MUST be declared after the visibility.
-
-* Control structure keywords MUST have one space after them; method and function calls MUST NOT.
-
-* Opening braces for control structures MUST go on the same line, and closing braces MUST go on the next line after the body.
-
-* Opening parentheses for control structures MUST NOT have a space after them, and closing parentheses for control structures MUST NOT have a space before.
-
-You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-2/).

README.md

@@ -2,25 +2,25 @@
 [![Code Coverage](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/coverage.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 
-# What is wallabag ?
+# What is wallabag?
 wallabag is a self hostable application allowing you to not miss any content anymore.
-Click, save, read it when you can. It extracts content so that you can read it when you have time.
+Click, save and read it when you can. It extracts content so that you can read it when you have time.
 
 More informations on our website: [wallabag.org](http://wallabag.org)
 
-# Want to test the v2 ?
+# Want to test the v2?
 
-Keep in mind it's an **instable** branch, everything can be broken :)
+Keep in mind it's an **unstable** branch, everything can be broken :)
+
+If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
 
 ```
-git clone https://github.com/wallabag/wallabag.git -b v2
+composer create-project wallabag/wallabag wallabag 2.0.*@alpha
-cd wallabag
+php bin/console wallabag:install
-composer install
+php bin/console server:run
-php app/console wallabag:install
-php app/console server:run
 ```
 
 ## License
-Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

TRANSLATION.md

@@ -1,67 +0,0 @@
-# How to manage translations for wallabag
-
-This guide will describe the procedure of translation management of the wallabag web application.
-
-All translations are made using [gettext](http://en.wikipedia.org/wiki/Gettext) system and tools. 
-
-You will need the [Poedit](http://www.poedit.net/download.php) editor to update, edit and create your translation files easily. However, you can also handle translations also without it: all can be done using gettext tools and your favorite plain text editor only. This guide, however, describes editing with Poedit. If you want to use gettext only, please refer to the xgettext manual page to update po files from sources (see also how it is used by Poedit below) and use msgunfmt tool to compile .mo files manually.  
-
-You need to know, that translation phrases are stored in **".po"** files (for example: `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po`), which are then complied in **".mo"** files using **msgfmt** gettext tool or by Poedit, which will run msgfmt for you in background. 
-
-**It's assumed, that you have wallabag installed locally on your computer or on the server you have access to.**
-
-## To change existing translation you will need to do:
-
-### 1. Clear cache
-You can do this using **http://your-wallabag-host.com/?empty-cache** link (replace http://your-wallabag-host.com/ with real url of your wallabag application)
-
-OR
-
-from command line:
-go to root of your installation of wallabag project and run next command:
-
-`rm -rf ./cache/*`
-
-(this may require root privileges if you run, for example Apache web server with mod_php)
-
-### 2. Generate php files from all twig templates
-Do this using next command:
-
-`php ./locale/tools/fillCache.php`
-
-OR
-
-from your browser: **http://your-wallabag-host.com/locale/tools/fillCache.php** (this may require removal of .htaccess file in locale/ directory).
-
-### 3. Configure your Poedit
-Open Poedit editor, open Edit->Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like
-
-`xgettext --no-location --force-po -o %o %C %K %F`
-
-Usually it is required to add "--no-location" to default value. 
-
-### 4. Open .po file you want to edit in Poedit and change its settings
-Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit.
-
-Go to "Catalog"->"Settings..." menu. Then go to "Path" tab and add path to wallabag installation in your local file system. This step can't be omitted as you will not be able to update phrases otherwise.
-
-You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation).
-
-### 5. Update opened .po file from sources
-Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu.
-
-As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Please review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors).
-
-### 6. Translate and save your .po file
-If you have any difficulties on this step, please consult with Poedit manual.
-Every time you save your .po file, Poedit will also compile appropriate .mo file by default (of course, if not disabled in preferences).
-
-You are now almost done.
-
-### 7. Clear cache again
-This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi).
-
-
-##To create new translation
-You just have to copy the folder corresponding to the language you want to translate from, change language in the project settings and for the folder and files names. Then start replacing all existing translations with your own.
-

Vagrantfile

@@ -1,71 +0,0 @@
-
-$script_sqlite = <<SCRIPT
-apt-get update
-apt-get install -y apache2 php5 php5-sqlite php5-xdebug
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-$script_mysql = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get install -y apache2 php5 php5-mysql php5-xdebug mysql-server mysql-client
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-service mysql restart
-echo "create database wallabag;" | mysql -u root
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-$script_postgres = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get install -y apache2 php5 php5-pgsql php5-xdebug postgresql postgresql-contrib
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-service postgresql restart
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-Vagrant.configure("2") do |config|
-
-  config.vm.define "sqlite" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "mysql" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_mysql
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "postgres" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_postgres
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "debian7" do |m|
-    m.vm.box = "chef/debian-7.6"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "debian6" do |m|
-    m.vm.box = "chef/debian-6.0.10"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.network :forwarded_port, guest: 80, host: 8003
-  #config.vm.network "public_network", :bridge => "en0: Wi-Fi (AirPort)"
-end

app/AppCache.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__.'/AppKernel.php';
-
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
 
 class AppCache extends HttpCache

app/AppKernel.php

@@ -7,7 +7,7 @@ class AppKernel extends Kernel
 {
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
@@ -26,9 +26,16 @@ class AppKernel extends Kernel
             new Wallabag\ApiBundle\WallabagApiBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
             new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
-        );
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+        ];
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
@@ -39,8 +46,23 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/var/logs';
+    }
+
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }

app/autoload.php

@@ -8,6 +8,6 @@ use Composer\Autoload\ClassLoader;
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;

app/config/capistrano/deploy.rb

@@ -0,0 +1,23 @@
+# config valid only for current version of Capistrano
+lock '3.4.0'
+
+set :application, 'wallabag'
+set :repo_url, 'git@github.com:wallabag/wallabag.git'
+
+set :ssh_user, 'framasoft_bag'
+server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
+
+set :scm, :git
+
+set :format, :pretty
+set :log_level, :info
+# set :log_level, :debug
+
+set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
+
+set :linked_files, %w{app/config/parameters.yml}
+set :linked_dirs, %w{app/logs web/uploads data}
+
+set :keep_releases, 3
+
+after 'deploy:finishing', 'deploy:cleanup'

app/config/capistrano/deploy/staging.rb

@@ -0,0 +1,2 @@
+set :branch, 'v2'
+set :deploy_to, '/var/www/v2.wallabag.org/web/'

app/config/config.yml

@@ -21,9 +21,21 @@ framework:
     trusted_proxies: ~
     session:
         # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+        handler_id:  session.handler.native_file
+        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
     fragments:       ~
     http_method_override: true
+    assets: ~
+
+wallabag_core:
+    languages:
+        en: 'English'
+        fr: 'Français'
+        de: 'Deutsch'
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
 
 # Twig Configuration
 twig:
@@ -45,12 +57,11 @@ twig:
         export_mobi: %export_mobi%
         export_pdf: %export_pdf%
         version: %app.version%
+        twofactor_auth: %twofactor_auth%
         warning_message: %warning_message%
         paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
-        flattr_url: "https://flattr.com/thing/1265480"
+    form_themes:
-    form:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
-        resources:
-            - LexikFormFilterBundle:Form:form_div_layout.html.twig
 
 # Assetic Configuration
 assetic:
@@ -81,9 +92,22 @@ doctrine:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
-                naming_strategy: wallabag_core.doctrine.prefixed_naming_strategy
                 auto_mapping: true
 
+stof_doctrine_extensions:
+    default_locale: "%locale%"
+    translation_fallback: true
+    orm:
+        default:
+            tree: true
+            sluggable: true
+
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"
@@ -110,7 +134,10 @@ fos_rest:
     routing_loader:
         default_format: json
 
-nelmio_api_doc: ~
+nelmio_api_doc:
+    sandbox:
+        enabled: false
+    name: wallabag API documentation
 
 nelmio_cors:
     defaults:
@@ -144,16 +171,39 @@ liip_theme:
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns:
-        # app_resource:
-        #     - %%app_path%%/views/themes/%%current_theme%%/%%template%%
-        #     - %%app_path%%/views/%%template%%
         bundle_resource:
             - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
-        # bundle_resource_dir:
-        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
-        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
 
 fos_user:
     db_driver: orm
     firewall_name: main
-    user_class: Wallabag\CoreBundle\Entity\User
+    user_class: Wallabag\UserBundle\Entity\User
+    registration:
+        confirmation:
+            enabled: true
+
+fos_oauth_server:
+    db_driver:           orm
+    client_class:        Wallabag\ApiBundle\Entity\Client
+    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
+    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
+    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    service:
+        user_provider: fos_user.user_manager
+
+scheb_two_factor:
+    trusted_computer:
+        enabled: true
+        cookie_name: wllbg_trusted_computer
+        cookie_lifetime: 2592000
+
+    email:
+        enabled: %twofactor_auth%
+        sender_email: %twofactor_sender%
+        digits: 6
+        template: WallabagUserBundle:Authentication:form.html.twig
+        mailer: wallabag_user.auth_code_mailer
+
+kphoen_rulerz:
+    executors:
+        doctrine: true

app/config/config_dev.yml

@@ -17,13 +17,14 @@ monolog:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
+            channels: [!event]
         console:
             type:   console
             bubble: false
             verbosity_levels:
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: ["!doctrine"]
+            channels: [!event, !doctrine]
         console_very_verbose:
             type:   console
             bubble: false
@@ -31,15 +32,7 @@ monolog:
                 VERBOSITY_VERBOSE: NOTICE
                 VERBOSITY_VERY_VERBOSE: NOTICE
                 VERBOSITY_DEBUG: DEBUG
-            channels: ["doctrine"]
+            channels: [doctrine]
-        # uncomment to get logging in your browser
-        # you may have to allow bigger header sizes in your Web server configuration
-        #firephp:
-        #    type:   firephp
-        #    level:  info
-        #chromephp:
-        #    type:   chromephp
-        #    level:  info
 
 assetic:
     use_controller: true
@@ -49,6 +42,3 @@ swiftmailer:
     transport: smtp
     host: 'localhost'
     port: 1025
-    username: null
-    password: null
-

app/config/config_prod.yml

@@ -17,11 +17,6 @@ monolog:
             type:         fingers_crossed
             action_level: error
             handler:      nested
-        wsse:
-            type: stream
-            path: %kernel.logs_dir%/%kernel.environment%.wsse.log
-            level: error
-            channels: [wsse]
         nested:
             type:  stream
             path:  "%kernel.logs_dir%/%kernel.environment%.log"

app/config/config_test.yml

@@ -19,9 +19,14 @@ swiftmailer:
 
 doctrine:
     dbal:
-        driver: pdo_sqlite
+        driver: "%test_database_driver%"
-        path: %kernel.root_dir%/../data/db/wallabag_test.sqlite
+        host: "%test_database_host%"
-        host: localhost
+        port: "%test_database_port%"
+        dbname: "%test_database_name%"
+        user: "%test_database_user%"
+        password: "%test_database_password%"
+        charset: UTF8
+        path: "%test_database_path%"
     orm:
         metadata_cache_driver:
             type: service

app/config/parameters.yml.dist

@@ -1,5 +1,15 @@
 # This file is a "template" of what your parameters.yml file should look like
 parameters:
+    # Uncomment these settings or manually update your parameters.yml
+    # to use docker-compose
+    #
+    # database_driver: %env.database_driver%
+    # database_host: %env.database_host%
+    # database_port: %env.database_port%
+    # database_name: %env.database_name%
+    # database_user: %env.database_user%
+    # database_password: %env.database_password%
+
     database_driver: pdo_sqlite
     database_host: 127.0.0.1
     database_port: ~
@@ -9,6 +19,14 @@ parameters:
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
 
+    test_database_driver: pdo_sqlite
+    test_database_host: 127.0.0.1
+    test_database_port: ~
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
     mailer_user:       ~
@@ -21,6 +39,8 @@ parameters:
 
     # wallabag misc
     app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
 
     # message to display at the bottom of the page
     warning_message: >
@@ -41,10 +61,15 @@ parameters:
     export_epub: true
     export_mobi: true
     export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
 
     # default user config
     items_on_page: 12
     theme: material
-    language: en_US
+    language: en
     from_email: no-reply@wallabag.org
     rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/routing.yml

@@ -1,32 +1,33 @@
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type:     annotation
+    prefix:   /import
+
 wallabag_api:
     resource: "@WallabagApiBundle/Resources/config/routing.yml"
     prefix: /
 
 app:
-    resource: @WallabagCoreBundle/Controller/
+    resource: "@WallabagCoreBundle/Controller/"
     type: annotation
 
 doc-api:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
     prefix: /api/doc
 
-login:
-    pattern:   /login
-    defaults:  { _controller: WallabagCoreBundle:Security:login }
-
-login_check:
-    pattern:   /login_check
-
-logout:
-    path:   /logout
-
 rest :
     type : rest
     resource : "routing_rest.yml"
     prefix : /api
 
 homepage:
-    pattern:   "/{page}"
+    path: "/{page}"
     defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
     requirements:
         page: \d+
+
+fos_user:
+    resource: "@FOSUserBundle/Resources/config/routing/all.xml"
+
+fos_oauth_server_token:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"

app/config/routing_dev.yml

@@ -6,10 +6,6 @@ _profiler:
     resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
     prefix:   /_profiler
 
-_configurator:
-    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
-    prefix:   /_configurator
-
 _errors:
     resource: "@TwigBundle/Resources/config/routing/errors.xml"
     prefix:   /_error

app/config/security.yml

@@ -1,9 +1,6 @@
 security:
     encoders:
-        Wallabag\CoreBundle\Entity\User:
+        FOS\UserBundle\Model\UserInterface: sha512
-            algorithm:        sha1
-            encode_as_base64: false
-            iterations:       1
 
     role_hierarchy:
         ROLE_ADMIN:       ROLE_USER
@@ -11,18 +8,28 @@ security:
 
     providers:
         administrators:
-            entity: { class: WallabagCoreBundle:User, property: username }
+            entity: { class: WallabagUserBundle:User, property: username }
         fos_userbundle:
             id: fos_user.user_provider.username
 
     # the main part of the security, where you can set up firewalls
     # for specific sections of your app
     firewalls:
-        wsse_secured:
+        # disables authentication for assets and the profiler, adapt it according to your needs
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        oauth_token:
+            pattern: ^/oauth/v2/token
+            security: false
+
+        api:
             pattern: /api/.*
-            wsse:         true
+            fos_oauth: true
             stateless: true
             anonymous: true
+
         login_firewall:
             pattern:    ^/login$
             anonymous:  ~
@@ -31,11 +38,11 @@ security:
             pattern: ^/
             form_login:
                 provider: fos_userbundle
-                csrf_provider: security.csrf.token_manager
+                csrf_token_generator: security.csrf.token_manager
 
             anonymous:    true
             remember_me:
-                key:      "%secret%"
+                secret:   "%secret%"
                 lifetime: 31536000
                 path:     /
                 domain:   ~
@@ -45,9 +52,9 @@ security:
                 target: /
 
     access_control:
-        - { path: ^/api/salt, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/forgot-password, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -1,9 +1,4 @@
-# Learn more about services, parameters and containers at
-# http://symfony.com/doc/current/book/service_container.html
 parameters:
-    security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider
-    security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder
-    security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator
     lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
 
 services:
@@ -17,3 +12,21 @@ services:
         class: Twig_Extensions_Extension_Text
         tags:
             - { name: twig.extension }
+
+    wallabag.twig_extension:
+        class: Wallabag\CoreBundle\Twig\WallabagExtension
+        public: false
+        tags:
+            - { name: twig.extension }
+
+    wallabag.locale_listener:
+        class: Wallabag\CoreBundle\EventListener\LocaleListener
+        arguments: ["%kernel.default_locale%"]
+        tags:
+            - { name: kernel.event_subscriber }
+
+    wallabag.user_locale_listener:
+        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+        arguments: ["@session"]
+        tags:
+            - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }

app/config/tests/parameters.yml.dist.mysql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_mysql
+    test_database_host: localhost
+    test_database_port: 3306
+    test_database_name: wallabag
+    test_database_user: root
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.pgsql

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_pgsql
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: wallabag
+    test_database_user: travis
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.sqlite

@@ -0,0 +1,65 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # wallabag misc
+    app.version: 2.0.0-alpha
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # message to display at the bottom of the page
+    warning_message: >
+        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+
+    download_pictures: false # if true, pictures will be stored into data/assets for each article
+
+    # Entry view
+    share_twitter: true
+    share_mail: true
+    share_shaarli: true
+    shaarli_url: http://myshaarli.com
+    share_diaspora: true
+    diaspora_url: http://diasporapod.com
+    flattr: true
+    carrot: true
+    show_printlink: true
+    export_epub: true
+    export_mobi: true
+    export_pdf: true
+    wallabag_url: http://v2.wallabag.org
+    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
+
+    # default user config
+    items_on_page: 12
+    theme: material
+    language: en_US
+    from_email: no-reply@wallabag.org
+    rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx

bin/console

@@ -1,22 +1,24 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask(0000);
 
 set_time_limit(0);
 
-require_once __DIR__.'/bootstrap.php.cache';
+/**
-require_once __DIR__.'/AppKernel.php';
+ * @var Composer\Autoload\ClassLoader $loader
-
+ */
-use Symfony\Bundle\FrameworkBundle\Console\Application;
+$loader = require __DIR__.'/../app/autoload.php';
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
 
 $input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
 
 if ($debug) {
     Debug::enable();

bin/doctrine

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine

bin/doctrine-dbal

@@ -0,0 +1 @@
+../vendor/doctrine/dbal/bin/doctrine-dbal

bin/doctrine-migrations

@@ -0,0 +1 @@
+../vendor/doctrine/migrations/bin/doctrine-migrations

bin/doctrine.php

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine.php

bin/security-checker

@@ -0,0 +1 @@
+../vendor/sensiolabs/security-checker/security-checker

bin/symfony_requirements

@@ -1,6 +1,7 @@
+#!/usr/bin/env php
 <?php
 
-require_once dirname(__FILE__).'/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
 
 $lineSize = 70;
 $symfonyRequirements = new SymfonyRequirements();

build.xml

@@ -1,46 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="wallabag" default="build">
-    <target name="build" depends="prepare"/>
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
 
     <target name="clean" description="Cleanup build artifacts">
-        <delete dir="${basedir}/app/cache"/>
+        <delete dir="${basedir}/var/cache"/>
     </target>
 
-    <target name="prepare" depends="clean" description="Prepare for build">
+    <target name="prepare" description="Prepare for build">
-        <exec executable="composer">
-            <arg value="install"/>
-            <arg value="--no-interaction"/>
-            <arg value="--no-progress"/>
-        </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:database:drop"/>
             <arg value="--force"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:schema:create"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:fixtures:load"/>
             <arg value="--no-interaction"/>
             <arg value="--env=test"/>
         </exec>
     </target>
 
+    <target name="db_mysql" description="Run test for MySQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.mysql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_sqlite" description="Run test for SQLite">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_pgsql" description="Run test for PostgreSQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
     <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">
         <exec executable="phpunit" failonerror="true">
             <arg value="--coverage-html"/>

composer.json

@@ -28,64 +28,88 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5.9",
-        "symfony/symfony": "~2.7.0",
+        "symfony/symfony": "3.0.*",
-        "doctrine/orm": "~2.3",
+        "doctrine/orm": "^2.5",
-        "doctrine/doctrine-bundle": "~1.2",
+        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-cache-bundle": "^1.2",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
-        "symfony/swiftmailer-bundle": "~2.3",
+        "symfony/swiftmailer-bundle": "^2.3",
-        "symfony/monolog-bundle": "~2.4",
+        "symfony/monolog-bundle": "^2.8",
-        "sensio/distribution-bundle": "~3.0.12",
+        "sensio/distribution-bundle": "^5.0",
-        "sensio/framework-extra-bundle": "~3.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
-        "incenteev/composer-parameter-handler": "~2.0",
+        "incenteev/composer-parameter-handler": "^2.0",
         "nelmio/cors-bundle": "~1.4.0",
         "friendsofsymfony/rest-bundle": "~1.4",
-        "jms/serializer-bundle": "~0.13",
+        "jms/serializer-bundle": "~1.0",
         "nelmio/api-doc-bundle": "~2.7",
         "ezyang/htmlpurifier": "~4.6",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnick.com/tcpdf": "~6.2",
+        "tecnickcom/tcpdf": "~6.2",
         "simplepie/simplepie": "~1.3.1",
-        "willdurand/hateoas-bundle": "~0.5.0",
+        "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",
-        "liip/theme-bundle": "~1.1.3",
+        "liip/theme-bundle": "~1.1",
         "pagerfanta/pagerfanta": "~1.0.3",
-        "lexik/form-filter-bundle": "~4.0",
+        "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master"
+        "friendsofsymfony/user-bundle": "dev-master",
+        "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "scheb/two-factor-bundle": "~2.0",
+        "grandt/phpepub": "~4.0",
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10",
+        "guzzlehttp/guzzle": "^5.2.0",
+        "doctrine/doctrine-migrations-bundle": "^1.0",
+        "paragonie/random_compat": "~1.0"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "~2.2.0",
+        "doctrine/doctrine-fixtures-bundle": "~2.2",
-        "sensio/generator-bundle": "~2.5",
+        "sensio/generator-bundle": "^3.0",
-        "phpunit/phpunit": "~4.4"
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "^2.7"
     },
     "scripts": {
-        "post-install-cmd": [
+        "build-parameters": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+        ],
+        "post-cmd": [
+            "@build-parameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+        ],
+        "post-install-cmd": [
+            "@post-cmd"
         ],
         "post-update-cmd": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+            "@post-cmd"
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ]
     },
     "extra": {
         "symfony-app-dir": "app",
+        "symfony-bin-dir": "bin",
+        "symfony-var-dir": "var",
         "symfony-web-dir": "web",
+        "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
+            "file": "app/config/parameters.yml",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
         }
     },
     "autoload": {
-        "psr-0": { "": "src/" }
+        "psr-4": { "": "src/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
     "config": {
         "bin-dir": "bin"

config/deploy.rb

@@ -1,66 +0,0 @@
-# config valid only for current version of Capistrano
-lock '3.4.0'
-
-set :application, 'wallabag'
-set :repo_url, 'git@github.com:wallabag/wallabag.git'
-
-set :ssh_user, 'ssh_user'
-server 'server_ip', user: fetch(:ssh_user), roles: %w{web app db}
-
-set :scm, :git
-
-set :format, :pretty
-set :log_level, :info
-# set :log_level, :debug
-
-set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
-
-set :linked_files, %w{app/config/parameters.yml}
-set :linked_dirs, %w{app/logs web/uploads}
-
-set :keep_releases, 3
-
-after 'deploy:finishing', 'deploy:cleanup'
-
-# Default branch is :master
-# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
-
-# Default deploy_to directory is /var/www/my_app_name
-# set :deploy_to, '/var/www/my_app_name'
-
-# Default value for :scm is :git
-# set :scm, :git
-
-# Default value for :format is :pretty
-# set :format, :pretty
-
-# Default value for :log_level is :debug
-# set :log_level, :debug
-
-# Default value for :pty is false
-# set :pty, true
-
-# Default value for :linked_files is []
-# set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml')
-
-# Default value for linked_dirs is []
-# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system')
-
-# Default value for default_env is {}
-# set :default_env, { path: "/opt/ruby/bin:$PATH" }
-
-# Default value for keep_releases is 5
-# set :keep_releases, 5
-
-namespace :deploy do
-
-  after :restart, :clear_cache do
-    on roles(:web), in: :groups, limit: 3, wait: 10 do
-      # Here we can do anything such as:
-      # within release_path do
-      #   execute :rake, 'cache:clear'
-      # end
-    end
-  end
-
-end

config/deploy/production.rb

@@ -1,61 +0,0 @@
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
-# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
-# server 'db.example.com', user: 'deploy', roles: %w{db}
-
-
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{deploy@example.com}, my_property: :my_value
-# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
-# role :db,  %w{deploy@example.com}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

config/deploy/staging.rb

@@ -1,64 +0,0 @@
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-set :branch, 'v2'
-set :deploy_to, '/var/www/'
-
-# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
-# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
-# server 'db.example.com', user: 'deploy', roles: %w{db}
-
-
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{deploy@example.com}, my_property: :my_value
-# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
-# role :db,  %w{deploy@example.com}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

docker-compose.yml

@@ -0,0 +1,42 @@
+nginx:
+    image: nginx
+    ports:
+        - "8080:80"
+    volumes:
+        - ./docker/nginx/nginx.conf:/nginx.conf
+        - ./docker/logs/nginx:/var/log/nginx
+        - .:/var/www/html
+    links:
+        - php:php
+    command: nginx -c /nginx.conf
+php:
+    build: docker/php
+    ports:
+        - "9000:9000"
+    volumes:
+        - .:/var/www/html
+    #links:
+        # - "postgres:rdbms"
+        # - "mariadb:rdbms"
+    env_file:
+        - ./docker/php/env
+        # Comment non-used DBMS lines
+        # If all DBMS are commented out, sqlite will be used as default
+        # - ./docker/postgres/env
+        # - ./docker/mariadb/env
+#postgres:
+#    image: postgres:9
+#    ports:
+#        - "5432:5432"
+#    volumes:
+#        - ./docker/data/pgsql:/var/lib/postgresql/data
+#    env_file:
+#        - ./docker/postgres/env
+#mariadb:
+#    image: mariadb:10
+#    ports:
+#        - "3306:3306"
+#    volumes:
+#        - ./docker/data/mariadb:/var/lib/mysql
+#    env_file:
+#        - ./docker/mariadb/env

docker/mariadb/env

@@ -0,0 +1,10 @@
+MYSQL_ROOT_PASSWORD=wallaroot
+MYSQL_USER=wallabag
+MYSQL_PASSWORD=wallapass
+MYSQL_DATABASE=wallabag
+SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+SYMFONY__ENV__DATABASE_HOST=rdbms
+SYMFONY__ENV__DATABASE_PORT=3306
+SYMFONY__ENV__DATABASE_NAME=wallabag
+SYMFONY__ENV__DATABASE_USER=wallabag
+SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docker/nginx/nginx.conf

@@ -0,0 +1,89 @@
+user  nginx;
+worker_processes  1;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  2048;
+    multi_accept on;
+    use epoll;
+}
+
+http {
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    server_tokens off;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 15;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log off;
+    error_log off;
+    gzip on;
+    gzip_disable "msie6";
+    open_file_cache max=100;
+
+
+    upstream php-upstream {
+        server php:9000;
+    }
+
+    server {
+        #server_name domain.tld www.domain.tld;
+        root /var/www/html/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        # DEV
+        # This rule should only be placed on your development environment
+        # In production, don't include this and don't deploy app_dev.php or config.php
+        location ~ ^/(app_dev|config)\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+        }
+        # PROD
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass php-upstream;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            # Prevents URIs that include the front controller. This will 404:
+            # http://domain.tld/app.php/some-path
+            # Remove the internal directive to allow URIs like this
+            internal;
+        }
+
+        error_log /var/log/nginx/project_error.log;
+        access_log /var/log/nginx/project_access.log;
+    }
+
+}
+
+daemon off;

docker/php/Dockerfile

@@ -0,0 +1,10 @@
+FROM php:fpm
+
+RUN apt-get update && apt-get install -y \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
+    && docker-php-ext-install \
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
+
+RUN usermod -u 1000 www-data
+
+CMD ["php-fpm"]

docker/php/env

@@ -0,0 +1,6 @@
+SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite
+SYMFONY__ENV__DATABASE_HOST=127.0.0.1
+SYMFONY__ENV__DATABASE_PORT=~
+SYMFONY__ENV__DATABASE_NAME=symfony
+SYMFONY__ENV__DATABASE_USER=root
+SYMFONY__ENV__DATABASE_PASSWORD=~

docker/postgres/env

@@ -0,0 +1,9 @@
+POSTGRES_USER=wallabag
+POSTGRES_PASSWORD=wallapass
+POSTGRES_DB=wallabag
+export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
+export SYMFONY__ENV__DATABASE_HOST=rdbms
+export SYMFONY__ENV__DATABASE_PORT=5432
+export SYMFONY__ENV__DATABASE_NAME=wallabag
+export SYMFONY__ENV__DATABASE_USER=wallabag
+export SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docs/en/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagdoc'
+latex_elements = {
+
+}
+
+latex_documents = [
+  ('index', 'wallabag.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabag', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/en/developer/docker.rst

@@ -0,0 +1,51 @@
+Run Wallabag in docker-compose
+==============================
+
+In order to run your own development instance of wallabag, you may
+want to use the pre-configured docker compose files.
+
+Requirements
+------------
+
+Make sure to have `Docker
+<https://docs.docker.com/installation/ubuntulinux/>`__ and `Docker
+Compose <https://docs.docker.com/compose/install/>`__ availables on
+your system and up to date.
+
+Switch DBMS
+-----------
+
+By default, Wallabag will start with a sqlite database.
+Since Wallabag provide support for Postgresql and MySQL, docker
+containers are also available for these ones.
+
+In ``docker-compose.yml``, for the chosen DBMS uncomment :
+
+- the container definition (``postgres`` or ``mariadb`` root level
+  block)
+- the container link in the ``php`` container
+- the container env file in the ``php`` container
+
+In order to keep running Symfony commands on your host (such as
+``wallabag:install``), you also should :
+
+- source the proper env files on your command line, so variables
+  like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
+- create a ``127.0.0.1 rdbms`` on your system ``hosts`` file
+
+Run Wallabag
+------------
+
+#. Fork and clone the project
+#. Edit ``app/config/parameters.yml`` to replace ``database_*``
+   properties with commented ones (with values prefixed by ``env.``)
+#. ``composer install`` the project dependencies
+#. ``php app/console wallabag:install`` to create the schema
+#. ``docker-compose up`` to run the containers
+#. Finally, browse to http://localhost:8080/ to find your freshly
+   installed wallabag.
+
+At various step, you'll probably run into UNIX permission problems,
+bad paths in generated cache, etc…
+Operations like removing cache files or changing files owners might
+be frequently required, so don't be afraid !

docs/en/index.rst

@@ -0,0 +1,37 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** is a read-it-later application: it saves a web page by
+keeping content only. Elements like navigation or ads are deleted.
+
+The main documentation for this application is organized into a couple sections:
+
+* :ref:`user-docs`
+* :ref:`dev-docs`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: User documentation
+
+   user/create_account
+   user/login
+   user/configuration
+   user/first_article
+   user/import
+   user/download_articles
+   user/filters
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Developer documentation
+
+   developer/docker

docs/en/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

docs/en/user/configuration.rst

@@ -0,0 +1,99 @@
+Configuration
+=============
+
+Now you're logged in, it's time to configure your account as you want.
+
+Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``, ``User information``, ``Password`` and ``Tagging rules``.
+
+Settings
+--------
+
+Theme
+~~~~~
+
+wallabag is customizable. You can choose your prefered theme here. You can also create a new one, a chapter is dedicated for this. The default theme is ``Material``, it's the theme used in the documentation screenshots. 
+
+Items per page
+~~~~~~~~~~~~~~
+
+You can change the number of articles displayed on each page.
+
+Language
+~~~~~~~~
+
+You can change the language of wallabag interface.
+
+RSS
+---
+
+wallabag provides RSS feeds for each article status: unread, starred and archive.
+
+Firstly, you need to create a personal token: click on ``Create your token``.
+It's possible to change your token by clicking on ``Reset your token``.
+
+Now you have three links, one for each status: add them into your favourite RSS reader.
+
+You can also define how many articles you want in each RSS feed (default value: 50).
+
+User information
+----------------
+
+You can change your name, your email address and enable ``Two factor authentication``.
+
+Two factor authentication
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components.
+
+https://en.wikipedia.org/wiki/Two-factor_authentication
+
+If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email. You have to put this code on the following form.
+
+.. image:: ../../img/user/2FA_form.png
+   :alt: Two factor authentication
+   :align: center
+
+If you don't want to receive a code each time you want to login, you can check the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
+
+Password
+--------
+
+You can change your password here.
+
+Tagging rules
+-------------
+
+If you want to automatically assign a tag to new articles, this part of the configuration is for you.
+
+What does « tagging rules » mean?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+They are rules used by wallabag to automatically tag new entries.
+Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
+
+How do I use them?
+~~~~~~~~~~~~~~~~~~
+
+Let assume you want to tag new entries as *« short reading »* when the reading time is inferior to 3 minutes.
+In that case, you should put « readingTime <= 3 » in the **Rule** field and *« short reading »* in the **Tags** field.
+Several tags can added simultaneously by separating them by a comma: *« short reading, must read »*.
+Complex rules can be written by using predefined operators: if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
+
+Which variables and operators can I use to write rules?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following variables and operators can be used to create tagging rules:
+
+===========  ==============================================  ========  ==========
+Variable     Meaning                                         Operator  Meaning
+-----------  ----------------------------------------------  --------  ----------
+title        Title of the entry                              <=        Less than…
+url          URL of the entry                                <         Strictly less than…
+isArchived   Whether the entry is archived or not            =>        Greater than…
+isStared     Whether the entry is starred or not             >         Strictly greater than…
+content      The entry's content                             =         Equal to…
+language     The entry's language                            !=        Not equal to…
+mimetype     The entry's mime-type                           OR        One rule or another
+readingTime  The estimated entry's reading time, in minutes  AND       One rule and another
+domainName   The domain name of the entry                    matches   Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
+===========  ==============================================  ========  ==========

docs/en/user/create_account.rst

@@ -0,0 +1,43 @@
+Create an account
+=================
+
+On the login page, click on ``Register`` button.
+
+.. image:: ../../img/user/registration_form.png
+   :alt: Registration form
+   :align: center
+
+You have to fill the form. Please sure to type a valid email address, we'll send you an activation email.
+
+.. image:: ../../img/user/sent_email.png
+   :alt: Email was sent to activate account
+   :align: center
+
+Check your inbox, you now have a new mail with a link like this ``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``. Click on it to activate your account.
+
+Your account is now activated.
+
+.. image:: ../../img/user/activated_account.png
+   :alt: Welcome on board!
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I can't valid the registration form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure that all fields are well filled:
+
+* valid email address
+* same passwords in two fields
+
+I don't receive my activation email
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Are you sure your email address was correct? Did you check your spams folder?
+
+When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+~~~~~~~~~~~~~~~
+
+You already enabled your account or the URL of the activation email is wrong.

docs/en/user/download_articles.rst

@@ -0,0 +1,16 @@
+Download articles
+=================
+
+You can download each article in several formats: ePUB, MOBI, PDF, XML, JSON, CSV.
+
+On the article view, click on this icon, in the sidebar:
+
+.. image:: ../../img/user/download_article.png
+   :alt: download article
+   :align: center
+
+You can also download a full category in these formats. For example, on **Unread** view, click on this icon in the top bar:
+
+.. image:: ../../img/user/download_articles.png
+   :alt: download articles
+   :align: center

docs/en/user/filters.rst

@@ -0,0 +1,2 @@
+Filters
+=======

docs/en/user/first_article.rst

@@ -0,0 +1,62 @@
+Save your first article
+=======================
+
+The main purpose of wallabag is to save web articles. You have many ways to do it.
+
+.. note::
+
+    A quickstart will be displayed in the application until you save your first article.
+
+By using a bookmarklet
+----------------------
+
+On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser.
+
+Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved.
+
+By using the classic form
+-------------------------
+
+In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Top bar
+   :align: center
+
+Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved.
+
+By using a browser add-on
+-------------------------
+
+Firefox
+~~~~~~~
+
+*This addon is not yet available for wallabag v2*.
+
+Chrome
+~~~~~~
+
+*This addon is not yet available for wallabag v2*.
+
+By using your smarphone application
+-----------------------------------
+
+Android
+~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+Firefox OS
+~~~~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+Windows Phone
+~~~~~~~~~~~~~
+
+*This application is not yet available for wallabag v2*.
+
+iOS
+~~~
+
+*This application is not yet available for wallabag v2*.

docs/en/user/import.rst

@@ -0,0 +1,64 @@
+Migrate to wallabag
+===================
+
+From wallabag 1.x
+-----------------
+
+Export your data from your wallabag 1.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
+
+.. image:: ../../img/user/export_wllbg_1.png
+   :alt: Export from wallabag 1.x
+   :align: center
+
+You will have a ``wallabag-export-1-1970-01-01.json`` file.
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on  ``Import`` link in the menu, select your export file on your computer and import it.
+
+.. image:: ../../img/user/import_wllbg.png
+   :alt: Import from wallabag 1.x
+   :align: center
+
+All your wallabag 1.x articles will be imported.
+
+From Pocket
+-----------
+
+Create a new applicaton on Pocket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue.
+
+* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
+* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application
+
+Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
+
+Now, all is fine to migrate from Pocket.
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on  ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``.
+
+You need to authorize wallabag to interact with your Pocket account. Your data will be imported. Data import can be a demanding process for your server (we need to work on this import to improve it). 
+
+From Instapaper
+---------------
+
+*Feature not yet implemented in wallabag v2.*
+
+From Readability
+----------------
+
+*Feature not yet implemented in wallabag v2.*
+
+From HTML or JSON file
+----------------------
+
+*Feature not yet implemented in wallabag v2.*

docs/en/user/login.rst

@@ -0,0 +1,20 @@
+Login
+=====
+
+Your account is now enabled, congratulations!
+
+To login to wallabag, fill the form on login page.
+
+If you are on your personal computer and you want to stay connected, you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
+
+.. image:: ../../img/user/login_form.png
+   :alt: Login form
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I forgot my password
+~~~~~~~~~~~~~~~~~~~~
+
+You can reset your password by clicking on ``Forgot your password?`` link, on the login page. Then, fill the form with your email address

docs/en/user/tags.rst

@@ -0,0 +1,2 @@
+Tags
+====

docs/fr/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag-fr'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagfrdoc'
+
+latex_elements = {
+}
+
+latex_documents = [
+  ('index', 'wallabag-fr.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabagfr', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/fr/index.rst

@@ -0,0 +1,17 @@
+Documentation de wallabag
+=========================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** est une application de lecture différée : elle permet
+simplement d’archiver une page web en ne conservant que le contenu. Les
+éléments superflus (menu, publicité, etc.) sont supprimés.
+
+La documentation principale de cette application est découpée en plusieurs sections :
+
+.. toctree::
+   :maxdepth: 2
+
+   index

docs/fr/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

docs/pt-br/conf.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# wallabag documentation build configuration file, created by
+# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
+
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'wallabag-pt'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
+version = '2.0.0'
+release = version
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+html_theme = 'default'
+html_static_path = ['_static']
+htmlhelp_basename = 'wallabagfrdoc'
+
+latex_elements = {
+}
+
+latex_documents = [
+  ('index', 'wallabag-pt.tex', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'manual'),
+]
+
+man_pages = [
+    ('index', 'wallabagpt', u'wallabag Documentation',
+     [u'Nicolas Lœuillet'], 1)
+]
+
+texinfo_documents = [
+  ('index', 'wallabag', u'wallabag Documentation',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
+   'Miscellaneous'),
+]
+
+##### Guzzle sphinx theme
+
+import guzzle_sphinx_theme
+html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
+html_theme_path = guzzle_sphinx_theme.html_theme_path()
+html_theme = 'guzzle_sphinx_theme'
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
+}
+
+# Register the theme as an extension to generate a sitemap.xml
+extensions.append("guzzle_sphinx_theme")

docs/pt-br/index.rst

@@ -0,0 +1,36 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** É uma aplicação "leia mais tarde": Ele salva páginas da web mantendo apenas o conteúdo. Elementos como ícones de navegação ou propaganda são deletedos.
+
+A documentação principal desta aplicação é organizada em duas seções:
+
+* :ref:`doc-usuario`
+* :ref:`doc-desenvolvedor`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Documentação do usuário
+
+   user/criar_conta
+   user/login
+   user/configuração
+   user/primeiro_artigo
+   user/importar
+   user/baixar_artigos
+   user/filtros
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Documentação do desenvolvedor
+
+   developer/docker

docs/pt-br/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx>=1.3.0,<1.4.0
+guzzle_sphinx_theme>=0.7.0,<0.8.0

phpunit.xml.dist

@@ -9,27 +9,27 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="app/bootstrap.php.cache"
+         bootstrap="app/autoload.php"
         >
 
     <testsuites>
         <testsuite name="wallabag Test Suite">
-            <directory>./src/Wallabag/*Bundle/Tests</directory>
+            <directory>src/Wallabag/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 
     <php>
-        <server name="KERNEL_DIR" value="./app/" />
+        <server name="KERNEL_DIR" value="app/" />
     </php>
 
     <filter>
         <whitelist>
-            <directory>./src</directory>
+            <directory>src</directory>
             <exclude>
-                <directory>./vendor</directory>
+                <directory>vendor</directory>
-                <directory>./src/Wallabag/*Bundle/Resources</directory>
+                <directory>src/Wallabag/*Bundle/Resources</directory>
-                <directory>./src/Wallabag/*Bundle/Tests</directory>
+                <directory>src/Wallabag/*Bundle/Tests</directory>
-                <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
+                <directory>src/Wallabag/*Bundle/DataFixtures</directory>
             </exclude>
         </whitelist>
     </filter>

src/Wallabag/ApiBundle/Controller/WallabagRestController.php

@@ -2,16 +2,17 @@
 
 namespace Wallabag\ApiBundle\Controller;
 
-use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use FOS\RestBundle\Controller\FOSRestController;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
 use Hateoas\Configuration\Route;
 use Hateoas\Representation\Factory\PagerfantaFactory;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
 
-class WallabagRestController extends Controller
+class WallabagRestController extends FOSRestController
 {
     /**
      * @param Entry  $entry
@@ -27,7 +28,7 @@ class WallabagRestController extends Controller
                 ->findOneByLabel($label);
 
             if (is_null($tagEntity)) {
-                $tagEntity = new Tag($this->getUser());
+                $tagEntity = new Tag();
                 $tagEntity->setLabel($label);
             }
 
@@ -38,29 +39,11 @@ class WallabagRestController extends Controller
         }
     }
 
-    /**
+    private function validateAuthentication()
-     * Retrieve salt for a giver user.
-     *
-     * @ApiDoc(
-     *       parameters={
-     *          {"name"="username", "dataType"="string", "required"=true, "description"="username"}
-     *       }
-     * )
-     *
-     * @return array
-     */
-    public function getSaltAction($username)
     {
-        $user = $this
+        if (false === $this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) {
-            ->getDoctrine()
+            throw new AccessDeniedException();
-            ->getRepository('WallabagCoreBundle:User')
-            ->findOneByUsername($username);
-
-        if (is_null($user)) {
-            throw $this->createNotFoundException();
         }
-
-        return array($user->getSalt() ?: null);
     }
 
     /**
@@ -78,10 +61,12 @@ class WallabagRestController extends Controller
      *       }
      * )
      *
-     * @return Entry
+     * @return Response
      */
     public function getEntriesAction(Request $request)
     {
+        $this->validateAuthentication();
+
         $isArchived = $request->query->get('archive');
         $isStarred = $request->query->get('star');
         $sort = $request->query->get('sort', 'created');
@@ -90,8 +75,7 @@ class WallabagRestController extends Controller
         $perPage = (int) $request->query->get('perPage', 30);
         $tags = $request->query->get('tags', []);
 
-        $pager = $this
+        $pager = $this->getDoctrine()
-            ->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
             ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
 
@@ -101,7 +85,7 @@ class WallabagRestController extends Controller
         $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
         $paginatedCollection = $pagerfantaFactory->createRepresentation(
             $pager,
-            new Route('api_get_entries', [], $absolute = true)
+            new Route('api_get_entries', [], UrlGeneratorInterface::ABSOLUTE_URL)
         );
 
         $json = $this->get('serializer')->serialize($paginatedCollection, 'json');
@@ -118,11 +102,12 @@ class WallabagRestController extends Controller
      *      }
      * )
      *
-     * @return Entry
+     * @return Response
      */
     public function getEntryAction(Entry $entry)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $json = $this->get('serializer')->serialize($entry, 'json');
 
@@ -140,10 +125,12 @@ class WallabagRestController extends Controller
      *       }
      * )
      *
-     * @return Entry
+     * @return Response
      */
     public function postEntriesAction(Request $request)
     {
+        $this->validateAuthentication();
+
         $url = $request->request->get('url');
 
         $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
@@ -180,15 +167,16 @@ class WallabagRestController extends Controller
      *      }
      * )
      *
-     * @return Entry
+     * @return Response
      */
     public function patchEntriesAction(Entry $entry, Request $request)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $title = $request->request->get('title');
-        $isArchived = $request->request->get('is_archived');
+        $isArchived = $request->request->get('archive');
-        $isStarred = $request->request->get('is_starred');
+        $isStarred = $request->request->get('star');
 
         if (!is_null($title)) {
             $entry->setTitle($title);
@@ -224,11 +212,12 @@ class WallabagRestController extends Controller
      *      }
      * )
      *
-     * @return Entry
+     * @return Response
      */
     public function deleteEntriesAction(Entry $entry)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $em = $this->getDoctrine()->getManager();
         $em->remove($entry);
@@ -247,10 +236,13 @@ class WallabagRestController extends Controller
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
+     *
+     * @return Response
      */
     public function getEntriesTagsAction(Entry $entry)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $json = $this->get('serializer')->serialize($entry->getTags(), 'json');
 
@@ -268,10 +260,13 @@ class WallabagRestController extends Controller
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
      *       }
      * )
+     *
+     * @return Response
      */
     public function postEntriesTagsAction(Request $request, Entry $entry)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $tags = $request->request->get('tags', '');
         if (!empty($tags)) {
@@ -296,10 +291,13 @@ class WallabagRestController extends Controller
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
+     *
+     * @return Response
      */
     public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
     {
-        $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
+        $this->validateUserAccess($entry->getUser()->getId());
 
         $entry->removeTag($tag);
         $em = $this->getDoctrine()->getManager();
@@ -315,10 +313,18 @@ class WallabagRestController extends Controller
      * Retrieve all tags.
      *
      * @ApiDoc()
+     *
+     * @return Response
      */
     public function getTagsAction()
     {
-        $json = $this->get('serializer')->serialize($this->getUser()->getTags(), 'json');
+        $this->validateAuthentication();
+
+        $tags = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Tag')
+            ->findAllTags($this->getUser()->getId());
+
+        $json = $this->get('serializer')->serialize($tags, 'json');
 
         return $this->renderJsonResponse($json);
     }
@@ -331,14 +337,16 @@ class WallabagRestController extends Controller
      *          {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"}
      *      }
      * )
+     *
+     * @return Response
      */
     public function deleteTagAction(Tag $tag)
     {
-        $this->validateUserAccess($tag->getUser()->getId(), $this->getUser()->getId());
+        $this->validateAuthentication();
 
-        $em = $this->getDoctrine()->getManager();
+        $this->getDoctrine()
-        $em->remove($tag);
+            ->getRepository('WallabagCoreBundle:Entry')
-        $em->flush();
+            ->removeTag($this->getUser()->getId(), $tag);
 
         $json = $this->get('serializer')->serialize($tag, 'json');
 
@@ -350,12 +358,12 @@ class WallabagRestController extends Controller
      * If not, throw exception. It means a user try to access information from an other user.
      *
      * @param int $requestUserId User id from the requested source
-     * @param int $currentUserId User id from the retrieved source
      */
-    private function validateUserAccess($requestUserId, $currentUserId)
+    private function validateUserAccess($requestUserId)
     {
-        if ($requestUserId != $currentUserId) {
+        $user = $this->get('security.token_storage')->getToken()->getUser();
-            throw $this->createAccessDeniedException('Access forbidden. Entry user id: '.$requestUserId.', logged user id: '.$currentUserId);
+        if ($requestUserId != $user->getId()) {
+            throw $this->createAccessDeniedException('Access forbidden. Entry user id: '.$requestUserId.', logged user id: '.$user->getId());
         }
     }
 

src/Wallabag/ApiBundle/DependencyInjection/Security/Factory/WsseFactory.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\DependencyInjection\Security\Factory;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
-
-class WsseFactory implements SecurityFactoryInterface
-{
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
-    {
-        $providerId = 'security.authentication.provider.wsse.'.$id;
-        $container
-            ->setDefinition($providerId, new DefinitionDecorator('wsse.security.authentication.provider'))
-            ->replaceArgument(0, new Reference($userProvider))
-        ;
-
-        $listenerId = 'security.authentication.listener.wsse.'.$id;
-        $listener = $container->setDefinition($listenerId, new DefinitionDecorator('wsse.security.authentication.listener'));
-
-        return array($providerId, $listenerId, $defaultEntryPoint);
-    }
-
-    public function getPosition()
-    {
-        return 'pre_auth';
-    }
-
-    public function getKey()
-    {
-        return 'wsse';
-    }
-
-    public function addConfiguration(NodeDefinition $node)
-    {
-    }
-}

src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php

@@ -3,9 +3,7 @@
 namespace Wallabag\ApiBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 
 class WallabagApiExtension extends Extension
 {
@@ -13,9 +11,6 @@ class WallabagApiExtension extends Extension
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
     }
 
     public function getAlias()

src/Wallabag/ApiBundle/Entity/AccessToken.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Wallabag\ApiBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
+
+/**
+ * @ORM\Table("oauth2_access_tokens")
+ * @ORM\Entity
+ */
+class AccessToken extends BaseAccessToken
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
+     */
+    protected $user;
+}

src/Wallabag/ApiBundle/Entity/AuthCode.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Wallabag\ApiBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
+
+/**
+ * @ORM\Table("oauth2_auth_codes")
+ * @ORM\Entity
+ */
+class AuthCode extends BaseAuthCode
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
+     */
+    protected $user;
+}

src/Wallabag/ApiBundle/Entity/Client.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Wallabag\ApiBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\Client as BaseClient;
+
+/**
+ * @ORM\Table("oauth2_clients")
+ * @ORM\Entity
+ */
+class Client extends BaseClient
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+}

src/Wallabag/ApiBundle/Entity/RefreshToken.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Wallabag\ApiBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
+
+/**
+ * @ORM\Table("oauth2_refresh_tokens")
+ * @ORM\Entity
+ */
+class RefreshToken extends BaseRefreshToken
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
+     */
+    protected $user;
+}

src/Wallabag/ApiBundle/Resources/config/services.yml

@@ -1,12 +0,0 @@
-services:
-    wsse.security.authentication.provider:
-        class: Wallabag\ApiBundle\Security\Authentication\Provider\WsseProvider
-        public: false
-        arguments: ['', '%kernel.cache_dir%/security/nonces']
-
-    wsse.security.authentication.listener:
-        class: Wallabag\ApiBundle\Security\Firewall\WsseListener
-        public: false
-        tags:
-            - { name: monolog.logger, channel: wsse }
-        arguments: ['@security.context', '@security.authentication.manager', '@logger']

src/Wallabag/ApiBundle/Security/Authentication/Provider/WsseProvider.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\Security\Authentication\Provider;
-
-use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\Exception\NonceExpiredException;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Wallabag\ApiBundle\Security\Authentication\Token\WsseUserToken;
-
-class WsseProvider implements AuthenticationProviderInterface
-{
-    private $userProvider;
-    private $cacheDir;
-
-    public function __construct(UserProviderInterface $userProvider, $cacheDir)
-    {
-        $this->userProvider = $userProvider;
-        $this->cacheDir = $cacheDir;
-
-        // If cache directory does not exist we create it
-        if (!is_dir($this->cacheDir)) {
-            mkdir($this->cacheDir, 0777, true);
-        }
-    }
-
-    public function authenticate(TokenInterface $token)
-    {
-        $user = $this->userProvider->loadUserByUsername($token->getUsername());
-
-        if (!$user) {
-            throw new AuthenticationException('Bad credentials. Did you forgot your username?');
-        }
-
-        if ($user && $this->validateDigest($token->digest, $token->nonce, $token->created, $user->getPassword())) {
-            $authenticatedToken = new WsseUserToken($user->getRoles());
-            $authenticatedToken->setUser($user);
-
-            return $authenticatedToken;
-        }
-
-        throw new AuthenticationException('The WSSE authentication failed.');
-    }
-
-    protected function validateDigest($digest, $nonce, $created, $secret)
-    {
-        // Check created time is not in the future
-        if (strtotime($created) > time()) {
-            throw new AuthenticationException('Back to the future...');
-        }
-
-        // Expire timestamp after 5 minutes
-        if (time() - strtotime($created) > 300) {
-            throw new AuthenticationException('Too late for this timestamp... Watch your watch.');
-        }
-
-        // Validate nonce is unique within 5 minutes
-        if (file_exists($this->cacheDir.'/'.$nonce) && file_get_contents($this->cacheDir.'/'.$nonce) + 300 > time()) {
-            throw new NonceExpiredException('Previously used nonce detected');
-        }
-
-        file_put_contents($this->cacheDir.'/'.$nonce, time());
-
-        // Validate Secret
-        $expected = base64_encode(sha1(base64_decode($nonce).$created.$secret, true));
-
-        if ($digest !== $expected) {
-            throw new AuthenticationException('Bad credentials ! Digest is not as expected.');
-        }
-
-        return $digest === $expected;
-    }
-
-    public function supports(TokenInterface $token)
-    {
-        return $token instanceof WsseUserToken;
-    }
-}

src/Wallabag/ApiBundle/Security/Authentication/Token/WsseUserToken.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\Security\Authentication\Token;
-
-use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
-
-class WsseUserToken extends AbstractToken
-{
-    public $created;
-    public $digest;
-    public $nonce;
-
-    public function __construct(array $roles = array())
-    {
-        parent::__construct($roles);
-
-        $this->setAuthenticated(count($roles) > 0);
-    }
-
-    public function getCredentials()
-    {
-        return '';
-    }
-}

src/Wallabag/ApiBundle/Security/Firewall/WsseListener.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\Security\Firewall;
-
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\Security\Http\Firewall\ListenerInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\SecurityContextInterface;
-use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Wallabag\ApiBundle\Security\Authentication\Token\WsseUserToken;
-use Psr\Log\LoggerInterface;
-
-class WsseListener implements ListenerInterface
-{
-    protected $securityContext;
-    protected $authenticationManager;
-    protected $logger;
-
-    public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger)
-    {
-        $this->securityContext = $securityContext;
-        $this->authenticationManager = $authenticationManager;
-        $this->logger = $logger;
-    }
-
-    public function handle(GetResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        $wsseRegex = '/UsernameToken Username="([^"]+)", PasswordDigest="([^"]+)", Nonce="([^"]+)", Created="([^"]+)"/';
-        if (!$request->headers->has('x-wsse') || 1 !== preg_match($wsseRegex, $request->headers->get('x-wsse'), $matches)) {
-            return;
-        }
-
-        $token = new WsseUserToken();
-        $token->setUser($matches[1]);
-
-        $token->digest = $matches[2];
-        $token->nonce = $matches[3];
-        $token->created = $matches[4];
-
-        try {
-            $authToken = $this->authenticationManager->authenticate($token);
-
-            $this->securityContext->setToken($authToken);
-
-            return;
-        } catch (AuthenticationException $failed) {
-            $failedMessage = 'WSSE Login failed for '.$token->getUsername().'. Why ? '.$failed->getMessage();
-            $this->logger->err($failedMessage);
-
-            // Deny authentication with a '403 Forbidden' HTTP response
-            $response = new Response();
-            $response->setStatusCode(403);
-            $response->setContent($failedMessage);
-            $event->setResponse($response);
-
-            return;
-        }
-    }
-}

src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php

@@ -2,99 +2,15 @@
 
 namespace Wallabag\ApiBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Wallabag\ApiBundle\Tests\WallabagApiTestCase;
 
-class WallabagRestControllerTest extends WebTestCase
+class WallabagRestControllerTest extends WallabagApiTestCase
 {
     protected static $salt;
 
-    /**
-     * Grab the salt once and store it to be available for all tests.
-     */
-    public static function setUpBeforeClass()
-    {
-        $client = self::createClient();
-
-        $user = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:User')
-            ->findOneByUsername('admin');
-
-        self::$salt = $user->getSalt();
-    }
-
-    /**
-     * Generate HTTP headers for authenticate user on API.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return array
-     */
-    private function generateHeaders($username, $password)
-    {
-        $encryptedPassword = sha1($password.$username.self::$salt);
-        $nonce = substr(md5(uniqid('nonce_', true)), 0, 16);
-
-        $now = new \DateTime('now', new \DateTimeZone('UTC'));
-        $created = (string) $now->format('Y-m-d\TH:i:s\Z');
-        $digest = base64_encode(sha1(base64_decode($nonce).$created.$encryptedPassword, true));
-
-        return array(
-            'HTTP_AUTHORIZATION' => 'Authorization profile="UsernameToken"',
-            'HTTP_x-wsse' => 'X-WSSE: UsernameToken Username="'.$username.'", PasswordDigest="'.$digest.'", Nonce="'.$nonce.'", Created="'.$created.'"',
-        );
-    }
-
-    public function testGetSalt()
-    {
-        $client = $this->createClient();
-        $client->request('GET', '/api/salts/admin.json');
-
-        $user = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:User')
-            ->findOneByUsername('admin');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $content = json_decode($client->getResponse()->getContent(), true);
-
-        $this->assertArrayHasKey(0, $content);
-        $this->assertEquals($user->getSalt(), $content[0]);
-
-        $client->request('GET', '/api/salts/notfound.json');
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testWithBadHeaders()
-    {
-        $client = $this->createClient();
-
-        $entry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByIsArchived(false);
-
-        if (!$entry) {
-            $this->markTestSkipped('No content found in db.');
-        }
-
-        $badHeaders = array(
-            'HTTP_AUTHORIZATION' => 'Authorization profile="UsernameToken"',
-            'HTTP_x-wsse' => 'X-WSSE: UsernameToken Username="admin", PasswordDigest="Wr0ngDig3st", Nonce="n0Nc3", Created="2015-01-01T13:37:00Z"',
-        );
-
-        $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $badHeaders);
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-
     public function testGetOneEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneBy(array('user' => 1, 'isArchived' => false));
@@ -103,18 +19,17 @@ class WallabagRestControllerTest extends WebTestCase
             $this->markTestSkipped('No content found in db.');
         }
 
-        $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers);
+        $this->client->request('GET', '/api/entries/'.$entry->getId().'.json');
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertEquals($entry->getTitle(), $content['title']);
         $this->assertEquals($entry->getUrl(), $content['url']);
         $this->assertCount(count($entry->getTags()), $content['tags']);
 
         $this->assertTrue(
-            $client->getResponse()->headers->contains(
+            $this->client->getResponse()->headers->contains(
                 'Content-Type',
                 'application/json'
             )
@@ -123,10 +38,7 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testGetOneEntryWrongUser()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneBy(array('user' => 2, 'isArchived' => false));
@@ -135,21 +47,18 @@ class WallabagRestControllerTest extends WebTestCase
             $this->markTestSkipped('No content found in db.');
         }
 
-        $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers);
+        $this->client->request('GET', '/api/entries/'.$entry->getId().'.json');
 
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
+        $this->assertEquals(403, $this->client->getResponse()->getStatusCode());
     }
 
     public function testGetEntries()
     {
-        $client = $this->createClient();
+        $this->client->request('GET', '/api/entries');
-        $headers = $this->generateHeaders('admin', 'mypassword');
 
-        $client->request('GET', '/api/entries', array(), array(), $headers);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertGreaterThanOrEqual(1, count($content));
         $this->assertNotEmpty($content['_embedded']['items']);
@@ -158,7 +67,7 @@ class WallabagRestControllerTest extends WebTestCase
         $this->assertGreaterThanOrEqual(1, $content['pages']);
 
         $this->assertTrue(
-            $client->getResponse()->headers->contains(
+            $this->client->getResponse()->headers->contains(
                 'Content-Type',
                 'application/json'
             )
@@ -167,14 +76,11 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testGetStarredEntries()
     {
-        $client = $this->createClient();
+        $this->client->request('GET', '/api/entries', array('star' => 1, 'sort' => 'updated'));
-        $headers = $this->generateHeaders('admin', 'mypassword');
 
-        $client->request('GET', '/api/entries', array('star' => 1, 'sort' => 'updated'), array(), $headers);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertGreaterThanOrEqual(1, count($content));
         $this->assertNotEmpty($content['_embedded']['items']);
@@ -183,7 +89,7 @@ class WallabagRestControllerTest extends WebTestCase
         $this->assertGreaterThanOrEqual(1, $content['pages']);
 
         $this->assertTrue(
-            $client->getResponse()->headers->contains(
+            $this->client->getResponse()->headers->contains(
                 'Content-Type',
                 'application/json'
             )
@@ -192,14 +98,11 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testGetArchiveEntries()
     {
-        $client = $this->createClient();
+        $this->client->request('GET', '/api/entries', array('archive' => 1));
-        $headers = $this->generateHeaders('admin', 'mypassword');
 
-        $client->request('GET', '/api/entries', array('archive' => 1), array(), $headers);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertGreaterThanOrEqual(1, count($content));
         $this->assertNotEmpty($content['_embedded']['items']);
@@ -208,7 +111,7 @@ class WallabagRestControllerTest extends WebTestCase
         $this->assertGreaterThanOrEqual(1, $content['pages']);
 
         $this->assertTrue(
-            $client->getResponse()->headers->contains(
+            $this->client->getResponse()->headers->contains(
                 'Content-Type',
                 'application/json'
             )
@@ -217,10 +120,7 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testDeleteEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneByUser(1);
@@ -229,36 +129,31 @@ class WallabagRestControllerTest extends WebTestCase
             $this->markTestSkipped('No content found in db.');
         }
 
-        $client->request('DELETE', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers);
+        $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json');
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertEquals($entry->getTitle(), $content['title']);
         $this->assertEquals($entry->getUrl(), $content['url']);
 
         // We'll try to delete this entry again
-        $headers = $this->generateHeaders('admin', 'mypassword');
+        $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json');
 
-        $client->request('DELETE', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers);
+        $this->assertEquals(404, $this->client->getResponse()->getStatusCode());
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
     }
 
     public function testPostEntry()
     {
-        $client = $this->createClient();
+        $this->client->request('POST', '/api/entries.json', array(
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $client->request('POST', '/api/entries.json', array(
             'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html',
             'tags' => 'google',
-        ), array(), $headers);
+        ));
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertGreaterThan(0, $content['id']);
         $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
@@ -269,10 +164,7 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testPatchEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneByUser(1);
@@ -284,16 +176,16 @@ class WallabagRestControllerTest extends WebTestCase
         // hydrate the tags relations
         $nbTags = count($entry->getTags());
 
-        $client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
+        $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
             'title' => 'New awesome title',
             'tags' => 'new tag '.uniqid(),
             'star' => true,
             'archive' => false,
-        ), array(), $headers);
+        ));
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertEquals($entry->getId(), $content['id']);
         $this->assertEquals($entry->getUrl(), $content['url']);
@@ -303,10 +195,7 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testGetTagsEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneWithTags(1);
@@ -319,20 +208,17 @@ class WallabagRestControllerTest extends WebTestCase
 
         $tags = array();
         foreach ($entry->getTags() as $tag) {
-            $tags[] = array('id' => $tag->getId(), 'label' => $tag->getLabel());
+            $tags[] = array('id' => $tag->getId(), 'label' => $tag->getLabel(), 'slug' => $tag->getSlug());
         }
 
-        $client->request('GET', '/api/entries/'.$entry->getId().'/tags', array(), array(), $headers);
+        $this->client->request('GET', '/api/entries/'.$entry->getId().'/tags');
 
-        $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $client->getResponse()->getContent());
+        $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $this->client->getResponse()->getContent());
     }
 
     public function testPostTagsOnEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->findOneByUser(1);
@@ -345,16 +231,16 @@ class WallabagRestControllerTest extends WebTestCase
 
         $newTags = 'tag1,tag2,tag3';
 
-        $client->request('POST', '/api/entries/'.$entry->getId().'/tags', array('tags' => $newTags), array(), $headers);
+        $this->client->request('POST', '/api/entries/'.$entry->getId().'/tags', array('tags' => $newTags));
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertArrayHasKey('tags', $content);
         $this->assertEquals($nbTags + 3, count($content['tags']));
 
-        $entryDB = $client->getContainer()
+        $entryDB = $this->client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
             ->find($entry->getId());
@@ -369,15 +255,13 @@ class WallabagRestControllerTest extends WebTestCase
         }
     }
 
-    public function testDeleteOneTagEntrie()
+    public function testDeleteOneTagEntry()
     {
-        $client = $this->createClient();
+        $entry = $this->client->getContainer()
-        $headers = $this->generateHeaders('admin', 'mypassword');
-
-        $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUser(1);
+            ->findOneWithTags(1);
+        $entry = $entry[0];
 
         if (!$entry) {
             $this->markTestSkipped('No content found in db.');
@@ -387,11 +271,11 @@ class WallabagRestControllerTest extends WebTestCase
         $nbTags = count($entry->getTags());
         $tag = $entry->getTags()[0];
 
-        $client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json', array(), array(), $headers);
+        $this->client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json');
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($this->client->getResponse()->getContent(), true);
 
         $this->assertArrayHasKey('tags', $content);
         $this->assertEquals($nbTags - 1, count($content['tags']));
@@ -399,14 +283,11 @@ class WallabagRestControllerTest extends WebTestCase
 
     public function testGetUserTags()
     {
-        $client = $this->createClient();
+        $this->client->request('GET', '/api/tags.json');
-        $headers = $this->generateHeaders('admin', 'mypassword');
 
-        $client->request('GET', '/api/tags.json', array(), array(), $headers);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertGreaterThan(0, $content);
         $this->assertArrayHasKey('id', $content[0]);
@@ -420,16 +301,21 @@ class WallabagRestControllerTest extends WebTestCase
      */
     public function testDeleteUserTag($tag)
     {
-        $client = $this->createClient();
+        $this->client->request('DELETE', '/api/tags/'.$tag['id'].'.json');
-        $headers = $this->generateHeaders('admin', 'mypassword');
 
-        $client->request('DELETE', '/api/tags/'.$tag['id'].'.json', array(), array(), $headers);
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
 
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $content = json_decode($this->client->getResponse()->getContent(), true);
-
-        $content = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertArrayHasKey('label', $content);
         $this->assertEquals($tag['label'], $content['label']);
+        $this->assertEquals($tag['slug'], $content['slug']);
+
+        $entries = $entry = $this->client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findAllByTagId($this->user->getId(), $tag['id']);
+
+        $this->assertCount(0, $entries);
     }
 }

src/Wallabag/ApiBundle/Tests/WallabagApiTestCase.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Wallabag\ApiBundle\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\BrowserKit\Cookie;
+
+abstract class WallabagApiTestCase extends WebTestCase
+{
+    /**
+     * @var Client
+     */
+    protected $client = null;
+
+    /**
+     * @var \FOS\UserBundle\Model\UserInterface
+     */
+    protected $user;
+
+    public function setUp()
+    {
+        $this->client = $this->createAuthorizedClient();
+    }
+
+    /**
+     * @return Client
+     */
+    protected function createAuthorizedClient()
+    {
+        $client = static::createClient();
+        $container = $client->getContainer();
+
+        /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
+        $userManager = $container->get('fos_user.user_manager');
+        /** @var $loginManager \FOS\UserBundle\Security\LoginManager */
+        $loginManager = $container->get('fos_user.security.login_manager');
+        $firewallName = $container->getParameter('fos_user.firewall_name');
+
+        $this->user = $userManager->findUserBy(array('username' => 'admin'));
+        $loginManager->loginUser($firewallName, $this->user);
+
+        // save the login token into the session and put it in a cookie
+        $container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken()));
+        $container->get('session')->save();
+
+        $session = $container->get('session');
+        $client->getCookieJar()->set(new Cookie($session->getName(), $session->getId()));
+
+        return $client;
+    }
+}

src/Wallabag/ApiBundle/WallabagApiBundle.php

@@ -3,16 +3,7 @@
 namespace Wallabag\ApiBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Wallabag\ApiBundle\DependencyInjection\Security\Factory\WsseFactory;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class WallabagApiBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
-    {
-        parent::build($container);
-
-        $extension = $container->getExtension('security');
-        $extension->addSecurityListenerFactory(new WsseFactory());
-    }
 }

src/Wallabag/CoreBundle/Command/InstallCommand.php

@@ -3,12 +3,14 @@
 namespace Wallabag\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\NullOutput;
-use Wallabag\CoreBundle\Entity\User;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
 use Wallabag\CoreBundle\Entity\Config;
 
 class InstallCommand extends ContainerAwareCommand
@@ -53,7 +55,7 @@ class InstallCommand extends ContainerAwareCommand
         ;
 
         $output->writeln('<info>Wallabag has been successfully installed.</info>');
-        $output->writeln('<comment>Just execute `php app/console server:run` for using wallabag: http://localhost:8000</comment>');
+        $output->writeln('<comment>Just execute `php bin/console server:run` for using wallabag: http://localhost:8000</comment>');
     }
 
     protected function checkRequirements()
@@ -85,17 +87,18 @@ class InstallCommand extends ContainerAwareCommand
         }
         $rows[] = array($label, $status, $help);
 
-        $this->getHelper('table')
+        $table = new Table($this->defaultOutput);
+        $table
             ->setHeaders(array('Checked', 'Status', 'Recommendation'))
             ->setRows($rows)
-            ->render($this->defaultOutput);
+            ->render();
 
         if (!$fulfilled) {
             throw new \RuntimeException('Some system requirements are not fulfilled. Please check output messages and fix them.');
-        } else {
-            $this->defaultOutput->writeln('<info>Success! Your system can run Wallabag properly.</info>');
         }
 
+        $this->defaultOutput->writeln('<info>Success! Your system can run Wallabag properly.</info>');
+
         $this->defaultOutput->writeln('');
 
         return $this;
@@ -107,14 +110,17 @@ class InstallCommand extends ContainerAwareCommand
 
         // user want to reset everything? Don't care about what is already here
         if (true === $this->defaultInput->getOption('reset')) {
-            $this->defaultOutput->writeln('Droping database, creating database and schema');
+            $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
 
             $this
                 ->runCommand('doctrine:database:drop', array('--force' => true))
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
+                ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
@@ -127,12 +133,15 @@ class InstallCommand extends ContainerAwareCommand
                 ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
-        $dialog = $this->getHelper('dialog');
+        $questionHelper = $this->getHelper('question');
+        $question = new ConfirmationQuestion('It appears that your database already exists. Would you like to reset it? (y/N)', false);
 
-        if ($dialog->askConfirmation($this->defaultOutput, '<question>It appears that your database already exists. Would you like to reset it? (y/N)</question> ', false)) {
+        if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
             $this->defaultOutput->writeln('Droping database, creating database and schema');
 
             $this
@@ -141,7 +150,8 @@ class InstallCommand extends ContainerAwareCommand
                 ->runCommand('doctrine:schema:create')
             ;
         } elseif ($this->isSchemaPresent()) {
-            if ($dialog->askConfirmation($this->defaultOutput, '<question>Seems like your database contains schema. Do you want to reset it? (y/N)</question> ', false)) {
+            $question = new ConfirmationQuestion('Seems like your database contains schema. Do you want to reset it? (y/N)', false);
+            if ($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
                 $this->defaultOutput->writeln('Droping schema and creating schema');
 
                 $this
@@ -160,17 +170,6 @@ class InstallCommand extends ContainerAwareCommand
         $this->defaultOutput->writeln('Clearing the cache');
         $this->runCommand('cache:clear');
 
-        /*
-        if ($this->getHelperSet()->get('dialog')->askConfirmation($this->defaultOutput, '<question>Load fixtures (Y/N)?</question>', false)) {
-            $doctrineConfig = $this->getContainer()->get('doctrine.orm.entity_manager')->getConnection()->getConfiguration();
-            $logger = $doctrineConfig->getSQLLogger();
-            // speed up fixture load
-            $doctrineConfig->setSQLLogger(null);
-            $this->runCommand('doctrine:fixtures:load');
-            $doctrineConfig->setSQLLogger($logger);
-        }
-        */
-
         $this->defaultOutput->writeln('');
 
         return $this;
@@ -180,18 +179,27 @@ class InstallCommand extends ContainerAwareCommand
     {
         $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
 
-        $dialog = $this->getHelperSet()->get('dialog');
+        $questionHelper = $this->getHelperSet()->get('question');
+        $question = new ConfirmationQuestion('Would you like to create a new user ? (y/N)', false);
 
-        if (false === $dialog->askConfirmation($this->defaultOutput, '<question>Would you like to create a new user ? (y/N)</question>', true)) {
+        if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
             return $this;
         }
 
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
 
-        $user = new User();
+        $userManager = $this->getContainer()->get('fos_user.user_manager');
-        $user->setUsername($dialog->ask($this->defaultOutput, '<question>Username</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
+        $user = $userManager->createUser();
-        $user->setPassword($dialog->ask($this->defaultOutput, '<question>Password</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
+
-        $user->setEmail($dialog->ask($this->defaultOutput, '<question>Email:</question>', ''));
+        $question = new Question('Username (default: wallabag) :', 'wallabag');
+        $user->setUsername($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+
+        $question = new Question('Password (default: wallabag) :', 'wallabag');
+        $user->setPlainPassword($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+
+        $question = new Question('Email:', '');
+        $user->setEmail($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
+
         $user->setEnabled(true);
 
         $em->persist($user);
@@ -279,10 +287,16 @@ class InstallCommand extends ContainerAwareCommand
         try {
             $schemaManager = $connection->getSchemaManager();
         } catch (\Exception $exception) {
+            // mysql & sqlite
             if (false !== strpos($exception->getMessage(), sprintf("Unknown database '%s'", $databaseName))) {
                 return false;
             }
 
+            // pgsql
+            if (false !== strpos($exception->getMessage(), sprintf('database "%s" does not exist', $databaseName))) {
+                return false;
+            }
+
             throw $exception;
         }
 

src/Wallabag/CoreBundle/Command/TagAllCommand.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Wallabag\CoreBundle\Command;
+
+use Doctrine\ORM\NoResultException;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TagAllCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this
+            ->setName('wallabag:tag:all')
+            ->setDescription('Tag all entries using the tagging rules.')
+            ->addArgument(
+               'username',
+               InputArgument::REQUIRED,
+               'User to tag entries for.'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $user = $this->getUser($input->getArgument('username'));
+        } catch (NoResultException $e) {
+            $output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username')));
+
+            return 1;
+        }
+        $tagger = $this->getContainer()->get('wallabag_core.rule_based_tagger');
+
+        $output->write(sprintf('Tagging entries for user « <info>%s</info> »... ', $user->getUserName()));
+
+        $entries = $tagger->tagAllForUser($user);
+
+        $em = $this->getDoctrine()->getManager();
+        foreach ($entries as $entry) {
+            $em->persist($entry);
+        }
+        $em->flush();
+
+        $output->writeln('<info>Done.</info>');
+    }
+
+    /**
+     * Fetches a user from its username.
+     *
+     * @param string $username
+     *
+     * @return \Wallabag\UserBundle\Entity\User
+     */
+    private function getUser($username)
+    {
+        return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username);
+    }
+
+    private function getDoctrine()
+    {
+        return $this->getContainer()->get('doctrine');
+    }
+}

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -4,15 +4,18 @@ namespace Wallabag\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\CoreBundle\Entity\TaggingRule;
+use Wallabag\CoreBundle\Form\Type\ConfigType;
 use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\UserInformationType;
 use Wallabag\CoreBundle\Form\Type\NewUserType;
 use Wallabag\CoreBundle\Form\Type\RssType;
+use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
+use Wallabag\CoreBundle\Form\Type\UserInformationType;
 use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\UserBundle\Entity\User;
 
 class ConfigController extends Controller
 {
@@ -25,10 +28,11 @@ class ConfigController extends Controller
     {
         $em = $this->getDoctrine()->getManager();
         $config = $this->getConfig();
+        $userManager = $this->container->get('fos_user.user_manager');
         $user = $this->getUser();
 
         // handle basic config detail (this form is defined as a service)
-        $configForm = $this->createForm('config', $config);
+        $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
         $configForm->handleRequest($request);
 
         if ($configForm->isValid()) {
@@ -41,20 +45,19 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Config saved'
+                'Config saved. Some parameters will be considered after disconnection.'
             );
 
             return $this->redirect($this->generateUrl('config'));
         }
 
         // handle changing password
-        $pwdForm = $this->createForm(new ChangePasswordType());
+        $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
         $pwdForm->handleRequest($request);
 
         if ($pwdForm->isValid()) {
-            $user->setPassword($pwdForm->get('new_password')->getData());
+            $user->setPlainPassword($pwdForm->get('new_password')->getData());
-            $em->persist($user);
+            $userManager->updateUser($user, true);
-            $em->flush();
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
@@ -65,12 +68,14 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile')));
+        $userForm = $this->createForm(UserInformationType::class, $user, array(
+            'validation_groups' => array('Profile'),
+            'action' => $this->generateUrl('config').'#set3',
+        ));
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
-            $em->persist($user);
+            $userManager->updateUser($user, true);
-            $em->flush();
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
@@ -81,7 +86,7 @@ class ConfigController extends Controller
         }
 
         // handle rss information
-        $rssForm = $this->createForm(new RssType(), $config);
+        $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
         $rssForm->handleRequest($request);
 
         if ($rssForm->isValid()) {
@@ -96,13 +101,36 @@ class ConfigController extends Controller
             return $this->redirect($this->generateUrl('config'));
         }
 
+        // handle tagging rule
+        $taggingRule = new TaggingRule();
+        $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
+        $newTaggingRule->handleRequest($request);
+
+        if ($newTaggingRule->isValid()) {
+            $taggingRule->setConfig($config);
+            $em->persist($taggingRule);
+            $em->flush();
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'Tagging rules updated'
+            );
+
+            return $this->redirect($this->generateUrl('config'));
+        }
+
         // handle adding new user
-        $newUser = new User();
+        $newUser = $userManager->createUser();
-        $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile')));
+        // enable created user by default
+        $newUser->setEnabled(true);
+        $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
+            'validation_groups' => array('Profile'),
+            'action' => $this->generateUrl('config').'#set6',
+        ));
         $newUserForm->handleRequest($request);
 
-        if ($newUserForm->isValid()) {
+        if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) {
-            $em->persist($newUser);
+            $userManager->updateUser($newUser, true);
 
             $config = new Config($newUser);
             $config->setTheme($this->container->getParameter('theme'));
@@ -129,6 +157,7 @@ class ConfigController extends Controller
                 'pwd' => $pwdForm->createView(),
                 'user' => $userForm->createView(),
                 'new_user' => $newUserForm->createView(),
+                'new_tagging_rule' => $newTaggingRule->createView(),
             ),
             'rss' => array(
                 'username' => $user->getUsername(),
@@ -160,6 +189,33 @@ class ConfigController extends Controller
         return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config');
     }
 
+    /**
+     * Deletes a tagging rule and redirect to the config homepage.
+     *
+     * @param TaggingRule $rule
+     *
+     * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
+     *
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function deleteTaggingRule(TaggingRule $rule)
+    {
+        if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
+            throw $this->createAccessDeniedException('You can not access this tagging ryle.');
+        }
+
+        $em = $this->getDoctrine()->getManager();
+        $em->remove($rule);
+        $em->flush();
+
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            'Tagging rule deleted'
+        );
+
+        return $this->redirect($this->generateUrl('config'));
+    }
+
     /**
      * Retrieve config for the current user.
      * If no config were found, create a new one.

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -2,18 +2,36 @@
 
 namespace Wallabag\CoreBundle\Controller;
 
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Form\Type\NewEntryType;
-use Wallabag\CoreBundle\Form\Type\EditEntryType;
 use Wallabag\CoreBundle\Filter\EntryFilterType;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Wallabag\CoreBundle\Form\Type\EditEntryType;
-use Pagerfanta\Pagerfanta;
+use Wallabag\CoreBundle\Form\Type\NewEntryType;
 
 class EntryController extends Controller
 {
+    /**
+     * @param Entry $entry
+     */
+    private function updateEntry(Entry $entry)
+    {
+        try {
+            $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($entry);
+            $em->flush();
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @param Request $request
      *
@@ -25,17 +43,24 @@ class EntryController extends Controller
     {
         $entry = new Entry($this->getUser());
 
-        $form = $this->createForm(new NewEntryType(), $entry);
+        $form = $this->createForm(NewEntryType::class, $entry);
 
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+            // check for existing entry, if it exists, redirect to it with a message
+            $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
 
-            $em = $this->getDoctrine()->getManager();
+            if (false !== $existingEntry) {
-            $em->persist($entry);
+                $this->get('session')->getFlashBag()->add(
-            $em->flush();
+                    'notice',
+                    'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y')
+                );
 
+                return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
+            }
+
+            $this->updateEntry($entry);
             $this->get('session')->getFlashBag()->add(
                 'notice',
                 'Entry saved'
@@ -49,6 +74,22 @@ class EntryController extends Controller
         ));
     }
 
+    /**
+     * @param Request $request
+     *
+     * @Route("/bookmarklet", name="bookmarklet")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function addEntryViaBookmarklet(Request $request)
+    {
+        $entry = new Entry($this->getUser());
+        $entry->setUrl($request->get('url'));
+        $this->updateEntry($entry);
+
+        return $this->redirect($this->generateUrl('homepage'));
+    }
+
     /**
      * @param Request $request
      *
@@ -75,7 +116,7 @@ class EntryController extends Controller
     {
         $this->checkUserAction($entry);
 
-        $form = $this->createForm(new EditEntryType(), $entry);
+        $form = $this->createForm(EditEntryType::class, $entry);
 
         $form->handleRequest($request);
 
@@ -124,6 +165,11 @@ class EntryController extends Controller
      */
     public function showUnreadAction(Request $request, $page)
     {
+        // load the quickstart if no entry in database
+        if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) {
+            return $this->redirect($this->generateUrl('quickstart'));
+        }
+
         return $this->showEntries('unread', $request, $page);
     }
 
@@ -169,7 +215,7 @@ class EntryController extends Controller
      */
     private function showEntries($type, Request $request, $page)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
+        $repository = $this->get('wallabag_core.entry_repository');
 
         switch ($type) {
             case 'starred':
@@ -192,7 +238,7 @@ class EntryController extends Controller
                 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
         }
 
-        $form = $this->get('form.factory')->create(new EntryFilterType());
+        $form = $this->createForm(EntryFilterType::class);
 
         if ($request->query->has($form->getName())) {
             // manually bind values from the request
@@ -237,6 +283,33 @@ class EntryController extends Controller
         );
     }
 
+    /**
+     * Reload an entry.
+     * Refetch content from the website and make it readable again.
+     *
+     * @param Entry $entry
+     *
+     * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry")
+     *
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function reloadAction(Entry $entry)
+    {
+        $this->checkUserAction($entry);
+
+        $message = 'Entry reloaded';
+        if (false === $this->updateEntry($entry)) {
+            $message = 'Failed to reload entry';
+        }
+
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            $message
+        );
+
+        return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
+    }
+
     /**
      * Changes read status for an entry.
      *
@@ -288,7 +361,7 @@ class EntryController extends Controller
     }
 
     /**
-     * Deletes entry and redirect to the homepage.
+     * Deletes entry and redirect to the homepage or the last viewed page.
      *
      * @param Entry $entry
      *
@@ -296,10 +369,18 @@ class EntryController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteEntryAction(Entry $entry)
+    public function deleteEntryAction(Request $request, Entry $entry)
     {
         $this->checkUserAction($entry);
 
+        // generates the view url for this entry to check for redirection later
+        // to avoid redirecting to the deleted entry. Ugh.
+        $url = $this->generateUrl(
+            'view',
+            array('id' => $entry->getId()),
+            UrlGeneratorInterface::ABSOLUTE_URL
+        );
+
         $em = $this->getDoctrine()->getManager();
         $em->remove($entry);
         $em->flush();
@@ -309,7 +390,8 @@ class EntryController extends Controller
             'Entry deleted'
         );
 
-        return $this->redirect($this->generateUrl('homepage'));
+        // don't redirect user to the deleted entry
+        return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage'));
     }
 
     /**

src/Wallabag/CoreBundle/Controller/ExportController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Wallabag\CoreBundle\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * The try/catch can be removed once all formats will be implemented.
+ * Still need implementation: txt.
+ */
+class ExportController extends Controller
+{
+    /**
+     * Gets one entry content.
+     *
+     * @param Entry $entry
+     *
+     * @Route("/export/{id}.{format}", name="export_entry", requirements={
+     *     "format": "epub|mobi|pdf|json|xml|txt|csv",
+     *     "id": "\d+"
+     * })
+     */
+    public function downloadEntryAction(Entry $entry, $format)
+    {
+        try {
+            return $this->get('wallabag_core.helper.entries_export')
+                ->setEntries($entry)
+                ->updateTitle('entry')
+                ->exportAs($format);
+        } catch (\InvalidArgumentException $e) {
+            throw new NotFoundHttpException($e->getMessage());
+        }
+    }
+
+    /**
+     * Export all entries for current user.
+     *
+     * @Route("/export/{category}.{format}", name="export_entries", requirements={
+     *     "format": "epub|mobi|pdf|json|xml|txt|csv",
+     *     "category": "all|unread|starred|archive"
+     * })
+     */
+    public function downloadEntriesAction($format, $category)
+    {
+        $method = ucfirst($category);
+        $methodBuilder = 'getBuilderFor'.$method.'ByUser';
+        $entries = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->$methodBuilder($this->getUser()->getId())
+            ->getQuery()
+            ->getResult();
+
+        try {
+            return $this->get('wallabag_core.helper.entries_export')
+                ->setEntries($entries)
+                ->updateTitle($method)
+                ->exportAs($format);
+        } catch (\InvalidArgumentException $e) {
+            throw new NotFoundHttpException($e->getMessage());
+        }
+    }
+}

src/Wallabag/CoreBundle/Controller/RssController.php

@@ -2,13 +2,13 @@
 
 namespace Wallabag\CoreBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Entity\Entry;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\UserBundle\Entity\User;
 
 class RssController extends Controller
 {
@@ -16,7 +16,7 @@ class RssController extends Controller
      * Shows unread entries for current user.
      *
      * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"})
-     * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter")
+     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -29,7 +29,7 @@ class RssController extends Controller
      * Shows read entries for current user.
      *
      * @Route("/{username}/{token}/archive.xml", name="archive_rss")
-     * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter")
+     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -42,7 +42,7 @@ class RssController extends Controller
      * Shows starred entries for current user.
      *
      * @Route("/{username}/{token}/starred.xml", name="starred_rss")
-     * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter")
+     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */

src/Wallabag/CoreBundle/Controller/SecurityController.php

@@ -1,153 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Controller;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Core\SecurityContext;
-use Wallabag\CoreBundle\Form\Type\ResetPasswordType;
-
-class SecurityController extends Controller
-{
-    public function loginAction(Request $request)
-    {
-        $session = $request->getSession();
-        // get the login error if there is one
-        if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
-            $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR);
-        } else {
-            $error = $session->get(SecurityContext::AUTHENTICATION_ERROR);
-            $session->remove(SecurityContext::AUTHENTICATION_ERROR);
-        }
-
-        return $this->render('WallabagCoreBundle:Security:login.html.twig', array(
-            // last username entered by the user
-            'last_username' => $session->get(SecurityContext::LAST_USERNAME),
-            'error' => $error,
-        ));
-    }
-
-    /**
-     * Request forgot password: show form.
-     *
-     * @Route("/forgot-password", name="forgot_password")
-     *
-     * @Method({"GET", "POST"})
-     */
-    public function forgotPasswordAction(Request $request)
-    {
-        $form = $this->createForm('forgot_password');
-        $form->handleRequest($request);
-
-        if ($form->isValid()) {
-            $user = $this->getDoctrine()->getRepository('WallabagCoreBundle:User')->findOneByEmail($form->get('email')->getData());
-
-            // generate "hard" token
-            $user->setConfirmationToken(rtrim(strtr(base64_encode(hash('sha256', uniqid(mt_rand(), true), true)), '+/', '-_'), '='));
-            $user->setPasswordRequestedAt(new \DateTime());
-
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($user);
-            $em->flush();
-
-            $message = \Swift_Message::newInstance()
-                ->setSubject('Reset Password')
-                ->setFrom($this->container->getParameter('from_email'))
-                ->setTo($user->getEmail())
-                ->setBody($this->renderView('WallabagCoreBundle:Mail:forgotPassword.txt.twig', array(
-                    'username' => $user->getUsername(),
-                    'confirmationUrl' => $this->generateUrl('forgot_password_reset', array('token' => $user->getConfirmationToken()), true),
-                )))
-            ;
-            $this->get('mailer')->send($message);
-
-            return $this->redirect($this->generateUrl('forgot_password_check_email',
-                array('email' => $this->getObfuscatedEmail($user->getEmail()))
-            ));
-        }
-
-        return $this->render('WallabagCoreBundle:Security:forgotPassword.html.twig', array(
-            'form' => $form->createView(),
-        ));
-    }
-
-    /**
-     * Tell the user to check his email provider.
-     *
-     * @Route("/forgot-password/check-email", name="forgot_password_check_email")
-     *
-     * @Method({"GET"})
-     */
-    public function checkEmailAction(Request $request)
-    {
-        $email = $request->query->get('email');
-
-        if (empty($email)) {
-            // the user does not come from the forgotPassword action
-            return $this->redirect($this->generateUrl('forgot_password'));
-        }
-
-        return $this->render('WallabagCoreBundle:Security:checkEmail.html.twig', array(
-            'email' => $email,
-        ));
-    }
-
-    /**
-     * Reset user password.
-     *
-     * @Route("/forgot-password/{token}", name="forgot_password_reset")
-     *
-     * @Method({"GET", "POST"})
-     */
-    public function resetAction(Request $request, $token)
-    {
-        $user = $this->getDoctrine()->getRepository('WallabagCoreBundle:User')->findOneByConfirmationToken($token);
-
-        if (null === $user) {
-            throw $this->createNotFoundException(sprintf('No user found with token "%s"', $token));
-        }
-
-        $form = $this->createForm(new ResetPasswordType());
-        $form->handleRequest($request);
-
-        if ($form->isValid()) {
-            $user->setPassword($form->get('new_password')->getData());
-
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($user);
-            $em->flush();
-
-            $this->get('session')->getFlashBag()->add(
-                'notice',
-                'The password has been reset successfully'
-            );
-
-            return $this->redirect($this->generateUrl('login'));
-        }
-
-        return $this->render('WallabagCoreBundle:Security:reset.html.twig', array(
-            'token' => $token,
-            'form' => $form->createView(),
-        ));
-    }
-
-    /**
-     * Get the truncated email displayed when requesting the resetting.
-     *
-     * Keeping only the part following @ in the address.
-     *
-     * @param string $email
-     *
-     * @return string
-     */
-    protected function getObfuscatedEmail($email)
-    {
-        if (false !== $pos = strpos($email, '@')) {
-            $email = '...'.substr($email, $pos);
-        }
-
-        return $email;
-    }
-}