Merge branch 'master' into 2.1

diff --combined .travis.yml
index 0e72d207230207a7048f2adbf05d732b5d439a22,7fe15c5f7b64a3f1b269cefdf8996a5561b05be2..17c3abafc6fc325458438c4434c010dcc0e1a705
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -15,9 -15,6 +15,9 @@@ cache
      directories:
          - vendor
          - $HOME/.composer/cache
 +        - node_modules
 +        - $HOME/.cache/bower
 +        - $HOME/.npm
  
  php:
      - 5.5
@@@ -25,21 -22,16 +25,21 @@@
      - 7.0
      - hhvm
  
 +node_js:
 +    - "5"
 +
  env:
 -    - DB=mysql
 -    - DB=pgsql
 -    - DB=sqlite
 +    - DB=mysql ASSETS=nobuild
 +    - DB=pgsql ASSETS=nobuild
 +    - DB=sqlite ASSETS=nobuild
  
  matrix:
      fast_finish: true
      include:
          - php: 7.0
 -          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
 +          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild
 +        - php: 7.0
 +          env: DB=sqlite ASSETS=build
      exclude:
          - php: hhvm
            env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
@@@ -57,16 -49,12 +57,16 @@@ before_script
      - composer self-update --no-progress
      - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
  
 +install:
 +    - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
 +    - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi;
 +
  before_install:
      - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
  
  script:
 -    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
 +    - travis_wait bash install.sh
      - ant prepare-$DB
-     - bin/phpunit -v
+     - phpunit -v
      - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
      - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;

diff --combined app/config/config.yml
index c371cf73dc69671085a5928d62d25f06474b01bd,9e2e08a67fae9365c67b177761dc157e6743a5f1..298478203fea90740431406b023a7ab004fa9196
--- 1/app/config/config.yml
--- 2/app/config/config.yml
+++ b/app/config/config.yml
@@@ -59,6 -59,19 +59,6 @@@ twig
      form_themes:
          - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
  
 -# Assetic Configuration
 -assetic:
 -    debug:          "%kernel.debug%"
 -    use_controller: false
 -    bundles:        [ ]
 -    #java: /usr/bin/java
 -    filters:
 -        cssrewrite: ~
 -        #closure:
 -        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
 -        #yui_css:
 -        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 -
  # Doctrine Configuration
  doctrine:
      dbal:
@@@ -156,7 -169,7 +156,7 @@@ liip_theme
  
      path_patterns:
          bundle_resource:
-             - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+             - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
  
  fos_user:
      db_driver: orm
@@@ -164,9 -177,9 +164,9 @@@
      user_class: Wallabag\UserBundle\Entity\User
      registration:
          confirmation:
-             enabled: %fosuser_confirmation%
+             enabled: "%fosuser_confirmation%"
      from_email:
-         address:        %from_email%
+         address:        "%from_email%"
          sender_name:    wallabag
  fos_oauth_server:
      db_driver:           orm
@@@ -184,8 -197,8 +184,8 @@@ scheb_two_factor
          cookie_lifetime: 2592000
  
      email:
-         enabled: %twofactor_auth%
-         sender_email: %twofactor_sender%
+         enabled: "%twofactor_auth%"
+         sender_email: "%twofactor_sender%"
          digits: 6
          template: WallabagUserBundle:Authentication:form.html.twig
          mailer: wallabag_user.auth_code_mailer

diff --combined app/config/config_dev.yml
index 410d5a6c0c64af4649857b8cdb05cf6c46e56e74,ec23babb8f6b4c7fc36a18e3a27122f98042cf55..f3030ff1620eb3a249e8fc0bb40d36340c09947d
--- 1/app/config/config_dev.yml
--- 2/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@@ -17,14 -17,14 +17,14 @@@ monolog
              type:   stream
              path:   "%kernel.logs_dir%/%kernel.environment%.log"
              level:  debug
-             channels: [!event]
+             channels: ['!event']
          console:
              type:   console
              bubble: false
              verbosity_levels:
                  VERBOSITY_VERBOSE: INFO
                  VERBOSITY_VERY_VERBOSE: DEBUG
-             channels: [!event, !doctrine]
+             channels: ['!event', '!doctrine']
          console_very_verbose:
              type:   console
              bubble: false
@@@ -34,6 -34,9 +34,6 @@@
                  VERBOSITY_DEBUG: DEBUG
              channels: [doctrine]
  
 -assetic:
 -    use_controller: true
 -
  swiftmailer:
      # see http://mailcatcher.me/
      transport: smtp

diff --combined composer.json
index a8ab2a5961c19368dc17cd7f37a4515c22ee3884,f3bd7893ef781e28f9f1e16d9c2b3c7560a77056..7beb9bd92f74ed663634fe5c8ebff1fe007b7088
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -43,11 -43,12 +43,11 @@@
          "ext-iconv": "*",
          "ext-tokenizer": "*",
          "ext-pdo": "*",
-         "symfony/symfony": "3.0.*",
+         "symfony/symfony": "3.1.*",
          "doctrine/orm": "^2.5",
          "doctrine/doctrine-bundle": "^1.6",
          "doctrine/doctrine-cache-bundle": "^1.2",
          "twig/extensions": "~1.0",
 -        "symfony/assetic-bundle": "~2.3",
          "symfony/swiftmailer-bundle": "^2.3",
          "symfony/monolog-bundle": "^2.8",
          "sensio/distribution-bundle": "^5.0",
@@@ -80,14 -81,14 +80,15 @@@
          "mnapoli/piwik-twig-extension": "^1.0",
          "lexik/maintenance-bundle": "~2.1",
          "ocramius/proxy-manager": "1.*",
 -        "white-october/pagerfanta-bundle": "^1.0"
 +        "white-october/pagerfanta-bundle": "^1.0",
 +        "mouf/nodejs-installer": "~1.0"
      },
      "require-dev": {
          "doctrine/doctrine-fixtures-bundle": "~2.2",
+         "doctrine/data-fixtures": "~1.1.1",
          "sensio/generator-bundle": "^3.0",
          "phpunit/phpunit": "~4.4",
-         "symfony/phpunit-bridge": "^2.7",
+         "symfony/phpunit-bridge": "^3.0",
          "friendsofphp/php-cs-fixer": "~1.9"
      },
      "scripts": {
@@@ -95,6 -96,7 +96,6 @@@
              "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
              "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::prepareDeploymentTarget"
          ],
@@@ -111,6 -113,7 +112,6 @@@
          "symfony-var-dir": "var",
          "symfony-web-dir": "web",
          "symfony-tests-dir": "tests",
 -        "symfony-assets-install": "relative",
          "incenteev-parameters": {
              "file": "app/config/parameters.yml"
          }
@@@ -119,6 -122,9 +120,9 @@@
          "psr-4": { "Wallabag\\": "src/Wallabag/" },
          "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
      },
+     "autoload-dev": {
+         "psr-4": { "Tests\\": "tests/" }
+     },
      "config": {
          "bin-dir": "bin"
      },

diff --combined tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
index 249672a65d403634f065d4dd35f2b63a04556626,6c6ce0873ff40ee73f85146243e7ccbd6603c673..2413d735485811761d3bb49536dcbac9be9346eb
--- 1/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
--- 2/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  
- namespace Wallabag\CoreBundle\Tests\Command;
+ namespace Tests\Wallabag\CoreBundle\Command;
  
  use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
  use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
@@@ -9,8 -9,8 +9,8 @@@ use Symfony\Component\Console\Input\Arr
  use Symfony\Component\Console\Output\NullOutput;
  use Symfony\Component\Console\Tester\CommandTester;
  use Wallabag\CoreBundle\Command\InstallCommand;
- use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
- use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
+ use Tests\Wallabag\CoreBundle\Mock\InstallCommandMock;
+ use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
  
  class InstallCommandTest extends WallabagCoreTestCase
  {
@@@ -71,6 -71,7 +71,6 @@@
          $this->assertContains('Setting up database.', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
      }
  
      public function testRunInstallCommandWithReset()
@@@ -102,6 -103,7 +102,6 @@@
          $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
  
          // we force to reset everything
          $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
@@@ -146,6 -148,7 +146,6 @@@
          $this->assertContains('Setting up database.', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
  
          // the current database doesn't already exist
          $this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay());
@@@ -183,6 -186,7 +183,6 @@@
          $this->assertContains('Setting up database.', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
  
          $this->assertContains('Droping schema and creating schema', $tester->getDisplay());
      }
@@@ -237,6 -241,7 +237,6 @@@
          $this->assertContains('Setting up database.', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
  
          $this->assertContains('Creating schema', $tester->getDisplay());
      }
@@@ -269,5 -274,6 +269,5 @@@
          $this->assertContains('Setting up database.', $tester->getDisplay());
          $this->assertContains('Administration setup.', $tester->getDisplay());
          $this->assertContains('Config setup.', $tester->getDisplay());
 -        $this->assertContains('Installing assets.', $tester->getDisplay());
      }
  }