silverstripe / deploynaut

code/api/DeploynautAPI.php

Spacing +6 added lines, -6 removed lines

@@ -53,12 +53,12 @@ 
             'projects' => array(),
         );
 
-        if ($request->httpMethod() != 'GET') {
+        if($request->httpMethod() != 'GET') {
             return $this->message('API not found', 404);
         }
 
-        foreach (DNProject::get() as $item) {
-            if ($item->canView($this->getMember())) {
+        foreach(DNProject::get() as $item) {
+            if($item->canView($this->getMember())) {
                 $response['projects'][] = array(
                     "name" => $item->Name,
                     "href" => Director::absoluteURL($item->APILink("")),
@@ -78,7 +78,7 @@ 
     public function project(SS_HTTPRequest $request)
     {
         $project = $this->getProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
         return new APIProject($this, $project);
@@ -93,12 +93,12 @@ 
     public function environment(SS_HTTPRequest $request)
     {
         $project = $this->getProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $environment = $this->getEnvironment();
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
         return new APIEnvironment($this, $environment);

code/api/nouns/APIEnvironment.php

Spacing +12 added lines, -12 removed lines

@@ -17,10 +17,10 @@ 
      */
     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(
@@ -54,10 +54,10 @@ 
      */
     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':
@@ -73,10 +73,10 @@ 
      */
     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':
@@ -111,7 +111,7 @@ 
      */
     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();
@@ -138,7 +138,7 @@ 
     protected function getPing($ID)
     {
         $ping = DNPing::get()->byID($ID);
-        if (!$ping) {
+        if(!$ping) {
             return $this->message('Ping not found', 404);
         }
         $output = array(
@@ -154,17 +154,17 @@ 
      */
     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);
         }
 
@@ -191,7 +191,7 @@ 
     protected function getDeploy($id)
     {
         $deploy = DNDeployment::get()->byID($id);
-        if (!$deploy) {
+        if(!$deploy) {
             return $this->message('Deploy not found', 404);
         }
         $output = array(

code/api/nouns/APINoun.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,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 {
@@ -81,10 +81,10 @@ 
      */
     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;
@@ -95,10 +95,10 @@ 
      */
     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 +6 added lines, -6 removed lines

@@ -17,11 +17,11 @@ 
      */
     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,
@@ -31,7 +31,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)),
@@ -50,10 +50,10 @@ 
      */
     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':
@@ -70,7 +70,7 @@ 
     protected function getFetch($ID)
     {
         $ping = DNGitFetch::get()->byID($ID);
-        if (!$ping) {
+        if(!$ping) {
             return $this->message('Fetch not found', 404);
         }
         $output = array(

code/backends/CapistranoDeploymentBackend.php

Spacing +41 added lines, -41 removed lines

@@ -30,7 +30,7 @@ 
 
         $currentBuild = $environment->CurrentBuild();
         $currentSha = $currentBuild ? $currentBuild->SHA : '-';
-        if ($currentSha !== $options['sha']) {
+        if($currentSha !== $options['sha']) {
             $strategy->setChange('Code version', $currentSha, $options['sha']);
         }
         $strategy->setActionTitle('Confirm deployment');
@@ -71,53 +71,53 @@ 
 
         // Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
         // if build_filename isn't specified
-        if ($this->packageGenerator) {
+        if($this->packageGenerator) {
             $log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
 
             try {
                 $args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $log->write($e->getMessage());
                 throw $e;
             }
 
-            if (empty($args['build_filename'])) {
+            if(empty($args['build_filename'])) {
                 throw new RuntimeException('Failed to generate package.');
             }
         }
 
         $command = $this->getCommand('deploy', 'web', $environment, $args, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
 
         // Deployment cleanup. We assume it is always safe to run this at the end, regardless of the outcome.
         $self = $this;
-        $cleanupFn = function () use ($self, $environment, $args, $log) {
+        $cleanupFn = function() use ($self, $environment, $args, $log) {
             $command = $self->getCommand('deploy:cleanup', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
 
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('cleanupFailure', $environment, $sha, $log, $project);
                 $log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
             }
         };
 
         // 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);
         }
 
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $cleanupFn();
             $this->extend('deployFailure', $environment, $sha, $log, $project);
             throw new RuntimeException($command->getErrorOutput());
         }
 
         // Check if maintenance page should be removed
-        if (empty($options['leaveMaintenancePage'])) {
+        if(empty($options['leaveMaintenancePage'])) {
             $this->disableMaintenance($environment, $log, $project);
         }
 
@@ -135,10 +135,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $this->extend('maintenanceEnableFailure', $environment, $log);
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -152,10 +152,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $this->extend('maintenanceDisableFailure', $environment, $log);
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -168,7 +168,7 @@ 
     public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
     {
         $command = $this->getCommand('deploy:check', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
             echo $buffer;
         });
@@ -179,7 +179,7 @@ 
      */
     public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
     {
-        if ($dataTransfer->Direction == 'get') {
+        if($dataTransfer->Direction == 'get') {
             $this->dataTransferBackup($dataTransfer, $log);
         } else {
             $environment = $dataTransfer->Environment();
@@ -190,14 +190,14 @@ 
             // extract the sspak contents, we'll need these so capistrano can restore that content
             try {
                 $archive->extractArchive($workingDir);
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $log->write($e->getMessage());
                 throw new RuntimeException($e->getMessage());
             }
 
             // validate the contents match the requested transfer mode
             $result = $archive->validateArchiveContents($dataTransfer->Mode);
-            if (!$result->valid()) {
+            if(!$result->valid()) {
                 // do some cleaning, get rid of the extracted archive lying around
                 $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
                 $process->run();
@@ -227,7 +227,7 @@ 
         $name = $environment->getFullName();
         $env = $environment->Project()->getProcessEnv();
 
-        if (!$args) {
+        if(!$args) {
             $args = array();
         }
         $args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
@@ -235,9 +235,9 @@ 
         // Inject env string directly into the command.
         // Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
         $envString = '';
-        if (!empty($env)) {
+        if(!empty($env)) {
             $envString .= 'env ';
-            foreach ($env as $key => $value) {
+            foreach($env as $key => $value) {
                 $envString .= "$key=\"$value\" ";
             }
         }
@@ -251,7 +251,7 @@ 
             $capTemplate
         );
 
-        if (defined('DEPLOYNAUT_CAPFILE')) {
+        if(defined('DEPLOYNAUT_CAPFILE')) {
             $capFile = DEPLOYNAUT_CAPFILE;
         } else {
             $capFile = ASSETS_PATH . '/Capfile';
@@ -259,7 +259,7 @@ 
         file_put_contents($capFile, $cap);
 
         $command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
-        foreach ($args as $argName => $argVal) {
+        foreach($args as $argName => $argVal) {
             $command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
         }
 
@@ -298,13 +298,13 @@ 
         $databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
 
         // Backup database
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'db'))) {
             $log->write(sprintf('Backup of database from "%s" started', $name));
             $command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('dataTransferFailure', $environment, $log);
                 throw new RuntimeException($command->getErrorOutput());
             }
@@ -312,13 +312,13 @@ 
         }
 
         // Backup assets
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
             $log->write(sprintf('Backup of assets from "%s" started', $name));
             $command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('dataTransferFailure', $environment, $log);
                 throw new RuntimeException($command->getErrorOutput());
             }
@@ -331,7 +331,7 @@ 
         try {
             $dataArchive->attachFile($sspakFilepath, $dataTransfer);
             $dataArchive->setArchiveFromFiles($filepathBase);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $log->write($e->getMessage());
             throw new RuntimeException($e->getMessage());
         }
@@ -341,7 +341,7 @@ 
         // e.g. when just an assets backup has been requested and no database.sql exists.
         $process = new Process(sprintf('rm -rf %s/assets && rm -f %s', $filepathBase, $databasePath));
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             $log->write('Could not delete temporary files');
             throw new RuntimeException($process->getErrorOutput());
         }
@@ -358,10 +358,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -383,7 +383,7 @@ 
 
         // Rollback cleanup.
         $self = $this;
-        $cleanupFn = function () use ($self, $workingDir, $environment, $log) {
+        $cleanupFn = function() use ($self, $workingDir, $environment, $log) {
             // Rebuild makes sense even if failed - maybe we can at least partly recover.
             $self->rebuild($environment, $log);
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -391,14 +391,14 @@ 
         };
 
         // Restore database into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'db'))) {
             $log->write(sprintf('Restore of database to "%s" started', $name));
             $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
             $command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $cleanupFn();
                 $log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
                 $this->extend('dataTransferFailure', $environment, $log);
@@ -408,14 +408,14 @@ 
         }
 
         // Restore assets into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
             $log->write(sprintf('Restore of assets to "%s" started', $name));
             $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
             $command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $cleanupFn();
                 $log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
                 $this->extend('dataTransferFailure', $environment, $log);

code/backends/DemoDeploymentBackend.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,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/backends/DeploymentStrategy.php

Spacing +9 added lines, -9 removed lines

@@ -141,10 +141,10 @@ 
     public function getChangesModificationNeeded()
     {
         $filtered = [];
-        foreach ($this->changes as $change => $details) {
-            if (array_key_exists('description', $details)) {
+        foreach($this->changes as $change => $details) {
+            if(array_key_exists('description', $details)) {
                 $filtered[$change] = $details;
-            } elseif (
+            } elseif(
                 (array_key_exists('from', $details) || array_key_exists('to', $details))
                 && $details['from'] !== $details['to']
             ) {
@@ -177,7 +177,7 @@ 
     public function getChange($key)
     {
         $changes = $this->getChanges();
-        if (array_key_exists($key, $changes)) {
+        if(array_key_exists($key, $changes)) {
             return new ArrayData($changes[$key]);
         }
         return null;
@@ -198,7 +198,7 @@ 
      */
     public function getOption($option)
     {
-        if (!empty($this->options[$option])) {
+        if(!empty($this->options[$option])) {
             return $this->options[$option];
         }
     }
@@ -243,7 +243,7 @@ 
             DeploymentStrategy::WARNING_CODE => 1,
             DeploymentStrategy::ERROR_CODE => 2
         ];
-        if ($map[$current] < $map[$code]) {
+        if($map[$current] < $map[$code]) {
             $this->setValidationCode($code);
         }
     }
@@ -274,7 +274,7 @@ 
         );
 
         $output = array();
-        foreach ($fields as $field) {
+        foreach($fields as $field) {
             $output[$field] = $this->$field;
         }
         return $output;
@@ -318,8 +318,8 @@ 
             'messages'
         );
 
-        foreach ($fields as $field) {
-            if (!empty($data[$field])) {
+        foreach($fields as $field) {
+            if(!empty($data[$field])) {
                 $this->$field = $data[$field];
             }
         }

code/backends/PackageGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -54,14 +54,14 @@
     public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log)
     {
         // Fetch through the cache
-        if ($this->cache) {
+        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)) {
+            if($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
                 return $filename;
             }
         }

code/backends/SimplePackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
     public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log)
     {
         $tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-        if (!file_exists($tempPath)) {
+        if(!file_exists($tempPath)) {
             mkdir($tempPath);
         }
 
@@ -65,7 +65,7 @@ 
 
         try {
             $this->executeProcesses($processes, $log);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             // Execute cleanup on failure
             $this->executeProcesses($cleanup, $log);
             throw $e;
@@ -84,8 +84,8 @@ 
      */
     protected function executeProcesses($processes, DeploynautLogFile $log)
     {
-        foreach ($processes as $process) {
-            $process->mustRun(function ($type, $buffer) use ($log) {
+        foreach($processes as $process) {
+            $process->mustRun(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
         }