From 9c1baf0fd774c8fa30bd5192fd8d097996b35e56 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 5 May 2019 17:23:16 +0200
Subject: [ticket/15987] Add container extension to support tables "array
 access"

PHPBB3-15987
---
 phpBB/phpbb/di/extension/tables.php | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 phpBB/phpbb/di/extension/tables.php

(limited to 'phpBB/phpbb/di/extension/tables.php')

diff --git a/phpBB/phpbb/di/extension/tables.php b/phpBB/phpbb/di/extension/tables.php
new file mode 100644
index 0000000000..99655dda3d
--- /dev/null
+++ b/phpBB/phpbb/di/extension/tables.php
@@ -0,0 +1,56 @@
+<?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\di\extension;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+
+/**
+ * Container tables extension
+ */
+class tables extends Extension
+{
+	/**
+	 * Loads a specific configuration.
+	 *
+	 * @param array            $configs   An array of configuration values
+	 * @param ContainerBuilder $container A ContainerBuilder instance
+	 *
+	 * @throws \InvalidArgumentException When provided tag is not defined in this extension
+	 */
+	public function load(array $configs, ContainerBuilder $container)
+	{
+		if (!$container->hasParameter('tables'))
+			return;
+
+		$tables = $container->getParameter('tables');
+
+		foreach ($tables as $table_name => $table_value)
+		{
+			$container->setParameter('tables.' . $table_name, $table_value);
+		}
+	}
+
+	/**
+	 * Returns the recommended alias to use in XML.
+	 *
+	 * This alias is also the mandatory prefix to use when using YAML.
+	 *
+	 * @return string The alias
+	 */
+	public function getAlias()
+	{
+		return 'tables';
+	}
+}
-- 
cgit v1.2.1


From 61fa4f006aa00eb67dd4df8d21f426ce7e53962c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 5 May 2019 18:20:30 +0200
Subject: [ticket/15987] Add missing paranthesis

PHPBB3-15987
---
 phpBB/phpbb/di/extension/tables.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/di/extension/tables.php')

diff --git a/phpBB/phpbb/di/extension/tables.php b/phpBB/phpbb/di/extension/tables.php
index 99655dda3d..ff545750b7 100644
--- a/phpBB/phpbb/di/extension/tables.php
+++ b/phpBB/phpbb/di/extension/tables.php
@@ -32,7 +32,9 @@ class tables extends Extension
 	public function load(array $configs, ContainerBuilder $container)
 	{
 		if (!$container->hasParameter('tables'))
+		{
 			return;
+		}
 
 		$tables = $container->getParameter('tables');
 
-- 
cgit v1.2.1


From d72498a9c3006210c49cb1690d079d52593db127 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 14 May 2019 21:20:51 +0200
Subject: [ticket/15987] Go back to previous table definition type

This will still allow using the 'tables' parameter array but will also ensure
full backward compatibility and compatibility with extensions that will add
more tables to the 'tables' array.

PHPBB3-15987
---
 phpBB/phpbb/di/extension/tables.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'phpBB/phpbb/di/extension/tables.php')

diff --git a/phpBB/phpbb/di/extension/tables.php b/phpBB/phpbb/di/extension/tables.php
index ff545750b7..40684b6038 100644
--- a/phpBB/phpbb/di/extension/tables.php
+++ b/phpBB/phpbb/di/extension/tables.php
@@ -22,26 +22,27 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 class tables extends Extension
 {
 	/**
-	 * Loads a specific configuration.
-	 *
-	 * @param array            $configs   An array of configuration values
-	 * @param ContainerBuilder $container A ContainerBuilder instance
-	 *
-	 * @throws \InvalidArgumentException When provided tag is not defined in this extension
+	 * {@inheritDoc}
 	 */
 	public function load(array $configs, ContainerBuilder $container)
 	{
-		if (!$container->hasParameter('tables'))
-		{
-			return;
-		}
+		// Tables is a reserved parameter and will be overwritten at all times
+		$tables = [];
 
-		$tables = $container->getParameter('tables');
-
-		foreach ($tables as $table_name => $table_value)
+		// Add access via 'tables' parameter to acquire array with all tables
+		$parameterBag = $container->getParameterBag();
+		$parameters = $parameterBag->all();
+		foreach ($parameters as $parameter_name => $parameter_value)
 		{
-			$container->setParameter('tables.' . $table_name, $table_value);
+			if (!preg_match('/tables\.(.+)/', $parameter_name, $matches))
+			{
+				continue;
+			}
+
+			$tables[$matches[1]] = $parameter_value;
 		}
+
+		$container->setParameter('tables', $tables);
 	}
 
 	/**
-- 
cgit v1.2.1