diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-24 11:28:07 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-24 11:28:07 +0200 |
commit | 2bc9cad78ed43eaadfc8844c0b55700e7045cbd7 (patch) | |
tree | ba568c2cbf5844366d52723e096f0cc381dc3a9d | |
parent | fb5c17a9ab5e10b1de9caa50e73638fdae19cb78 (diff) | |
download | wallabag-2bc9cad78ed43eaadfc8844c0b55700e7045cbd7.tar.gz wallabag-2bc9cad78ed43eaadfc8844c0b55700e7045cbd7.tar.zst wallabag-2bc9cad78ed43eaadfc8844c0b55700e7045cbd7.zip |
Remove useless spaces
-rw-r--r-- | app/config/config.yml | 41 | ||||
-rw-r--r-- | app/config/config_dev.yml | 13 | ||||
-rw-r--r-- | app/config/config_prod.yml | 10 | ||||
-rw-r--r-- | app/config/routing.yml | 4 | ||||
-rw-r--r-- | app/config/routing_dev.yml | 6 | ||||
-rw-r--r-- | app/config/security.yml | 16 |
6 files changed, 48 insertions, 42 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 9e2e08a6..f1321d67 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -5,25 +5,27 @@ imports: | |||
5 | 5 | ||
6 | framework: | 6 | framework: |
7 | #esi: ~ | 7 | #esi: ~ |
8 | translator: { fallback: "%locale%" } | 8 | translator: |
9 | secret: "%secret%" | 9 | enabled: true |
10 | fallback: "%locale%" | ||
11 | secret: "%secret%" | ||
10 | router: | 12 | router: |
11 | resource: "%kernel.root_dir%/config/routing.yml" | 13 | resource: "%kernel.root_dir%/config/routing.yml" |
12 | strict_requirements: ~ | 14 | strict_requirements: ~ |
13 | form: ~ | 15 | form: ~ |
14 | csrf_protection: ~ | 16 | csrf_protection: ~ |
15 | validation: { enable_annotations: true } | 17 | validation: |
18 | enable_annotations: true | ||
16 | templating: | 19 | templating: |
17 | engines: ['twig'] | 20 | engines: ['twig'] |
18 | #assets_version: SomeVersionScheme | 21 | default_locale: "%locale%" |
19 | default_locale: "%locale%" | 22 | trusted_hosts: ~ |
20 | trusted_hosts: ~ | ||
21 | trusted_proxies: ~ | 23 | trusted_proxies: ~ |
22 | session: | 24 | session: |
23 | # handler_id set to null will use default session handler from php.ini | 25 | # handler_id set to null will use default session handler from php.ini |
24 | handler_id: session.handler.native_file | 26 | handler_id: session.handler.native_file |
25 | save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" | 27 | save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" |
26 | fragments: ~ | 28 | fragments: ~ |
27 | http_method_override: true | 29 | http_method_override: true |
28 | assets: ~ | 30 | assets: ~ |
29 | 31 | ||
@@ -54,14 +56,14 @@ wallabag_import: | |||
54 | 56 | ||
55 | # Twig Configuration | 57 | # Twig Configuration |
56 | twig: | 58 | twig: |
57 | debug: "%kernel.debug%" | 59 | debug: "%kernel.debug%" |
58 | strict_variables: "%kernel.debug%" | 60 | strict_variables: "%kernel.debug%" |
59 | form_themes: | 61 | form_themes: |
60 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" | 62 | - "LexikFormFilterBundle:Form:form_div_layout.html.twig" |
61 | 63 | ||
62 | # Assetic Configuration | 64 | # Assetic Configuration |
63 | assetic: | 65 | assetic: |
64 | debug: "%kernel.debug%" | 66 | debug: "%kernel.debug%" |
65 | use_controller: false | 67 | use_controller: false |
66 | bundles: [ ] | 68 | bundles: [ ] |
67 | #java: /usr/bin/java | 69 | #java: /usr/bin/java |
@@ -75,14 +77,14 @@ assetic: | |||
75 | # Doctrine Configuration | 77 | # Doctrine Configuration |
76 | doctrine: | 78 | doctrine: |
77 | dbal: | 79 | dbal: |
78 | driver: "%database_driver%" | 80 | driver: "%database_driver%" |
79 | host: "%database_host%" | 81 | host: "%database_host%" |
80 | port: "%database_port%" | 82 | port: "%database_port%" |
81 | dbname: "%database_name%" | 83 | dbname: "%database_name%" |
82 | user: "%database_user%" | 84 | user: "%database_user%" |
83 | password: "%database_password%" | 85 | password: "%database_password%" |
84 | charset: UTF8 | 86 | charset: UTF8 |
85 | path: "%database_path%" | 87 | path: "%database_path%" |
86 | server_version: 5.6 | 88 | server_version: 5.6 |
87 | 89 | ||
88 | orm: | 90 | orm: |
@@ -108,10 +110,11 @@ doctrine_migrations: | |||
108 | # Swiftmailer Configuration | 110 | # Swiftmailer Configuration |
109 | swiftmailer: | 111 | swiftmailer: |
110 | transport: "%mailer_transport%" | 112 | transport: "%mailer_transport%" |
111 | host: "%mailer_host%" | 113 | host: "%mailer_host%" |
112 | username: "%mailer_user%" | 114 | username: "%mailer_user%" |
113 | password: "%mailer_password%" | 115 | password: "%mailer_password%" |
114 | spool: { type: memory } | 116 | spool: |
117 | type: memory | ||
115 | 118 | ||
116 | fos_rest: | 119 | fos_rest: |
117 | param_fetcher_listener: true | 120 | param_fetcher_listener: true |
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index ec23babb..0fa23dbf 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml | |||
@@ -5,7 +5,8 @@ framework: | |||
5 | router: | 5 | router: |
6 | resource: "%kernel.root_dir%/config/routing_dev.yml" | 6 | resource: "%kernel.root_dir%/config/routing_dev.yml" |
7 | strict_requirements: true | 7 | strict_requirements: true |
8 | profiler: { only_exceptions: false } | 8 | profiler: |
9 | only_exceptions: false | ||
9 | 10 | ||
10 | web_profiler: | 11 | web_profiler: |
11 | toolbar: true | 12 | toolbar: true |
@@ -14,19 +15,19 @@ web_profiler: | |||
14 | monolog: | 15 | monolog: |
15 | handlers: | 16 | handlers: |
16 | main: | 17 | main: |
17 | type: stream | 18 | type: stream |
18 | path: "%kernel.logs_dir%/%kernel.environment%.log" | 19 | path: "%kernel.logs_dir%/%kernel.environment%.log" |
19 | level: debug | 20 | level: debug |
20 | channels: ['!event'] | 21 | channels: ['!event'] |
21 | console: | 22 | console: |
22 | type: console | 23 | type: console |
23 | bubble: false | 24 | bubble: false |
24 | verbosity_levels: | 25 | verbosity_levels: |
25 | VERBOSITY_VERBOSE: INFO | 26 | VERBOSITY_VERBOSE: INFO |
26 | VERBOSITY_VERY_VERBOSE: DEBUG | 27 | VERBOSITY_VERY_VERBOSE: DEBUG |
27 | channels: ['!event', '!doctrine'] | 28 | channels: ['!event', '!doctrine'] |
28 | console_very_verbose: | 29 | console_very_verbose: |
29 | type: console | 30 | type: console |
30 | bubble: false | 31 | bubble: false |
31 | verbosity_levels: | 32 | verbosity_levels: |
32 | VERBOSITY_VERBOSE: NOTICE | 33 | VERBOSITY_VERBOSE: NOTICE |
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 65b040cc..5a4dd69e 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml | |||
@@ -14,12 +14,12 @@ imports: | |||
14 | monolog: | 14 | monolog: |
15 | handlers: | 15 | handlers: |
16 | main: | 16 | main: |
17 | type: fingers_crossed | 17 | type: fingers_crossed |
18 | action_level: error | 18 | action_level: error |
19 | handler: nested | 19 | handler: nested |
20 | nested: | 20 | nested: |
21 | type: stream | 21 | type: stream |
22 | path: "%kernel.logs_dir%/%kernel.environment%.log" | 22 | path: "%kernel.logs_dir%/%kernel.environment%.log" |
23 | level: debug | 23 | level: debug |
24 | console: | 24 | console: |
25 | type: console | 25 | type: console |
diff --git a/app/config/routing.yml b/app/config/routing.yml index 6a6aa6ac..40cc7165 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -4,8 +4,8 @@ wallabag_annotation: | |||
4 | 4 | ||
5 | wallabag_import: | 5 | wallabag_import: |
6 | resource: "@WallabagImportBundle/Controller/" | 6 | resource: "@WallabagImportBundle/Controller/" |
7 | type: annotation | 7 | type: annotation |
8 | prefix: /import | 8 | prefix: /import |
9 | 9 | ||
10 | wallabag_api: | 10 | wallabag_api: |
11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | 11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" |
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 404f6a3b..95c1b026 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml | |||
@@ -1,14 +1,14 @@ | |||
1 | _wdt: | 1 | _wdt: |
2 | resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" | 2 | resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" |
3 | prefix: /_wdt | 3 | prefix: /_wdt |
4 | 4 | ||
5 | _profiler: | 5 | _profiler: |
6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" | 6 | resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" |
7 | prefix: /_profiler | 7 | prefix: /_profiler |
8 | 8 | ||
9 | _errors: | 9 | _errors: |
10 | resource: "@TwigBundle/Resources/config/routing/errors.xml" | 10 | resource: "@TwigBundle/Resources/config/routing/errors.xml" |
11 | prefix: /_error | 11 | prefix: /_error |
12 | 12 | ||
13 | _main: | 13 | _main: |
14 | resource: routing.yml | 14 | resource: routing.yml |
diff --git a/app/config/security.yml b/app/config/security.yml index 0748c06c..e24e03df 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -3,12 +3,14 @@ security: | |||
3 | FOS\UserBundle\Model\UserInterface: sha512 | 3 | FOS\UserBundle\Model\UserInterface: sha512 |
4 | 4 | ||
5 | role_hierarchy: | 5 | role_hierarchy: |
6 | ROLE_ADMIN: ROLE_USER | 6 | ROLE_ADMIN: ROLE_USER |
7 | ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ] | 7 | ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ] |
8 | 8 | ||
9 | providers: | 9 | providers: |
10 | administrators: | 10 | administrators: |
11 | entity: { class: WallabagUserBundle:User, property: username } | 11 | entity: |
12 | class: WallabagUserBundle:User | ||
13 | property: username | ||
12 | fos_userbundle: | 14 | fos_userbundle: |
13 | id: fos_user.user_provider.username | 15 | id: fos_user.user_provider.username |
14 | 16 | ||
@@ -31,7 +33,7 @@ security: | |||
31 | anonymous: true | 33 | anonymous: true |
32 | 34 | ||
33 | login_firewall: | 35 | login_firewall: |
34 | pattern: ^/login$ | 36 | pattern: ^/login$ |
35 | anonymous: ~ | 37 | anonymous: ~ |
36 | 38 | ||
37 | secured_area: | 39 | secured_area: |
@@ -40,12 +42,12 @@ security: | |||
40 | provider: fos_userbundle | 42 | provider: fos_userbundle |
41 | csrf_token_generator: security.csrf.token_manager | 43 | csrf_token_generator: security.csrf.token_manager |
42 | 44 | ||
43 | anonymous: true | 45 | anonymous: true |
44 | remember_me: | 46 | remember_me: |
45 | secret: "%secret%" | 47 | secret: "%secret%" |
46 | lifetime: 31536000 | 48 | lifetime: 31536000 |
47 | path: / | 49 | path: / |
48 | domain: ~ | 50 | domain: ~ |
49 | 51 | ||
50 | logout: | 52 | logout: |
51 | path: /logout | 53 | path: /logout |