From 5c895a7fd15822856fb407910264c5d95e1e223c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 22 Dec 2015 13:00:37 +0100 Subject: Update bundle & stock file - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler --- app/config/config.yml | 5 ++--- app/config/routing.yml | 2 +- app/config/routing_dev.yml | 6 +----- app/config/security.yml | 9 +++++++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 8e9369c2..5bc16dd9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -59,9 +59,8 @@ twig: 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: - resources: - - LexikFormFilterBundle:Form:form_div_layout.html.twig + form_themes: + - "LexikFormFilterBundle:Form:form_div_layout.html.twig" # Assetic Configuration assetic: diff --git a/app/config/routing.yml b/app/config/routing.yml index 1ca2f677..84b98d23 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -8,7 +8,7 @@ wallabag_api: prefix: / app: - resource: @WallabagCoreBundle/Controller/ + resource: "@WallabagCoreBundle/Controller/" type: annotation doc-api: diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 1a236e28..404f6a3b 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -6,13 +6,9 @@ _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 _main: - resource: routing.yml \ No newline at end of file + resource: routing.yml diff --git a/app/config/security.yml b/app/config/security.yml index 576cfd25..a99a7d80 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -15,6 +15,11 @@ security: # the main part of the security, where you can set up firewalls # for specific sections of your app firewalls: + # 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 @@ -33,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: ~ -- cgit v1.2.3 From 1d405d0e62a708928bccd2222ebd89d4804231f9 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 14:10:33 +0100 Subject: Remove some commented code --- app/config/config.yml | 6 ------ app/config/config_dev.yml | 8 -------- 2 files changed, 14 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 5bc16dd9..5fac3192 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -170,14 +170,8 @@ 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 diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 205e0f66..116dd0d5 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -32,14 +32,6 @@ monolog: VERBOSITY_VERY_VERBOSE: NOTICE VERBOSITY_DEBUG: DEBUG 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 -- cgit v1.2.3 From 73cd160bfc6e4a1b88f2117eb0c097a91ac5c753 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 18:15:07 +0100 Subject: Switch to Symfony 3 structure --- app/config/config.yml | 3 ++- app/config/config_dev.yml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 5fac3192..133fc12f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -21,7 +21,8 @@ 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 diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 116dd0d5..6b077fdb 100644 --- a/app/config/config_dev.yml +++ b/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,7 +32,7 @@ monolog: VERBOSITY_VERBOSE: NOTICE VERBOSITY_VERY_VERBOSE: NOTICE VERBOSITY_DEBUG: DEBUG - channels: ["doctrine"] + channels: [doctrine] assetic: use_controller: true -- cgit v1.2.3 From d8dbe76bf5b97d199ce4a20de53a52728a88befc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 14 Jan 2016 18:35:59 +0100 Subject: Add assets config To avoid : > Twig_Error_Syntax: Unknown "asset" function in --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 133fc12f..19e7155d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -25,6 +25,7 @@ framework: save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" fragments: ~ http_method_override: true + assets: ~ wallabag_core: languages: -- cgit v1.2.3