Completed
Pull Request — master (#575)
by Mateusz
03:07
created
code/control/DeployForm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 				substr($sha, 0, 8),
74 74
 				$branch->LastUpdated()->TimeDiff()
75 75
 			);
76
-			$branches[$sha . '-' . $name] = $branchValue;
76
+			$branches[$sha.'-'.$name] = $branchValue;
77 77
 		}
78 78
 
79 79
 		// Tags
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 				substr($sha, 0, 8),
87 87
 				$branch->LastUpdated()->TimeDiff()
88 88
 			);
89
-			$tags[$sha . '-' . $tag] = $tagValue;
89
+			$tags[$sha.'-'.$tag] = $tagValue;
90 90
 		}
91 91
 		$tags = array_reverse($tags);
92 92
 
Please login to merge, or discard this patch.
code/jobs/DeployJob.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 	public static function sig_file_for_data_object($dataObject) {
14 14
 		$dir = DNData::inst()->getSignalDir();
15
-		if (!is_dir($dir)) {
15
+		if(!is_dir($dir)) {
16 16
 			`mkdir $dir`;
17 17
 		}
18 18
 		return sprintf(
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function alarmHandler() {
43 43
 		$sigFile = $this->args['sigFile'];
44
-		if (file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
44
+		if(file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
45 45
 			$signal = (int)file_get_contents($sigFile);
46
-			if (is_int($signal) && in_array((int)$signal, [
46
+			if(is_int($signal) && in_array((int)$signal, [
47 47
 				// The following signals are trapped by both Resque and Rainforest.
48 48
 				SIGTERM,
49 49
 				SIGINT,
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 				SIGCONT
55 55
 			])) {
56 56
 				echo sprintf(
57
-					'[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL,
57
+					'[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL,
58 58
 					$signal,
59 59
 					getmypid()
60 60
 				);
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 
65 65
 				// Dispatch to own process group.
66 66
 				$pgid = posix_getpgid(getmypid());
67
-				if ($pgid<=0) {
67
+				if($pgid <= 0) {
68 68
 					echo sprintf(
69
-						'[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL,
69
+						'[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL,
70 70
 						$pgid
71 71
 					);
72 72
 				} else {
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 		posix_setsid();
86 86
 
87 87
 		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
88
-			if (!empty($this->args['sigFile'])) {
89
-				echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']);
88
+			if(!empty($this->args['sigFile'])) {
89
+				echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']);
90 90
 				declare(ticks = 1);
91 91
 				pcntl_signal(SIGALRM, [$this, 'alarmHandler']);
92 92
 				pcntl_alarm(1);
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 
100 100
 	public function perform() {
101
-		echo "[-] DeployJob starting" . PHP_EOL;
101
+		echo "[-] DeployJob starting".PHP_EOL;
102 102
 		$log = new DeploynautLogFile($this->args['logfile']);
103 103
 
104 104
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 				$this->args
133 133
 			);
134 134
 		} catch(Exception $e) {
135
-			echo "[-] DeployJob failed" . PHP_EOL;
135
+			echo "[-] DeployJob failed".PHP_EOL;
136 136
 			throw $e;
137 137
 		}
138 138
 		$this->updateStatus('Finished');
139
-		echo "[-] DeployJob finished" . PHP_EOL;
139
+		echo "[-] DeployJob finished".PHP_EOL;
140 140
 	}
141 141
 
142 142
 	/**
Please login to merge, or discard this patch.