Passed
Push — release-2.1 ( a29e75...4c7a51 )
by Jon
04:49 queued 11s
created
Sources/Subs.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			{
379 379
 				$val = 'CASE ';
380 380
 				foreach ($members as $k => $v)
381
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
381
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
382 382
 
383 383
 				$val = $val . ' END';
384 384
 				$type = 'raw';
@@ -1045,11 +1045,11 @@  discard block
 block discarded – undo
1045 1045
 			// Anything that isn't a specification, punctuation mark, or whitespace.
1046 1046
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
1047 1047
 			// A series of punctuation marks (except %), possibly separated by whitespace.
1048
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
1048
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
1049 1049
 			// Unwanted trailing punctuation and whitespace.
1050
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1050
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1051 1051
 			// Unwanted opening punctuation and whitespace.
1052
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1052
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1053 1053
 		),
1054 1054
 		array(
1055 1055
 			'',
@@ -1139,7 +1139,7 @@  discard block
 block discarded – undo
1139 1139
 	elseif (!empty($context['character_set']) && is_callable('mb_decode_numericentity'))
1140 1140
 	{
1141 1141
 		// Get whatever the default replacement character is for this encoding.
1142
-		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD,0xFFFD,0,0xFFFF), $context['character_set']);
1142
+		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD, 0xFFFD, 0, 0xFFFF), $context['character_set']);
1143 1143
 	}
1144 1144
 	else
1145 1145
 		$substitute = '?';
@@ -1624,7 +1624,7 @@  discard block
 block discarded – undo
1624 1624
 								$returnContext .= '<img src="' . $currentAttachment['href'] . '"' . $alt . $title . ' class="bbc_img">';
1625 1625
 							else
1626 1626
 							{
1627
-								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
1627
+								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1628 1628
 								$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
1629 1629
 								$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
1630 1630
 							}
@@ -1635,7 +1635,7 @@  discard block
 block discarded – undo
1635 1635
 							$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1636 1636
 							$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
1637 1637
 
1638
-							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="'. $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1638
+							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="' . $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1639 1639
 						}
1640 1640
 						// Audio.
1641 1641
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1643,7 +1643,7 @@  discard block
 block discarded – undo
1643 1643
 							$width = 'max-width:100%; width: ' . (!empty($params['{width}']) ? $params['{width}'] : '400') . 'px;';
1644 1644
 							$height = !empty($params['{height}']) ? 'height: ' . $params['{height}'] . 'px;' : '';
1645 1645
 
1646
-							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1646
+							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1647 1647
 						}
1648 1648
 						// Anything else.
1649 1649
 						else
@@ -1812,7 +1812,7 @@  discard block
 block discarded – undo
1812 1812
 				'type' => 'unparsed_commas_content',
1813 1813
 				'test' => '\d+,\d+\]',
1814 1814
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1815
-				'validate' => function (&$tag, &$data, $disabled)
1815
+				'validate' => function(&$tag, &$data, $disabled)
1816 1816
 				{
1817 1817
 					$data[0] = normalize_iri($data[0]);
1818 1818
 
@@ -1938,8 +1938,8 @@  discard block
 block discarded – undo
1938 1938
 					else
1939 1939
 						$url = get_proxied_url($url);
1940 1940
 
1941
-					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}']. '"' : ' alt=""';
1942
-					$title = !empty($params['{title}']) ? ' title="' . $params['{title}']. '"' : '';
1941
+					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}'] . '"' : ' alt=""';
1942
+					$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
1943 1943
 
1944 1944
 					$data = isset($disabled[$tag['tag']]) ? $url : '<img src="' . $url . '"' . $alt . $title . $params['{width}'] . $params['{height}'] . ' class="bbc_img' . (!empty($params['{width}']) || !empty($params['{height}']) ? ' resized' : '') . '" loading="lazy">';
1945 1945
 				},
@@ -2370,12 +2370,12 @@  discard block
 block discarded – undo
2370 2370
 		$codes[] = array(
2371 2371
 			'tag' => 'cowsay',
2372 2372
 			'parameters' => array(
2373
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2373
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2374 2374
 					{
2375 2375
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2376 2376
 					},
2377 2377
 				),
2378
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2378
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2379 2379
 					{
2380 2380
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2381 2381
 					},
@@ -4080,7 +4080,7 @@  discard block
 block discarded – undo
4080 4080
 		if ($fp != false)
4081 4081
 		{
4082 4082
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
4083
-			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: '. SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
4083
+			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: ' . SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
4084 4084
 
4085 4085
 			// Read in the HTTP/1.1 or whatever.
4086 4086
 			$test = substr(fgets($fp, 11), -1);
@@ -4676,7 +4676,7 @@  discard block
 block discarded – undo
4676 4676
 
4677 4677
 	uasort(
4678 4678
 		$context['css_files'],
4679
-		function ($a, $b)
4679
+		function($a, $b)
4680 4680
 		{
4681 4681
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4682 4682
 		}
@@ -5973,7 +5973,7 @@  discard block
 block discarded – undo
5973 5973
 			{
5974 5974
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
5975 5975
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5976
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5976
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5977 5977
 				if ($keep_alive)
5978 5978
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
5979 5979
 				else
@@ -5983,7 +5983,7 @@  discard block
 block discarded – undo
5983 5983
 			{
5984 5984
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
5985 5985
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5986
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5986
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5987 5987
 				if ($keep_alive)
5988 5988
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
5989 5989
 				else
@@ -6232,13 +6232,13 @@  discard block
 block discarded – undo
6232 6232
 
6233 6233
 	// UTF-8 occurences of MS special characters
6234 6234
 	$findchars_utf8 = array(
6235
-		"\xe2\x80\x9a",	// single low-9 quotation mark
6236
-		"\xe2\x80\x9e",	// double low-9 quotation mark
6237
-		"\xe2\x80\xa6",	// horizontal ellipsis
6238
-		"\xe2\x80\x98",	// left single curly quote
6239
-		"\xe2\x80\x99",	// right single curly quote
6240
-		"\xe2\x80\x9c",	// left double curly quote
6241
-		"\xe2\x80\x9d",	// right double curly quote
6235
+		"\xe2\x80\x9a", // single low-9 quotation mark
6236
+		"\xe2\x80\x9e", // double low-9 quotation mark
6237
+		"\xe2\x80\xa6", // horizontal ellipsis
6238
+		"\xe2\x80\x98", // left single curly quote
6239
+		"\xe2\x80\x99", // right single curly quote
6240
+		"\xe2\x80\x9c", // left double curly quote
6241
+		"\xe2\x80\x9d", // right double curly quote
6242 6242
 	);
6243 6243
 
6244 6244
 	// windows 1252 / iso equivalents
@@ -6254,13 +6254,13 @@  discard block
 block discarded – undo
6254 6254
 
6255 6255
 	// safe replacements
6256 6256
 	$replacechars = array(
6257
-		',',	// &sbquo;
6258
-		',,',	// &bdquo;
6259
-		'...',	// &hellip;
6260
-		"'",	// &lsquo;
6261
-		"'",	// &rsquo;
6262
-		'"',	// &ldquo;
6263
-		'"',	// &rdquo;
6257
+		',', // &sbquo;
6258
+		',,', // &bdquo;
6259
+		'...', // &hellip;
6260
+		"'", // &lsquo;
6261
+		"'", // &rsquo;
6262
+		'"', // &ldquo;
6263
+		'"', // &rdquo;
6264 6264
 	);
6265 6265
 
6266 6266
 	if ($context['utf8'])
@@ -6621,7 +6621,7 @@  discard block
 block discarded – undo
6621 6621
 		// We don't want abbreviations like '+03' or '-11'.
6622 6622
 		$abbrs = array_filter(
6623 6623
 			$tzvalue['abbrs'],
6624
-			function ($abbr)
6624
+			function($abbr)
6625 6625
 			{
6626 6626
 				return !strspn($abbr, '+-');
6627 6627
 			}
@@ -7610,7 +7610,7 @@  discard block
 block discarded – undo
7610 7610
 			EXISTS (
7611 7611
 				SELECT bpv.id_board
7612 7612
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7613
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
7613
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
7614 7614
 					AND bpv.deny = 0
7615 7615
 					AND bpv.id_board = b.id_board
7616 7616
 			)';
@@ -7620,7 +7620,7 @@  discard block
 block discarded – undo
7620 7620
 			AND NOT EXISTS (
7621 7621
 				SELECT bpv.id_board
7622 7622
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7623
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
7623
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
7624 7624
 					AND bpv.deny = 1
7625 7625
 					AND bpv.id_board = b.id_board
7626 7626
 			)';
@@ -8027,8 +8027,8 @@  discard block
 block discarded – undo
8027 8027
 	$i = 0;
8028 8028
 	while (empty($done))
8029 8029
 	{
8030
-		if (strpos($format, '{'. --$i . '}') !== false)
8031
-			$replacements['{'. $i . '}'] = array_pop($list);
8030
+		if (strpos($format, '{' . --$i . '}') !== false)
8031
+			$replacements['{' . $i . '}'] = array_pop($list);
8032 8032
 		else
8033 8033
 			$done = true;
8034 8034
 	}
@@ -8038,8 +8038,8 @@  discard block
 block discarded – undo
8038 8038
 	$i = 0;
8039 8039
 	while (empty($done))
8040 8040
 	{
8041
-		if (strpos($format, '{'. ++$i . '}') !== false)
8042
-			$replacements['{'. $i . '}'] = array_shift($list);
8041
+		if (strpos($format, '{' . ++$i . '}') !== false)
8042
+			$replacements['{' . $i . '}'] = array_shift($list);
8043 8043
 		else
8044 8044
 			$done = true;
8045 8045
 	}
@@ -8217,7 +8217,7 @@  discard block
 block discarded – undo
8217 8217
 	if (empty($stringSubject))
8218 8218
 		return '';
8219 8219
 
8220
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
8220
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
8221 8221
 	$toFind = array();
8222 8222
 	$replaceWith = array();
8223 8223
 
Please login to merge, or discard this patch.
other/update_unicode_data.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		if ($func_name !== 'utf8_default_ignorables') {
242 242
 			$func_text .= '"';
243 243
 
244
-			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
244
+			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
245 245
 
246 246
 			foreach (unpack('C*', $key) as $byte_value) {
247 247
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 		} else {
256 256
 			$func_text .= '"';
257 257
 
258
-			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
258
+			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
259 259
 			foreach (unpack('C*', $value) as $byte_value) {
260 260
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
261 261
 			}
Please login to merge, or discard this patch.
Braces   +79 added lines, -37 removed lines patch added patch discarded remove patch
@@ -34,14 +34,16 @@  discard block
 block discarded – undo
34 34
 $utf8_arrays['utf8_casefold_maps'] = array('file' => 'CaseFold.php', 'data' => array());
35 35
 $utf8_arrays['utf8_default_ignorables'] = array('file' => 'DefaultIgnorables.php', 'data' => array());
36 36
 
37
-foreach ($utf8_arrays as $func_name => $func_info) {
37
+foreach ($utf8_arrays as $func_name => $func_info)
38
+{
38 39
 	if (!is_file($unicodedir . '/' . $func_info['file']) || !is_writable($unicodedir . '/' . $func_info['file']))
39 40
 		die($unicodedir . '/' . $func_info['file'] . ' not found or not writable.');
40 41
 }
41 42
 
42 43
 // We need some of these for further analysis below.
43 44
 $derived_normalization_props = array();
44
-foreach (file($unicode_data_url . '/DerivedNormalizationProps.txt') as $line) {
45
+foreach (file($unicode_data_url . '/DerivedNormalizationProps.txt') as $line)
46
+{
45 47
 	$line = substr($line, 0, strcspn($line, '#'));
46 48
 
47 49
 	if (strpos($line, ';') === false)
@@ -49,17 +51,22 @@  discard block
 block discarded – undo
49 51
 
50 52
 	$fields = explode(';', $line);
51 53
 
52
-	foreach ($fields as $key => $value) {
54
+	foreach ($fields as $key => $value)
55
+	{
53 56
 		$fields[$key] = trim($value);
54 57
 	}
55 58
 
56
-	if (!isset($derived_normalization_props[$fields[1]])) {
59
+	if (!isset($derived_normalization_props[$fields[1]]))
60
+	{
57 61
 		$derived_normalization_props[$fields[1]] = array();
58 62
 	}
59 63
 
60
-	if (strpos($fields[0], '..') === false) {
64
+	if (strpos($fields[0], '..') === false)
65
+	{
61 66
 		$entities = array('&#x' . $fields[0] . ';');
62
-	} else {
67
+	}
68
+	else
69
+	{
63 70
 		$entities = array();
64 71
 
65 72
 		list($start, $end) = explode('..', $fields[0]);
@@ -68,27 +75,35 @@  discard block
 block discarded – undo
68 75
 		$ord_e = hexdec($end);
69 76
 
70 77
 		$ord = $ord_s;
71
-		while ($ord <= $ord_e) {
78
+		while ($ord <= $ord_e)
79
+		{
72 80
 			$entities[] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
73 81
 		}
74 82
 	}
75 83
 
76 84
 	$value = '';
77
-	if (!isset($fields[2])) {
85
+	if (!isset($fields[2]))
86
+	{
78 87
 		$value = 'SAME';
79
-	} elseif (in_array($fields[1], array('FC_NFKC', 'NFKC_CF'))) {
88
+	}
89
+	elseif (in_array($fields[1], array('FC_NFKC', 'NFKC_CF')))
90
+	{
80 91
 		$value = trim($fields[2]) !== '' ? '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';' : '';
81
-	} else {
92
+	}
93
+	else
94
+	{
82 95
 		$value = $fields[2];
83 96
 	}
84 97
 
85
-	foreach ($entities as $entity) {
98
+	foreach ($entities as $entity)
99
+	{
86 100
 		$derived_normalization_props[$fields[1]][$entity] = $value === 'SAME' ? $entity : $value;
87 101
 	}
88 102
 }
89 103
 
90 104
 // Go through all the characters in the Unicode database.
91
-foreach (file($unicode_data_url . '/UnicodeData.txt') as $line) {
105
+foreach (file($unicode_data_url . '/UnicodeData.txt') as $line)
106
+{
92 107
 	$fields = explode(';', $line);
93 108
 
94 109
 	if (!empty($fields[3]))
@@ -109,12 +124,14 @@  discard block
 block discarded – undo
109 124
 	$full_decomposition_maps['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim(strip_tags($fields[5]))) . ';';
110 125
 
111 126
 	// Just the canonical decompositions.
112
-	if (strpos($fields[5], '<') === false) {
127
+	if (strpos($fields[5], '<') === false)
128
+	{
113 129
 		$utf8_arrays['utf8_normalize_d_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[5])) . ';';
114 130
 	}
115 131
 }
116 132
 
117
-foreach (file($unicode_data_url . '/CaseFolding.txt') as $line) {
133
+foreach (file($unicode_data_url . '/CaseFolding.txt') as $line)
134
+{
118 135
 	$line = substr($line, 0, strcspn($line, '#'));
119 136
 
120 137
 	if (strpos($line, ';') === false)
@@ -122,12 +139,14 @@  discard block
 block discarded – undo
122 139
 
123 140
 	$fields = explode(';', $line);
124 141
 
125
-	foreach ($fields as $key => $value) {
142
+	foreach ($fields as $key => $value)
143
+	{
126 144
 		$fields[$key] = trim($value);
127 145
 	}
128 146
 
129 147
 	// Full casefolding.
130
-	if (in_array($fields[1], array('C', 'F'))) {
148
+	if (in_array($fields[1], array('C', 'F')))
149
+	{
131 150
 		$utf8_arrays['utf8_casefold_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
132 151
 	}
133 152
 
@@ -141,13 +160,17 @@  discard block
 block discarded – undo
141 160
 // This is necessary because some characters decompose to other characters that
142 161
 // themselves decompose further.
143 162
 $changed = true;
144
-while ($changed) {
163
+while ($changed)
164
+{
145 165
 	$temp = array();
146
-	foreach ($full_decomposition_maps as $composed => $decomposed) {
166
+	foreach ($full_decomposition_maps as $composed => $decomposed)
167
+	{
147 168
 		$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
148 169
 
149
-		foreach ($parts as $partnum => $hex) {
150
-			if (isset($full_decomposition_maps[$hex])) {
170
+		foreach ($parts as $partnum => $hex)
171
+		{
172
+			if (isset($full_decomposition_maps[$hex]))
173
+			{
151 174
 				$parts[$partnum] = $full_decomposition_maps[$hex];
152 175
 			}
153 176
 		}
@@ -166,17 +189,22 @@  discard block
 block discarded – undo
166 189
 // Same as above, but using only canonical decompositions.
167 190
 $changed = true;
168 191
 $iteration = 0;
169
-while ($changed) {
192
+while ($changed)
193
+{
170 194
 	$temp = array();
171
-	foreach ($utf8_arrays['utf8_normalize_d_maps']['data'] as $composed => $decomposed) {
172
-		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion'])) {
195
+	foreach ($utf8_arrays['utf8_normalize_d_maps']['data'] as $composed => $decomposed)
196
+	{
197
+		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion']))
198
+		{
173 199
 			$utf8_arrays['utf8_compose_maps']['data'][$decomposed] = $composed;
174 200
 		}
175 201
 
176 202
 		$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
177 203
 
178
-		foreach ($parts as $partnum => $hex) {
179
-			if (isset($utf8_arrays['utf8_normalize_d_maps']['data'][$hex])) {
204
+		foreach ($parts as $partnum => $hex)
205
+		{
206
+			if (isset($utf8_arrays['utf8_normalize_d_maps']['data'][$hex]))
207
+			{
180 208
 				$parts[$partnum] = $utf8_arrays['utf8_normalize_d_maps']['data'][$hex];
181 209
 			}
182 210
 		}
@@ -196,7 +224,8 @@  discard block
 block discarded – undo
196 224
 $utf8_arrays['utf8_normalize_kd_maps']['data'] = array_diff_assoc($full_decomposition_maps, $utf8_arrays['utf8_normalize_d_maps']['data']);
197 225
 
198 226
 // Some characters have the 'Default_Ignorable_Code_Point' property.
199
-foreach (file($unicode_data_url . '/DerivedCoreProperties.txt') as $line) {
227
+foreach (file($unicode_data_url . '/DerivedCoreProperties.txt') as $line)
228
+{
200 229
 	if (strpos($line, 'Default_Ignorable_Code_Point') === false)
201 230
 		continue;
202 231
 
@@ -207,13 +236,17 @@  discard block
 block discarded – undo
207 236
 
208 237
 	$fields = explode(';', $line);
209 238
 
210
-	foreach ($fields as $key => $value) {
239
+	foreach ($fields as $key => $value)
240
+	{
211 241
 		$fields[$key] = trim($value);
212 242
 	}
213 243
 
214
-	if (strpos($fields[0], '..') === false) {
244
+	if (strpos($fields[0], '..') === false)
245
+	{
215 246
 		$utf8_arrays['utf8_default_ignorables']['data'][] = '&#x' . $fields[0] . ';';
216
-	} else {
247
+	}
248
+	else
249
+	{
217 250
 		$entities = array();
218 251
 
219 252
 		list($start, $end) = explode('..', $fields[0]);
@@ -222,13 +255,15 @@  discard block
 block discarded – undo
222 255
 		$ord_e = hexdec($end);
223 256
 
224 257
 		$ord = $ord_s;
225
-		while ($ord <= $ord_e) {
258
+		while ($ord <= $ord_e)
259
+		{
226 260
 			$utf8_arrays['utf8_default_ignorables']['data'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
227 261
 		}
228 262
 	}
229 263
 }
230 264
 
231
-foreach ($utf8_arrays as $func_name => $func_info) {
265
+foreach ($utf8_arrays as $func_name => $func_info)
266
+{
232 267
 	// Now update the file.
233 268
 	$file_contents = file_get_contents($unicodedir . '/' . $func_info['file']);
234 269
 
@@ -238,28 +273,35 @@  discard block
 block discarded – undo
238 273
 
239 274
 	$func_text .= "\n\t" . 'return array(' . "\n";
240 275
 
241
-	foreach ($func_info['data'] as $key => $value) {
276
+	foreach ($func_info['data'] as $key => $value)
277
+	{
242 278
 		$func_text .= "\t\t";
243 279
 
244
-		if ($func_name !== 'utf8_default_ignorables') {
280
+		if ($func_name !== 'utf8_default_ignorables')
281
+		{
245 282
 			$func_text .= '"';
246 283
 
247 284
 			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
248 285
 
249
-			foreach (unpack('C*', $key) as $byte_value) {
286
+			foreach (unpack('C*', $key) as $byte_value)
287
+			{
250 288
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
251 289
 			}
252 290
 
253 291
 			$func_text .= '" => ';
254 292
 		}
255 293
 
256
-		if ($func_name == 'utf8_combining_classes') {
294
+		if ($func_name == 'utf8_combining_classes')
295
+		{
257 296
 			$func_text .= $value;
258
-		} else {
297
+		}
298
+		else
299
+		{
259 300
 			$func_text .= '"';
260 301
 
261 302
 			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
262
-			foreach (unpack('C*', $value) as $byte_value) {
303
+			foreach (unpack('C*', $value) as $byte_value)
304
+			{
263 305
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
264 306
 			}
265 307
 
Please login to merge, or discard this patch.
Sources/Subs-Charset.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 	$combining_classes = utf8_combining_classes();
250 250
 
251 251
 	// Replace characters with decomposed forms.
252
-	for ($i=0; $i < count($chars); $i++)
252
+	for ($i = 0; $i < count($chars); $i++)
253 253
 	{
254 254
 		// Hangul characters.
255 255
 		if ($chars[$i] >= "\xEA\xB0\x80" && $chars[$i] <= "\xED\x9E\xA3")
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		{
284 284
 			$temp = $chars[$i];
285 285
 			$chars[$i] = $chars[$i - 1];
286
-			$chars[$i -1] = $temp;
286
+			$chars[$i - 1] = $temp;
287 287
 
288 288
 			// Backtrack and check again.
289 289
 			if ($i > 1)
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 
535 535
 		Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex
536 536
 	*/
537
-	$string  = mb_ereg_replace_callback(
537
+	$string = mb_ereg_replace_callback(
538 538
 		'\p{Regional_Indicator}\p{Regional_Indicator}' .
539 539
 		'|' .
540 540
 		'\p{Emoji}' .
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 				'[\x{E0020}-\x{E007E}]+\x{E007F}' .
556 556
 			')?' .
557 557
 		')*',
558
-		function ($matches) use (&$placeholders)
558
+		function($matches) use (&$placeholders)
559 559
 		{
560 560
 			// Skip lone ASCII characters that are not actully part of an emoji sequence.
561 561
 			// This can happen because the digits 0-9 and the '*' and '#' characters are
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 			// Do the thing.
931 931
 			$temp = @mb_ereg_replace_callback(
932 932
 				$pattern,
933
-				function ($matches) use ($placeholders)
933
+				function($matches) use ($placeholders)
934 934
 				{
935 935
 					return strtr($matches[0], $placeholders);
936 936
 				},
Please login to merge, or discard this patch.