silverstripe / deploynaut

code/control/DNDeploymentHandlers.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	}
 
 	protected function sendEmailToApprover(DNDeployment $deployment) {
-		if (!$deployment->Approver()->exists()) {
+		if(!$deployment->Approver()->exists()) {
 			return false;
 		}
 

code/model/jobs/DNDeployment.php

Spacing +10 added lines, -10 removed lines

@@ -87,9 +87,9 @@ 
 	}
 
 	public function getMachine() {
-<<<<<<< Updated upstream
+<< << << < Updated upstream
 		return $this->stateMachineFactory->forDNDeployment($this);
-||||||| merged common ancestors
+|| || || | merged common ancestors
 		$loader = new Finite\Loader\ArrayLoader([
 			'class'   => 'DNDeployment',
 			'states'  => [
@@ -158,7 +158,7 @@ 
 	public function onAbort() {
 		// 2 is SIGINT - we can't use SIGINT constant in the mod_apache context.
 		DeployJob::set_signal($this, 2);
-=======
+=== === =
 		$notificationService = Injector::inst()->get('DeploymentNotificationService');
 
 		$loader = new Finite\Loader\ArrayLoader([
@@ -230,7 +230,7 @@ 
 	public function onAbort() {
 		// 2 is SIGINT - we can't use SIGINT constant in the mod_apache context.
 		DeployJob::set_signal($this, 2);
->>>>>>> Stashed changes
+>> >> >> > Stashed changes
 	}
 
 	public function Link() {
@@ -238,7 +238,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -357,12 +357,12 @@ 
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if($strategy->getActionCode() !== 'full') return null;
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
-		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+		foreach($changes as $change => $details) {
+			if($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -373,7 +373,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -422,7 +422,7 @@ 
 
 			// if there is a compare URL, and a description or a change (something actually changed)
 			// then show the URL. Otherwise don't show anything, as there is no comparison to be made.
-			if ($changed || $description) {
+			if($changed || $description) {
 				$compareUrl = isset($change['compareUrl']) ? $change['compareUrl'] : '';
 			}