Merge pull request #2220 from Rurik19/master

Enable PATCH method for CORS in API part

diff --combined app/config/config.yml
index 30d6de930c27166e3aa6369b1fbf9a7383bfffee,408e1b1e4e2cd700cfae8d8587a21f8410ff6a31..72c854ab4b871708da01a7b44cd9da774c8cacf6
--- 1/app/config/config.yml
--- 2/app/config/config.yml
+++ b/app/config/config.yml
@@@ -5,32 -5,30 +5,32 @@@ imports
  
  framework:
      #esi:             ~
 -    translator:      { fallback: "%locale%" }
 -    secret:          "%secret%"
 +    translator:
 +        enabled: true
 +        fallback: "%locale%"
 +    secret: "%secret%"
      router:
          resource: "%kernel.root_dir%/config/routing.yml"
          strict_requirements: ~
 -    form:            ~
 +    form: ~
      csrf_protection: ~
 -    validation:      { enable_annotations: true }
 +    validation:
 +        enable_annotations: true
      templating:
          engines: ['twig']
 -        #assets_version: SomeVersionScheme
 -    default_locale:  "%locale%"
 -    trusted_hosts:   ~
 +    default_locale: "%locale%"
 +    trusted_hosts: ~
      trusted_proxies: ~
      session:
          # handler_id set to null will use default session handler from php.ini
 -        handler_id:  session.handler.native_file
 -        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
 -    fragments:       ~
 +        handler_id: session.handler.native_file
 +        save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
 +    fragments: ~
      http_method_override: true
      assets: ~
  
  wallabag_core:
 -    version: 2.0.4
 +    version: 2.0.6
      paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
      languages:
          en: 'English'
@@@ -56,14 -54,14 +56,14 @@@ wallabag_import
  
  # Twig Configuration
  twig:
 -    debug:            "%kernel.debug%"
 +    debug: "%kernel.debug%"
      strict_variables: "%kernel.debug%"
      form_themes:
          - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
  
  # Assetic Configuration
  assetic:
 -    debug:          "%kernel.debug%"
 +    debug: "%kernel.debug%"
      use_controller: false
      bundles:        [ ]
      #java: /usr/bin/java
@@@ -77,14 -75,14 +77,14 @@@
  # Doctrine Configuration
  doctrine:
      dbal:
 -        driver:   "%database_driver%"
 +        driver: "%database_driver%"
          host: "%database_host%"
          port: "%database_port%"
          dbname: "%database_name%"
          user: "%database_user%"
          password: "%database_password%"
 -        charset:  UTF8
 -        path:     "%database_path%"
 +        charset: UTF8
 +        path: "%database_path%"
          server_version: 5.6
  
      orm:
@@@ -110,11 -108,10 +110,11 @@@ doctrine_migrations
  # Swiftmailer Configuration
  swiftmailer:
      transport: "%mailer_transport%"
 -    host:      "%mailer_host%"
 -    username:  "%mailer_user%"
 -    password:  "%mailer_password%"
 -    spool:     { type: memory }
 +    host: "%mailer_host%"
 +    username: "%mailer_user%"
 +    password: "%mailer_password%"
 +    spool:
 +        type: memory
  
  fos_rest:
      param_fetcher_listener: true
@@@ -153,7 -150,7 +153,7 @@@ nelmio_cors
          '^/api/':
              allow_origin: ['*']
              allow_headers: ['X-Custom-Auth']
-             allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+             allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
              max_age: 3600
          '^/oauth/':
              allow_origin: ['*']
@@@ -177,17 -174,17 +177,17 @@@ 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
 -    firewall_name: main
 +    firewall_name: secured_area
      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
@@@ -205,8 -202,8 +205,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