SimpleMachines / SMF2.1

Sources/tasks/CreatePost-Notify.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 {
 	/**
 	 * Constants for reply types.
-	*/
+	 */
 	const NOTIFY_TYPE_REPLY_AND_MODIFY = 1;
 	const NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING = 2;
 	const NOTIFY_TYPE_ONLY_REPLIES = 3;
@@ -27,7 +27,7 @@ 
 
 	/**
 	 * Constants for frequencies.
-	*/
+	 */
 	const FREQUENCY_NOTHING = 0;
 	const FREQUENCY_EVERYTHING = 1;
 	const FREQUENCY_FIRST_UNREAD_MSG = 2;

Braces -1 removed lines

@@ -266,7 +266,6 @@
 				$user_info = $real_user_info;
 				unset($real_user_info);
 			}
-
 			else
 				$user_info = null;
 

Spacing +3 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 		if ($type == 'edit')
 		{
 			// Filter out members who have already been notified about this post's topic
-			$unnotified = array_filter($watched, function ($member)
+			$unnotified = array_filter($watched, function($member)
 			{
 				return empty($member['sent']);
 			});
@@ -204,8 +204,7 @@ 
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($prefs[$member_id]))
 			{
 				$pref = !empty($prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
-					$prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
-					(!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0);
+					$prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0);
 
 				$message_type = 'notification_' . $type;
 
@@ -224,8 +223,7 @@ 
 			elseif ($type == 'topic')
 			{
 				$pref = !empty($prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
-					$prefs[$member_id]['board_notify_' . $topicOptions['board']] :
-					(!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0);
+					$prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0);
 
 				$content_type = 'board';
 

Sources/Load.php

Braces +1 added lines, -8 removed lines

@@ -104,7 +104,7 @@ 
 	// Set a list of common functions.
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
-		{
+	{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
 			return $string;
 		} : function($string)
@@ -925,7 +925,6 @@ 
 			$user_settings_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) -
 					$tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 			$user_settings_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset'];
 	}
@@ -1655,7 +1654,6 @@ 
 			$time_user = new DateTime('now', $tz_user);
 			$profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 		{
 			// !!! Compatibility.
@@ -2318,7 +2316,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2699,14 +2696,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName;
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName;
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName;
@@ -2814,14 +2809,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName;
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName;
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName;

Sources/tasks/ExportProfileData.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => $scripturl . '?action=profile;area=download;u=' . $uid . ';t=' . hash_hmac('sha1', $idhash, get_auth_secret()),

Braces +3 added lines, -1 removed lines

@@ -119,7 +119,9 @@
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function ($datatype) use ($txt)
+			{
+return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => $scripturl . '?action=profile;area=download;u=' . $uid . ';t=' . hash_hmac('sha1', $idhash, get_auth_secret()),

Sources/ManageErrors.php

Spacing +2 added lines, -2 removed lines

@@ -355,8 +355,8 @@
 	elseif (isset($_POST['delall']) && isset($filter))
 	{
 		// ip need a different placeholder type
-		$filter_type = $filter['variable'] == 'ip'? 'inet' : 'string';
-		$filter_op = $filter['variable'] == 'ip'? '=' : 'LIKE';
+		$filter_type = $filter['variable'] == 'ip' ? 'inet' : 'string';
+		$filter_op = $filter['variable'] == 'ip' ? '=' : 'LIKE';
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_errors
 			WHERE ' . $filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',

Sources/Profile-Actions.php

Spacing +1 added lines, -1 removed lines

@@ -1396,7 +1396,7 @@
 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));

Braces +3 added lines, -1 removed lines

@@ -1396,7 +1396,9 @@
 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function ($datatype) use ($txt)
+	{
+return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));

Tests/installTest.php

Indentation +43 added lines, -43 removed lines

@@ -20,56 +20,56 @@
 
 final class InstallTest extends TestCase
 {
-    public function testWrite() {
-        load_lang_file();
-        $var = CheckFilesWritable();
-        $this->assertEquals(true,$var);
-    }
+	public function testWrite() {
+		load_lang_file();
+		$var = CheckFilesWritable();
+		$this->assertEquals(true,$var);
+	}
 
-    public function testDBSettings() {
-        $_POST['db_type'] = 'postgresql';
-        $_POST['db_prefix'] = 'smf_';
-        $_POST['db_name'] = 'postgres';
-        $_POST['db_user'] = 'postgres';
-        $_POST['db_passwd'] = '';
-        $_POST['db_server'] = 'localhost';
-        $_POST['db_port'] = '5432';
+	public function testDBSettings() {
+		$_POST['db_type'] = 'postgresql';
+		$_POST['db_prefix'] = 'smf_';
+		$_POST['db_name'] = 'postgres';
+		$_POST['db_user'] = 'postgres';
+		$_POST['db_passwd'] = '';
+		$_POST['db_server'] = 'localhost';
+		$_POST['db_port'] = '5432';
 
-        // updateSettingsFile got different way to detect setting dir...
-        $GLOBALS['boarddir'] = getcwd();
+		// updateSettingsFile got different way to detect setting dir...
+		$GLOBALS['boarddir'] = getcwd();
 
-        load_lang_file();
-        $var = DatabaseSettings();
-        $this->assertEquals(true,$var);
-    }
+		load_lang_file();
+		$var = DatabaseSettings();
+		$this->assertEquals(true,$var);
+	}
 
-    public function testForumSettings() {
-        $_SERVER['SERVER_NAME'] = 'localhost';
-        $_POST['boardurl'] = 'http://localhost';
-        $_POST['mbname'] = 'My PHPUnit Community';
-        load_lang_file();
-        $var = ForumSettings();
-        $this->assertEquals(true,$var);
-    }
+	public function testForumSettings() {
+		$_SERVER['SERVER_NAME'] = 'localhost';
+		$_POST['boardurl'] = 'http://localhost';
+		$_POST['mbname'] = 'My PHPUnit Community';
+		load_lang_file();
+		$var = ForumSettings();
+		$this->assertEquals(true,$var);
+	}
 
-    public function testDatabasePopulation() {
-        load_lang_file();
-        $var = DatabasePopulation();
-        $this->assertEquals(true,$var);
-    }
+	public function testDatabasePopulation() {
+		load_lang_file();
+		$var = DatabasePopulation();
+		$this->assertEquals(true,$var);
+	}
 
-    public function testAdminAccount() {
-        $_POST['username'] = 'Admin';
-        $_POST['email'] = 'phpunit@localhost.com';
-        $_POST['password1'] = 'admin';    
-        $_POST['contbutt'] = '1234';
+	public function testAdminAccount() {
+		$_POST['username'] = 'Admin';
+		$_POST['email'] = 'phpunit@localhost.com';
+		$_POST['password1'] = 'admin';    
+		$_POST['contbutt'] = '1234';
 
-        $_POST['password2'] = $_POST['password1'];
-        $_POST['server_email'] = $_POST['email'];
-        load_lang_file();
-        $var = AdminAccount();
-        $this->assertEquals(true,$var);
-    }
+		$_POST['password2'] = $_POST['password1'];
+		$_POST['server_email'] = $_POST['email'];
+		load_lang_file();
+		$var = AdminAccount();
+		$this->assertEquals(true,$var);
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
  * @version 2.1 RC2
  */
 
-define('SMFPHPUNIT',TRUE);
+define('SMFPHPUNIT', TRUE);
 use PHPUnit\Framework\TestCase;
 require_once('./install.php');
 
@@ -23,7 +23,7 @@ 
     public function testWrite() {
         load_lang_file();
         $var = CheckFilesWritable();
-        $this->assertEquals(true,$var);
+        $this->assertEquals(true, $var);
     }
 
     public function testDBSettings() {
@@ -40,7 +40,7 @@ 
 
         load_lang_file();
         $var = DatabaseSettings();
-        $this->assertEquals(true,$var);
+        $this->assertEquals(true, $var);
     }
 
     public function testForumSettings() {
@@ -49,13 +49,13 @@ 
         $_POST['mbname'] = 'My PHPUnit Community';
         load_lang_file();
         $var = ForumSettings();
-        $this->assertEquals(true,$var);
+        $this->assertEquals(true, $var);
     }
 
     public function testDatabasePopulation() {
         load_lang_file();
         $var = DatabasePopulation();
-        $this->assertEquals(true,$var);
+        $this->assertEquals(true, $var);
     }
 
     public function testAdminAccount() {
@@ -68,7 +68,7 @@ 
         $_POST['server_email'] = $_POST['email'];
         load_lang_file();
         $var = AdminAccount();
-        $this->assertEquals(true,$var);
+        $this->assertEquals(true, $var);
     }
 }
 

Braces +10 added lines, -5 removed lines

@@ -20,13 +20,15 @@ 
 
 final class InstallTest extends TestCase
 {
-    public function testWrite() {
+    public function testWrite()
+    {
         load_lang_file();
         $var = CheckFilesWritable();
         $this->assertEquals(true,$var);
     }
 
-    public function testDBSettings() {
+    public function testDBSettings()
+    {
         $_POST['db_type'] = 'postgresql';
         $_POST['db_prefix'] = 'smf_';
         $_POST['db_name'] = 'postgres';
@@ -43,7 +45,8 @@ 
         $this->assertEquals(true,$var);
     }
 
-    public function testForumSettings() {
+    public function testForumSettings()
+    {
         $_SERVER['SERVER_NAME'] = 'localhost';
         $_POST['boardurl'] = 'http://localhost';
         $_POST['mbname'] = 'My PHPUnit Community';
@@ -52,13 +55,15 @@ 
         $this->assertEquals(true,$var);
     }
 
-    public function testDatabasePopulation() {
+    public function testDatabasePopulation()
+    {
         load_lang_file();
         $var = DatabasePopulation();
         $this->assertEquals(true,$var);
     }
 
-    public function testAdminAccount() {
+    public function testAdminAccount()
+    {
         $_POST['username'] = 'Admin';
         $_POST['email'] = 'phpunit@localhost.com';
         $_POST['password1'] = 'admin';    

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * @version 2.1 RC2
  */
 
-define('SMFPHPUNIT',TRUE);
+define('SMFPHPUNIT',true);
 use PHPUnit\Framework\TestCase;
 require_once('./install.php');