silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Doc Comments +2 added lines

@@ -79,6 +79,7 @@ 
     }
 
     /**
+     * @param string $code
      */
     public function setActionCode($code)
     {
@@ -95,6 +96,7 @@ 
 
     /**
      * @param int
+     * @param string $seconds
      */
     public function setEstimatedTime($seconds)
     {

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/control/DNRoot.php

Doc Comments +2 added lines, -2 removed lines

@@ -997,7 +997,7 @@ 
      * @param array $data
      * @param Form $form
      *
-     * @return bool|HTMLText|SS_HTTPResponse
+     * @return SS_HTTPResponse|null
      */
     public function doCreateEnvironment($data, Form $form)
     {
@@ -2430,7 +2430,7 @@ 
     /**
      * Create project action.
      *
-     * @return SS_HTTPResponse
+     * @return HTMLText
      */
     public function createproject(SS_HTTPRequest $request)
     {

Spacing +193 added lines, -193 removed lines

@@ -191,8 +191,8 @@ 
         Requirements::javascript('deploynaut/javascript/material.js');
 
         // Load the buildable dependencies only if not loaded centrally.
-        if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
-            if (\Director::isDev()) {
+        if(!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+            if(\Director::isDev()) {
                 \Requirements::javascript('deploynaut/static/bundle-debug.js');
             } else {
                 \Requirements::javascript('deploynaut/static/bundle.js');
@@ -211,13 +211,13 @@ 
      */
     public static function FlagSnapshotsEnabled()
     {
-        if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
+        if(defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
             return true;
         }
-        if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
+        if(defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
             $allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
             $member = Member::currentUser();
-            if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
+            if($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
                 return true;
             }
         }
@@ -230,7 +230,7 @@ 
     public static function get_support_links()
     {
         $supportLinks = self::config()->support_links;
-        if ($supportLinks) {
+        if($supportLinks) {
             return new ArrayList($supportLinks);
         }
     }
@@ -254,7 +254,7 @@ 
     {
         parent::init();
 
-        if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
+        if(!Member::currentUser() && !Session::get('AutoLoginHash')) {
             return Security::permissionFailure();
         }
 
@@ -341,11 +341,11 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canBackup()) {
+        if(!$project->canBackup()) {
             return new SS_HTTPResponse("Not allowed to create snapshots on any environments", 401);
         }
 
@@ -368,11 +368,11 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
@@ -405,22 +405,22 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         // Framing an environment as a "group of people with download access"
         // makes more sense to the user here, while still allowing us to enforce
         // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canUploadArchive();
         });
         $envsMap = array();
-        foreach ($envs as $env) {
+        foreach($envs as $env) {
             $envsMap[$env->ID] = $env->Name;
         }
 
@@ -465,18 +465,18 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $validEnvs = $project->DNEnvironmentList()
-            ->filterByCallback(function ($item) {
+            ->filterByCallback(function($item) {
                 return $item->canUploadArchive();
             });
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -501,7 +501,7 @@ 
         $dataArchive->write();
         $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
 
-        $cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+        $cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
             $process->run();
             $dataTransfer->delete();
@@ -511,7 +511,7 @@ 
         // extract the sspak contents so we can inspect them
         try {
             $dataArchive->extractArchive($workingDir);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $cleanupFn();
             $form->sessionMessage(
                 'There was a problem trying to open your snapshot for processing. Please try uploading again',
@@ -522,7 +522,7 @@ 
 
         // validate that the sspak contents match the declared contents
         $result = $dataArchive->validateArchiveContents();
-        if (!$result->valid()) {
+        if(!$result->valid()) {
             $cleanupFn();
             $form->sessionMessage($result->message(), 'bad');
             return $this->redirectBack();
@@ -532,7 +532,7 @@ 
         try {
             $dataArchive->fixArchivePermissions($workingDir);
             $dataArchive->setArchiveFromFiles($workingDir);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $cleanupFn();
             $form->sessionMessage(
                 'There was a problem processing your snapshot. Please try uploading again',
@@ -563,22 +563,22 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         // Framing an environment as a "group of people with download access"
         // makes more sense to the user here, while still allowing us to enforce
         // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canUploadArchive();
         });
         $envsMap = array();
-        foreach ($envs as $env) {
+        foreach($envs as $env) {
             $envsMap[$env->ID] = $env->Name;
         }
 
@@ -616,17 +616,17 @@ 
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        $validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
                 return $item->canUploadArchive();
         });
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -666,20 +666,20 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             return new SS_HTTPResponse("Archive not found.", 404);
         }
 
-        if (!$dataArchive->canRestore()) {
+        if(!$dataArchive->canRestore()) {
             throw new SS_HTTPResponse_Exception('Not allowed to restore archive', 403);
         }
 
@@ -710,19 +710,19 @@ 
     public function toggleprojectstar(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return $this->project404Response();
         }
         $favProject = $member->StarredProjects()
             ->filter('DNProjectID', $project->ID)
             ->first();
 
-        if ($favProject) {
+        if($favProject) {
             $member->StarredProjects()->remove($favProject);
         } else {
             $member->StarredProjects()->add($project);
@@ -737,13 +737,13 @@ 
     public function branch(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $branchName = $request->getVar('name');
         $branch = $project->DNBranchList()->byName($branchName);
-        if (!$branch) {
+        if(!$branch) {
             return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
         }
 
@@ -760,13 +760,13 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
@@ -816,17 +816,17 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
-        if (!$environment->DryRunEnabled && $isDryRun) {
+        if(!$environment->DryRunEnabled && $isDryRun) {
             return new SS_HTTPResponse("Dry-run for pipelines is not enabled for this environment", 404);
         }
 
@@ -838,7 +838,7 @@ 
         $pipeline->AuthorID = Member::currentUserID();
         $pipeline->SHA = $sha->FullName();
         // Record build at time of execution
-        if ($currentBuild = $environment->CurrentBuild()) {
+        if($currentBuild = $environment->CurrentBuild()) {
             $pipeline->PreviousDeploymentID = $currentBuild->ID;
         }
         $pipeline->start(); // start() will call write(), so no need to do it here as well.
@@ -856,20 +856,20 @@ 
         $params = $request->params();
         $pipeline = Pipeline::get()->byID($params['Identifier']);
 
-        if (!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
+        if(!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
             throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
         }
-        if (!$pipeline->Environment()->canView()) {
+        if(!$pipeline->Environment()->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $pipeline->Environment();
         $project = $pipeline->Environment()->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this pipeline");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this pipeline");
         }
 
@@ -886,22 +886,22 @@ 
     public function createenv(SS_HTTPRequest $request)
     {
         $params = $request->params();
-        if ($params['Identifier']) {
+        if($params['Identifier']) {
             $record = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-            if (!$record || !$record->ID) {
+            if(!$record || !$record->ID) {
                 throw new SS_HTTPResponse_Exception('Create environment not found', 404);
             }
-            if (!$record->canView()) {
+            if(!$record->canView()) {
                 return Security::permissionFailure();
             }
 
             $project = $this->getCurrentProject();
-            if (!$project) {
+            if(!$project) {
                 return $this->project404Response();
             }
 
-            if ($project->Name != $params['Project']) {
+            if($project->Name != $params['Project']) {
                 throw new LogicException("Project in URL doesn't match this creation");
             }
 
@@ -920,21 +920,21 @@ 
         $params = $request->params();
         $env = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-        if (!$env || !$env->ID) {
+        if(!$env || !$env->ID) {
             throw new SS_HTTPResponse_Exception('Log not found', 404);
         }
-        if (!$env->canView()) {
+        if(!$env->canView()) {
             return Security::permissionFailure();
         }
 
         $project = $env->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $env->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -952,27 +952,27 @@ 
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $envType = $project->AllowedEnvironmentType;
-        if (!$envType || !class_exists($envType)) {
+        if(!$envType || !class_exists($envType)) {
             return null;
         }
 
         $backend = Injector::inst()->get($envType);
-        if (!($backend instanceof EnvironmentCreateBackend)) {
+        if(!($backend instanceof EnvironmentCreateBackend)) {
             // Only allow this for supported backends.
             return null;
         }
 
         $fields = $backend->getCreateEnvironmentFields($project);
-        if (!$fields) {
+        if(!$fields) {
             return null;
         }
 
-        if (!$project->canCreateEnvironments()) {
+        if(!$project->canCreateEnvironments()) {
             return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
         }
 
@@ -1004,11 +1004,11 @@ 
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canCreateEnvironments()) {
+        if(!$project->canCreateEnvironments()) {
             return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
         }
 
@@ -1034,13 +1034,13 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
@@ -1065,11 +1065,11 @@ 
     public function DNProjectList()
     {
         $memberId = Member::currentUserID();
-        if (!$memberId) {
+        if(!$memberId) {
             return new ArrayList();
         }
 
-        if (Permission::check('ADMIN')) {
+        if(Permission::check('ADMIN')) {
             return DNProject::get();
         }
 
@@ -1084,7 +1084,7 @@ 
     public function getPlatformSpecificStrings()
     {
         $strings = $this->config()->platform_specific_strings;
-        if ($strings) {
+        if($strings) {
             return new ArrayList($strings);
         }
     }
@@ -1097,15 +1097,15 @@ 
     public function getStarredProjects()
     {
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return new ArrayList();
         }
 
         $favProjects = $member->StarredProjects();
 
         $list = new ArrayList();
-        foreach ($favProjects as $project) {
-            if ($project->canView($member)) {
+        foreach($favProjects as $project) {
+            if($project->canView($member)) {
                 $list->add($project);
             }
         }
@@ -1126,24 +1126,24 @@ 
         $currentProject = $this->getCurrentProject();
 
         $projects = $this->getStarredProjects();
-        if ($projects->count() < 1) {
+        if($projects->count() < 1) {
             $projects = $this->DNProjectList();
         } else {
             $limit = -1;
         }
 
-        if ($projects->count() > 0) {
+        if($projects->count() > 0) {
             $activeProject = false;
 
-            if ($limit > 0) {
+            if($limit > 0) {
                 $limitedProjects = $projects->limit($limit);
             } else {
                 $limitedProjects = $projects;
             }
 
-            foreach ($limitedProjects as $project) {
+            foreach($limitedProjects as $project) {
                 $isActive = $currentProject && $currentProject->ID == $project->ID;
-                if ($isActive) {
+                if($isActive) {
                     $activeProject = true;
                 }
 
@@ -1154,12 +1154,12 @@ 
             }
 
             // Ensure the current project is in the list
-            if (!$activeProject && $currentProject) {
+            if(!$activeProject && $currentProject) {
                 $navigation->unshift(array(
                     'Project' => $currentProject,
                     'IsActive' => true,
                 ));
-                if ($limit > 0 && $navigation->count() > $limit) {
+                if($limit > 0 && $navigation->count() > $limit) {
                     $navigation->pop();
                 }
             }
@@ -1178,17 +1178,17 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
-        if (!$environment->canDeploy()) {
+        if(!$environment->canDeploy()) {
             return new SS_HTTPResponse("Not allowed to deploy", 401);
         }
 
@@ -1196,7 +1196,7 @@ 
         $form = new DeployForm($this, 'DeployForm', $environment, $project);
 
         // If this is an ajax request we don't want to submit the form - we just want to retrieve the markup.
-        if (
+        if(
             $request &&
             !$request->requestVar('action_showDeploySummary') &&
             $this->getRequest()->isAjax() &&
@@ -1225,19 +1225,19 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
         // For now only permit advanced options on one environment type, because we hacked the "full-deploy"
         // checkbox in. Other environments such as the fast or capistrano one wouldn't know what to do with it.
-        if (get_class($env) === 'RainforestEnvironment') {
+        if(get_class($env) === 'RainforestEnvironment') {
             $advanced = Permission::check('DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS') ? 'true' : 'false';
         } else {
             $advanced = 'false';
@@ -1254,7 +1254,7 @@ 
             'field_data' => array(),
             'advanced_opts' => $advanced
         );
-        foreach ($project->DNBranchList() as $branch) {
+        foreach($project->DNBranchList() as $branch) {
             $sha = $branch->SHA();
             $name = $branch->Name();
             $branchValue = sprintf("%s (%s, %s old)",
@@ -1279,7 +1279,7 @@ 
             'advanced_opts' => $advanced
         );
 
-        foreach ($project->DNTagList()->setLimit(null) as $tag) {
+        foreach($project->DNTagList()->setLimit(null) as $tag) {
             $name = $tag->Name();
             $data['field_data'][] = array(
                 'id' => $tag->SHA(),
@@ -1305,15 +1305,15 @@ 
         // We are aiming at the format:
         // [{text: 'optgroup text', children: [{id: '<sha>', text: '<inner text>'}]}]
         $redeploy = array();
-        foreach ($project->DNEnvironmentList() as $dnEnvironment) {
+        foreach($project->DNEnvironmentList() as $dnEnvironment) {
             $envName = $dnEnvironment->Name;
             $perEnvDeploys = array();
 
-            foreach ($dnEnvironment->DeployHistory() as $deploy) {
+            foreach($dnEnvironment->DeployHistory() as $deploy) {
                 $sha = $deploy->SHA;
 
                 // Check if exists to make sure the newest deployment date is used.
-                if (!isset($perEnvDeploys[$sha])) {
+                if(!isset($perEnvDeploys[$sha])) {
                     $pastValue = sprintf("%s (deployed %s)",
                         substr($sha, 0, 8),
                         $deploy->obj('LastEdited')->Ago()
@@ -1325,12 +1325,12 @@ 
                 }
             }
 
-            if (!empty($perEnvDeploys)) {
+            if(!empty($perEnvDeploys)) {
                 $redeploy[$envName] = array_values($perEnvDeploys);
             }
         }
         // Convert the array to the frontend format (i.e. keyed to regular array)
-        foreach ($redeploy as $env => $descr) {
+        foreach($redeploy as $env => $descr) {
             $data['field_data'][] = array('text'=>$env, 'children'=>$descr);
         }
         $tabs[] = $data;
@@ -1352,7 +1352,7 @@ 
             ->filter('ProjectID', $project->ID)
             ->sort('LastEdited', 'DESC')
             ->first();
-        if ($fetch) {
+        if($fetch) {
             $lastFetched = $fetch->dbObject('LastEdited')->Ago();
         }
 
@@ -1378,7 +1378,7 @@ 
 
         // Ensure the submitted token has a value
         $submittedToken = $request->postVar('SecurityID');
-        if (!$submittedToken) {
+        if(!$submittedToken) {
             return false;
         }
 
@@ -1386,7 +1386,7 @@ 
         $check = $token->check($submittedToken);
 
         // Reset the token after we've checked the existing token
-        if ($resetToken) {
+        if($resetToken) {
             $token->reset();
         }
 
@@ -1404,13 +1404,13 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
@@ -1424,7 +1424,7 @@ 
         // Add in a URL for comparing from->to code changes. Ensure that we have
         // two proper 40 character SHAs, otherwise we can't show the compare link.
         $interface = $project->getRepositoryInterface();
-        if (
+        if(
             !empty($interface) && !empty($interface->URL)
             && !empty($data['changes']['Code version']['from'])
             && strlen($data['changes']['Code version']['from']) == '40'
@@ -1462,20 +1462,20 @@ 
     {
 
         // Ensure the CSRF Token is correct
-        if (!$this->checkCsrfToken($request)) {
+        if(!$this->checkCsrfToken($request)) {
             // CSRF token didn't match
             return $this->httpError(400, 'Bad Request');
         }
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
@@ -1507,20 +1507,20 @@ 
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
-        if (!$deployment || !$deployment->ID) {
+        if(!$deployment || !$deployment->ID) {
             throw new SS_HTTPResponse_Exception('Deployment not found', 404);
         }
-        if (!$deployment->canView()) {
+        if(!$deployment->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $deployment->Environment();
         $project = $environment->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this deploy");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
@@ -1543,25 +1543,25 @@ 
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
-        if (!$deployment || !$deployment->ID) {
+        if(!$deployment || !$deployment->ID) {
             throw new SS_HTTPResponse_Exception('Deployment not found', 404);
         }
-        if (!$deployment->canView()) {
+        if(!$deployment->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $deployment->Environment();
         $project = $environment->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this deploy");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $deployment->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -1578,11 +1578,11 @@ 
     public function getDataTransferForm(SS_HTTPRequest $request = null)
     {
         // Performs canView permission check by limiting visible projects
-        $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canBackup();
         });
 
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
@@ -1618,21 +1618,21 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $dataArchive = null;
 
         // Validate direction.
-        if ($data['Direction'] == 'get') {
+        if($data['Direction'] == 'get') {
             $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
+                ->filterByCallback(function($item) {
                     return $item->canBackup();
                 });
-        } elseif ($data['Direction'] == 'push') {
+        } elseif($data['Direction'] == 'push') {
             $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
+                ->filterByCallback(function($item) {
                     return $item->canRestore();
                 });
         } else {
@@ -1641,7 +1641,7 @@ 
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -1649,17 +1649,17 @@ 
 
 
         // Only 'push' direction is allowed an association with an existing archive.
-        if (
+        if(
             $data['Direction'] == 'push'
             && isset($data['DataArchiveID'])
             && is_numeric($data['DataArchiveID'])
         ) {
             $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-            if (!$dataArchive) {
+            if(!$dataArchive) {
                 throw new LogicException('Invalid data archive');
             }
 
-            if (!$dataArchive->canDownload()) {
+            if(!$dataArchive->canDownload()) {
                 throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
             }
         }
@@ -1669,7 +1669,7 @@ 
         $transfer->Direction = $data['Direction'];
         $transfer->Mode = $data['Mode'];
         $transfer->DataArchiveID = $dataArchive ? $dataArchive->ID : null;
-        if ($data['Direction'] == 'push') {
+        if($data['Direction'] == 'push') {
             $transfer->setBackupBeforePush(!empty($data['BackupBeforePush']));
         }
         $transfer->write();
@@ -1693,17 +1693,17 @@ 
         $params = $request->params();
         $transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-        if (!$transfer || !$transfer->ID) {
+        if(!$transfer || !$transfer->ID) {
             throw new SS_HTTPResponse_Exception('Transfer not found', 404);
         }
-        if (!$transfer->canView()) {
+        if(!$transfer->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $transfer->Environment();
         $project = $environment->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
@@ -1728,22 +1728,22 @@ 
         $params = $request->params();
         $transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-        if (!$transfer || !$transfer->ID) {
+        if(!$transfer || !$transfer->ID) {
             throw new SS_HTTPResponse_Exception('Transfer not found', 404);
         }
-        if (!$transfer->canView()) {
+        if(!$transfer->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $transfer->Environment();
         $project = $environment->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $transfer->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -1767,22 +1767,22 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canRestore();
         });
 
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
         $modesMap = array();
-        if (in_array($dataArchive->Mode, array('all'))) {
+        if(in_array($dataArchive->Mode, array('all'))) {
             $modesMap['all'] = 'Database and Assets';
         };
-        if (in_array($dataArchive->Mode, array('all', 'db'))) {
+        if(in_array($dataArchive->Mode, array('all', 'db'))) {
             $modesMap['db'] = 'Database only';
         };
-        if (in_array($dataArchive->Mode, array('all', 'assets'))) {
+        if(in_array($dataArchive->Mode, array('all', 'assets'))) {
             $modesMap['assets'] = 'Assets only';
         };
 
@@ -1828,13 +1828,13 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
         // We check for canDownload because that implies access to the data.
         // canRestore is later checked on the actual restore action per environment.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
@@ -1861,11 +1861,11 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
-        if (!$dataArchive->canDelete()) {
+        if(!$dataArchive->canDelete()) {
             throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
         }
 
@@ -1887,7 +1887,7 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
@@ -1925,24 +1925,24 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $dataArchive = null;
 
-        if (
+        if(
             isset($data['DataArchiveID'])
             && is_numeric($data['DataArchiveID'])
         ) {
             $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
         }
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new LogicException('Invalid data archive');
         }
 
-        if (!$dataArchive->canDelete()) {
+        if(!$dataArchive->canDelete()) {
             throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
         }
 
@@ -1966,12 +1966,12 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
         // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
@@ -1994,7 +1994,7 @@ 
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         $envs = $dataArchive->validTargetEnvironments();
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
@@ -2036,25 +2036,25 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new LogicException('Invalid data archive');
         }
 
         // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $validEnvs = $dataArchive->validTargetEnvironments();
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -2073,7 +2073,7 @@ 
     {
         try {
             Resque::queues();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return $e->getMessage();
         }
         return '';
@@ -2140,10 +2140,10 @@ 
     public function getCurrentProject()
     {
         $projectName = trim($this->getRequest()->param('Project'));
-        if (!$projectName) {
+        if(!$projectName) {
             return null;
         }
-        if (empty(self::$_project_cache[$projectName])) {
+        if(empty(self::$_project_cache[$projectName])) {
             self::$_project_cache[$projectName] = $this->DNProjectList()->filter('Name', $projectName)->First();
         }
         return self::$_project_cache[$projectName];
@@ -2155,14 +2155,14 @@ 
      */
     public function getCurrentEnvironment(DNProject $project = null)
     {
-        if ($this->getRequest()->param('Environment') === null) {
+        if($this->getRequest()->param('Environment') === null) {
             return null;
         }
-        if ($project === null) {
+        if($project === null) {
             $project = $this->getCurrentProject();
         }
         // project can still be null
-        if ($project === null) {
+        if($project === null) {
             return null;
         }
         return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->param('Environment'))->First();
@@ -2204,23 +2204,23 @@ 
      */
     public function CanViewArchives(Member $member = null)
     {
-        if ($member === null) {
+        if($member === null) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         $allProjects = $this->DNProjectList();
-        if (!$allProjects) {
+        if(!$allProjects) {
             return false;
         }
 
-        foreach ($allProjects as $project) {
-            if ($project->Environments()) {
-                foreach ($project->Environments() as $environment) {
-                    if (
+        foreach($allProjects as $project) {
+            if($project->Environments()) {
+                foreach($project->Environments() as $environment) {
+                    if(
                         $environment->canRestore($member) ||
                         $environment->canBackup($member) ||
                         $environment->canUploadArchive($member) ||
@@ -2242,7 +2242,7 @@ 
     public function CreateEnvironmentList()
     {
         $project = $this->getCurrentProject();
-        if ($project) {
+        if($project) {
             return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
         }
         return new PaginatedList(new ArrayList(), $this->request);
@@ -2259,9 +2259,9 @@ 
         $archives = new ArrayList();
 
         $archiveList = $project->Environments()->relation("DataArchives");
-        if ($archiveList->count() > 0) {
-            foreach ($archiveList as $archive) {
-                if ($archive->canView() && !$archive->isPending()) {
+        if($archiveList->count() > 0) {
+            foreach($archiveList as $archive) {
+                if($archive->canView() && !$archive->isPending()) {
                     $archives->push($archive);
                 }
             }
@@ -2277,9 +2277,9 @@ 
     {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
-        foreach ($project->DNEnvironmentList() as $env) {
-            foreach ($env->DataArchives() as $archive) {
-                if ($archive->canView() && $archive->isPending()) {
+        foreach($project->DNEnvironmentList() as $env) {
+            foreach($env->DataArchives() as $archive) {
+                if($archive->canView() && $archive->isPending()) {
                     $archives->push($archive);
                 }
             }
@@ -2294,7 +2294,7 @@ 
     {
         $project = $this->getCurrentProject();
 
-        $transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
+        $transfers = DNDataTransfer::get()->filterByCallback(function($record) use ($project) {
             return
                 $record->Environment()->Project()->ID == $project->ID && // Ensure only the current Project is shown
                 (
@@ -2313,9 +2313,9 @@ 
      */
     public function DeployHistory()
     {
-        if ($env = $this->getCurrentEnvironment()) {
+        if($env = $this->getCurrentEnvironment()) {
             $history = $env->DeployHistory();
-            if ($history->count() > 0) {
+            if($history->count() > 0) {
                 $pagination = new PaginatedList($history, $this->getRequest());
                 $pagination->setPageLength(8);
                 return $pagination;
@@ -2358,7 +2358,7 @@ 
         $sendJSON = (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false)
             || $this->getRequest()->getExtension() == 'json';
 
-        if (!$sendJSON) {
+        if(!$sendJSON) {
             $this->response->addHeader("Content-type", "text/plain");
             return $content;
         }
@@ -2376,7 +2376,7 @@ 
      */
     protected function validateSnapshotMode($mode)
     {
-        if (!in_array($mode, array('all', 'assets', 'db'))) {
+        if(!in_array($mode, array('all', 'assets', 'db'))) {
             throw new LogicException('Invalid mode');
         }
     }
@@ -2391,12 +2391,12 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
         $data[$sectionName] = 1;
 
-        if ($this !== '') {
+        if($this !== '') {
             $data['Title'] = $title;
         }
 
@@ -2412,7 +2412,7 @@ 
     {
         $list = new ArrayList();
 
-        if (Member::currentUserID()) {
+        if(Member::currentUserID()) {
             $list->push(new ArrayData(array(
                 'Classes' => 'logout',
                 'FaIcon' => 'sign-out',
@@ -2434,7 +2434,7 @@ 
      */
     public function createproject(SS_HTTPRequest $request)
     {
-        if ($this->canCreateProjects()) {
+        if($this->canCreateProjects()) {
             return $this->render(['CurrentTitle' => 'Create Stack']);
         }
         return $this->httpError(403);
@@ -2447,10 +2447,10 @@ 
      */
     public function canCreateProjects($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
@@ -2515,11 +2515,11 @@ 
         $form->saveInto($project);
         $this->extend('onBeforeCreateProject', $project, $data, $form);
         try {
-            if ($project->write() > 0) {
+            if($project->write() > 0) {
                 $this->extend('onAfterCreateProject', $project, $data, $form);
 
                 // If an extension hasn't redirected us, we'll redirect to the project.
-                if (!$this->redirectedTo()) {
+                if(!$this->redirectedTo()) {
                     return $this->redirect($project->Link());
                 } else {
                     return $this->response;
@@ -2527,7 +2527,7 @@ 
             } else {
                 $form->sessionMessage('Unable to write the stack to the database.', 'bad');
             }
-        } catch (ValidationException $e) {
+        } catch(ValidationException $e) {
             $form->sessionMessage($e->getMessage(), 'bad');
         }
         return $this->redirectBack();
@@ -2543,7 +2543,7 @@ 
     public function createprojectprogress(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->httpError(404);
         }
 
@@ -2551,13 +2551,13 @@ 
         $complete = array();
         $inProgress = array();
         $failed = array();
-        if ($envCreations->count() > 0) {
-            foreach ($envCreations as $env) {
+        if($envCreations->count() > 0) {
+            foreach($envCreations as $env) {
                 $data = unserialize($env->Data);
-                if (!isset($data['Name'])) {
+                if(!isset($data['Name'])) {
                     $data['Name'] = 'Unknown';
                 }
-                switch ($env->ResqueStatus()) {
+                switch($env->ResqueStatus()) {
                     case "Queued":
                     case "Running":
                         $inProgress[$env->ID] = Convert::raw2xml($env->ResqueStatus());
@@ -2594,17 +2594,17 @@ 
     public function checkrepoaccess(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->httpError(404);
         }
 
-        if ($project->CVSPath) {
+        if($project->CVSPath) {
             $fetch = new FetchJob();
             $fetch->args = array('projectID' => $project->ID);
             try {
                 $fetch->perform();
                 $canAccessRepo = true;
-            } catch (RuntimeException $e) {
+            } catch(RuntimeException $e) {
                 $canAccessRepo = false;
             }
             $data = ['canAccessRepo' => $canAccessRepo];

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/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;
             }
         }