Passed
Pull Request — release-2.1 (#6842)
by Mathias
04:40 queued 10s
created
Sources/Cache/APIs/Sqlite.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -131,14 +131,14 @@  discard block
 block discarded – undo
131 131
 		$class_name = $this->getImplementationClassKeyName();
132 132
 		$class_name_txt_key = strtolower($class_name);
133 133
 
134
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
134
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
135 135
 		$config_vars[] = array(
136
-			'cachedir_'. $class_name_txt_key,
137
-			$txt['cachedir_'. $class_name_txt_key],
136
+			'cachedir_' . $class_name_txt_key,
137
+			$txt['cachedir_' . $class_name_txt_key],
138 138
 			'file',
139 139
 			'text',
140 140
 			36,
141
-			'cache_'. $class_name_txt_key .'_cachedir');
141
+			'cache_' . $class_name_txt_key . '_cachedir');
142 142
 
143 143
 		if (!isset($context['settings_post_javascript']))
144 144
 			$context['settings_post_javascript'] = '';
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		$context['settings_post_javascript'] .= '
147 147
 			$("#cache_accelerator").change(function (e) {
148 148
 				var cache_type = e.currentTarget.value;
149
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
149
+				$("#cachedir_'. $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
150 150
 			});';
151 151
 	}
152 152
 
Please login to merge, or discard this patch.
Sources/Subs-Db-postgresql.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,11 +75,11 @@  discard block
 block discarded – undo
75 75
 		display_db_error();
76 76
 
77 77
 	// We need to escape ' and \
78
-	$db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd);
78
+	$db_passwd = str_replace(array('\\', '\''), array('\\\\', '\\\''), $db_passwd);
79 79
 
80 80
 	// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch.
81 81
 	set_error_handler(function($errno, $errstr) {
82
-		throw new ErrorException($errstr, $errno);});
82
+		throw new ErrorException($errstr, $errno); });
83 83
 	try
84 84
 	{
85 85
 		if (!empty($db_options['persist']))
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
938 938
 	if (filter_var($error_array[2], FILTER_VALIDATE_IP) === false)
939 939
 		$error_array[2] = null;
940 940
 
941
-	if(empty($db_persist))
941
+	if (empty($db_persist))
942 942
 	{ // without pooling
943 943
 		if (empty($pg_error_data_prep))
944 944
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
Please login to merge, or discard this patch.
Sources/Subs-Admin.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 				'if (!is_dir(realpath($cachedir)) && is_dir($boarddir . \'/cache\'))',
847 847
 				'	$cachedir = $boarddir . \'/cache\';',
848 848
 			)),
849
-			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
849
+			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
850 850
 		),
851 851
 		'db_character_set' => array(
852 852
 			'text' => implode("\n", array(
@@ -945,8 +945,8 @@  discard block
 block discarded – undo
945 945
 		'boolean' =>  '(?i:TRUE|FALSE|(["\']?)[01]\b\\1)',
946 946
 		'NULL' =>  '(?i:NULL)',
947 947
 		// These use a PCRE subroutine to match nested arrays.
948
-		'array' =>  'array\s*(\((?'.'>[^()]|(?1))*\))',
949
-		'object' =>  '\w+::__set_state\(array\s*(\((?'.'>[^()]|(?1))*\))\)',
948
+		'array' =>  'array\s*(\((?' . '>[^()]|(?1))*\))',
949
+		'object' =>  '\w+::__set_state\(array\s*(\((?' . '>[^()]|(?1))*\))\)',
950 950
 	);
951 951
 
952 952
 	/*
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
 		),
980 980
 		// Remove the code that redirects to the installer.
981 981
 		$neg_index-- => array(
982
-			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?'.'>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
982
+			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
983 983
 			'placeholder' => '',
984 984
 		),
985 985
 	);
@@ -1742,7 +1742,7 @@  discard block
 block discarded – undo
1742 1742
 	// Prevents warnings about constants that are already defined.
1743 1743
 	$settingsText = preg_replace_callback(
1744 1744
 		'~\bdefine\s*\(\s*(["\'])(\w+)\1~',
1745
-		function ($matches)
1745
+		function($matches)
1746 1746
 		{
1747 1747
 			return 'define(\'' . md5(mt_rand()) . '\'';
1748 1748
 		},
@@ -1752,7 +1752,7 @@  discard block
 block discarded – undo
1752 1752
 	// Handle eval errors gracefully in both PHP 5 and PHP 7
1753 1753
 	try
1754 1754
 	{
1755
-		if($settingsText !== '' && @eval($settingsText) === false)
1755
+		if ($settingsText !== '' && @eval($settingsText) === false)
1756 1756
 			throw new ErrorException('eval error');
1757 1757
 
1758 1758
 		unset($mtime, $settingsFile, $settingsText);
@@ -1955,7 +1955,7 @@  discard block
 block discarded – undo
1955 1955
 	}
1956 1956
 
1957 1957
 	// Everything is simpler if we convert heredocs to normal strings first.
1958
-	if (preg_match_all('/<<<(\'?)(\w+)\'?'. $line_ending . '(.*?)'. $line_ending . '\2;$/m', $code_str, $matches))
1958
+	if (preg_match_all('/<<<(\'?)(\w+)\'?' . $line_ending . '(.*?)' . $line_ending . '\2;$/m', $code_str, $matches))
1959 1959
 	{
1960 1960
 		foreach ($matches[0] as $mkey => $heredoc)
1961 1961
 		{
@@ -1969,7 +1969,7 @@  discard block
 block discarded – undo
1969 1969
 	}
1970 1970
 
1971 1971
 	// Split before everything that could possibly delimit a comment or a string.
1972
-	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|'. $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
1972
+	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|' . $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
1973 1973
 
1974 1974
 	$in_string = 0;
1975 1975
 	$in_comment = 0;
Please login to merge, or discard this patch.
Sources/ManageServer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1638,7 +1638,7 @@
 block discarded – undo
1638 1638
 	$cacheAPIdir = $sourcedir . '/Cache';
1639 1639
 
1640 1640
 	$loadedApis = array();
1641
-	$apis_dir = $cacheAPIdir .'/'. CacheApi::APIS_FOLDER;
1641
+	$apis_dir = $cacheAPIdir . '/' . CacheApi::APIS_FOLDER;
1642 1642
 
1643 1643
 	$api_classes = new GlobIterator($apis_dir . '/*.php', FilesystemIterator::NEW_CURRENT_AND_KEY);
1644 1644
 
Please login to merge, or discard this patch.
Sources/Subs-BoardIndex.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -195,8 +195,7 @@
 block discarded – undo
195 195
 				);
196 196
 
197 197
 				$categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ?
198
-						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' :
199
-						$row_board['cat_name']);
198
+						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']);
200 199
 
201 200
 			}
202 201
 
Please login to merge, or discard this patch.
Sources/Subs-Boards.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 
852 852
 	clean_cache('data');
853 853
 
854
-	cache_put_data('parsed_boards_descriptions_'. $parsed_boards_cat_id, $already_parsed_boards, 864000);
854
+	cache_put_data('parsed_boards_descriptions_' . $parsed_boards_cat_id, $already_parsed_boards, 864000);
855 855
 
856 856
 	if (empty($boardOptions['dont_log']))
857 857
 		logAction('edit_board', array('board' => $board_id), 'admin');
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 			$context['description_allowed_tags']
1580 1580
 		);
1581 1581
 
1582
-	cache_put_data('parsed_boards_descriptions_'. $category_id, $already_parsed_boards, 864000);
1582
+	cache_put_data('parsed_boards_descriptions_' . $category_id, $already_parsed_boards, 864000);
1583 1583
 
1584 1584
 	return $already_parsed_boards;
1585 1585
 }
Please login to merge, or discard this patch.
Themes/default/Packages.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -455,7 +455,7 @@
 block discarded – undo
455 455
 
456 456
 	elseif ($context['uninstalling'])
457 457
 		echo '
458
-			', $txt['package_uninstall_done'] .' <br>
458
+			', $txt['package_uninstall_done'] . ' <br>
459 459
 			', '<a href="', $context['keep_url'], '" class="button">', $txt['package_keep'], '</a>', '<a href="', $context['remove_url'], '" class="button">', $txt['package_delete2'], '</a>';
460 460
 
461 461
 	elseif ($context['install_finished'])
Please login to merge, or discard this patch.
Sources/ManageSettings.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -364,8 +364,8 @@  discard block
 block discarded – undo
364 364
 		}
365 365
 
366 366
 		// Clean up tags with children
367
-		foreach($bbcTagsChildren as $parent_tag => $children)
368
-			foreach($children as $index => $child_tag)
367
+		foreach ($bbcTagsChildren as $parent_tag => $children)
368
+			foreach ($children as $index => $child_tag)
369 369
 			{
370 370
 				// Remove entries where parent and child tag is the same
371 371
 				if ($child_tag == $parent_tag)
@@ -1888,25 +1888,25 @@  discard block
 block discarded – undo
1888 1888
 		$fields = array();
1889 1889
 		$new_sort = array();
1890 1890
 
1891
-		while($row = $smcFunc['db_fetch_assoc']($request))
1891
+		while ($row = $smcFunc['db_fetch_assoc']($request))
1892 1892
 				$fields[] = $row['id_field'];
1893 1893
 		$smcFunc['db_free_result']($request);
1894 1894
 
1895 1895
 		$idx = array_search($context['fid'], $fields);
1896 1896
 
1897
-		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx )
1897
+		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx)
1898 1898
 		{
1899
-				$new_sort = array_slice($fields ,0 ,$idx ,true);
1899
+				$new_sort = array_slice($fields, 0, $idx, true);
1900 1900
 				$new_sort[] = $fields[$idx + 1];
1901 1901
 				$new_sort[] = $fields[$idx];
1902
-				$new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true);
1902
+				$new_sort += array_slice($fields, $idx + 2, count($fields), true);
1903 1903
 		}
1904 1904
 		elseif ($context['fid'] > 0 and $idx < count($fields))
1905 1905
 		{
1906
-				$new_sort = array_slice($fields ,0 ,($idx - 1) ,true);
1906
+				$new_sort = array_slice($fields, 0, ($idx - 1), true);
1907 1907
 				$new_sort[] = $fields[$idx];
1908 1908
 				$new_sort[] = $fields[$idx - 1];
1909
-				$new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true);
1909
+				$new_sort += array_slice($fields, ($idx + 1), count($fields), true);
1910 1910
 		}
1911 1911
 		else
1912 1912
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
Please login to merge, or discard this patch.
Sources/Profile-View.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
262 262
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
263 263
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
264
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
264
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
265 265
 		OFFSET {int:offset}' : ''),
266 266
 		array(
267 267
 			'id_member' => $memID,
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	call_integration_hook('integrate_fetch_alerts', array(&$alerts, &$formats));
360 360
 
361 361
 	// Substitute $scripturl into the link formats. (Done here to make life easier for hooked mods.)
362
-	$formats = array_map(function ($format) use ($scripturl) {
362
+	$formats = array_map(function($format) use ($scripturl) {
363 363
 		$format['link'] = str_replace('{scripturl}', $scripturl, $format['link']);
364 364
 		$format['text'] = str_replace('{scripturl}', $scripturl, $format['text']);
365 365
 
@@ -1166,20 +1166,20 @@  discard block
 block discarded – undo
1166 1166
 		$context['posts'][$key]['quickbuttons'] = array(
1167 1167
 			'reply' => array(
1168 1168
 				'label' => $txt['reply'],
1169
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
1169
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
1170 1170
 				'icon' => 'reply_button',
1171 1171
 				'show' => $post['can_reply']
1172 1172
 			),
1173 1173
 			'quote' => array(
1174 1174
 				'label' => $txt['quote_action'],
1175
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
1175
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
1176 1176
 				'icon' => 'quote',
1177 1177
 				'show' => $post['can_quote']
1178 1178
 			),
1179 1179
 			'remove' => array(
1180 1180
 				'label' => $txt['remove'],
1181
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1182
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
1181
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1182
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
1183 1183
 				'class' => 'you_sure',
1184 1184
 				'icon' => 'remove_button',
1185 1185
 				'show' => $post['can_delete']
Please login to merge, or discard this patch.