silverstripe / deploynaut

code/control/DNDeploymentDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		// It gives a chance to perform a dry-run, and reject the transition, for example
 		// in case the user is unauthorised.
 			'finite.test_transition',
-			function (Finite\Event\TransitionEvent $e) use ($project) {
+			function(Finite\Event\TransitionEvent $e) use ($project) {
 				$code = null;
 
 				switch ($e->getTransition()->getName()) {

code/backends/PackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -50,14 +50,14 @@
 	 */
 	public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
 		// Fetch through the cache
-		if($this->cache) {
-			$identifier .= '-' . get_class($this) . '-' . $this->getIdentifier();
+		if ($this->cache) {
+			$identifier .= '-'.get_class($this).'-'.$this->getIdentifier();
  			return $this->cache->getPackageFilename($this, $identifier, $sha, $repositoryDir, $log);
 
  		// Default, cacheless implementation
  		} else {
- 			$filename = TEMP_FOLDER . '/' . $sha . '.tar.gz';
- 			if($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
+ 			$filename = TEMP_FOLDER.'/'.$sha.'.tar.gz';
+ 			if ($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
  				return $filename;
  			}
  		}

code/backends/SimplePackageGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -30,8 +30,8 @@ 
 	 * Generate the package
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
-		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-		if(!file_exists($tempPath)) {
+		$tempPath = TEMP_FOLDER."/".str_replace(".tar.gz", "", basename($outputFilename));
+		if (!file_exists($tempPath)) {
 			mkdir($tempPath);
 		}
 
@@ -42,22 +42,22 @@ 
 		// Execute these in sequence until there's a failure
 		$processes = array(
 			// Export the relevant SHA into a temp folder
-			new AbortableProcess("git archive $sha | tar -x -C " . $escapedTempPath, $baseDir),
+			new AbortableProcess("git archive $sha | tar -x -C ".$escapedTempPath, $baseDir),
 			// Run build script
 			new AbortableProcess($this->buildScript, $tempPath, null, null, 3600),
 			// Compress the result
-			new AbortableProcess("tar -czf " . $escapedOutputFile . " " . $escapedTempDir, dirname($tempPath)),
+			new AbortableProcess("tar -czf ".$escapedOutputFile." ".$escapedTempDir, dirname($tempPath)),
 		);
 
 		// Call at the end, regardless of success or failure
 		$cleanup = array(
 			// Delete the temporary staging folder
-			new AbortableProcess("rm -rf " . $escapedTempPath),
+			new AbortableProcess("rm -rf ".$escapedTempPath),
 		);
 
 		try {
 			$this->executeProcesses($processes, $log);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			// Execute cleanup on failure
 			$this->executeProcesses($cleanup, $log);
 			throw $e;
@@ -75,7 +75,7 @@ 
 	 * @param DeploynautLogFile $log The log to send output to
 	 */
 	protected function executeProcesses($processes, DeploynautLogFile $log) {
-		foreach($processes as $process) {
+		foreach ($processes as $process) {
 			$process->mustRun(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});

code/backends/SizeRestrictedPackageCache.php

Spacing +13 added lines, -13 removed lines

@@ -48,25 +48,25 @@ 
 		$repositoryDir,
 		DeploynautLogFile $log
 	) {
-		if(!$this->baseDir) {
+		if (!$this->baseDir) {
 			throw new \LogicException("Can't use PackageCache without setting BaseDir");
 		}
 
-		$buildPath = $this->baseDir . '/' . $this->sanitiseDirName($identifier);
+		$buildPath = $this->baseDir.'/'.$this->sanitiseDirName($identifier);
 		$filename = "$buildPath/$sha.tar.gz";
 
-		if(!file_exists($this->baseDir)) {
-			if(!mkdir($this->baseDir)) {
+		if (!file_exists($this->baseDir)) {
+			if (!mkdir($this->baseDir)) {
 				throw new \LogicException("Can't create base dir {$this->baseDir}");
 			}
 		}
-		if(!file_exists($buildPath)) {
-			if(!mkdir($buildPath)) {
+		if (!file_exists($buildPath)) {
+			if (!mkdir($buildPath)) {
 				throw new \LogicException("Can't create build path $buildPath");
 			}
 		}
 
-		if(file_exists($filename)) {
+		if (file_exists($filename)) {
 			$log->write("Using previously generated package $filename");
 			// This will ensure that our cache garbage collection will remove least-recently-accessed,
 			// rather than oldest.
@@ -74,11 +74,11 @@ 
 			return $filename;
 
 		} else {
-			if($this->cacheSize) {
+			if ($this->cacheSize) {
 				$this->reduceDirSizeTo($buildPath, $this->cacheSize - 1, $log);
 			}
 
-			if($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
+			if ($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
 				return $filename;
 			}
 		}
@@ -103,14 +103,14 @@ 
 	 * @param DeploynautLogFile $log The log to send removal status messages to
 	 */
 	protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log) {
-		$files = glob($dir . '/*.tar.gz');
-		if(sizeof($files) > $count) {
+		$files = glob($dir.'/*.tar.gz');
+		if (sizeof($files) > $count) {
 			usort($files, function($a, $b) {
 				return filemtime($a) > filemtime($b);
 			});
 
-			for($i = 0; $i < sizeof($files) - $count; $i++) {
-				$log->write("Removing " . $files[$i] . " from package cache");
+			for ($i = 0; $i < sizeof($files) - $count; $i++) {
+				$log->write("Removing ".$files[$i]." from package cache");
 				unlink($files[$i]);
 			}
 		}

code/backends/DemoDeploymentBackend.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 
 		$file = sprintf('%s/%s.deploy-history.txt', DEPLOYNAUT_LOG_PATH, $environment->getFullName());
 		$CLI_file = escapeshellarg($file);
-		$CLI_line = escapeshellarg(date('Y-m-d H:i:s') . " => $sha");
+		$CLI_line = escapeshellarg(date('Y-m-d H:i:s')." => $sha");
 
 		// Put maintenance page up
 		$this->enableMaintenance($environment, $log, $project);
@@ -54,7 +54,7 @@ 
 		$log->write("Well, that was a waste of time");
 
 		// Once the deployment has run it's necessary to update the maintenance page status
-		if(!empty($options['leaveMaintenancePage'])) {
+		if (!empty($options['leaveMaintenancePage'])) {
 			$this->enableMaintenance($environment, $log, $project);
 		} else {
 			// Remove maintenance page if we want it to

code/events/GenericEvent.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 * @return string
 	 */
 	public function get($keyname) {
-		if(array_key_exists($keyname, $this->data)) {
+		if (array_key_exists($keyname, $this->data)) {
 			return $this->data[$keyname];
 		}
 		return '';

code/api/nouns/APINoun.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	protected function getAPIResponse($output) {
 		$response = $this->getResponse();
-		if($this->respondWithText()) {
+		if ($this->respondWithText()) {
 			$body = print_r($output, true);
 			$response->addHeader('Content-Type', 'text/plain');
 		} else {
@@ -74,10 +74,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithJSON() {
-		if($this->getRequest()->getExtension() == 'json') {
+		if ($this->getRequest()->getExtension() == 'json') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
 			return true;
 		}
 		return false;
@@ -87,10 +87,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithText() {
-		if($this->getRequest()->getExtension() == 'txt') {
+		if ($this->getRequest()->getExtension() == 'txt') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
 			return true;
 		}
 		return false;

code/api/nouns/APIProject.php

Spacing +8 added lines, -8 removed lines

@@ -15,11 +15,11 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to this environment', 403);
 		}
 
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				$response = array(
 					"name" => $this->record->Name,
@@ -29,7 +29,7 @@ 
 					"disk-quota-mb" => $this->record->DiskQuotaMB,
 					"environments" => array(),
 				);
-				foreach($this->record->DNEnvironmentList() as $environment) {
+				foreach ($this->record->DNEnvironmentList() as $environment) {
 					$response['environments'][] = array(
 						'name' => $environment->Name,
 						'href' => Director::absoluteURL($this->record->APILink($environment->Name)),
@@ -47,10 +47,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function fetch(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getFetch($this->getRequest()->param('ID'));
 			case 'POST':
@@ -66,7 +66,7 @@ 
 	 */
 	protected function getFetch($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
-		if(!$ping) {
+		if (!$ping) {
 			return $this->message('Fetch not found', 404);
 		}
 		$output = array(
@@ -87,9 +87,9 @@ 
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
 		$output = array(
-			'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
+			'message' => 'Fetch queued as job '.$fetch->ResqueToken,
 			'href' => $location,
 		);
 

code/api/nouns/APIEnvironment.php

Spacing +16 added lines, -16 removed lines

@@ -15,10 +15,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to view this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				$href = Director::absoluteURL($this->record->Project()->APILink($this->record->Name));
 				return $this->getAPIResponse(array(
@@ -51,10 +51,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function ping(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getPing($this->getRequest()->param('ID'));
 			case 'POST':
@@ -71,10 +71,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function deploy(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getDeploy($this->getRequest()->param('ID'));
 			case 'POST':
@@ -106,7 +106,7 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	protected function createPing() {
-		if(!$this->record->canDeploy($this->getMember())) {
+		if (!$this->record->canDeploy($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
 		$ping = DNPing::create();
@@ -114,9 +114,9 @@ 
 		$ping->write();
 		$ping->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/ping/'.$ping->ID;
 		$output = array(
-			'message' => 'Ping queued as job ' . $ping->ResqueToken,
+			'message' => 'Ping queued as job '.$ping->ResqueToken,
 			'href' => $location,
 		);
 
@@ -132,7 +132,7 @@ 
 	 */
 	protected function getPing($ID) {
 		$ping = DNPing::get()->byID($ID);
-		if(!$ping) {
+		if (!$ping) {
 			return $this->message('Ping not found', 404);
 		}
 		$output = array(
@@ -149,17 +149,17 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	protected function createDeploy() {
-		if(!$this->record->canDeploy($this->getMember())) {
+		if (!$this->record->canDeploy($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
 
 		$reqBody = $this->getRequestBody();
 
-		if($reqBody === null) {
+		if ($reqBody === null) {
 			return $this->message('the request body did not contain a valid JSON object.', 400);
 		}
 
-		if(empty($reqBody['release'])) {
+		if (empty($reqBody['release'])) {
 			return $this->message('deploy requires a {"release": "sha1"} in the body of the request.', 400);
 		}
 
@@ -168,9 +168,9 @@ 
 		));
 		$deploy = $strategy->createDeployment();
 		$deploy->start();
-		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/deploy/'.$deploy->ID;
 		$output = array(
-			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
+			'message' => 'Deploy queued as job '.$deploy->ResqueToken,
 			'href' => $location,
 		);
 		$response = $this->getAPIResponse($output);
@@ -187,7 +187,7 @@ 
 	 */
 	protected function getDeploy($id) {
 		$deploy = DNDeployment::get()->byID($id);
-		if(!$deploy) {
+		if (!$deploy) {
 			return $this->message('Deploy not found', 404);
 		}
 		$output = array(