silverstripe / deploynaut

tests/DryRunPipelineTest.php

Doc Comments +1 added lines

@@ -125,6 +125,7 @@
 	/**
 	 * Make the dummy deployment step
 	 *
+	 * @param string $name
 	 * @return SmokeTestPipelineStep
 	 */
 	public function getDummySmokeTestStep($name) {

tests/PipelineTest.php

Doc Comments +13 added lines

@@ -36,14 +36,23 @@ 
 		PipelineTest_RecordingMessageSender::clear();
 	}
 
+	/**
+	 * @param string $message
+	 */
 	protected function assertHasLog($message) {
 		$this->assertTrue(PipelineTest_MockLog::has_message($message), "Assert log \"$message\"");
 	}
 
+	/**
+	 * @param string $message
+	 */
 	protected function assertNotLogged($message) {
 		$this->assertFalse(PipelineTest_MockLog::has_message($message), "Assert not logged \"$message\"");
 	}
 
+	/**
+	 * @param string $recipient
+	 */
 	public function assertSentMessage($message, $recipient) {
 		$this->assertTrue(
 			PipelineTest_RecordingMessageSender::has_message($message, $recipient),
@@ -51,6 +60,10 @@ 
 		);
 	}
 
+	/**
+	 * @param string $message
+	 * @param string $recipient
+	 */
 	public function assertNotSentMessage($message, $recipient) {
 		$this->assertFalse(
 			PipelineTest_RecordingMessageSender::has_message($message, $recipient),

Braces +9 added lines, -3 removed lines

@@ -102,7 +102,9 @@ 
 	 */
 	public static function has_message($test) {
 		foreach(self::$messages as $message) {
-			if(strpos($message, $test) !== false) return true;
+			if(strpos($message, $test) !== false) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -122,8 +124,12 @@ 
 
 	public static function has_message($test, $recipient = null) {
 		foreach(self::$messages as $message) {
-			if($message[1] !== $test) continue;
-			if($recipient && $message[0] === $recipient) return true;
+			if($message[1] !== $test) {
+				continue;
+			}
+			if($recipient && $message[0] === $recipient) {
+				return true;
+			}
 		}
 		return false;
 	}

tests/SimplePackageGeneratorTest.php

Doc Comments +1 added lines

@@ -58,6 +58,7 @@
 	/**
 	 * Create a simple temporary git repo at the given path, for component testing,
 	 * and return the SHA of the EHAD
+	 * @param string $path
 	 */
 	protected function createTempGitRepo($path) {
 		$CLI_path = escapeshellarg($path);

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 	public function setUp() {
 		// We muck with the filesystem, create one folder that contains all the stuff we create,
 		// and delete it entirely on tearDown()
-		$this->tempPath = TEMP_FOLDER . '/SimplePackageGeneratorTest-' . rand(1000000,9999999);
+		$this->tempPath = TEMP_FOLDER . '/SimplePackageGeneratorTest-' . rand(1000000, 9999999);
 		mkdir($this->tempPath);
 
 	}
@@ -25,8 +25,8 @@ 
 	 */
 	public function testGeneratePackage() {
 		// Build some precursor state for the test
-		$gitPath = $this->tempPath .'/git-repo';
-		$packagePath = $this->tempPath .'/test.tar.gz';
+		$gitPath = $this->tempPath . '/git-repo';
+		$packagePath = $this->tempPath . '/test.tar.gz';
 		$sha = $this->createTempGitRepo($gitPath);
 		$this->assertNotEmpty($sha);
 

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 	}
 	public function tearDown() {
-		if($this->tempPath) Filesystem::removeFolder($this->tempPath);
+		if($this->tempPath) {
+			Filesystem::removeFolder($this->tempPath);
+		}
 	}
 
 	/**

tests/SmokeTestPipelineStepTest.php

Doc Comments +1 added lines

@@ -7,6 +7,7 @@
 	/**
 	 * Make the dummy deployment step
 	 *
+	 * @param string $name
 	 * @return SmokeTestPipelineStep
 	 */
 	public function getDummySmokeTestStep($name) {

tests/AbstractPipelineTest.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 
 		// Confirm the correct abort link is generated
 		$this->assertEquals($pipeline->Link('abort'),
-			'naut/project/Project 1/environment/env1/pipeline/'.$pipeline->ID.'/abort');
+			'naut/project/Project 1/environment/env1/pipeline/' . $pipeline->ID . '/abort');
 	}
 
 	public function testCanCancelPipeline() {

tests/DNDataArchiveTest.php

Spacing +9 added lines, -9 removed lines

@@ -120,25 +120,25 @@ 
 
 	public function testValidateArchiveContentsAll() {
 		$archive = DNDataArchive::create();
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/all.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/all.sspak';
 		$result = $archive->validateArchiveContents('all');
 		$this->assertTrue($result->valid());
 	}
 
 	public function testValidateArchiveContentsDB() {
 		$archive = DNDataArchive::create();
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/all.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/all.sspak';
 		$result = $archive->validateArchiveContents('db');
 		$this->assertTrue($result->valid());
 
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/db.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/db.sspak';
 		$result = $archive->validateArchiveContents('db');
 		$this->assertTrue($result->valid());
 	}
 
 	public function testValidateArchiveContentsDBFails() {
 		$archive = DNDataArchive::create();
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/assets.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/assets.sspak';
 		$result = $archive->validateArchiveContents('db');
 		$this->assertFalse($result->valid());
 		$this->assertEquals('The snapshot is missing the database.', current($result->messageList()));
@@ -146,18 +146,18 @@ 
 
 	public function testValidateArchiveContentsAssets() {
 		$archive = DNDataArchive::create();
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/all.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/all.sspak';
 		$result = $archive->validateArchiveContents('assets');
 		$this->assertTrue($result->valid());
 
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/assets.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/assets.sspak';
 		$result = $archive->validateArchiveContents('assets');
 		$this->assertTrue($result->valid());
 	}
 
 	public function testValidateArchiveContentsAssetsFails() {
 		$archive = DNDataArchive::create();
-		$archive->ArchiveFile()->Filename = __DIR__.'/sspaks/db.sspak';
+		$archive->ArchiveFile()->Filename = __DIR__ . '/sspaks/db.sspak';
 		$result = $archive->validateArchiveContents('assets');
 		$this->assertFalse($result->valid());
 		$this->assertEquals('The snapshot is missing assets.', current($result->messageList()));
@@ -165,10 +165,10 @@ 
 
 	public function testValidateArchiveContentsFileMissingFails() {
 		$archive = DNDataArchive::create();
-		$filename = __DIR__.'/sspaks/not.found.sspak';
+		$filename = __DIR__ . '/sspaks/not.found.sspak';
 		$archive->ArchiveFile()->Filename = $filename;
 		$result = $archive->validateArchiveContents('all');
 		$this->assertFalse($result->valid());
-		$this->assertEquals('SSPak file "'.$filename.'" cannot be read.', current($result->messageList()));
+		$this->assertEquals('SSPak file "' . $filename . '" cannot be read.', current($result->messageList()));
 	}
 }

tests/DNProjectTest.php

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@ 
 	 */
 	public function testOnBeforeWriteShouldNotCreateCapFolder() {
 		$this->assertTrue(file_exists($this->envPath));
-		$this->assertFalse(file_exists($this->envPath.'/testproject'));
+		$this->assertFalse(file_exists($this->envPath . '/testproject'));
 		$this->project->onBeforeWrite();
-		$this->assertFalse(file_exists($this->envPath.'/testproject'), 'Folder should not have been created');
+		$this->assertFalse(file_exists($this->envPath . '/testproject'), 'Folder should not have been created');
 	}
 
 	public function testOnBeforeWriteShouldCreateCapFolder() {
 		$this->assertTrue(file_exists($this->envPath));
-		$this->assertFalse(file_exists($this->envPath.'/testproject'));
+		$this->assertFalse(file_exists($this->envPath . '/testproject'));
 		$this->project->CreateEnvFolder = true;
 		$this->project->onBeforeWrite();
-		$this->assertTrue(file_exists($this->envPath.'/testproject'), 'Folder should have been created');
+		$this->assertTrue(file_exists($this->envPath . '/testproject'), 'Folder should have been created');
 	}
 
 	public function testSetCreateProjectFolderFieldNoFolderExists() {
@@ -45,7 +45,7 @@ 
 
 	public function testSetCreateProjectFolderFieldFolderExists() {
 		$this->assertFalse(
-			file_exists($this->envPath.'/'.$this->project->Name),
+			file_exists($this->envPath . '/' . $this->project->Name),
 			'project folder shouldnt exist prior to save'
 		);
 		$this->project->CreateEnvFolder = true;

tests/DeploynautTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			'DNData' => array(
 				'properties' => array(
 					'EnvironmentDir' => $this->envPath,
-					'KeyDir' => TEMP_FOLDER .'/deploynaut_test/gitkeys',
+					'KeyDir' => TEMP_FOLDER . '/deploynaut_test/gitkeys',
 					'DataTransferDir' => Director::baseFolder() . '/assets/transfers',
 					'GitUser' => ''
 				)

tests/SizeRestrictedPackageCacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@
 	public function setUp() {
 		// We muck with the filesystem, create one folder that contains all the stuff we create,
 		// and delete it entirely on tearDown()
-		$this->tempPath = TEMP_FOLDER . '/PackageCacheTest-' . rand(1000000,9999999);
+		$this->tempPath = TEMP_FOLDER . '/PackageCacheTest-' . rand(1000000, 9999999);
 		mkdir($this->tempPath);
 
 		$this->cache = new SizeRestrictedPackageCache;
 		$this->cache->setCacheSize(3);
-		mkdir($this->tempPath .'/cache');
-		$this->cache->setBaseDir($this->tempPath .'/cache');
+		mkdir($this->tempPath . '/cache');
+		$this->cache->setBaseDir($this->tempPath . '/cache');
 
 		$this->gen = new PackageCacheTest_MockGenerator;
 		// To do: refactor so as not to be pipelinetest-specific (see also SimplePackageGeneratorTest)

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
 
 	}
 	public function tearDown() {
-		if($this->tempPath) Filesystem::removeFolder($this->tempPath);
+		if($this->tempPath) {
+			Filesystem::removeFolder($this->tempPath);
+		}
 	}