Passed
Pull Request — release-2.1 (#6097)
by Mathias
10:40
created
Sources/ManageErrors.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -355,8 +355,8 @@
 block discarded – undo
355 355
 	elseif (isset($_POST['delall']) && isset($filter))
356 356
 	{
357 357
 		// ip need a different placeholder type
358
-		$filter_type = $filter['variable'] == 'ip'? 'inet' : 'string';
359
-		$filter_op = $filter['variable'] == 'ip'? '=' : 'LIKE';
358
+		$filter_type = $filter['variable'] == 'ip' ? 'inet' : 'string';
359
+		$filter_op = $filter['variable'] == 'ip' ? '=' : 'LIKE';
360 360
 		$smcFunc['db_query']('', '
361 361
 			DELETE FROM {db_prefix}log_errors
362 362
 			WHERE ' . $filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',
Please login to merge, or discard this patch.
Sources/News.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	);
93 93
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
94 94
 		if (isset($_GET[$var]))
95
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
95
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
96 96
 
97 97
 	// Handle the cases where a board, boards, or category is asked for.
98 98
 	$query_this_board = 1;
@@ -299,17 +299,17 @@  discard block
 block discarded – undo
299 299
 	 * namespaces, which could cause it to mangle the XML horrifically
300 300
 	 * during processing.
301 301
 	 */
302
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
302
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
303 303
 
304 304
 	// Allow mods to add extra namespaces and tags to the feed/channel
305 305
 	$namespaces = array(
306 306
 		'rss' => array(),
307
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
308
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
307
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
308
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
309 309
 		'rdf' => array(
310
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
311
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
312
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
310
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
311
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
312
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
313 313
 		),
314 314
 		'smf' => array(
315 315
 			'smf' => $smf_ns,
Please login to merge, or discard this patch.
Sources/Profile-Actions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1396,7 +1396,7 @@
 block discarded – undo
1396 1396
 
1397 1397
 	// Figure out the filename we'll tell the browser.
1398 1398
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
1399
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
1399
+	$included_desc = array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
1400 1400
 
1401 1401
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
1402 1402
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));
Please login to merge, or discard this patch.
Tests/installTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @version 2.1 RC2
15 15
  */
16 16
 
17
-define('SMFPHPUNIT',TRUE);
17
+define('SMFPHPUNIT', TRUE);
18 18
 use PHPUnit\Framework\TestCase;
19 19
 require_once('./install.php');
20 20
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     public function testWrite() {
24 24
         load_lang_file();
25 25
         $var = CheckFilesWritable();
26
-        $this->assertEquals(true,$var);
26
+        $this->assertEquals(true, $var);
27 27
     }
28 28
 
29 29
     public function testDBSettings() {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
         load_lang_file();
42 42
         $var = DatabaseSettings();
43
-        $this->assertEquals(true,$var);
43
+        $this->assertEquals(true, $var);
44 44
     }
45 45
 
46 46
     public function testForumSettings() {
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
         $_POST['mbname'] = 'My PHPUnit Community';
50 50
         load_lang_file();
51 51
         $var = ForumSettings();
52
-        $this->assertEquals(true,$var);
52
+        $this->assertEquals(true, $var);
53 53
     }
54 54
 
55 55
     public function testDatabasePopulation() {
56 56
         load_lang_file();
57 57
         $var = DatabasePopulation();
58
-        $this->assertEquals(true,$var);
58
+        $this->assertEquals(true, $var);
59 59
     }
60 60
 
61 61
     public function testAdminAccount() {
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         $_POST['server_email'] = $_POST['email'];
69 69
         load_lang_file();
70 70
         $var = AdminAccount();
71
-        $this->assertEquals(true,$var);
71
+        $this->assertEquals(true, $var);
72 72
     }
73 73
 }
74 74
 
Please login to merge, or discard this patch.