silverstripe / deploynaut

code/model/DNTag.php

Braces +5 added lines, -10 removed lines

@@ -2,8 +2,7 @@ 
 
 use Gitonomy\Git\Reference\Tag;
 
-class DNTag extends ViewableData
-{
+class DNTag extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Reference\Tag
@@ -28,8 +27,7 @@ 
      * @param DNProject $project
      * @param DNData $data
      */
-    public function __construct(Tag $tag, DNProject $project, DNData $data)
-    {
+    public function __construct(Tag $tag, DNProject $project, DNData $data) {
         $this->tag = $tag;
         $this->project = $project;
         $this->data = $data;
@@ -38,24 +36,21 @@ 
     /**
      * @return string
      */
-    public function Name()
-    {
+    public function Name() {
         return htmlentities($this->tag->getName());
     }
 
     /**
      * @return string
      */
-    public function SHA()
-    {
+    public function SHA() {
         return htmlentities($this->tag->getCommitHash());
     }
 
     /**
      * @return SS_Datetime
      */
-    public function Created()
-    {
+    public function Created() {
         $created = $this->tag->getCommit()->getCommitterDate();
 
         // gitonomy sets the time to UTC, so now we set the timezone to

code/model/GitonomyCache.php

Braces +2 added lines, -4 removed lines

@@ -3,12 +3,10 @@
 /**
  * Helper class caching expensive gitonomy calls
  */
-class GitonomyCache
-{
+class GitonomyCache {
     public static $cache = array();
 
-    public static function getIncludingBranches($commit)
-    {
+    public static function getIncludingBranches($commit) {
         $cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
         if (!isset(self::$cache[$cacheKey])) {
             self::$cache[$cacheKey] = $commit->getIncludingBranches();

code/model/Pipeline.php

Braces +44 added lines, -88 removed lines

@@ -111,8 +111,7 @@ 
  *
  * @method HasManyList Steps()
  */
-class Pipeline extends DataObject implements PipelineData
-{
+class Pipeline extends DataObject implements PipelineData {
 
     /**
      * Messages
@@ -212,21 +211,18 @@ 
     /**
      * @param ConfirmationMessagingService $service
      */
-    public function setMessagingService(ConfirmationMessagingService $service)
-    {
+    public function setMessagingService(ConfirmationMessagingService $service) {
         $this->messagingService = $service;
     }
 
     /**
      * @return ConfirmationMessagingService
      */
-    public function getMessagingService()
-    {
+    public function getMessagingService() {
         return $this->messagingService;
     }
 
-    public function __isset($property)
-    {
+    public function __isset($property) {
         // Workaround fixed in https://github.com/silverstripe/silverstripe-framework/pull/3201
         // Remove this once we update to a version of framework which supports this
         if ($property === 'MessagingService') {
@@ -240,8 +236,7 @@ 
      *
      * @return array
      */
-    public function getReplacements()
-    {
+    public function getReplacements() {
         // Get member who began this request
         $author = $this->Author();
         $environment = $this->Environment();
@@ -261,16 +256,14 @@ 
      *
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return "Pipeline {$this->ID} (Status: {$this->Status})";
     }
 
     /**
      * @param Member $member
      */
-    public function canAbort($member = null)
-    {
+    public function canAbort($member = null) {
         // Owner can abort
         $member = $member ?: Member::currentUser();
         if (!$member) {
@@ -289,8 +282,7 @@ 
      *
      * @return string Status description (html format)
      */
-    public function getRunningDescription()
-    {
+    public function getRunningDescription() {
         if (!$this->isActive()) {
             return 'This pipeline is not currently running';
         }
@@ -306,8 +298,7 @@ 
      *
      * @return ArrayList List of items with a Link and Title attribute
      */
-    public function RunningOptions()
-    {
+    public function RunningOptions() {
         if (!$this->isActive()) {
             return null;
         }
@@ -325,8 +316,7 @@ 
      *
      * @return ArrayList List of logs with a Link and Title attribute
      */
-    public function LogOptions()
-    {
+    public function LogOptions() {
         if (!$this->isActive()) {
             return null;
         }
@@ -390,8 +380,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function getConfigData()
-    {
+    public function getConfigData() {
         // Lazy load if necessary
         $data = null;
         if (!$this->Config && ($data = $this->Environment()->loadPipelineConfig())) {
@@ -414,8 +403,7 @@ 
         throw new Exception(sprintf('YAML configuration for pipeline not found at path "%s"', $path));
     }
 
-    public function setConfig($data)
-    {
+    public function setConfig($data) {
         $this->mergedConfig = null;
         return parent::setField('Config', $data);
     }
@@ -426,8 +414,7 @@ 
      * @param string $setting Settings
      * @return mixed Value of setting, or null if not set
      */
-    public function getConfigSetting($setting)
-    {
+    public function getConfigSetting($setting) {
         $source = $this->getConfigData();
 
         foreach (func_get_args() as $setting) {
@@ -443,8 +430,7 @@ 
     /**
      * @return FieldList
      */
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = new FieldList(new TabSet('Root'));
 
         // Main fields
@@ -505,8 +491,7 @@ 
      *
      * @return DNEnvironment
      */
-    public function getDependentEnvironment()
-    {
+    public function getDependentEnvironment() {
         // dependent environment not available
         $projectName = $this->getConfigSetting('PipelineConfig', 'DependsOnProject');
         $environmentName = $this->getConfigSetting('PipelineConfig', 'DependsOnEnvironment');
@@ -544,8 +529,7 @@ 
      * @param int $order
      * @return PipelineStep
      */
-    protected function generateStep($name, $stepConfig, $order = 0)
-    {
+    protected function generateStep($name, $stepConfig, $order = 0) {
         $stepClass = isset($stepConfig['Class']) ? $stepConfig['Class'] : $stepConfig;
 
         if (empty($stepClass)) {
@@ -583,8 +567,7 @@ 
      * @throws LogicException
      * @return boolean
      */
-    public function start()
-    {
+    public function start() {
         // Ensure there are no other running {@link Pipeline} objects for this {@link DNEnvironment}
         // Requires that $this->EnvironmentID has been set
         $env = $this->Environment();
@@ -614,8 +597,7 @@ 
     /**
      * Mark this Pipeline as completed.
      */
-    public function markComplete()
-    {
+    public function markComplete() {
         $this->Status = "Complete";
         $this->log("Pipeline completed successfully.");
         $this->write();
@@ -628,8 +610,7 @@ 
     /**
      * @return bool true if this Pipeline has successfully completed all {@link PipelineStep} steps already.
      */
-    public function isComplete()
-    {
+    public function isComplete() {
         return $this->Status == "Complete";
     }
 
@@ -638,8 +619,7 @@ 
      *
      * @return bool
      */
-    public function isRunning()
-    {
+    public function isRunning() {
         return $this->Status == "Running";
     }
 
@@ -648,8 +628,7 @@ 
      *
      * @return bool
      */
-    public function isActive()
-    {
+    public function isActive() {
         return $this->isRunning() || $this->isRollback();
     }
 
@@ -660,8 +639,7 @@ 
      * @param array $stepConfig
      * @return PipelineStep
      */
-    private function pushPipelineStep($name, $stepConfig)
-    {
+    private function pushPipelineStep($name, $stepConfig) {
         $lastStep = $this->Steps()->sort("Order DESC")->first();
         $order = $lastStep ? $lastStep->Order + 1 : 1;
         return $this->generateStep($name, $stepConfig, $order);
@@ -670,8 +648,7 @@ 
     /**
      * The rollback has finished - close the pipeline and send relevant messages.
      */
-    protected function finaliseRollback()
-    {
+    protected function finaliseRollback() {
 
         // Figure out the status by inspecting specific rollback steps.
         $success = true;
@@ -701,8 +678,7 @@ 
     /**
      * Initiate a rollback. Moves the pipeline to the 'Rollback' status.
      */
-    protected function beginRollback()
-    {
+    protected function beginRollback() {
         $this->log("Beginning rollback...");
         $this->sendMessage(self::ALERT_ROLLBACK_STARTED);
 
@@ -731,8 +707,7 @@ 
      *
      * @return boolean
      */
-    protected function canStartRollback()
-    {
+    protected function canStartRollback() {
         // The rollback cannot run twice.
         if ($this->isRollback()) {
             return false;
@@ -765,8 +740,7 @@ 
      *
      * @param bool $notify Set to false to disable notifications for this failure
      */
-    public function markFailed($notify = true)
-    {
+    public function markFailed($notify = true) {
         // Abort all running or queued steps.
         $steps = $this->Steps();
         foreach ($steps as $step) {
@@ -793,24 +767,21 @@ 
     /**
      * @return bool true if this Pipeline failed to execute all {@link PipelineStep} steps successfully
      */
-    public function isFailed()
-    {
+    public function isFailed() {
         return $this->Status == "Failed";
     }
 
     /**
      * @return bool true if this Pipeline is rolling back.
      */
-    public function isRollback()
-    {
+    public function isRollback() {
         return $this->Status == "Rollback";
     }
 
     /**
      * Mark this Pipeline as aborted
      */
-    public function markAborted()
-    {
+    public function markAborted() {
         $this->Status = 'Aborted';
         $logMessage = sprintf(
             "Pipeline processing aborted. %s (%s) aborted the pipeline",
@@ -838,8 +809,7 @@ 
      * @param string $messageID Message ID
      * @return array Resulting array(subject, message)
      */
-    protected function generateMessageTemplate($messageID)
-    {
+    protected function generateMessageTemplate($messageID) {
         $subject = $this->getConfigSetting('PipelineConfig', 'Subjects', $messageID);
         $message = $this->getConfigSetting('PipelineConfig', 'Messages', $messageID);
         $substitutions = $this->getReplacements();
@@ -854,8 +824,7 @@ 
      * @param array $substitutions
      * @return array Resulting array(subject, message)
      */
-    public function injectMessageReplacements($message, $subject, $substitutions)
-    {
+    public function injectMessageReplacements($message, $subject, $substitutions) {
         // Handle empty messages
         if (empty($subject) && empty($message)) {
             return array(null, null);
@@ -883,8 +852,7 @@ 
      * @param string $messageID Message ID. One of 'Abort', 'Success', or 'Failure', or some custom message
      * @return boolean|null True if successful
      */
-    public function sendMessage($messageID)
-    {
+    public function sendMessage($messageID) {
         // Check message, subject, and additional arguments to include
         list($subject, $message) = $this->generateMessageTemplate($messageID);
         if (empty($subject) || empty($message)) {
@@ -924,8 +892,7 @@ 
     /**
      * @return bool true if this Pipeline has been aborted
      */
-    public function isAborted()
-    {
+    public function isAborted() {
         return $this->Status === "Aborted";
     }
 
@@ -940,8 +907,7 @@ 
      *
      * If the Pipeline has run out of steps, then it will mark the pipeline as completed.
      */
-    public function checkPipelineStatus()
-    {
+    public function checkPipelineStatus() {
         $message = "";
 
         if (!$this->isActive()) {
@@ -1035,8 +1001,7 @@ 
      *
      * @return DataObject|null The next step in the pipeline, or null if none remain.
      */
-    protected function findNextStep()
-    {
+    protected function findNextStep() {
         // otherwise get next step in chain
         $currentStep = $this->CurrentStep();
 
@@ -1054,8 +1019,7 @@ 
      *
      * @return DataObject|null The previous step in the pipeline, or null if this is the first.
      */
-    public function findPreviousStep()
-    {
+    public function findPreviousStep() {
         // otherwise get previous step in chain
         $currentStep = $this->CurrentStep();
 
@@ -1079,8 +1043,7 @@ 
      * @param string $message The message to log
      * @throws LogicException Thrown if we can't log yet because we don't know what to log to (no db record yet).
      */
-    public function log($message = "")
-    {
+    public function log($message = "") {
         $log = $this->getLogger();
 
         // Taken from Debug::caller(), amended for our purposes to filter out the intermediate call to
@@ -1116,8 +1079,7 @@ 
      * @return DeploynautLogFile
      * @throws RuntimeException
      */
-    public function getLogger()
-    {
+    public function getLogger() {
         if (!$this->isInDB()) {
             throw new RuntimeException("Can't write to a log file until we know the database ID.");
         }
@@ -1139,8 +1101,7 @@ 
     /**
      * @return bool
      */
-    public function getDryRun()
-    {
+    public function getDryRun() {
         return $this->getField('DryRun');
     }
 
@@ -1149,8 +1110,7 @@ 
      *
      * @return string
      */
-    public function Link($action = null)
-    {
+    public function Link($action = null) {
         return Controller::join_links($this->Environment()->Link(), 'pipeline', $this->ID, $action);
     }
 
@@ -1160,32 +1120,28 @@ 
      * @param string|null $action
      * @return string
      */
-    public function StepLink($action = null)
-    {
+    public function StepLink($action = null) {
         return Controller::join_links($this->Link('step'), $action);
     }
 
     /**
      * @return string
      */
-    public function AbortLink()
-    {
+    public function AbortLink() {
         return $this->Link('abort');
     }
 
     /**
      * @return string
      */
-    public function LogLink()
-    {
+    public function LogLink() {
         return $this->Link('log');
     }
 
     /**
      * @return string
      */
-    public function LogContent()
-    {
+    public function LogContent() {
         if ($this->exists() && $this->Environment()) {
             $logger = $this->getLogger();
             if ($logger->exists()) {

code/model/PipelineData.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-interface PipelineData
-{
+interface PipelineData {
 
     /**
      * Is this a dry run?

code/model/jobs/DNCreateEnvironment.php

Braces +14 added lines, -28 removed lines

@@ -13,8 +13,7 @@ 
  * @method Member Creator()
  * @property int $CreatorID
  */
-class DNCreateEnvironment extends DataObject
-{
+class DNCreateEnvironment extends DataObject {
 
     /**
      * @var array
@@ -39,8 +38,7 @@ 
      * @param int $int
      * @return string
      */
-    public static function map_resque_status($int)
-    {
+    public static function map_resque_status($int) {
         $remap = array(
             Resque_Job_Status::STATUS_WAITING => "Queued",
             Resque_Job_Status::STATUS_RUNNING => "Running",
@@ -54,8 +52,7 @@ 
     /**
      * @return string
      */
-    public function Name()
-    {
+    public function Name() {
         $data = unserialize($this->Data);
         return !empty($data['Name']) ? Convert::raw2xml($data['Name']) : '';
     }
@@ -63,24 +60,21 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links($this->Project()->Link(), 'createenv', $this->ID);
     }
 
     /**
      * @return string
      */
-    public function LogLink()
-    {
+    public function LogLink() {
         return $this->Link() . '/log';
     }
 
     /**
      * @return boolean
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return $this->Project()->canView($member);
     }
 
@@ -88,8 +82,7 @@ 
      * Return a path to the log file.
      * @return string
      */
-    protected function logfile()
-    {
+    protected function logfile() {
         return sprintf(
             '%s.createenv.%s.log',
             $this->Project()->Name,
@@ -100,13 +93,11 @@ 
     /**
      * @return DeploynautLogFile
      */
-    public function log()
-    {
+    public function log() {
         return Injector::inst()->createWithArgs('DeploynautLogFile', array($this->logfile()));
     }
 
-    public function LogContent()
-    {
+    public function LogContent() {
         return $this->log()->content();
     }
 
@@ -115,8 +106,7 @@ 
      *
      * @return string
      */
-    public function ResqueStatus()
-    {
+    public function ResqueStatus() {
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status
@@ -139,8 +129,7 @@ 
      *
      * @return string Resque token
      */
-    protected function enqueueCreation()
-    {
+    protected function enqueueCreation() {
         $project = $this->Project();
         $log = $this->log();
 
@@ -169,8 +158,7 @@ 
         return Resque::enqueue('create', 'CreateEnvJob', $args, true);
     }
 
-    public function start()
-    {
+    public function start() {
         $log = $this->log();
         $token = $this->enqueueCreation();
         $this->ResqueToken = $token;
@@ -181,8 +169,7 @@ 
         $log->write($message);
     }
 
-    public function createEnvironment()
-    {
+    public function createEnvironment() {
         $backend = $this->getBackend();
         if ($backend) {
             return $backend->createEnvironment($this);
@@ -196,8 +183,7 @@ 
      * @return EnvironmentCreateBackend|null
      * @throws Exception
      */
-    public function getBackend()
-    {
+    public function getBackend() {
         $data = unserialize($this->Data);
         if (isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
             $env = Injector::inst()->get($data['EnvironmentType']);

code/model/jobs/DNDataTransfer.php

Braces +17 added lines, -34 removed lines

@@ -31,8 +31,7 @@ 
  * @method DNDataTransfer BackupDataTransfer()
  * @property int BackupDataTransferID
  */
-class DNDataTransfer extends DataObject
-{
+class DNDataTransfer extends DataObject {
 
     private static $db = array(
         "ResqueToken" => "Varchar(255)",
@@ -94,8 +93,7 @@ 
      * @param int $int
      * @return string
      */
-    public static function map_resque_status($int)
-    {
+    public static function map_resque_status($int) {
         $remap = array(
             Resque_Job_Status::STATUS_WAITING => "Queued",
             Resque_Job_Status::STATUS_RUNNING => "Running",
@@ -109,28 +107,23 @@ 
     /**
      * @param boolean $value
      */
-    public function setBackupBeforePush($value)
-    {
+    public function setBackupBeforePush($value) {
         $this->backupBeforePush = $value;
     }
 
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
     }
 
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links($this->Environment()->Project()->Link(), 'transfer', $this->ID);
     }
 
-    public function LogLink()
-    {
+    public function LogLink() {
         return Controller::join_links($this->Link(), 'log');
     }
 
-    public function getDefaultSearchContext()
-    {
+    public function getDefaultSearchContext() {
         $context = parent::getDefaultSearchContext();
         $context->getFields()->dataFieldByName('Status')->setHasEmptyDefault(true);
         $context->getFields()->dataFieldByName('Origin')->setHasEmptyDefault(true);
@@ -138,8 +131,7 @@ 
         return $context;
     }
 
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = parent::getCMSFields();
         $fields->removeByName('EnvironmentID');
         $fields->removeByName('ArchiveFile');
@@ -167,8 +159,7 @@ 
     /**
      * Queue a transfer job
      */
-    public function start()
-    {
+    public function start() {
         $env = $this->Environment();
         $log = $this->log();
 
@@ -208,8 +199,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return $this->Environment()->canView($member);
     }
 
@@ -217,8 +207,7 @@ 
      * Return a path to the log file.
      * @return string
      */
-    protected function logfile()
-    {
+    protected function logfile() {
         return sprintf(
             '%s.datatransfer.%s.log',
             $this->Environment()->getFullName('.'),
@@ -229,21 +218,18 @@ 
     /**
      * @return \DeploynautLogFile
      */
-    public function log()
-    {
+    public function log() {
         return new DeploynautLogFile($this->logfile());
     }
 
     /**
      * @return string
      */
-    public function LogContent()
-    {
+    public function LogContent() {
         return $this->log()->content();
     }
 
-    public function getDescription()
-    {
+    public function getDescription() {
         $envName = $this->Environment()->getFullName();
         if ($this->Direction == 'get') {
             if ($this->Origin == 'ManualUpload') {
@@ -260,8 +246,7 @@ 
         return $description;
     }
 
-    public function getModeNice()
-    {
+    public function getModeNice() {
         if ($this->Mode == 'all') {
             return 'database and assets';
         } else {
@@ -273,8 +258,7 @@ 
      * Is this transfer an automated backup of a push transfer?
      * @return boolean
      */
-    public function IsBackupDataTransfer()
-    {
+    public function IsBackupDataTransfer() {
         return DB::query(sprintf(
             'SELECT COUNT("ID") FROM "DNDataTransfer" WHERE "BackupDataTransferID" = %d',
             $this->ID
@@ -286,8 +270,7 @@ 
      *
      * @return string
      */
-    public function ResqueStatus()
-    {
+    public function ResqueStatus() {
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDataTransfer.Status

code/model/jobs/DNDeployment.php

Braces +20 added lines, -40 removed lines

@@ -12,8 +12,7 @@ 
  * @method Member Deployer()
  * @property int DeployerID
  */
-class DNDeployment extends DataObject
-{
+class DNDeployment extends DataObject {
 
     /**
      * @var array
@@ -38,8 +37,7 @@ 
 
     private static $default_sort = '"LastEdited" DESC';
 
-    public function getTitle()
-    {
+    public function getTitle() {
         return "#{$this->ID}: {$this->SHA} (Status: {$this->Status})";
     }
 
@@ -54,8 +52,7 @@ 
      * @param int $int
      * @return string
      */
-    public static function map_resque_status($int)
-    {
+    public static function map_resque_status($int) {
         $remap = array(
             Resque_Job_Status::STATUS_WAITING => "Queued",
             Resque_Job_Status::STATUS_RUNNING => "Running",
@@ -67,18 +64,15 @@ 
     }
 
 
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links($this->Environment()->Link(), 'deploy', $this->ID);
     }
 
-    public function LogLink()
-    {
+    public function LogLink() {
         return $this->Link() . '/log';
     }
 
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return $this->Environment()->canView($member);
     }
 
@@ -86,8 +80,7 @@ 
      * Return a path to the log file.
      * @return string
      */
-    protected function logfile()
-    {
+    protected function logfile() {
         return sprintf(
             '%s.%s.log',
             $this->Environment()->getFullName('.'),
@@ -98,13 +91,11 @@ 
     /**
      * @return DeploynautLogFile
      */
-    public function log()
-    {
+    public function log() {
         return Injector::inst()->createWithArgs('DeploynautLogFile', array($this->logfile()));
     }
 
-    public function LogContent()
-    {
+    public function LogContent() {
         return $this->log()->content();
     }
 
@@ -113,8 +104,7 @@ 
      *
      * @return string
      */
-    public function ResqueStatus()
-    {
+    public function ResqueStatus() {
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status
@@ -138,8 +128,7 @@ 
      *
      * @return \Gitonomy\Git\Repository|null
      */
-    public function getRepository()
-    {
+    public function getRepository() {
         if (!$this->SHA) {
             return null;
         }
@@ -152,8 +141,7 @@ 
      *
      * @return \Gitonomy\Git\Commit|null
      */
-    public function getCommit()
-    {
+    public function getCommit() {
         $repo = $this->getRepository();
         if ($repo) {
             try {
@@ -172,8 +160,7 @@ 
      *
      * @return string|null
      */
-    public function getCommitMessage()
-    {
+    public function getCommitMessage() {
         $commit = $this->getCommit();
         if ($commit) {
             try {
@@ -190,8 +177,7 @@ 
      *
      * @return ArrayList
      */
-    public function getTags()
-    {
+    public function getTags() {
         $returnTags = array();
         $repo = $this->getRepository();
         if ($repo) {
@@ -213,8 +199,7 @@ 
      *
      * @return ArrayList
      */
-    public function getFullDeployMessages()
-    {
+    public function getFullDeployMessages() {
         $strategy = $this->getDeploymentStrategy();
         if ($strategy->getActionCode()!=='full') {
             return null;
@@ -251,8 +236,7 @@ 
      *
      * @return \Varchar|null
      */
-    public function getTag()
-    {
+    public function getTag() {
         $tags = $this->getTags();
         if ($tags->count() > 0) {
             return $tags->last();
@@ -263,8 +247,7 @@ 
     /**
      * @return DeploymentStrategy
      */
-    public function getDeploymentStrategy()
-    {
+    public function getDeploymentStrategy() {
         $environment = $this->Environment();
         $strategy = new DeploymentStrategy($environment);
         $strategy->fromJSON($this->Strategy);
@@ -277,8 +260,7 @@ 
      *
      * @return ArrayList
      */
-    public function getChanges()
-    {
+    public function getChanges() {
         $list = new ArrayList();
         $strategy = $this->getDeploymentStrategy();
         foreach ($strategy->getChanges() as $name => $change) {
@@ -304,8 +286,7 @@ 
      *
      * @return string Resque token
      */
-    protected function enqueueDeployment()
-    {
+    protected function enqueueDeployment() {
         $environment = $this->Environment();
         $project = $environment->Project();
         $log = $this->log();
@@ -344,8 +325,7 @@ 
         return Resque::enqueue('deploy', 'DeployJob', $args, true);
     }
 
-    public function start()
-    {
+    public function start() {
         $log = $this->log();
         $token = $this->enqueueDeployment();
         $this->ResqueToken = $token;

code/model/jobs/DNGitFetch.php

Braces +8 added lines, -16 removed lines

@@ -11,8 +11,7 @@ 
  * @property int $DeployerID
  *
  */
-class DNGitFetch extends DataObject
-{
+class DNGitFetch extends DataObject {
 
     /**
      * @var array
@@ -36,8 +35,7 @@ 
      * @param int $int
      * @return string
      */
-    public static function map_resque_status($int)
-    {
+    public static function map_resque_status($int) {
         $remap = array(
             Resque_Job_Status::STATUS_WAITING => "Queued",
             Resque_Job_Status::STATUS_RUNNING => "Running",
@@ -52,8 +50,7 @@ 
      * Queue a fetch job
      * @param bool $forceClone Force repository to be re-cloned
      */
-    public function start($forceClone = false)
-    {
+    public function start($forceClone = false) {
         $project = $this->Project();
         $log = $this->log();
 
@@ -95,8 +92,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return $this->Project()->canView($member);
     }
 
@@ -104,8 +100,7 @@ 
      * Return a path to the log file.
      * @return string
      */
-    protected function logfile()
-    {
+    protected function logfile() {
         return sprintf(
             '%s.fetch.%s.log',
             $this->Project()->Name,
@@ -116,16 +111,14 @@ 
     /**
      * @return \DeploynautLogFile
      */
-    public function log()
-    {
+    public function log() {
         return new DeploynautLogFile($this->logfile());
     }
 
     /**
      * @return string
      */
-    public function LogContent()
-    {
+    public function LogContent() {
         return $this->log()->content();
     }
 
@@ -134,8 +127,7 @@ 
      *
      * @return string
      */
-    public function ResqueStatus()
-    {
+    public function ResqueStatus() {
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status

code/model/jobs/DNPing.php

Braces +9 added lines, -18 removed lines

@@ -9,8 +9,7 @@ 
  * @method Member Deployer()
  * @property int DeployerID
  */
-class DNPing extends DataObject
-{
+class DNPing extends DataObject {
 
     /**
      * @var array
@@ -30,16 +29,14 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links($this->Environment()->Link(), 'ping', $this->ID);
     }
 
     /**
      * @return string
      */
-    public function LogLink()
-    {
+    public function LogLink() {
         return $this->Link() . '/log';
     }
 
@@ -47,8 +44,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return $this->Environment()->canView($member);
     }
 
@@ -56,8 +52,7 @@ 
      * Return a path to the log file.
      * @return string
      */
-    protected function logfile()
-    {
+    protected function logfile() {
         return sprintf(
             '%s.ping.%s.log',
             $this->Environment()->getFullName('.'),
@@ -68,24 +63,21 @@ 
     /**
      * @return \DeploynautLogFile
      */
-    public function log()
-    {
+    public function log() {
         return new DeploynautLogFile($this->logfile());
     }
 
     /**
      * @return string
      */
-    public function LogContent()
-    {
+    public function LogContent() {
         return $this->log()->content();
     }
 
     /**
      * @return string
      */
-    public function ResqueStatus()
-    {
+    public function ResqueStatus() {
         $status = new Resque_Job_Status($this->ResqueToken);
 
         $remap = array(
@@ -102,8 +94,7 @@ 
     /**
      * Queue a ping job
      */
-    public function start()
-    {
+    public function start() {
         $environment = $this->Environment();
         $project = $environment->Project();
         $log = $this->log();