From d17a8ab523f5cc77352170c679767c5523f57ec9 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 29 Feb 2016 08:28:37 -0800
Subject: [ticket/12684] Fix merge errors

PHPBB3-12684
---
 phpBB/config/default/container/services_console.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/config')

diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 2055fb68c5..b39353d841 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -175,6 +175,16 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.user.add:
+        class: phpbb\console\command\user\add
+        arguments:
+            - '@user'
+            - '@dbal.conn'
+            - '@config'
+            - '@passwords.manager'
+        tags:
+            - { name: console.command }
+
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
-- 
cgit v1.2.1


From 6fe084a2fd967c188bdca827a46647120a5ea58d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 29 Feb 2016 11:38:49 -0800
Subject: [ticket/12684] Updates for 3.2 API

PHPBB3-12684
---
 phpBB/config/default/container/services_console.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/config')

diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index b39353d841..006df0d7b3 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -182,6 +182,8 @@ services:
             - '@dbal.conn'
             - '@config'
             - '@passwords.manager'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: console.command }
 
-- 
cgit v1.2.1


From 637b02690db0d3b7af2915c1da4bacc8fa054f6c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 29 Feb 2016 13:28:42 -0800
Subject: [ticket/12684] Update to use non-deprecated methods

PHPBB3-12684
---
 .../config/default/container/services_console.yml  | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'phpBB/config')

diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 006df0d7b3..0a28c0ed1f 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -175,18 +175,6 @@ services:
         tags:
             - { name: console.command }
 
-    console.command.user.add:
-        class: phpbb\console\command\user\add
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@passwords.manager'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
@@ -231,3 +219,16 @@ services:
             - '@user'
         tags:
             - { name: console.command }
+
+    console.command.user.add:
+        class: phpbb\console\command\user\add
+        arguments:
+            - '@user'
+            - '@dbal.conn'
+            - '@config'
+            - '@language'
+            - '@passwords.manager'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+        tags:
+            - { name: console.command }
-- 
cgit v1.2.1