[ticket/13597] Modify variable-variable syntax to be compatible with PHP7

marc1706 · marc1706 · commit 3df25babce5d · 2015-02-11T12:03:54.000+01:00
PHPBB3-13597
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
@@ -198,9 +198,9 @@
 foreach ($prefixes as $prefix)
 {
 	$var = $prefix . 'permissions';
-	if (sizeof($$var))
+	if (sizeof(${$var}))
 	{
-		foreach ($$var as $auth_option => $l_ary)
+		foreach (${$var} as $auth_option => $l_ary)
 		{
 			$sql_ary = array(
 				'auth_option'	=> $auth_option,
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
@@ -460,7 +460,7 @@ function main($id, $mode)
 
 					if (!$cp->vars[$key] && $action == 'edit')
 					{
-						$cp->vars[$key] = $$key;
+						$cp->vars[$key] = ${$key};
 					}
 
 					$field_data = $cp->vars;
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
@@ -78,7 +78,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
 	foreach ($sorts as $name => $sort_ary)
 	{
 		$key = $sort_ary['key'];
-		$selected = $$sort_ary['key'];
+		$selected = ${$sort_ary['key']};
 
 		// Check if the key is selectable. If not, we reset to the default or first key found.
 		// This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the
@@ -87,12 +87,12 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,
 		{
 			if ($sort_ary['default'] !== false)
 			{
-				$selected = $$key = $sort_ary['default'];
+				$selected = ${$key} = $sort_ary['default'];
 			}
 			else
 			{
 				@reset($sort_ary['options']);
-				$selected = $$key = key($sort_ary['options']);
+				$selected = ${$key} = key($sort_ary['options']);
 			}
 		}
 
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
@@ -510,7 +510,7 @@ function msg_email()
 
 			foreach ($address_ary as $which_ary)
 			{
-				$$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);
+				${$type} .= ((${$type} != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);
 			}
 		}
 
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
@@ -1415,9 +1415,9 @@ function rebuild_header($check_ary)
 		$_types = array('u', 'g');
 		foreach ($_types as $type)
 		{
-			if (sizeof($$type))
+			if (sizeof(${$type}))
 			{
-				foreach ($$type as $id)
+				foreach (${$type} as $id)
 				{
 					$address[$type][$id] = $check_type;
 				}
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
@@ -44,13 +44,13 @@ function user_get_id_name(&$user_id_ary, &$username_ary, $user_type = false)
 
 	$which_ary = ($user_id_ary) ? 'user_id_ary' : 'username_ary';
 
-	if ($$which_ary && !is_array($$which_ary))
+	if (${$which_ary} && !is_array(${$which_ary}))
 	{
-		$$which_ary = array($$which_ary);
+		${$which_ary} = array(${$which_ary});
 	}
 
-	$sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', $$which_ary) : array_map('utf8_clean_string', $$which_ary);
-	unset($$which_ary);
+	$sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', ${$which_ary}) : array_map('utf8_clean_string', ${$which_ary});
+	unset(${$which_ary});
 
 	$user_id_ary = $username_ary = array();
 
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
@@ -599,7 +599,7 @@ function get_convert_settings($sub)
 				'S_EXPLAIN'		=> $vars['explain'],
 				'S_LEGEND'		=> false,
 				'TITLE_EXPLAIN'	=> ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',
-				'CONTENT'		=> $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options),
+				'CONTENT'		=> $this->p_master->input_field($config_key, $vars['type'], ${$config_key}, $options),
 				)
 			);
 		}

Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,9 @@`
`198`	`198`	`foreach ($prefixes as $prefix)`
`199`	`199`	`{`
`200`	`200`	`$var = $prefix . 'permissions';`
`201`		`- if (sizeof($$var))`
	`201`	`+ if (sizeof(${$var}))`
`202`	`202`	`{`
`203`		`- foreach ($$var as $auth_option => $l_ary)`
	`203`	`+ foreach (${$var} as $auth_option => $l_ary)`
`204`	`204`	`{`
`205`	`205`	`$sql_ary = array(`
`206`	`206`	`'auth_option' => $auth_option,`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ function main($id, $mode)`
`460`	`460`
`461`	`461`	`if (!$cp->vars[$key] && $action == 'edit')`
`462`	`462`	`{`
`463`		`- $cp->vars[$key] = $$key;`
	`463`	`+ $cp->vars[$key] = ${$key};`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`$field_data = $cp->vars;`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,`
`78`	`78`	`foreach ($sorts as $name => $sort_ary)`
`79`	`79`	`{`
`80`	`80`	`$key = $sort_ary['key'];`
`81`		`- $selected = $$sort_ary['key'];`
	`81`	`+ $selected = ${$sort_ary['key']};`
`82`	`82`
`83`	`83`	`// Check if the key is selectable. If not, we reset to the default or first key found.`
`84`	`84`	`// This ensures the values are always valid. We also set $sort_dir/sort_key/etc. to the`
`@@ -87,12 +87,12 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key,`
`87`	`87`	`{`
`88`	`88`	`if ($sort_ary['default'] !== false)`
`89`	`89`	`{`
`90`		`- $selected = $$key = $sort_ary['default'];`
	`90`	`+ $selected = ${$key} = $sort_ary['default'];`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
`94`	`94`	`@reset($sort_ary['options']);`
`95`		`- $selected = $$key = key($sort_ary['options']);`
	`95`	`+ $selected = ${$key} = key($sort_ary['options']);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ function msg_email()`
`510`	`510`
`511`	`511`	`foreach ($address_ary as $which_ary)`
`512`	`512`	`{`
`513`		`- $$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);`
	`513`	`+ ${$type} .= ((${$type} != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']);`
`514`	`514`	`}`
`515`	`515`	`}`
`516`	`516`
Original file line number	Diff line number	Diff line change
`@@ -1415,9 +1415,9 @@ function rebuild_header($check_ary)`
`1415`	`1415`	`$_types = array('u', 'g');`
`1416`	`1416`	`foreach ($_types as $type)`
`1417`	`1417`	`{`
`1418`		`- if (sizeof($$type))`
	`1418`	`+ if (sizeof(${$type}))`
`1419`	`1419`	`{`
`1420`		`- foreach ($$type as $id)`
	`1420`	`+ foreach (${$type} as $id)`
`1421`	`1421`	`{`
`1422`	`1422`	`$address[$type][$id] = $check_type;`
`1423`	`1423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ function user_get_id_name(&$user_id_ary, &$username_ary, $user_type = false)`
`44`	`44`
`45`	`45`	`$which_ary = ($user_id_ary) ? 'user_id_ary' : 'username_ary';`
`46`	`46`
`47`		`- if ($$which_ary && !is_array($$which_ary))`
	`47`	`+ if (${$which_ary} && !is_array(${$which_ary}))`
`48`	`48`	`{`
`49`		`- $$which_ary = array($$which_ary);`
	`49`	`+ ${$which_ary} = array(${$which_ary});`
`50`	`50`	`}`
`51`	`51`
`52`		`- $sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', $$which_ary) : array_map('utf8_clean_string', $$which_ary);`
`53`		`- unset($$which_ary);`
	`52`	`+ $sql_in = ($which_ary == 'user_id_ary') ? array_map('intval', ${$which_ary}) : array_map('utf8_clean_string', ${$which_ary});`
	`53`	`+ unset(${$which_ary});`
`54`	`54`
`55`	`55`	`$user_id_ary = $username_ary = array();`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ function get_convert_settings($sub)`
`599`	`599`	`'S_EXPLAIN' => $vars['explain'],`
`600`	`600`	`'S_LEGEND' => false,`
`601`	`601`	`'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',`
`602`		`- 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options),`
	`602`	`+ 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], ${$config_key}, $options),`
`603`	`603`	`)`
`604`	`604`	`);`
`605`	`605`	`}`