aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-20 18:56:55 +0200
committerTristan Darricau <github@nicofuma.fr>2014-11-20 19:01:03 +0100
commit42c9fd5c76aa6f2757ed3366729b2d0e48c3333d (patch)
tree35e5a379f6f8cd3229ea91b4a5c41a046a7ded6d /phpBB/config
parent8664d3229a511eb320fef3df6a852d1a20852dae (diff)
downloadforums-42c9fd5c76aa6f2757ed3366729b2d0e48c3333d.tar
forums-42c9fd5c76aa6f2757ed3366729b2d0e48c3333d.tar.gz
forums-42c9fd5c76aa6f2757ed3366729b2d0e48c3333d.tar.bz2
forums-42c9fd5c76aa6f2757ed3366729b2d0e48c3333d.tar.xz
forums-42c9fd5c76aa6f2757ed3366729b2d0e48c3333d.zip
[ticket/12620] Add inheritance between environments
PHPBB3-12620
Diffstat (limited to 'phpBB/config')
-rw-r--r--phpBB/config/default/parameters.yml0
-rw-r--r--phpBB/config/development/environment.yml3
-rw-r--r--phpBB/config/development/parameters.yml2
-rw-r--r--phpBB/config/development/services.yml2
-rw-r--r--phpBB/config/production/environment.yml3
-rw-r--r--phpBB/config/production/parameters.yml2
-rw-r--r--phpBB/config/production/services.yml2
7 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/config/default/parameters.yml b/phpBB/config/default/parameters.yml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/phpBB/config/default/parameters.yml
diff --git a/phpBB/config/development/environment.yml b/phpBB/config/development/environment.yml
index 6342885067..40a3c7a683 100644
--- a/phpBB/config/development/environment.yml
+++ b/phpBB/config/development/environment.yml
@@ -1,2 +1,3 @@
imports:
- - { resource: ../default/services.yml }
+ - { resource: services.yml }
+ - { resource: parameters.yml }
diff --git a/phpBB/config/development/parameters.yml b/phpBB/config/development/parameters.yml
new file mode 100644
index 0000000000..02743729f9
--- /dev/null
+++ b/phpBB/config/development/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/parameters.yml }
diff --git a/phpBB/config/development/services.yml b/phpBB/config/development/services.yml
new file mode 100644
index 0000000000..6342885067
--- /dev/null
+++ b/phpBB/config/development/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/services.yml }
diff --git a/phpBB/config/production/environment.yml b/phpBB/config/production/environment.yml
index 6342885067..40a3c7a683 100644
--- a/phpBB/config/production/environment.yml
+++ b/phpBB/config/production/environment.yml
@@ -1,2 +1,3 @@
imports:
- - { resource: ../default/services.yml }
+ - { resource: services.yml }
+ - { resource: parameters.yml }
diff --git a/phpBB/config/production/parameters.yml b/phpBB/config/production/parameters.yml
new file mode 100644
index 0000000000..02743729f9
--- /dev/null
+++ b/phpBB/config/production/parameters.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/parameters.yml }
diff --git a/phpBB/config/production/services.yml b/phpBB/config/production/services.yml
new file mode 100644
index 0000000000..6342885067
--- /dev/null
+++ b/phpBB/config/production/services.yml
@@ -0,0 +1,2 @@
+imports:
+ - { resource: ../default/services.yml }