Merge pull request #10841 from hypeJunction/cs

New Coding Standards

.gitignore

@@ -61,6 +61,7 @@ tmtags
 Thumbs.db
 Desktop.ini
 npm-debug.log
+phpcbf-fixed.diff
 
 # Codio.com
 startup.sh

actions/admin/delete_admin_notice.php

@@ -10,4 +10,4 @@
 	register_error(elgg_echo("admin:notices:could_not_delete"));
 }
 
-forward(REFERER);
+forward(REFERER);

actions/admin/menu/save.php

@@ -7,18 +7,18 @@
  */
 
 // featured menu items
-$featured_names = get_input('featured_menu_names', array());
+$featured_names = get_input('featured_menu_names', []);
 $featured_names = array_unique($featured_names);
 if (in_array(' ', $featured_names)) {
 	unset($featured_names[array_search(' ', $featured_names)]);
 }
 elgg_save_config('site_featured_menu_names', $featured_names);
 
 // custom menu items
-$custom_menu_titles = get_input('custom_menu_titles', array());
-$custom_menu_urls = get_input('custom_menu_urls', array());
+$custom_menu_titles = get_input('custom_menu_titles', []);
+$custom_menu_urls = get_input('custom_menu_urls', []);
 $num_menu_items = count($custom_menu_titles);
-$custom_menu_items = array();
+$custom_menu_items = [];
 for ($i = 0; $i < $num_menu_items; $i++) {
 	if (trim($custom_menu_urls[$i]) && trim($custom_menu_titles[$i])) {
 		$url = $custom_menu_urls[$i];

actions/admin/plugins/activate.php

@@ -14,33 +14,32 @@
 $plugin_guids = get_input('plugin_guids');
 
 if (!is_array($plugin_guids)) {
-	$plugin_guids = array($plugin_guids);
+	$plugin_guids = [$plugin_guids];
 }
 
-$activated_guids = array();
+$activated_guids = [];
 foreach ($plugin_guids as $guid) {
 	$plugin = get_entity($guid);
 
 	if (!($plugin instanceof ElggPlugin)) {
-		register_error(elgg_echo('admin:plugins:activate:no', array($guid)));
+		register_error(elgg_echo('admin:plugins:activate:no', [$guid]));
 		continue;
 	}
 
 	if ($plugin->activate()) {
 		$activated_guids[] = $guid;
-		$ids = array(
+		$ids = [
 			'cannot_start' . $plugin->getID(),
 			'invalid_and_deactivated_' . $plugin->getID()
-		);
+		];
 
 		foreach ($ids as $id) {
 			elgg_delete_admin_notice($id);
 		}
-
 	} else {
 		$msg = $plugin->getError();
 		$string = ($msg) ? 'admin:plugins:activate:no_with_msg' : 'admin:plugins:activate:no';
-		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+		register_error(elgg_echo($string, [$plugin->getFriendlyName(), $plugin->getError()]));
 	}
 }
 
@@ -50,7 +49,7 @@
 
 if (count($activated_guids) === 1) {
 	$url = 'admin/plugins';
-	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	$query = (string) parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
 	if ($query) {
 		$url .= "?$query";
 	}

actions/admin/plugins/activate_all.php

@@ -39,10 +39,10 @@
 			continue;
 		}
 
-		$ids = array(
+		$ids = [
 			'cannot_start' . $plugin->getID(),
 			'invalid_and_deactivated_' . $plugin->getID()
-		);
+		];
 
 		foreach ($ids as $id) {
 			elgg_delete_admin_notice($id);
@@ -63,12 +63,12 @@
 	foreach ($plugins as $plugin) {
 		$msg = $plugin->getError();
 		$string = ($msg) ? 'admin:plugins:activate:no_with_msg' : 'admin:plugins:activate:no';
-		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $msg)));
+		register_error(elgg_echo($string, [$plugin->getFriendlyName(), $msg]));
 	}
 }
 
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_flush_caches();
 
-forward(REFERER);
+forward(REFERER);

actions/admin/plugins/deactivate.php

@@ -14,14 +14,14 @@
 $plugin_guids = get_input('plugin_guids');
 
 if (!is_array($plugin_guids)) {
-	$plugin_guids = array($plugin_guids);
+	$plugin_guids = [$plugin_guids];
 }
 
 foreach ($plugin_guids as $guid) {
 	$plugin = get_entity($guid);
 
 	if (!($plugin instanceof ElggPlugin)) {
-		register_error(elgg_echo('admin:plugins:deactivate:no', array($guid)));
+		register_error(elgg_echo('admin:plugins:deactivate:no', [$guid]));
 		continue;
 	}
 
@@ -30,7 +30,7 @@
 	} else {
 		$msg = $plugin->getError();
 		$string = ($msg) ? 'admin:plugins:deactivate:no_with_msg' : 'admin:plugins:deactivate:no';
-		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+		register_error(elgg_echo($string, [$plugin->getFriendlyName(), $plugin->getError()]));
 	}
 }
 
@@ -40,7 +40,7 @@
 
 if (count($plugin_guids) == 1) {
 	$url = 'admin/plugins';
-	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	$query = (string) parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
 	if ($query) {
 		$url .= "?$query";
 	}

actions/admin/plugins/deactivate_all.php

@@ -34,7 +34,7 @@
 	if (!$plugin->deactivate()) {
 		$msg = $plugin->getError();
 		$string = ($msg) ? 'admin:plugins:deactivate:no_with_msg' : 'admin:plugins:deactivate:no';
-		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+		register_error(elgg_echo($string, [$plugin->getFriendlyName(), $plugin->getError()]));
 	}
 }
 

actions/admin/plugins/set_priority.php

@@ -19,7 +19,7 @@
 $plugin = get_entity($plugin_guid);
 
 if (!($plugin instanceof ElggPlugin)) {
-	register_error(elgg_echo('admin:plugins:set_priority:no', array($plugin_guid)));
+	register_error(elgg_echo('admin:plugins:set_priority:no', [$plugin_guid]));
 	forward(REFERER);
 }
 
@@ -28,11 +28,11 @@
 } else {
 	$msg = $plugin->getError();
 	$string = ($msg) ? 'admin:plugins:set_priority:no_with_msg' : 'admin:plugins:set_priority:no';
-	register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+	register_error(elgg_echo($string, [$plugin->getFriendlyName(), $plugin->getError()]));
 }
 
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_flush_caches();
 
-forward(REFERER);
+forward(REFERER);

actions/admin/site/flush_cache.php

@@ -7,4 +7,4 @@
 _elgg_services()->autoloadManager->deleteCache();
 
 system_message(elgg_echo('admin:cache:flushed'));
-forward(REFERER);
+forward(REFERER);

actions/admin/site/set_maintenance_mode.php

@@ -3,7 +3,7 @@
  * Configure site maintenance mode
  */
 
-$mode = (int)get_input('mode');
+$mode = (int) get_input('mode');
 $message = get_input('message');
 
 $site = elgg_get_site_entity();

actions/admin/site/update_advanced.php

@@ -25,13 +25,13 @@
 // check for relative paths
 if (stripos(PHP_OS, 'win') === 0) {
 	if (strpos($dataroot, ':') !== 1) {
-		$msg = elgg_echo('admin:configuration:dataroot:relative_path', array($dataroot));
+		$msg = elgg_echo('admin:configuration:dataroot:relative_path', [$dataroot]);
 		register_error($msg);
 		forward(REFERER);
 	}
 } else {
 	if (strpos($dataroot, '/') !== 0) {
-		$msg = elgg_echo('admin:configuration:dataroot:relative_path', array($dataroot));
+		$msg = elgg_echo('admin:configuration:dataroot:relative_path', [$dataroot]);
 		register_error($msg);
 		forward(REFERER);
 	}

actions/admin/site/update_basic.php

@@ -25,7 +25,7 @@
 
 elgg_save_config('language', get_input('language'));
 
-$default_limit = (int)get_input('default_limit');
+$default_limit = (int) get_input('default_limit');
 if ($default_limit < 1) {
 	register_error(elgg_echo('admin:configuration:default_limit'));
 	forward(REFERER);

actions/admin/user/ban.php

@@ -27,4 +27,4 @@
 	register_error(elgg_echo('admin:user:ban:no'));
 }
 
-forward(REFERER);
+forward(REFERER);

actions/admin/user/delete.php

@@ -23,7 +23,7 @@
 
 if (($user instanceof ElggUser) && ($user->canEdit())) {
 	if ($user->delete()) {
-		system_message(elgg_echo('admin:user:delete:yes', array($name)));
+		system_message(elgg_echo('admin:user:delete:yes', [$name]));
 	} else {
 		register_error(elgg_echo('admin:user:delete:no'));
 	}
@@ -33,7 +33,7 @@
 
 // forward to user administration if on a user's page as it no longer exists
 $forward = REFERER;
-if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) {
+if (strpos($_SERVER['HTTP_REFERER'], $username) != false) {
 	$forward = "admin/users/newest";
 }
 

actions/admin/user/resetpassword.php

@@ -25,13 +25,13 @@
 
 		notify_user($user->guid,
 			elgg_get_site_entity()->guid,
-			elgg_echo('email:resetpassword:subject', array(), $user->language),
-			elgg_echo('email:resetpassword:body', array($user->username, $password), $user->language),
-			array(
+			elgg_echo('email:resetpassword:subject', [], $user->language),
+			elgg_echo('email:resetpassword:body', [$user->username, $password], $user->language),
+			[
 				'object' => $user,
 				'action' => 'resetpassword',
 				'password' => $password,
-			),
+			],
 			'email');
 	} else {
 		register_error(elgg_echo('admin:user:resetpassword:no'));

actions/avatar/crop.php

@@ -32,13 +32,13 @@
 
 system_message(elgg_echo('avatar:crop:success'));
 $view = 'river/user/default/profileiconupdate';
-_elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
-elgg_create_river_item(array(
+_elgg_delete_river(['subject_guid' => $owner->guid, 'view' => $view]);
+elgg_create_river_item([
 	'view' => $view,
 	'action_type' => 'update',
 	'subject_guid' => $owner->guid,
 	'object_guid' => $owner->guid,
-));
+]);
 
 
 forward(REFERER);

actions/avatar/upload.php

@@ -26,13 +26,13 @@
 	system_message(elgg_echo("avatar:upload:success"));
 
 	$view = 'river/user/default/profileiconupdate';
-	_elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
-	elgg_create_river_item(array(
+	_elgg_delete_river(['subject_guid' => $owner->guid, 'view' => $view]);
+	elgg_create_river_item([
 		'view' => $view,
 		'action_type' => 'update',
 		'subject_guid' => $owner->guid,
 		'object_guid' => $owner->guid,
-	));
+	]);
 }
 
 forward(REFERER);

actions/comment/delete.php

@@ -19,4 +19,4 @@
 	register_error(elgg_echo('generic_comment:notfound'));
 }
 
-forward(REFERER);
+forward(REFERER);

actions/comment/save.php

@@ -34,11 +34,11 @@
 
 		if (elgg_is_xhr()) {
 			// @todo move to its own view object/comment/content in 1.x
-			echo elgg_view('output/longtext', array(
+			echo elgg_view('output/longtext', [
 				'value' => $comment->description,
 				'class' => 'elgg-inner',
 				'data-role' => 'comment-text',
-			));
+			]);
 		}
 	} else {
 		register_error(elgg_echo('generic_comment:failure'));
@@ -66,13 +66,13 @@
 	}
 
 	// Add to river
-	elgg_create_river_item(array(
+	elgg_create_river_item([
 		'view' => 'river/object/comment/create',
 		'action_type' => 'comment',
 		'subject_guid' => $user->guid,
 		'object_guid' => $guid,
 		'target_guid' => $entity_guid,
-	));
+	]);
 
 	system_message(elgg_echo('generic_comment:posted'));
 }

actions/entity/delete.php

@@ -29,7 +29,7 @@
 $container = $entity->getContainerEntity();
 
 if (!$entity->delete()) {
-	register_error(elgg_echo('entity:delete:fail', array($display_name)));
+	register_error(elgg_echo('entity:delete:fail', [$display_name]));
 	forward(REFERRER);
 }
 
@@ -51,15 +51,15 @@
 	}
 }
 
-$success_keys = array(
+$success_keys = [
 	"entity:delete:$type:$subtype:success",
 	"entity:delete:$type:success",
 	"entity:delete:success",
-);
+];
 
 foreach ($success_keys as $success_key) {
 	if (elgg_language_key_exists($success_key)) {
-		system_message(elgg_echo($success_key, array($display_name)));
+		system_message(elgg_echo($success_key, [$display_name]));
 		break;
 	}
 }

actions/friends/add.php

@@ -16,9 +16,9 @@
 }
 
 if (!elgg_get_logged_in_user_entity()->addFriend($friend->guid, true)) {
-	register_error(elgg_echo("friends:add:failure", array($friend->name)));
+	register_error(elgg_echo("friends:add:failure", [$friend->name]));
 	forward(REFERER);
 }
 
-system_message(elgg_echo("friends:add:successful", array($friend->name)));
+system_message(elgg_echo("friends:add:successful", [$friend->name]));
 forward(REFERER);

actions/friends/remove.php

@@ -16,10 +16,10 @@
 }
 
 if (!elgg_get_logged_in_user_entity()->removeFriend($friend->guid)) {
-	register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+	register_error(elgg_echo("friends:remove:failure", [$friend->name]));
 	forward(REFERER);
 }
 
-system_message(elgg_echo("friends:remove:successful", array($friend->name)));
+system_message(elgg_echo("friends:remove:successful", [$friend->name]));
 forward(REFERER);