Completed
Push — master ( fee7e6...ef02c6 )
by Mateusz
130:46 queued 127:35
created
code/backends/SizeRestrictedPackageCache.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 			throw new \LogicException("Can't use PackageCache without setting BaseDir");
53 53
 		}
54 54
 
55
-		$buildPath = $this->baseDir . '/' . $this->sanitiseDirName($identifier);
55
+		$buildPath = $this->baseDir.'/'.$this->sanitiseDirName($identifier);
56 56
 		$filename = "$buildPath/$sha.tar.gz";
57 57
 
58 58
 		if(!file_exists($this->baseDir)) {
@@ -103,14 +103,14 @@  discard block
 block discarded – undo
103 103
 	 * @param DeploynautLogFile $log The log to send removal status messages to
104 104
 	 */
105 105
 	protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log) {
106
-		$files = glob($dir . '/*.tar.gz');
106
+		$files = glob($dir.'/*.tar.gz');
107 107
 		if(sizeof($files) > $count) {
108 108
 			usort($files, function($a, $b) {
109 109
 				return filemtime($a) > filemtime($b);
110 110
 			});
111 111
 
112 112
 			for($i = 0; $i < sizeof($files) - $count; $i++) {
113
-				$log->write("Removing " . $files[$i] . " from package cache");
113
+				$log->write("Removing ".$files[$i]." from package cache");
114 114
 				unlink($files[$i]);
115 115
 			}
116 116
 		}
Please login to merge, or discard this patch.
code/tasks/DNMigrate1_1to1_2.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 			foreach($environments as $environment) {
17 17
 				$newFilename = basename($environment->Filename);
18 18
 				if($environment->Filename != $newFilename) {
19
-					echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
19
+					echo 'Migrating "'.$environment->Filename.'" to '.$newFilename.PHP_EOL;
20 20
 					$environment->Filename = $newFilename;
21 21
 					$environment->write();
22 22
 				}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 		foreach($projects as $project) {
29 29
 			if(!$project->projectFolderExists()) {
30 30
 				$warnings = true;
31
-				echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
31
+				echo 'Project '.$project->Name.' don\'t have a cap project folder'.PHP_EOL;
32 32
 			}
33 33
 		}
34 34
 		if($warnings) {
Please login to merge, or discard this patch.
code/tasks/SyncProjectsAndEnvironments.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@  discard block
 block discarded – undo
19 19
 
20 20
 		if($dryRun) {
21 21
 			echo "Running in dry run mode, no changes commited, ";
22
-			echo "the output shows a prediction on what will happen." . PHP_EOL;
23
-			echo "To skip dryrun, run the task like this:" . PHP_EOL;
24
-			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
22
+			echo "the output shows a prediction on what will happen.".PHP_EOL;
23
+			echo "To skip dryrun, run the task like this:".PHP_EOL;
24
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0".PHP_EOL.PHP_EOL;
25 25
 			sleep(3);
26 26
 		}
27 27
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 		}
68 68
 
69 69
 		foreach($removeList as $remove) {
70
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
70
+			$this->message('Removing "'.basename($remove->Name).'" from db');
71 71
 			if(!$dryRun) {
72 72
 				$removeList->remove($remove);
73 73
 			}
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 		}
89 89
 
90 90
 		foreach($removeList as $remove) {
91
-			$this->message($remove->Name . ' ' . $remove->Path);
91
+			$this->message($remove->Name.' '.$remove->Path);
92 92
 			if(!$dryrun) {
93 93
 				$removeList->remove($remove);
94 94
 			}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				continue;
121 121
 			}
122 122
 
123
-			$this->message('Adding "' . basename($path) . '" to db');
123
+			$this->message('Adding "'.basename($path).'" to db');
124 124
 			if(!$dryRun) {
125 125
 				$environment = DNEnvironment::create_from_path($path);
126 126
 				$environment->ProjectID = $project->ID;
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
 	 */
152 152
 	protected function message($text) {
153 153
 		if(PHP_SAPI !== 'cli') {
154
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
154
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
155 155
 		}
156
-		echo ' - ' . $text . PHP_EOL;
156
+		echo ' - '.$text.PHP_EOL;
157 157
 	}
158 158
 
159 159
 	/**
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	protected function echoHeader($text) {
163 163
 		if(PHP_SAPI !== 'cli') {
164
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
164
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
165 165
 		} else {
166
-			echo '# ' . $text . PHP_EOL;
166
+			echo '# '.$text.PHP_EOL;
167 167
 		}
168 168
 	}
169 169
 }
Please login to merge, or discard this patch.
code/api/nouns/APIProject.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,9 +87,9 @@
 block discarded – undo
87 87
 		$fetch->write();
88 88
 		$fetch->start();
89 89
 
90
-		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
90
+		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
91 91
 		$output = array(
92
-			'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
92
+			'message' => 'Fetch queued as job '.$fetch->ResqueToken,
93 93
 			'href' => $location,
94 94
 		);
95 95
 
Please login to merge, or discard this patch.
code/api/nouns/APIEnvironment.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 		$ping->write();
113 113
 		$ping->start();
114 114
 
115
-		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
115
+		$location = Director::absoluteBaseURL().$this->Link().'/ping/'.$ping->ID;
116 116
 		$output = array(
117
-			'message' => 'Ping queued as job ' . $ping->ResqueToken,
117
+			'message' => 'Ping queued as job '.$ping->ResqueToken,
118 118
 			'href' => $location,
119 119
 		);
120 120
 
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 		));
165 165
 		$deploy = $strategy->createDeployment();
166 166
 		$deploy->start();
167
-		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
167
+		$location = Director::absoluteBaseURL().$this->Link().'/deploy/'.$deploy->ID;
168 168
 		$output = array(
169
-			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
169
+			'message' => 'Deploy queued as job '.$deploy->ResqueToken,
170 170
 			'href' => $location,
171 171
 		);
172 172
 		$response = $this->getAPIResponse($output);
Please login to merge, or discard this patch.
code/api/DeploynautAPI.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	protected function project404Response() {
107 107
 		$projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
108
-		return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
108
+		return new SS_HTTPResponse('Project "'.$projectName.'" not found.', 404);
109 109
 	}
110 110
 
111 111
 	/**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 */
114 114
 	protected function environment404Response() {
115 115
 		$envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
116
-		return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
116
+		return new SS_HTTPResponse('Environment "'.$envName.'" not found.', 404);
117 117
 	}
118 118
 
119 119
 	/**
Please login to merge, or discard this patch.
code/jobs/DeployJob.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	}
17 17
 
18 18
 	public function perform() {
19
-		echo "[-] DeployJob starting" . PHP_EOL;
19
+		echo "[-] DeployJob starting".PHP_EOL;
20 20
 		$log = new DeploynautLogFile($this->args['logfile']);
21 21
 
22 22
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 				$this->args
51 51
 			);
52 52
 		} catch(Exception $e) {
53
-			echo "[-] DeployJob failed" . PHP_EOL;
53
+			echo "[-] DeployJob failed".PHP_EOL;
54 54
 			throw $e;
55 55
 		}
56 56
 		$this->updateStatus('Finished');
57
-		echo "[-] DeployJob finished" . PHP_EOL;
57
+		echo "[-] DeployJob finished".PHP_EOL;
58 58
 	}
59 59
 
60 60
 	/**
Please login to merge, or discard this patch.
code/jobs/PingJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	 * Do the actual job by calling the appropiate backend
32 32
 	 */
33 33
 	public function perform() {
34
-		echo "[-] PingJob starting" . PHP_EOL;
34
+		echo "[-] PingJob starting".PHP_EOL;
35 35
 		$log = new DeploynautLogFile($this->args['logfile']);
36 36
 
37 37
 		$ping = DNPing::get()->byID($this->args['pingID']);
Please login to merge, or discard this patch.
code/jobs/CreateEnvJob.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	 *
20 20
 	 */
21 21
 	public function perform() {
22
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
22
+		echo "[-] CreateEnvJob starting".PHP_EOL;
23 23
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
24 24
 		try {
25 25
 			$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
 			$envCreate->createEnvironment();
32 32
 
33 33
 		} catch(Exception $e) {
34
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
34
+			echo "[-] CreateEnvJob failed".PHP_EOL;
35 35
 			throw $e;
36 36
 		}
37 37
 		$this->updateStatus('Finished');
38
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
38
+		echo "[-] CreateEnvJob finished".PHP_EOL;
39 39
 	}
40 40
 
41 41
 	/**
Please login to merge, or discard this patch.