21 files changed, 27 insertions, 18 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 0782bd7321..d4549dc2d4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -29,6 +29,11 @@ $phpbb_class_loader->register();
 $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
 extract($phpbb_config_php_file->get_all());
 
+if (!defined('ENVIRONMENT'))
+{
+	@define('ENVIRONMENT', 'productive');
+}
+
 if (!defined('PHPBB_INSTALLED'))
 {
 	// Redirect the user to the installer
diff --git a/phpBB/config/config_debug.yml b/phpBB/config/config_debug.yml
new file mode 100644
index 0000000000..6982aa4f83
--- /dev/null
+++ b/phpBB/config/config_debug.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: services.yml }
diff --git a/phpBB/config/config_productive.yml b/phpBB/config/config_productive.yml
new file mode 100644
index 0000000000..6982aa4f83
--- /dev/null
+++ b/phpBB/config/config_productive.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: services.yml }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index f6dbae4a76..3f36a5178a 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -1,19 +1,19 @@
 imports:
-    - { resource: auth.yml }
-    - { resource: avatar.yml }
-    - { resource: captcha.yml }
-    - { resource: console.yml }
-    - { resource: content.yml }
-    - { resource: cron.yml }
-    - { resource: db.yml }
-    - { resource: event.yml }
-    - { resource: feed.yml }
-    - { resource: mimetype_guesser.yml }
-    - { resource: notification.yml }
-    - { resource: password.yml }
-    - { resource: profilefield.yml }
-    - { resource: twig.yml }
-    - { resource: user.yml }
+    - { resource: services_auth.yml }
+    - { resource: services_avatar.yml }
+    - { resource: services_captcha.yml }
+    - { resource: services_console.yml }
+    - { resource: services_content.yml }
+    - { resource: services_cron.yml }
+    - { resource: services_db.yml }
+    - { resource: services_event.yml }
+    - { resource: services_feed.yml }
+    - { resource: services_mimetype_guesser.yml }
+    - { resource: services_notification.yml }
+    - { resource: services_password.yml }
+    - { resource: services_profilefield.yml }
+    - { resource: services_twig.yml }
+    - { resource: services_user.yml }
 
     - { resource: tables.yml }
     - { resource: parameters.yml }
diff --git a/phpBB/config/auth.yml b/phpBB/config/services_auth.yml
index 88a90ca2d6..88a90ca2d6 100644
--- a/phpBB/config/auth.yml
+++ b/phpBB/config/services_auth.yml
diff --git a/phpBB/config/avatar.yml b/phpBB/config/services_avatar.yml
index 5292489715..5292489715 100644
--- a/phpBB/config/avatar.yml
+++ b/phpBB/config/services_avatar.yml
diff --git a/phpBB/config/captcha.yml b/phpBB/config/services_captcha.yml
index e3f617e909..e3f617e909 100644
--- a/phpBB/config/captcha.yml
+++ b/phpBB/config/services_captcha.yml
diff --git a/phpBB/config/console.yml b/phpBB/config/services_console.yml
index 1e18a7dd37..1e18a7dd37 100644
--- a/phpBB/config/console.yml
+++ b/phpBB/config/services_console.yml
diff --git a/phpBB/config/content.yml b/phpBB/config/services_content.yml
index f0985f0292..f0985f0292 100644
--- a/phpBB/config/content.yml
+++ b/phpBB/config/services_content.yml
diff --git a/phpBB/config/cron.yml b/phpBB/config/services_cron.yml
index 7a90c39733..7a90c39733 100644
--- a/phpBB/config/cron.yml
+++ b/phpBB/config/services_cron.yml
diff --git a/phpBB/config/db.yml b/phpBB/config/services_db.yml
index b3f1b485ea..b3f1b485ea 100644
--- a/phpBB/config/db.yml
+++ b/phpBB/config/services_db.yml
diff --git a/phpBB/config/event.yml b/phpBB/config/services_event.yml
index 1ccef78f9b..1ccef78f9b 100644
--- a/phpBB/config/event.yml
+++ b/phpBB/config/services_event.yml
diff --git a/phpBB/config/feed.yml b/phpBB/config/services_feed.yml
index 48bd9fe76f..48bd9fe76f 100644
--- a/phpBB/config/feed.yml
+++ b/phpBB/config/services_feed.yml
diff --git a/phpBB/config/mimetype_guesser.yml b/phpBB/config/services_mimetype_guesser.yml
index 2e89ed3c1f..2e89ed3c1f 100644
--- a/phpBB/config/mimetype_guesser.yml
+++ b/phpBB/config/services_mimetype_guesser.yml
diff --git a/phpBB/config/notification.yml b/phpBB/config/services_notification.yml
index add577be2c..add577be2c 100644
--- a/phpBB/config/notification.yml
+++ b/phpBB/config/services_notification.yml
diff --git a/phpBB/config/password.yml b/phpBB/config/services_password.yml
index cb45ec3d42..cb45ec3d42 100644
--- a/phpBB/config/password.yml
+++ b/phpBB/config/services_password.yml
diff --git a/phpBB/config/profilefield.yml b/phpBB/config/services_profilefield.yml
index 5ccfef9148..5ccfef9148 100644
--- a/phpBB/config/profilefield.yml
+++ b/phpBB/config/services_profilefield.yml
diff --git a/phpBB/config/twig.yml b/phpBB/config/services_twig.yml
index 0745d8b47e..0745d8b47e 100644
--- a/phpBB/config/twig.yml
+++ b/phpBB/config/services_twig.yml
diff --git a/phpBB/config/user.yml b/phpBB/config/services_user.yml
index 1ca853ea45..1ca853ea45 100644
--- a/phpBB/config/user.yml
+++ b/phpBB/config/services_user.yml
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 28cc603bdb..2be8e6e860 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -453,11 +453,11 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont
 
 	if ($debug)
 	{
-		$config_data .= "@define('DEBUG', true);\n";
+		$config_data .= "@define('ENVIRONMENT', 'debug');\n";
 	}
 	else
 	{
-		$config_data .= "// @define('DEBUG', true);\n";
+		$config_data .= "@define('ENVIRONMENT', 'productive');\n";
 	}
 
 	if ($debug_container)
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index ca4fa5c082..d203cc7049 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -50,7 +50,7 @@ class core extends Extension
 	public function load(array $config, ContainerBuilder $container)
 	{
 		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
-		$loader->load('services.yml');
+		$loader->load('config_' . ENVIRONMENT . '.yml');
 	}
 
 	/**