From 3dcaa48850bf823b238391fbf9c3f085092010bc Mon Sep 17 00:00:00 2001
From: CHItA <mate.bartus@gmail.com>
Date: Sat, 13 Jun 2015 15:35:19 +0200
Subject: [ticket/13740] Move installer files to phpbb/install directory

PHPBB3-13740
---
 phpBB/phpbb/install/helper/iohandler/factory.php | 76 ++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 phpBB/phpbb/install/helper/iohandler/factory.php

(limited to 'phpBB/phpbb/install/helper/iohandler/factory.php')

diff --git a/phpBB/phpbb/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
new file mode 100644
index 0000000000..0af75b78ae
--- /dev/null
+++ b/phpBB/phpbb/install/helper/iohandler/factory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\install\helper\iohandler;
+
+use phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception;
+
+/**
+ * Input-output handler factory
+ */
+class factory
+{
+	/**
+	 * @var \Symfony\Component\DependencyInjection\ContainerInterface
+	 */
+	protected $container;
+
+	/**
+	 * @var string
+	 */
+	protected $environment;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \Symfony\Component\DependencyInjection\ContainerInterface $container Dependency injection container
+	 */
+	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container)
+	{
+		$this->container	= $container;
+		$this->environment	= null;
+	}
+
+	/**
+	 * @param string	$environment	The name of the input-output handler to use
+	 */
+	public function set_environment($environment)
+	{
+		$this->environment = $environment;
+	}
+
+	/**
+	 * Factory getter for iohandler
+	 *
+	 * @return \phpbb\install\helper\iohandler\iohandler_interface
+	 *
+	 * @throws \phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception
+	 * 		When the specified iohandler_interface does not exists
+	 */
+	public function get()
+	{
+		switch ($this->environment)
+		{
+			case 'ajax':
+				return $this->container->get('installer.helper.iohandler_ajax');
+			break;
+			case 'nojs':
+				// @todo replace this
+				return $this->container->get('installer.helper.iohandler_ajax');
+			break;
+			default:
+				throw new iohandler_not_implemented_exception();
+			break;
+		}
+	}
+}
-- 
cgit v1.2.1


From 06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sun, 31 May 2015 17:19:42 +0200
Subject: [ticket/13740] CLI installer and fixes

[ci skip]

PHPBB3-13740
---
 phpBB/phpbb/install/helper/iohandler/factory.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/helper/iohandler/factory.php')

diff --git a/phpBB/phpbb/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
index 0af75b78ae..7081af06a5 100644
--- a/phpBB/phpbb/install/helper/iohandler/factory.php
+++ b/phpBB/phpbb/install/helper/iohandler/factory.php
@@ -59,7 +59,7 @@ class factory
 	 */
 	public function get()
 	{
-		switch ($this->environment)
+		if ($this->container->has('installer.helper.iohandler_' . $this->environment))
 		{
 			case 'ajax':
 				return $this->container->get('installer.helper.iohandler_ajax');
@@ -68,9 +68,14 @@ class factory
 				// @todo replace this
 				return $this->container->get('installer.helper.iohandler_ajax');
 			break;
+			case 'cli':
+				return $this->container->get('installer.helper.iohandler_cli');
+			break;
 			default:
 				throw new iohandler_not_implemented_exception();
 			break;
 		}
+
+		throw new iohandler_not_implemented_exception();
 	}
 }
-- 
cgit v1.2.1


From 249345d9cc6d6bff380436d6e05f24918d762c0d Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sat, 27 Jun 2015 17:10:42 +0200
Subject: [ticket/13740] Clean up CLI merge

[ci skip]

PHPBB3-13740
---
 phpBB/phpbb/install/helper/iohandler/factory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/install/helper/iohandler/factory.php')

diff --git a/phpBB/phpbb/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
index 7081af06a5..52d24e49b2 100644
--- a/phpBB/phpbb/install/helper/iohandler/factory.php
+++ b/phpBB/phpbb/install/helper/iohandler/factory.php
@@ -59,7 +59,7 @@ class factory
 	 */
 	public function get()
 	{
-		if ($this->container->has('installer.helper.iohandler_' . $this->environment))
+		switch ($this->environment)
 		{
 			case 'ajax':
 				return $this->container->get('installer.helper.iohandler_ajax');
-- 
cgit v1.2.1


From 37705353c53a391aa44da7a30f10ed824a442cfc Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sat, 6 Feb 2016 14:10:48 +0100
Subject: [ticket/14460] Use the selected language with AJAX requests as well

PHPBB3-14460
---
 phpBB/phpbb/install/helper/iohandler/factory.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/phpbb/install/helper/iohandler/factory.php')

diff --git a/phpBB/phpbb/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
index 52d24e49b2..1e8395760a 100644
--- a/phpBB/phpbb/install/helper/iohandler/factory.php
+++ b/phpBB/phpbb/install/helper/iohandler/factory.php
@@ -75,7 +75,5 @@ class factory
 				throw new iohandler_not_implemented_exception();
 			break;
 		}
-
-		throw new iohandler_not_implemented_exception();
 	}
 }
-- 
cgit v1.2.1