1 files changed, 85 insertions, 0 deletions
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index b1dacef3fd..0f24d77034 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -73,6 +73,45 @@ class phpbb_request_request_var_test extends phpbb_test_case
 		unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
 	}
 
+	/**
+	* @dataProvider deep_access
+	* Only possible with 3.1.x (later)
+	public function test_deep_multi_dim_array_access($path, $default, $expected)
+	{
+		$this->unset_variables('var');
+
+		$_REQUEST['var'] = array(
+			0 => array(
+				'b' => array(
+					true => array(
+						5 => 'c',
+						6 => 'd',
+					),
+				),
+			),
+			2 => array(
+				3 => array(
+					false => 5,
+				),
+			),
+		);
+
+		$result = request_var($path, $default);
+		$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path);
+	}
+
+	public static function deep_access()
+	{
+		return array(
+			// array(path, default, expected result)
+			array(array('var', 0, 'b', true, 5), '', 'c'),
+			array(array('var', 0, 'b', true, 6), '', 'd'),
+			array(array('var', 2, 3, false), 0, 5),
+			array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')),
+		);
+	}
+*/
+
 	public static function request_variables()
 	{
 		return array(
@@ -173,6 +212,52 @@ class phpbb_request_request_var_test extends phpbb_test_case
 					'abc' => array()
 				)
 			),
+			/* 3-dimensional (not supported atm!
+			array(
+				// input:
+				array(
+					0 => array(0 => array(3, '4', 'ab'), 1 => array()),
+					1 => array(array(3, 4)),
+				),
+				// default:
+				array(0 => array(0 => array(0))),
+				false,
+				// expected:
+				array(
+					0 => array(0 => array(3, 4, 0), 1 => array()),
+					1 => array(array(3, 4))
+				)
+			),
+			array(
+				// input:
+				array(
+					'ü' => array(array('c' => 'd')),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				),
+				// default:
+				array('' => array(0 => array('' => 0))),
+				false,
+				// expected:
+				array(
+					'??' => array(4 => array('a' => 2, '??' => 3)),
+				)
+			),
+			array(
+				// input:
+				array(
+					'ü' => array(array('c' => 'd')),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				),
+				// default:
+				array('' => array(0 => array('' => 0))),
+				true,
+				// expected:
+				array(
+					'ü' => array(array('c' => 0)),
+					'ä' => array(4 => array('a' => 2, 'ö' => 3)),
+				)
+			),
+			*/
 		);
 	}