Inspection of "Merge pull request #860 from hemberger/player-name" - smrealms/smr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 31dc49...cc7a48 )

by Dan

created 2020-06-09 08:41 UTC

Status

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -1,35 +1,35 @@  discard block
 block discarded – undo
 <?php
 $CombatPlanet = $PlanetCombatResults['Planet'];
 $TotalDamage = $PlanetCombatResults['TotalDamage'];
-if($MinimalDisplay) {
+if ($MinimalDisplay) {
 	echo $CombatPlanet->getCombatName();
-	if($TotalDamage > 0) {
+	if ($TotalDamage > 0) {
 		?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
 	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
 }
-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
-	foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
-		$ShootingWeapon =& $WeaponResults['Weapon'];
-		$ShotHit =& $WeaponResults['Hit'];
-		$ActualDamage =& $WeaponResults['ActualDamage'];
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
+	foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
+		$ShootingWeapon = & $WeaponResults['Weapon'];
+		$ShotHit = & $WeaponResults['Hit'];
+		$ActualDamage = & $WeaponResults['ActualDamage'];
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
 		
-		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-			if(!$ShotHit) {
+			if (!$ShotHit) {
 				?> and misses<?php
-			} else if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+			} else if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but it cannot do any damage<?php
@@ -37,81 +37,81 @@  discard block
 block discarded – undo
 			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
 				}
 			}
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($PlanetCombatResults['Drones'])) {
-	$Drones =& $PlanetCombatResults['Drones'];
-	$ActualDamage =& $Drones['ActualDamage'];
-	$WeaponDamage =& $Drones['WeaponDamage'];
-	$TargetPlayer =& $Drones['TargetPlayer'];
+if (isset($PlanetCombatResults['Drones'])) {
+	$Drones = & $PlanetCombatResults['Drones'];
+	$ActualDamage = & $Drones['ActualDamage'];
+	$WeaponDamage = & $Drones['WeaponDamage'];
+	$TargetPlayer = & $Drones['TargetPlayer'];
 	$DamageTypes = 0;
-	if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-	if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+	if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+	if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 	
 	echo $CombatPlanet->getCombatName();
-	if($WeaponDamage['Launched'] == 0) {
+	if ($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's combat drones<?php
 	} else {
-		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if($ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
-		if(!$ActualDamage['TargetAlreadyDead']) {
-			if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		if (!$ActualDamage['TargetAlreadyDead']) {
+			if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which prove ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but they cannot do any damage<?php
 				}
 			} else {
 				?> destroying <?php
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
 				}
 			}
 		}
 	} ?>.
 	<br /><?php
-	if($ActualDamage['KillingShot']) {
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
+	if ($ActualDamage['KillingShot']) {
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 	}
 }
 
 echo $CombatPlanet->getCombatName();
-if($TotalDamage > 0) {
+if ($TotalDamage > 0) {
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
 } else {
 	?> does no damage this round. You call that a planet? It needs a better builder<?php

Please login to merge, or discard this patch.

engine/Default/chat_sharing.php 1 patch

Spacing +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -19,8 +19,7 @@  discard block
 block discarded – undo
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getDisplayName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +39,7 @@  discard block
 block discarded – undo
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getDisplayName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

Please login to merge, or discard this patch.

		@@ -1,35 +1,35 @@ discard block
		block discarded – undo
1	1	<?php
2	2	$CombatPlanet = $PlanetCombatResults['Planet'];
3	3	$TotalDamage = $PlanetCombatResults['TotalDamage'];
4		-if($MinimalDisplay) {
	4	+if ($MinimalDisplay) {
5	5	echo $CombatPlanet->getCombatName();
6		- if($TotalDamage > 0) {
	6	+ if ($TotalDamage > 0) {
7	7	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
8	8	} else {
9	9	?> does no damage this round<?php
10	10	} ?>. <?php echo $AttackLogLink;
11	11	return;
12	12	}
13		-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
14		- foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
15		- $ShootingWeapon =& $WeaponResults['Weapon'];
16		- $ShotHit =& $WeaponResults['Hit'];
17		- $ActualDamage =& $WeaponResults['ActualDamage'];
18		- $WeaponDamage =& $WeaponResults['WeaponDamage'];
19		- $TargetPlayer =& $WeaponResults['TargetPlayer'];
	13	+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
	14	+ foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
	15	+ $ShootingWeapon = & $WeaponResults['Weapon'];
	16	+ $ShotHit = & $WeaponResults['Hit'];
	17	+ $ActualDamage = & $WeaponResults['ActualDamage'];
	18	+ $WeaponDamage = & $WeaponResults['WeaponDamage'];
	19	+ $TargetPlayer = & $WeaponResults['TargetPlayer'];
20	20
21		- echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
	21	+ echo $CombatPlanet->getCombatName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
22	22	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
23		- if(!$ShotHit) {
	23	+ if (!$ShotHit) {
24	24	?> and misses<?php
25		- } else if($ActualDamage['TotalDamage'] == 0) {
26		- if($WeaponDamage['Shield'] > 0) {
27		- if($ActualDamage['HasCDs']) {
	25	+ } else if ($ActualDamage['TotalDamage'] == 0) {
	26	+ if ($WeaponDamage['Shield'] > 0) {
	27	+ if ($ActualDamage['HasCDs']) {
28	28	?> which proves ineffective against their combat drones<?php
29	29	} else {
30	30	?> which washes harmlessly over their hull<?php
31	31	}
32		- } else if($WeaponDamage['Armour'] > 0) {
	32	+ } else if ($WeaponDamage['Armour'] > 0) {
33	33	?> which is deflected by their shields<?php
34	34	} else {
35	35	?> but it cannot do any damage<?php
		@@ -37,81 +37,81 @@ discard block
		block discarded – undo
37	37	} else {
38	38	?> destroying <?php
39	39	$DamageTypes = 0;
40		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
41		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
42		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	40	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	41	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	42	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
43	43
44		- if($ActualDamage['Shield'] > 0) {
	44	+ if ($ActualDamage['Shield'] > 0) {
45	45	?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
46	46	$this->doDamageTypeReductionDisplay($DamageTypes);
47	47	}
48		- if($ActualDamage['NumCDs'] > 0) {
	48	+ if ($ActualDamage['NumCDs'] > 0) {
49	49	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
50	50	$this->doDamageTypeReductionDisplay($DamageTypes);
51	51	}
52		- if($ActualDamage['Armour'] > 0) {
	52	+ if ($ActualDamage['Armour'] > 0) {
53	53	?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
54	54	}
55	55	}
56	56	} ?>.
57	57	<br /><?php
58	58	if ($ShotHit && $ActualDamage['KillingShot']) {
59		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
	59	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
60	60	}
61	61	}
62	62	}
63		-if(isset($PlanetCombatResults['Drones'])) {
64		- $Drones =& $PlanetCombatResults['Drones'];
65		- $ActualDamage =& $Drones['ActualDamage'];
66		- $WeaponDamage =& $Drones['WeaponDamage'];
67		- $TargetPlayer =& $Drones['TargetPlayer'];
	63	+if (isset($PlanetCombatResults['Drones'])) {
	64	+ $Drones = & $PlanetCombatResults['Drones'];
	65	+ $ActualDamage = & $Drones['ActualDamage'];
	66	+ $WeaponDamage = & $Drones['WeaponDamage'];
	67	+ $TargetPlayer = & $Drones['TargetPlayer'];
68	68	$DamageTypes = 0;
69		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
70		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
71		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	69	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	70	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	71	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
72	72
73	73	echo $CombatPlanet->getCombatName();
74		- if($WeaponDamage['Launched'] == 0) {
	74	+ if ($WeaponDamage['Launched'] == 0) {
75	75	?> fails to launch it's combat drones<?php
76	76	} else {
77		- ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if($ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
78		- if(!$ActualDamage['TargetAlreadyDead']) {
79		- if($ActualDamage['TotalDamage'] == 0) {
80		- if($WeaponDamage['Shield'] > 0) {
81		- if($ActualDamage['HasCDs']) {
	77	+ ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
	78	+ if (!$ActualDamage['TargetAlreadyDead']) {
	79	+ if ($ActualDamage['TotalDamage'] == 0) {
	80	+ if ($WeaponDamage['Shield'] > 0) {
	81	+ if ($ActualDamage['HasCDs']) {
82	82	?> which prove ineffective against their combat drones<?php
83	83	} else {
84	84	?> which washes harmlessly over their hull<?php
85	85	}
86		- } else if($WeaponDamage['Armour'] > 0) {
	86	+ } else if ($WeaponDamage['Armour'] > 0) {
87	87	?> which is deflected by their shields<?php
88	88	} else {
89	89	?> but they cannot do any damage<?php
90	90	}
91	91	} else {
92	92	?> destroying <?php
93		- if($ActualDamage['Shield'] > 0) {
	93	+ if ($ActualDamage['Shield'] > 0) {
94	94	?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
95	95	$this->doDamageTypeReductionDisplay($DamageTypes);
96	96	}
97		- if($ActualDamage['NumCDs'] > 0) {
	97	+ if ($ActualDamage['NumCDs'] > 0) {
98	98	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
99	99	$this->doDamageTypeReductionDisplay($DamageTypes);
100	100	}
101		- if($ActualDamage['Armour'] > 0) {
	101	+ if ($ActualDamage['Armour'] > 0) {
102	102	?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
103	103	}
104	104	}
105	105	}
106	106	} ?>.
107	107	<br /><?php
108		- if($ActualDamage['KillingShot']) {
109		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
	108	+ if ($ActualDamage['KillingShot']) {
	109	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
110	110	}
111	111	}
112	112
113	113	echo $CombatPlanet->getCombatName();
114		-if($TotalDamage > 0) {
	114	+if ($TotalDamage > 0) {
115	115	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
116	116	} else {
117	117	?> does no damage this round. You call that a planet? It needs a better builder<?php

Scrutinizer GitHub App not installed

Push — master ( 31dc49...cc7a48 )

Status

Category

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -4 removed lines patch added patch discarded remove patch

		@@ -19,8 +19,7 @@ discard block
		block discarded – undo
19	19	$shareFrom[$fromAccountId] = array(
20	20	'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
21	21	'Player Name' => $otherPlayer == null ?
22		- '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() :
23		- $otherPlayer->getDisplayName(),
	22	+ '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
24	23	'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
25	24	'Game ID' => $gameId,
26	25	);
		@@ -40,8 +39,7 @@ discard block
		block discarded – undo
40	39	$shareTo[$toAccountId] = array(
41	40	'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
42	41	'Player Name' => $otherPlayer == null ?
43		- '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() :
44		- $otherPlayer->getDisplayName(),
	42	+ '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(),
45	43	'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
46	44	'Game ID' => $gameId,
47	45	);

smrealms / smr

Scrutinizer GitHub App not installed

Push — master ( 31dc49...cc7a48 )

Status

Category

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -4 removed lines patch added patch discarded remove patch