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);

Braces +9 added lines, -18 removed lines

@@ -13,8 +13,7 @@ 
  * DeploynautAPI > APIProject > APIEnvironment
  *
  */
-class DeploynautAPI extends APINoun
-{
+class DeploynautAPI extends APINoun {
 
     /**
      * Default URL handlers - (Action)/(ID)//(OtherID)
@@ -46,8 +45,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function listProjects(SS_HTTPRequest $request)
-    {
+    public function listProjects(SS_HTTPRequest $request) {
         $response = array(
             'href' => Director::absoluteURL($this->Link()),
             'projects' => array(),
@@ -75,8 +73,7 @@ 
      * @param SS_HTTPRequest $request
      * @return APIProject
      */
-    public function project(SS_HTTPRequest $request)
-    {
+    public function project(SS_HTTPRequest $request) {
         $project = $this->getProject();
         if (!$project) {
             return $this->project404Response();
@@ -90,8 +87,7 @@ 
      * @param SS_HTTPRequest $request
      * @return APIEnvironment
      */
-    public function environment(SS_HTTPRequest $request)
-    {
+    public function environment(SS_HTTPRequest $request) {
         $project = $this->getProject();
         if (!$project) {
             return $this->project404Response();
@@ -107,8 +103,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function project404Response()
-    {
+    protected function project404Response() {
         $projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
         return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
     }
@@ -116,8 +111,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function environment404Response()
-    {
+    protected function environment404Response() {
         $envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
         return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
     }
@@ -127,8 +121,7 @@ 
      *
      * @return DNProject
      */
-    protected function getProject()
-    {
+    protected function getProject() {
         $projectName = $this->getRequest()->param('Project');
         return DNProject::get()->filter('Name', $projectName)->first();
     }
@@ -138,8 +131,7 @@ 
      *
      * @return DNEnvironment
      */
-    protected function getEnvironment()
-    {
+    protected function getEnvironment() {
         $projectName = $this->getRequest()->param('Project');
         $project = DNProject::get()->filter('Name', $projectName)->first();
         $environmentName = $this->getRequest()->param('Environment');
@@ -149,8 +141,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return 'naut/api';
     }
 }

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(

Braces +10 added lines, -20 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class APIEnvironment extends APINoun
-{
+class APIEnvironment extends APINoun {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to view this environment', 403);
         }
@@ -52,8 +50,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function ping(SS_HTTPRequest $request)
-    {
+    public function ping(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -71,8 +68,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function deploy(SS_HTTPRequest $request)
-    {
+    public function deploy(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -89,8 +85,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links(
             $this->parent->Link(),
             $this->record->Project()->Name,
@@ -101,16 +96,14 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function showRecord()
-    {
+    protected function showRecord() {
         return $this->getAPIResponse($this->record->toMap());
     }
 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createPing()
-    {
+    protected function createPing() {
         if (!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -135,8 +128,7 @@ 
      * @param int $ID
      * @return SS_HTTPResponse
      */
-    protected function getPing($ID)
-    {
+    protected function getPing($ID) {
         $ping = DNPing::get()->byID($ID);
         if (!$ping) {
             return $this->message('Ping not found', 404);
@@ -152,8 +144,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createDeploy()
-    {
+    protected function createDeploy() {
         if (!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -188,8 +179,7 @@ 
      * @param int $id
      * @return SS_HTTPResponse
      */
-    protected function getDeploy($id)
-    {
+    protected function getDeploy($id) {
         $deploy = DNDeployment::get()->byID($id);
         if (!$deploy) {
             return $this->message('Deploy not found', 404);

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;

Braces +10 added lines, -20 removed lines

@@ -2,8 +2,7 @@ 
 /**
  * Base class for the APINouns
  */
-class APINoun extends Controller
-{
+class APINoun extends Controller {
 
     /**
      * @var controller
@@ -26,8 +25,7 @@ 
      * @param Controller|null $parent
      * @param DataObject|null $record
      */
-    public function __construct(\Controller $parent = null, DataObject $record = null)
-    {
+    public function __construct(\Controller $parent = null, DataObject $record = null) {
         $this->record = $record;
         $this->parent = $parent;
         parent::__construct();
@@ -36,8 +34,7 @@ 
     /**
      * Enable basic auth on the API
      */
-    public function init()
-    {
+    public function init() {
         $this->member = BasicAuth::requireLogin('Deploynaut API');
         parent::init();
     }
@@ -45,16 +42,14 @@ 
     /**
      * @return DataObject
      */
-    public function getRecord()
-    {
+    public function getRecord() {
         return $this->record;
     }
 
     /**
      * @return Member
      */
-    public function getMember()
-    {
+    public function getMember() {
         return $this->member;
     }
 
@@ -62,8 +57,7 @@ 
      * @param array $output
      * @return SS_HTTPResponse
      */
-    protected function getAPIResponse($output)
-    {
+    protected function getAPIResponse($output) {
         $response = $this->getResponse();
         if ($this->respondWithText()) {
             $body = print_r($output, true);
@@ -79,8 +73,7 @@ 
     /**
      * @return boolean
      */
-    protected function respondWithJSON()
-    {
+    protected function respondWithJSON() {
         if ($this->getRequest()->getExtension() == 'json') {
             return true;
         }
@@ -93,8 +86,7 @@ 
     /**
      * @return boolean
      */
-    protected function respondWithText()
-    {
+    protected function respondWithText() {
         if ($this->getRequest()->getExtension() == 'txt') {
             return true;
         }
@@ -107,8 +99,7 @@ 
     /**
      * @return array|null
      */
-    protected function getRequestBody()
-    {
+    protected function getRequestBody() {
         return Convert::json2array($this->getRequest()->getBody());
     }
 
@@ -119,8 +110,7 @@ 
      * @param int $statusCode
      * @return SS_HTTPResponse
      */
-    protected function message($message, $statusCode)
-    {
+    protected function message($message, $statusCode) {
         $response = $this->getAPIResponse(array(
             'message' => $message,
             'statusCode' => $statusCode

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(

Braces +6 added lines, -12 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class APIProject extends APINoun
-{
+class APIProject extends APINoun {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to this environment', 403);
         }
@@ -48,8 +46,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function fetch(SS_HTTPRequest $request)
-    {
+    public function fetch(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -67,8 +64,7 @@ 
      * @param int $ID
      * @return SS_HTTPResponse
      */
-    protected function getFetch($ID)
-    {
+    protected function getFetch($ID) {
         $ping = DNGitFetch::get()->byID($ID);
         if (!$ping) {
             return $this->message('Fetch not found', 404);
@@ -84,8 +80,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createFetch()
-    {
+    protected function createFetch() {
         /** @var DNGitFetch $fetch */
         $fetch = DNGitFetch::create();
         $fetch->ProjectID = $this->record->ID;
@@ -107,8 +102,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links(
             $this->parent->Link(),
             $this->record->Name

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);

Braces +12 added lines, -24 removed lines

@@ -1,18 +1,15 @@ 
 <?php
 use \Symfony\Component\Process\Process;
 
-class CapistranoDeploymentBackend extends Object implements DeploymentBackend
-{
+class CapistranoDeploymentBackend extends Object implements DeploymentBackend {
 
     protected $packageGenerator;
 
-    public function getPackageGenerator()
-    {
+    public function getPackageGenerator() {
         return $this->packageGenerator;
     }
 
-    public function setPackageGenerator(PackageGenerator $packageGenerator)
-    {
+    public function setPackageGenerator(PackageGenerator $packageGenerator) {
         $this->packageGenerator = $packageGenerator;
     }
 
@@ -24,8 +21,7 @@ 
      *
      * @return DeploymentStrategy
      */
-    public function planDeploy(DNEnvironment $environment, $options)
-    {
+    public function planDeploy(DNEnvironment $environment, $options) {
         $strategy = new DeploymentStrategy($environment, $options);
 
         $currentBuild = $environment->CurrentBuild();
@@ -131,8 +127,7 @@ 
     /**
      * Enable a maintenance page for the given environment using the maintenance:enable Capistrano task.
      */
-    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -148,8 +143,7 @@ 
     /**
      * Disable the maintenance page for the given environment using the maintenance:disable Capistrano task.
      */
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -165,8 +159,7 @@ 
     /**
      * Check the status using the deploy:check capistrano method
      */
-    public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    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) {
             $log->write($buffer);
@@ -177,8 +170,7 @@ 
     /**
      * @inheritdoc
      */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         if ($dataTransfer->Direction == 'get') {
             $this->dataTransferBackup($dataTransfer, $log);
         } else {
@@ -222,8 +214,7 @@ 
      * @param DeploynautLogFile $log
      * @return \Symfony\Component\Process\Process
      */
-    public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log)
-    {
+    public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log) {
         $name = $environment->getFullName();
         $env = $environment->Project()->getProcessEnv();
 
@@ -277,8 +268,7 @@ 
      * @param DNDataTransfer    $dataTransfer
      * @param DeploynautLogFile $log
      */
-    protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         $environment = $dataTransfer->Environment();
         $name = $environment->getFullName();
 
@@ -354,8 +344,7 @@ 
      * Also cleans up and generates new error pages.
      * @param DeploynautLogFile $log
      */
-    public function rebuild(DNEnvironment $environment, $log)
-    {
+    public function rebuild(DNEnvironment $environment, $log) {
         $name = $environment->getFullName();
         $command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -376,8 +365,7 @@ 
      * @param DNDataTransfer $dataTransfer
      * @param DeploynautLogFile $log
      */
-    protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         $environment = $dataTransfer->Environment();
         $name = $environment->getFullName();
 

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

Braces +6 added lines, -12 removed lines

@@ -7,8 +7,7 @@ 
  *
  * It's useful for demonstrating how the system works, and how you can write deployment back-ends
  */
-class DemoDeploymentBackend extends Object implements DeploymentBackend
-{
+class DemoDeploymentBackend extends Object implements DeploymentBackend {
 
     /**
      * Create a deployment strategy.
@@ -18,8 +17,7 @@ 
      *
      * @return DeploymentStrategy
      */
-    public function planDeploy(DNEnvironment $environment, $options = array())
-    {
+    public function planDeploy(DNEnvironment $environment, $options = array()) {
         return new DeploymentStrategy($environment, $options);
     }
 
@@ -69,23 +67,19 @@ 
     /**
      * @inheritdoc
      */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         die('Not implemented');
     }
 
-    public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project)
-    {
+    public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Maintenance page enabled on "%s"', $environment->getFullName()));
     }
 
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Maintenance page disabled on "%s"', $environment->getFullName()));
     }
 
-    public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Ping "%s"', $environment->getFullName()));
     }
 }

code/backends/DeploymentBackend.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-interface DeploymentBackend
-{
+interface DeploymentBackend {
 
     /**
      * Creates a deployment strategy that can be used to do some pre-flight checks.

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

Braces +25 added lines, -50 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class DeploymentStrategy extends ViewableData
-{
+class DeploymentStrategy extends ViewableData {
 
     const SUCCESS_CODE = 'success';
 
@@ -56,8 +55,7 @@ 
      * @param DNEnvironment $environment
      * @param array $options
      */
-    public function __construct(DNEnvironment $environment, $options = array())
-    {
+    public function __construct(DNEnvironment $environment, $options = array()) {
         $this->environment = $environment;
         $this->options = $options;
     }
@@ -65,47 +63,41 @@ 
     /**
      * @param string $title
      */
-    public function setActionTitle($title)
-    {
+    public function setActionTitle($title) {
         $this->actionTitle = $title;
     }
 
     /**
      * @return string
      */
-    public function getActionTitle()
-    {
+    public function getActionTitle() {
         return $this->actionTitle;
     }
 
     /**
      */
-    public function setActionCode($code)
-    {
+    public function setActionCode($code) {
         $this->actionCode = $code;
     }
 
     /**
      * @return string
      */
-    public function getActionCode()
-    {
+    public function getActionCode() {
         return $this->actionCode;
     }
 
     /**
      * @param int
      */
-    public function setEstimatedTime($seconds)
-    {
+    public function setEstimatedTime($seconds) {
         $this->estimatedTime = $seconds;
     }
 
     /**
      * @return int Time in minutes
      */
-    public function getEstimatedTime()
-    {
+    public function getEstimatedTime() {
         return $this->estimatedTime;
     }
 
@@ -114,8 +106,7 @@ 
      * @param string $from
      * @param string $to
      */
-    public function setChange($title, $from, $to)
-    {
+    public function setChange($title, $from, $to) {
         return $this->changes[$title] = array(
             'from' => $from,
             'to' => $to
@@ -126,8 +117,7 @@ 
      * @param string $title
      * @param string $desc
      */
-    public function setChangeDescriptionOnly($title, $desc)
-    {
+    public function setChangeDescriptionOnly($title, $desc) {
         return $this->changes[$title] = array(
             'description' => $desc
         );
@@ -138,8 +128,7 @@ 
      *
      * @return array
      */
-    public function getChangesModificationNeeded()
-    {
+    public function getChangesModificationNeeded() {
         $filtered = [];
         foreach ($this->changes as $change => $details) {
             if (array_key_exists('description', $details)) {
@@ -164,8 +153,7 @@ 
      *		)
      *	)
      */
-    public function getChanges()
-    {
+    public function getChanges() {
         return $this->changes;
     }
 
@@ -174,8 +162,7 @@ 
      *
      * @return ArrayData|null
      */
-    public function getChange($key)
-    {
+    public function getChange($key) {
         $changes = $this->getChanges();
         if (array_key_exists($key, $changes)) {
             return new ArrayData($changes[$key]);
@@ -187,8 +174,7 @@ 
      * @param string $option
      * @param string $value
      */
-    public function setOption($option, $value)
-    {
+    public function setOption($option, $value) {
         $this->options[$option] = $value;
     }
 
@@ -196,8 +182,7 @@ 
      * @param string $option
      * @return string|null
      */
-    public function getOption($option)
-    {
+    public function getOption($option) {
         if (!empty($this->options[$option])) {
             return $this->options[$option];
         }
@@ -206,32 +191,28 @@ 
     /**
      * @return string
      */
-    public function getOptions()
-    {
+    public function getOptions() {
         return $this->options;
     }
 
     /**
      * @param string $code
      */
-    public function setValidationCode($code)
-    {
+    public function setValidationCode($code) {
         $this->validationCode = $code;
     }
 
     /**
      * @return string
      */
-    public function getValidationCode()
-    {
+    public function getValidationCode() {
         return $this->validationCode;
     }
 
     /**
      * @param string $msg
      */
-    public function setMessage($msg, $code = self::ERROR_CODE)
-    {
+    public function setMessage($msg, $code = self::ERROR_CODE) {
         $this->messages[] = [
             'text' => $msg,
             'code' => $code
@@ -251,8 +232,7 @@ 
     /**
      * @return array
      */
-    public function getMessages()
-    {
+    public function getMessages() {
         return $this->messages;
     }
 
@@ -261,8 +241,7 @@ 
      *
      * @return array
      */
-    public function toArray()
-    {
+    public function toArray() {
         $fields = array(
             'actionTitle',
             'actionCode',
@@ -283,8 +262,7 @@ 
     /**
      * @return string
      */
-    public function toJSON()
-    {
+    public function toJSON() {
         return json_encode($this->toArray(), JSON_PRETTY_PRINT);
     }
 
@@ -294,8 +272,7 @@ 
      *
      * @param string $json
      */
-    public function fromJSON($json)
-    {
+    public function fromJSON($json) {
         $decoded = json_decode($json, true);
         return $this->fromArray($decoded);
     }
@@ -306,8 +283,7 @@ 
      *
      * @param string $data
      */
-    public function fromArray($data)
-    {
+    public function fromArray($data) {
         $fields = array(
             'actionTitle',
             'actionCode',
@@ -328,8 +304,7 @@ 
     /**
      * @return DNDeployment
      */
-    public function createDeployment()
-    {
+    public function createDeployment() {
         $deployment = DNDeployment::create();
         $deployment->EnvironmentID = $this->environment->ID;
         // Pull out the SHA from the options so we can make it queryable.

code/backends/EnvironmentCreateBackend.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-interface EnvironmentCreateBackend
-{
+interface EnvironmentCreateBackend {
 
     /**
      * @param DNCreateEnvironment $job