Merge remote-tracking branch 'origin/master' into 2.2

diff --combined app/config/config.yml
index 53c26beb5a3a60d5cc04164e1586308696ddb809,3d9067d1a9d51c70ec59dfea59c309350fa4c779..487e934bcd0ab1262ff748fc4c9780636e17b503
--- 1/app/config/config.yml
--- 2/app/config/config.yml
+++ b/app/config/config.yml
@@@ -30,7 -30,7 +30,7 @@@ framework
      assets: ~
  
  wallabag_core:
-     version: 2.2.0-dev
+     version: 2.1.5
      paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
      languages:
          en: 'English'
@@@ -78,7 -78,7 +78,7 @@@ doctrine
          dbname: "%database_name%"
          user: "%database_user%"
          password: "%database_password%"
 -        charset: UTF8
 +        charset: "%database_charset%"
          path: "%database_path%"
          unix_socket: "%database_socket%"
          server_version: 5.6
@@@ -115,26 -115,12 +115,26 @@@ swiftmailer
  fos_rest:
      param_fetcher_listener: true
      body_listener: true
 -    format_listener: true
      view:
 +        mime_types:
 +            csv:
 +                - 'text/csv'
 +                - 'text/plain'
 +            pdf:
 +                - 'application/pdf'
 +            epub:
 +                - 'application/epub+zip'
 +            mobi:
 +                - 'application/x-mobipocket-ebook'
          view_response_listener: 'force'
          formats:
              xml: true
 -            json : true
 +            json: true
 +            txt: true
 +            csv: true
 +            pdf: true
 +            epub: true
 +            mobi: true
          templating_formats:
              html: true
          force_redirects:
@@@ -143,21 -129,10 +143,21 @@@
          default_engine: twig
      routing_loader:
          default_format: json
 +    format_listener:
 +        enabled: true
 +        rules:
 +            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: false, prefer_extension: false }
 +            - { path: "^/api", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
 +            - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
 +            # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
 +            # so we need to add custom rule for custom api export but also for all other routes of the application...
 +            - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
  
  nelmio_api_doc:
      sandbox:
          enabled: false
 +    cache:
 +        enabled: true
      name: wallabag API documentation
  
  nelmio_cors:
@@@ -218,7 -193,9 +218,9 @@@ fos_oauth_server
      auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
      service:
          user_provider: fos_user.user_manager
- 
+         options:
+             refresh_token_lifetime: 1209600
+                 
  scheb_two_factor:
      trusted_computer:
          enabled: true
@@@ -236,6 -213,16 +238,6 @@@ kphoen_rulerz
      executors:
          doctrine: true
  
 -lexik_maintenance:
 -    authorized:
 -        ips: ['127.0.0.1']
 -    driver:
 -        ttl: 3600
 -        class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
 -    response:
 -        code: 503
 -        status: "wallabag Service Temporarily Unavailable"
 -
  old_sound_rabbit_mq:
      connections:
          default:
@@@ -256,11 -243,6 +258,11 @@@
              exchange_options:
                  name: 'wallabag.import.readability'
                  type: topic
 +        import_pinboard:
 +            connection: default
 +            exchange_options:
 +                name: 'wallabag.import.pinboard'
 +                type: topic
          import_instapaper:
              connection: default
              exchange_options:
@@@ -311,14 -293,6 +313,14 @@@
              queue_options:
                  name: 'wallabag.import.instapaper'
              callback: wallabag_import.consumer.amqp.instapaper
 +        import_pinboard:
 +            connection: default
 +            exchange_options:
 +                name: 'wallabag.import.pinboard'
 +                type: topic
 +            queue_options:
 +                name: 'wallabag.import.pinboard'
 +            callback: wallabag_import.consumer.amqp.pinboard
          import_wallabag_v1:
              connection: default
              exchange_options:
@@@ -351,17 -325,3 +353,17 @@@
              queue_options:
                  name: 'wallabag.import.chrome'
              callback: wallabag_import.consumer.amqp.chrome
 +
 +fos_js_routing:
 +    routes_to_expose:
 +        - homepage
 +        - starred
 +        - archive
 +        - all
 +        - tag
 +        - config
 +        - import
 +        - developer
 +        - howto
 +        - logout
 +        - new

diff --combined composer.json
index 6d7a7adf5d7b69c6a3e0bbe7f5136a925a39916c,70f5fc99cd26f193be823b70cd0e3bd6f5505798..1548d6ec60db32bfcd912380e426f4e51d844326
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -58,7 -58,7 +58,7 @@@
          "jms/serializer-bundle": "~1.1",
          "nelmio/api-doc-bundle": "~2.7",
          "mgargano/simplehtmldom": "~1.5",
 -        "tecnickcom/tcpdf": "~6.2",
 +        "tecnickcom/tc-lib-pdf": "dev-master",
          "simplepie/simplepie": "~1.3.1",
          "willdurand/hateoas-bundle": "~1.0",
          "htmlawed/htmlawed": "~1.1.19",
@@@ -77,19 -77,18 +77,19 @@@
          "paragonie/random_compat": "~1.0",
          "craue/config-bundle": "~1.4",
          "mnapoli/piwik-twig-extension": "^1.0",
 -        "lexik/maintenance-bundle": "~2.1",
          "ocramius/proxy-manager": "1.*",
          "white-october/pagerfanta-bundle": "^1.0",
          "php-amqplib/rabbitmq-bundle": "^1.8",
          "predis/predis": "^1.0",
 -        "javibravo/simpleue": "^1.0"
 +        "javibravo/simpleue": "^1.0",
 +        "symfony/dom-crawler": "^3.1",
 +        "friendsofsymfony/jsrouting-bundle": "^1.6"
      },
      "require-dev": {
          "doctrine/doctrine-fixtures-bundle": "~2.2",
          "doctrine/data-fixtures": "~1.1.1",
          "sensio/generator-bundle": "^3.0",
-         "phpunit/phpunit": "~5.0",
+         "phpunit/phpunit": "~4.0",
          "symfony/phpunit-bridge": "^3.0",
          "friendsofphp/php-cs-fixer": "~1.9",
          "m6web/redis-mock": "^2.0"
@@@ -99,7 -98,6 +99,7 @@@
              "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"
          ],
          "post-install-cmd": [
@@@ -115,7 -113,6 +115,7 @@@
          "symfony-var-dir": "var",
          "symfony-web-dir": "web",
          "symfony-tests-dir": "tests",
 +        "symfony-assets-install": "symlink",
          "incenteev-parameters": {
              "file": "app/config/parameters.yml"
          }
@@@ -128,7 -125,10 +128,10 @@@
          "psr-4": { "Tests\\": "tests/" }
      },
      "config": {
-         "bin-dir": "bin"
+         "bin-dir": "bin",
+         "platform": {
+             "php": "5.5.9"
+         }
      },
      "minimum-stability": "dev",
      "prefer-stable": true