aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-10-04 16:30:34 +0200
committerTristan Darricau <github@nicofuma.fr>2014-11-20 20:59:48 +0100
commit6cbb60d13f75da6d9b6c6d60555ea119df79b5c0 (patch)
tree3977e49d0e6eee7bf153973a81f459b0b0a612f1 /phpBB/config
parent74cd97e75b1dce43a05d8e15e9fbccf01e833b57 (diff)
downloadforums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar
forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.gz
forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.bz2
forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.tar.xz
forums-6cbb60d13f75da6d9b6c6d60555ea119df79b5c0.zip
[ticket/12620] Adds a yaml config file
PHPBB3-12620
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/default/config.yml0
-rw-r--r--phpBB/config/default/container/parameters.yml (renamed from phpBB/config/default/parameters.yml)0
-rw-r--r--phpBB/config/default/container/services.yml (renamed from phpBB/config/default/services.yml)0
-rw-r--r--phpBB/config/default/container/services_auth_providers.yml (renamed from phpBB/config/default/services_auth_providers.yml)0
-rw-r--r--phpBB/config/default/container/services_avatars.yml (renamed from phpBB/config/default/services_avatars.yml)0
-rw-r--r--phpBB/config/default/container/services_captcha.yml (renamed from phpBB/config/default/services_captcha.yml)0
-rw-r--r--phpBB/config/default/container/services_console.yml (renamed from phpBB/config/default/services_console.yml)0
-rw-r--r--phpBB/config/default/container/services_cron_tasks.yml (renamed from phpBB/config/default/services_cron_tasks.yml)0
-rw-r--r--phpBB/config/default/container/services_feed.yml (renamed from phpBB/config/default/services_feed.yml)0
-rw-r--r--phpBB/config/default/container/services_migrator.yml (renamed from phpBB/config/default/services_migrator.yml)0
-rw-r--r--phpBB/config/default/container/services_mimetype_guessers.yml (renamed from phpBB/config/default/services_mimetype_guessers.yml)0
-rw-r--r--phpBB/config/default/container/services_notifications.yml (renamed from phpBB/config/default/services_notifications.yml)0
-rw-r--r--phpBB/config/default/container/services_passwords.yml (renamed from phpBB/config/default/services_passwords.yml)0
-rw-r--r--phpBB/config/default/container/services_profilefields.yml (renamed from phpBB/config/default/services_profilefields.yml)0
-rw-r--r--phpBB/config/default/container/services_twig.yml (renamed from phpBB/config/default/services_twig.yml)2
-rw-r--r--phpBB/config/default/container/tables.yml (renamed from phpBB/config/default/tables.yml)0
-rw-r--r--phpBB/config/development/config.yml5
-rw-r--r--phpBB/config/development/container/environment.yml (renamed from phpBB/config/development/environment.yml)0
-rw-r--r--phpBB/config/development/container/parameters.yml2
-rw-r--r--phpBB/config/development/container/services.yml2
-rw-r--r--phpBB/config/development/parameters.yml2
-rw-r--r--phpBB/config/development/services.yml2
-rw-r--r--phpBB/config/production/config.yml2
-rw-r--r--phpBB/config/production/container/environment.yml (renamed from phpBB/config/production/environment.yml)0
-rw-r--r--phpBB/config/production/container/parameters.yml2
-rw-r--r--phpBB/config/production/container/services.yml2
-rw-r--r--phpBB/config/production/parameters.yml2
-rw-r--r--phpBB/config/production/services.yml2
28 files changed, 16 insertions, 9 deletions
diff --git a/phpBB/config/default/config.yml b/phpBB/config/default/config.yml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/phpBB/config/default/config.yml
diff --git a/phpBB/config/default/parameters.yml b/phpBB/config/default/container/parameters.yml
index 8ecc1428f4..8ecc1428f4 100644
--- a/phpBB/config/default/parameters.yml
+++ b/phpBB/config/default/container/parameters.yml
diff --git a/phpBB/config/default/services.yml b/phpBB/config/default/container/services.yml
index 3f36a5178a..3f36a5178a 100644
--- a/phpBB/config/default/services.yml
+++ b/phpBB/config/default/container/services.yml
diff --git a/phpBB/config/default/services_auth_providers.yml b/phpBB/config/default/container/services_auth_providers.yml
index 89303a684a..89303a684a 100644
--- a/phpBB/config/default/services_auth_providers.yml
+++ b/phpBB/config/default/container/services_auth_providers.yml
diff --git a/phpBB/config/default/services_avatars.yml b/phpBB/config/default/container/services_avatars.yml
index 8e5b1fdbfe..8e5b1fdbfe 100644
--- a/phpBB/config/default/services_avatars.yml
+++ b/phpBB/config/default/container/services_avatars.yml
diff --git a/phpBB/config/default/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml
index e3f617e909..e3f617e909 100644
--- a/phpBB/config/default/services_captcha.yml
+++ b/phpBB/config/default/container/services_captcha.yml
diff --git a/phpBB/config/default/services_console.yml b/phpBB/config/default/container/services_console.yml
index 1e18a7dd37..1e18a7dd37 100644
--- a/phpBB/config/default/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
diff --git a/phpBB/config/default/services_cron_tasks.yml b/phpBB/config/default/container/services_cron_tasks.yml
index acf9a48bf9..acf9a48bf9 100644
--- a/phpBB/config/default/services_cron_tasks.yml
+++ b/phpBB/config/default/container/services_cron_tasks.yml
diff --git a/phpBB/config/default/services_feed.yml b/phpBB/config/default/container/services_feed.yml
index 48bd9fe76f..48bd9fe76f 100644
--- a/phpBB/config/default/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
diff --git a/phpBB/config/default/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml
index cd04eea5c2..cd04eea5c2 100644
--- a/phpBB/config/default/services_migrator.yml
+++ b/phpBB/config/default/container/services_migrator.yml
diff --git a/phpBB/config/default/services_mimetype_guessers.yml b/phpBB/config/default/container/services_mimetype_guessers.yml
index 0115146deb..0115146deb 100644
--- a/phpBB/config/default/services_mimetype_guessers.yml
+++ b/phpBB/config/default/container/services_mimetype_guessers.yml
diff --git a/phpBB/config/default/services_notifications.yml b/phpBB/config/default/container/services_notifications.yml
index 5675e76a99..5675e76a99 100644
--- a/phpBB/config/default/services_notifications.yml
+++ b/phpBB/config/default/container/services_notifications.yml
diff --git a/phpBB/config/default/services_passwords.yml b/phpBB/config/default/container/services_passwords.yml
index 3dc217286f..3dc217286f 100644
--- a/phpBB/config/default/services_passwords.yml
+++ b/phpBB/config/default/container/services_passwords.yml
diff --git a/phpBB/config/default/services_profilefields.yml b/phpBB/config/default/container/services_profilefields.yml
index ce2a84b12b..ce2a84b12b 100644
--- a/phpBB/config/default/services_profilefields.yml
+++ b/phpBB/config/default/container/services_profilefields.yml
diff --git a/phpBB/config/default/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index 06ce5bc15c..fc5f9ba6a1 100644
--- a/phpBB/config/default/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -1,5 +1,5 @@
parameters:
- core.template.cache_path: %core.root_path%cache/%environment%/twig/
+ core.template.cache_path: %core.root_path%cache/%core.environment%/twig/
services:
template.twig.environment:
diff --git a/phpBB/config/default/tables.yml b/phpBB/config/default/container/tables.yml
index 2fe2a33be8..2fe2a33be8 100644
--- a/phpBB/config/default/tables.yml
+++ b/phpBB/config/default/container/tables.yml
diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
new file mode 100644
index 0000000000..1c17b08931
--- /dev/null
+++ b/phpBB/config/development/config.yml
@@ -0,0 +1,5 @@
+imports:
+ - { resource: ../default/config.yml }
+
+core:
+ require_dev_dependencies: true
diff --git a/phpBB/config/development/environment.yml b/phpBB/config/development/container/environment.yml
index 40a3c7a683..40a3c7a683 100644
--- a/phpBB/config/development/environment.yml
+++ b/phpBB/config/development/container/environment.yml
diff --git a/phpBB/config/development/container/parameters.yml b/phpBB/config/development/container/parameters.yml
new file mode 100644
index 0000000000..0447646806
--- /dev/null
+++ b/phpBB/config/development/container/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/parameters.yml }
diff --git a/phpBB/config/development/container/services.yml b/phpBB/config/development/container/services.yml
new file mode 100644
index 0000000000..b302f0f966
--- /dev/null
+++ b/phpBB/config/development/container/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/services.yml }
diff --git a/phpBB/config/development/parameters.yml b/phpBB/config/development/parameters.yml
deleted file mode 100644
index 02743729f9..0000000000
--- a/phpBB/config/development/parameters.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
- - { resource: ../default/parameters.yml }
diff --git a/phpBB/config/development/services.yml b/phpBB/config/development/services.yml
deleted file mode 100644
index 6342885067..0000000000
--- a/phpBB/config/development/services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
- - { resource: ../default/services.yml }
diff --git a/phpBB/config/production/config.yml b/phpBB/config/production/config.yml
new file mode 100644
index 0000000000..979dbbcdd9
--- /dev/null
+++ b/phpBB/config/production/config.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/config.yml }
diff --git a/phpBB/config/production/environment.yml b/phpBB/config/production/container/environment.yml
index 40a3c7a683..40a3c7a683 100644
--- a/phpBB/config/production/environment.yml
+++ b/phpBB/config/production/container/environment.yml
diff --git a/phpBB/config/production/container/parameters.yml b/phpBB/config/production/container/parameters.yml
new file mode 100644
index 0000000000..0447646806
--- /dev/null
+++ b/phpBB/config/production/container/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/parameters.yml }
diff --git a/phpBB/config/production/container/services.yml b/phpBB/config/production/container/services.yml
new file mode 100644
index 0000000000..b302f0f966
--- /dev/null
+++ b/phpBB/config/production/container/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../../default/container/services.yml }
diff --git a/phpBB/config/production/parameters.yml b/phpBB/config/production/parameters.yml
deleted file mode 100644
index 02743729f9..0000000000
--- a/phpBB/config/production/parameters.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
- - { resource: ../default/parameters.yml }
diff --git a/phpBB/config/production/services.yml b/phpBB/config/production/services.yml
deleted file mode 100644
index 6342885067..0000000000
--- a/phpBB/config/production/services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
- - { resource: ../default/services.yml }