silverstripe / deploynaut

code/model/steps/EmergencyRollbackStep.php

Braces +8 added lines, -16 removed lines

@@ -23,8 +23,7 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class EmergencyRollbackStep extends LongRunningPipelineStep
-{
+class EmergencyRollbackStep extends LongRunningPipelineStep {
 
     /**
      * @var array
@@ -44,8 +43,7 @@ 
     /**
      * @return bool
      */
-    public function start()
-    {
+    public function start() {
         // Just in case this step is being mistakenly restarted
         if (!empty($this->RolledBack)) {
             $this->log(_t('EmergencyRollbackStep.BEENROLLEDBACK',
@@ -83,8 +81,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canTriggerRollback($member = null)
-    {
+    public function canTriggerRollback($member = null) {
         return $this->Pipeline()->Environment()->canDeploy($member) || $this->Pipeline()->canAbort($member);
     }
 
@@ -93,8 +90,7 @@ 
      *
      * @return boolean True if successful
      */
-    public function rollback()
-    {
+    public function rollback() {
         // Check permission
         if (!$this->canTriggerRollback()) {
             return Security::permissionFailure(
@@ -126,8 +122,7 @@ 
     /**
      * Dismiss the rollback window
      */
-    public function dismiss()
-    {
+    public function dismiss() {
         // Check permission
         if (!$this->canTriggerRollback()) {
             return Security::permissionFailure(
@@ -145,8 +140,7 @@ 
     /**
      * Initiate the a rollback window
      */
-    public function beginRollbackWindow()
-    {
+    public function beginRollbackWindow() {
         $this->Status = 'Started';
         if (!$this->Started) {
             $this->Started = SS_Datetime::now()->Rfc2822();
@@ -159,8 +153,7 @@ 
         return true;
     }
 
-    public function getRunningDescription()
-    {
+    public function getRunningDescription() {
         // Don't show options if this step has already been confirmed
         if ($this->RolledBack) {
             return;
@@ -170,8 +163,7 @@ 
             'You may now roll back to the previous version, if needed.');
     }
 
-    public function allowedActions()
-    {
+    public function allowedActions() {
         // Don't show options if this step has already been confirmed or can't be confirmed
         if (!$this->canTriggerRollback()) {
             return parent::allowedActions();

code/model/steps/LongRunningPipelineStep.php

Braces +5 added lines, -10 removed lines

@@ -9,16 +9,14 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class LongRunningPipelineStep extends PipelineStep
-{
+class LongRunningPipelineStep extends PipelineStep {
 
     /**
      * Determines maximum allowed execution for deployment
      *
      * @return int Number of seconds, or null if not enabled
      */
-    public function getMaxDuration()
-    {
+    public function getMaxDuration() {
         return $this->getConfigSetting('MaxDuration') ?: null;
     }
 
@@ -34,8 +32,7 @@ 
      *
      * @return boolean
      */
-    public function isTimedOut()
-    {
+    public function isTimedOut() {
         $age = $this->getAge();
         $timeout = $this->getMaxDuration();
         return $age && $timeout && ($age > $timeout);
@@ -46,8 +43,7 @@ 
      *
      * @return int Age in seconds
      */
-    public function getAge()
-    {
+    public function getAge() {
         if ($this->Started) {
             $started = intval($this->dbObject('Started')->Format('U'));
             $now = intval(SS_Datetime::now()->Format('U'));
@@ -58,8 +54,7 @@ 
         return 0;
     }
 
-    public function start()
-    {
+    public function start() {
         // Ensure started date is set
         if (!$this->Started) {
             $this->Started = SS_Datetime::now()->Rfc2822();

code/model/steps/PipelineStep.php

Braces +21 added lines, -42 removed lines

@@ -25,8 +25,7 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class PipelineStep extends DataObject implements PipelineData
-{
+class PipelineStep extends DataObject implements PipelineData {
 
     /**
      * @var array
@@ -70,18 +69,15 @@ 
      *
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->Name ?: get_class($this);
     }
 
-    public function getTreeTitle()
-    {
+    public function getTreeTitle() {
         return $this->Title . ' (Status: ' . $this->Status . ')';
     }
 
-    public function getNiceName()
-    {
+    public function getNiceName() {
         $niceName = $this->getConfigSetting('NiceName')
             ?: ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $this->getTitle()))));
 
@@ -100,8 +96,7 @@ 
      *
      * @return array
      */
-    public function getConfigData()
-    {
+    public function getConfigData() {
         if (!$this->Config) {
             return array();
         }
@@ -116,8 +111,7 @@ 
         return $this->mergedConfig;
     }
 
-    public function setConfig($data)
-    {
+    public function setConfig($data) {
         $this->mergedConfig = null;
         return parent::setField('Config', $data);
     }
@@ -127,8 +121,7 @@ 
      *
      * @return string
      */
-    public function getRunningDescription()
-    {
+    public function getRunningDescription() {
         return '';
     }
 
@@ -138,8 +131,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) {
             if (empty($source[$setting])) {
@@ -150,8 +142,7 @@ 
         return $source;
     }
 
-    public function finish()
-    {
+    public function finish() {
         $this->Status = 'Finished';
         $this->log('Step finished successfully!');
         $this->write();
@@ -162,8 +153,7 @@ 
      *
      * @param bool $notify Set to false to disable notifications for this failure
      */
-    public function markFailed($notify = true)
-    {
+    public function markFailed($notify = true) {
         $this->Status = 'Failed';
         $this->log('Marking pipeline step as failed. See earlier log messages to determine cause.');
         $this->write();
@@ -175,8 +165,7 @@ 
      *
      * @return boolean
      */
-    public function isQueued()
-    {
+    public function isQueued() {
         return $this->Status === 'Queued';
     }
 
@@ -185,8 +174,7 @@ 
      *
      * @return boolean
      */
-    public function isRunning()
-    {
+    public function isRunning() {
         return $this->Status === 'Started';
     }
 
@@ -195,8 +183,7 @@ 
      *
      * @return boolean
      */
-    public function isFinished()
-    {
+    public function isFinished() {
         return $this->Status === "Finished";
     }
 
@@ -206,8 +193,7 @@ 
      *
      * @return boolean
      */
-    public function isFailed()
-    {
+    public function isFailed() {
         return $this->Status === "Failed";
     }
 
@@ -216,8 +202,7 @@ 
      *
      * @return boolean
      */
-    public function isAborted()
-    {
+    public function isAborted() {
         return $this->Status === "Aborted";
     }
 
@@ -226,8 +211,7 @@ 
      *
      * @param string $message
      */
-    public function log($message = "")
-    {
+    public function log($message = "") {
         $this->Pipeline()->log($message);
     }
 
@@ -240,8 +224,7 @@ 
      *
      * @return DNEnvironment The dependent {@link DNEnvironment}.
      */
-    protected function getDependentEnvironment()
-    {
+    protected function getDependentEnvironment() {
         if ($this->getConfigSetting('PerformTestOn') === 'DependentEnvironment') {
             try {
                 $environment = $this->Pipeline()->getDependentEnvironment();
@@ -263,8 +246,7 @@ 
      *
      * @return boolean|null True if successfully started, false if error
      */
-    public function start()
-    {
+    public function start() {
         $this->Status = 'Started';
         $this->write();
     }
@@ -278,8 +260,7 @@ 
      *
      * @return boolean True if successfully aborted, false if error
      */
-    public function abort()
-    {
+    public function abort() {
         if ($this->isQueued() || $this->isRunning()) {
             $this->Status = 'Aborted';
             $this->log('Step aborted');
@@ -303,13 +284,11 @@ 
      *     )
      * )
      */
-    public function allowedActions()
-    {
+    public function allowedActions() {
         return array();
     }
 
-    public function getDryRun()
-    {
+    public function getDryRun() {
         return $this->Pipeline()->DryRun;
     }
 }

code/model/steps/RollbackStep.php

Braces +9 added lines, -18 removed lines

@@ -22,8 +22,7 @@ 
  * @method DNDataTransfer RollbackDatabase()
  * @property int RollbackDatabaseID
  */
-class RollbackStep extends LongRunningPipelineStep
-{
+class RollbackStep extends LongRunningPipelineStep {
 
     /**
      * @var array
@@ -43,8 +42,7 @@ 
     /**
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         // Make sure the title includes the subtask
         return parent::getTitle() . ":{$this->Doing}";
     }
@@ -52,8 +50,7 @@ 
     /**
      * @return bool|null
      */
-    public function start()
-    {
+    public function start() {
         parent::start();
 
         switch ($this->Status) {
@@ -84,8 +81,7 @@ 
      *
      * @return boolean
      */
-    protected function startRevertDeploy()
-    {
+    protected function startRevertDeploy() {
         $this->Status = 'Started';
         $this->Doing = 'Deployment';
         $this->log("{$this->Title} starting revert deployment");
@@ -128,8 +124,7 @@ 
      *
      * @return bool True if success
      */
-    protected function startRevertDatabase()
-    {
+    protected function startRevertDatabase() {
         // Mark self as creating a snapshot
         $this->Status = 'Started';
         $this->Doing = 'Snapshot';
@@ -171,8 +166,7 @@ 
     /**
      * Check status of current snapshot
      */
-    protected function continueRevertDatabase()
-    {
+    protected function continueRevertDatabase() {
         $this->log("Checking status of {$this->Title}...");
 
         // Skip snapshot for dry run
@@ -205,8 +199,7 @@ 
      *
      * @return boolean
      */
-    protected function continueRevertDeploy()
-    {
+    protected function continueRevertDeploy() {
         $this->log("Checking status of {$this->Title}...");
 
         // Skip deployment for dry run
@@ -246,8 +239,7 @@ 
      *
      * @return boolean
      */
-    protected function doRestoreDB()
-    {
+    protected function doRestoreDB() {
         return $this->getConfigSetting('RestoreDB') && $this->Pipeline()->PreviousSnapshot();
     }
 
@@ -257,8 +249,7 @@ 
      * @param string $status Resque task status
      * @return boolean True if the task is finished successfully
      */
-    protected function checkResqueStatus($status)
-    {
+    protected function checkResqueStatus($status) {
         switch ($status) {
             case "Complete":
                 return true;

code/model/steps/SmokeTestPipelineStep.php

Braces +6 added lines, -12 removed lines

@@ -44,8 +44,7 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class SmokeTestPipelineStep extends PipelineStep
-{
+class SmokeTestPipelineStep extends PipelineStep {
 
     /**
      * Default config setting
@@ -64,8 +63,7 @@ 
      *
      * @return array List of tests
      */
-    protected function getTests()
-    {
+    protected function getTests() {
         // Get core tests
         $tests = $this->getConfigSetting('Tests');
 
@@ -99,8 +97,7 @@ 
      *
      * @return resource Curl handle
      */
-    protected function initCurl()
-    {
+    protected function initCurl() {
         $handle = curl_init();
 
         // avoid curl_exec pushing out the response to the screen
@@ -125,8 +122,7 @@ 
      * @param array $test Test data
      * @return bool success
      */
-    public function runTest($ch, $name, $test)
-    {
+    public function runTest($ch, $name, $test) {
         $this->log(sprintf('Starting smoke test "%s" to URL %s', $name, $test['URL']));
         curl_setopt($ch, CURLOPT_URL, $test['URL']);
 
@@ -203,8 +199,7 @@ 
         return false;
     }
 
-    public function start()
-    {
+    public function start() {
         $this->Status = 'Started';
         $this->log("Starting {$this->Title}...");
         $this->write();
@@ -236,8 +231,7 @@ 
         return $success;
     }
 
-    public function markFailed($notify = true)
-    {
+    public function markFailed($notify = true) {
         if ($this->getDryRun()) {
             $this->log("[Skipped] Smoke testing failed: Putting up emergency maintenance page");
         } else {

code/model/steps/TriggerDeployStep.php

Braces +7 added lines, -14 removed lines

@@ -22,8 +22,7 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class TriggerDeployStep extends LongRunningPipelineStep
-{
+class TriggerDeployStep extends LongRunningPipelineStep {
 
     /**
      * @var array
@@ -43,8 +42,7 @@ 
     /**
      * @return bool
      */
-    public function start()
-    {
+    public function start() {
         // Just in case this step is being mistakenly restarted
         if (!empty($this->Deployed)) {
             $this->log(_t('TriggerDeployStep.BEENDEPLOYED',
@@ -82,8 +80,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canTriggerDeploy($member = null)
-    {
+    public function canTriggerDeploy($member = null) {
         return $this->Pipeline()->Environment()->canDeploy($member);
     }
 
@@ -92,8 +89,7 @@ 
      *
      * @return boolean True if successful
      */
-    public function deploy()
-    {
+    public function deploy() {
         // Check permission
         if (!$this->canTriggerDeploy()) {
             return Security::permissionFailure(
@@ -118,8 +114,7 @@ 
     /**
      * Initiate the deployment process
      */
-    public function StartDeployment()
-    {
+    public function StartDeployment() {
         $this->Status = 'Started';
         if (!$this->Started) {
             $this->Started = SS_Datetime::now()->Rfc2822();
@@ -129,8 +124,7 @@ 
         return true;
     }
 
-    public function getRunningDescription()
-    {
+    public function getRunningDescription() {
         // Don't show options if this step has already been confirmed
         if ($this->Deployed) {
             return;
@@ -140,8 +134,7 @@ 
             'Please press the "Deploy" button to continue deployment');
     }
 
-    public function allowedActions()
-    {
+    public function allowedActions() {
         // Don't show options if this step has already been confirmed or can't be confirmed
         if (!$this->canTriggerDeploy()) {
             return parent::allowedActions();

code/model/steps/UserConfirmationStep.php

Braces +15 added lines, -30 removed lines

@@ -52,8 +52,7 @@ 
  * @package deploynaut
  * @subpackage pipeline
  */
-class UserConfirmationStep extends LongRunningPipelineStep
-{
+class UserConfirmationStep extends LongRunningPipelineStep {
 
     /**
      * Messages
@@ -120,8 +119,7 @@ 
      *
      * @param ConfirmationMessagingService $service
      */
-    public function setMessagingService(ConfirmationMessagingService $service)
-    {
+    public function setMessagingService(ConfirmationMessagingService $service) {
         $this->messagingService = $service;
     }
 
@@ -130,8 +128,7 @@ 
      *
      * @return ConfirmationMessagingService
      */
-    public function getMessagingService()
-    {
+    public function getMessagingService() {
         return $this->messagingService;
     }
 
@@ -140,13 +137,11 @@ 
      *
      * @return boolean
      */
-    public function hasResponse()
-    {
+    public function hasResponse() {
         return $this->Approval !== 'None';
     }
 
-    public function start()
-    {
+    public function start() {
         parent::start();
 
         // Just in case this step is being mistakenly restarted
@@ -175,8 +170,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canApprove($member = null)
-    {
+    public function canApprove($member = null) {
         return $this->Pipeline()->Environment()->canApprove($member);
     }
 
@@ -185,8 +179,7 @@ 
      *
      * @return boolean True if successful
      */
-    public function approve()
-    {
+    public function approve() {
         // Check permission
         if (!$this->canApprove()) {
             return Security::permissionFailure(
@@ -214,8 +207,7 @@ 
      *
      * @return boolean True if successful
      */
-    public function reject()
-    {
+    public function reject() {
         // Check permission
         if (!$this->canApprove()) {
             return Security::permissionFailure(
@@ -243,8 +235,7 @@ 
      *
      * @return boolean True if not failed
      */
-    protected function checkStatus()
-    {
+    protected function checkStatus() {
         // For running or queued tasks ensure that we have not exceeded
         // a reasonable time-elapsed to consider this job inactive
         if ($this->isTimedOut()) {
@@ -289,8 +280,7 @@ 
     /**
      * Initiate the approval process
      */
-    public function startApproval()
-    {
+    public function startApproval() {
         $this->Status = 'Started';
         $this->log("Starting {$this->Title}...");
         // Determine if we should use delayed notification
@@ -311,8 +301,7 @@ 
      * @param string $messageID Message ID
      * @return array Resulting array(subject, message)
      */
-    protected function generateMessageTemplate($role, $messageID)
-    {
+    protected function generateMessageTemplate($role, $messageID) {
         $subject = $this->getConfigSetting('Subjects', "$messageID-$role")
                 ?: $this->getConfigSetting('Subjects', $messageID);
         $message = $this->getConfigSetting('Messages', "$messageID-$role")
@@ -328,8 +317,7 @@ 
      *
      * @return array
      */
-    public function getReplacements()
-    {
+    public function getReplacements() {
         // Get member who began this request
         return array_merge(
             $this->Pipeline()->getReplacements(),
@@ -349,8 +337,7 @@ 
      * This is used for delayed notification so that failover recipients can be notified.
      * @return boolean|null True if successful
      */
-    protected function sendMessage($messageID, $recipientGroup = 'all')
-    {
+    protected function sendMessage($messageID, $recipientGroup = 'all') {
         // Add additionally configured arguments
         $arguments = $this->getConfigSetting('ServiceArguments') ?: array();
 
@@ -389,8 +376,7 @@ 
         }
     }
 
-    public function getRunningDescription()
-    {
+    public function getRunningDescription() {
 
         // Don't show options if this step has already been confirmed
         if ($this->hasResponse() || !$this->isRunning()) {
@@ -400,8 +386,7 @@ 
         return 'This deployment is currently awaiting approval before it can complete.';
     }
 
-    public function allowedActions()
-    {
+    public function allowedActions() {
         // Don't show options if this step has already been confirmed or can't be confirmed
         if ($this->hasResponse() || !$this->isRunning() || !$this->canApprove()) {
             return parent::allowedActions();

code/queuereport/ResqueJob.php

Braces +8 added lines, -16 removed lines

@@ -6,8 +6,7 @@ 
  * Used in the Resque report admin
  *
  */
-class ResqueJob extends ViewableData
-{
+class ResqueJob extends ViewableData {
 
     /**
      * @var array
@@ -17,48 +16,42 @@ 
     /**
      * @param array $data
      */
-    public function __construct($data = array())
-    {
+    public function __construct($data = array()) {
         $this->record = $data;
     }
 
     /**
      * @return string
      */
-    public function i18n_singular_name()
-    {
+    public function i18n_singular_name() {
         return 'Resque queue';
     }
 
     /**
      * @return boolean
      */
-    public function canView()
-    {
+    public function canView() {
         return true;
     }
 
     /**
      * @return bool
      */
-    public function canEdit()
-    {
+    public function canEdit() {
         return false;
     }
 
     /**
      * @return bool
      */
-    public function candelete()
-    {
+    public function candelete() {
         return false;
     }
 
     /**
      * @return bool
      */
-    public function cancreate()
-    {
+    public function cancreate() {
         return false;
     }
 
@@ -66,8 +59,7 @@ 
      * @param string $property
      * @return mixed
      */
-    public function __get($property)
-    {
+    public function __get($property) {
         if (isset($this->record[$property])) {
             return $this->record[$property];
         }

code/queuereport/ResqueQueue.php

Braces +10 added lines, -20 removed lines

@@ -8,8 +8,7 @@ 
  * @property string $Name
  * @property int $Size
  */
-class ResqueQueue extends ViewableData
-{
+class ResqueQueue extends ViewableData {
 
     /**
      * @var array
@@ -19,16 +18,14 @@ 
     /**
      * @param array $data
      */
-    public function __construct($data = array())
-    {
+    public function __construct($data = array()) {
         $this->record = $data;
     }
 
     /**
      * @return \FieldList
      */
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fieldList = new FieldList();
         $fieldList->push(new ReadonlyField('Name', 'Name', $this->Name));
         $fieldList->push(new ReadonlyField('Size', 'Size', $this->Size));
@@ -45,13 +42,11 @@ 
     /**
      * @return string
      */
-    public function i18n_singular_name()
-    {
+    public function i18n_singular_name() {
         return 'Resque queue';
     }
 
-    protected function getJobs()
-    {
+    protected function getJobs() {
         $jobs = new ArrayList();
 
         $resqueJobs = Resque::redis()->lrange('queue:' . $this->Name, 0, -1);
@@ -86,32 +81,28 @@ 
     /**
      * @return boolean
      */
-    public function canView()
-    {
+    public function canView() {
         return true;
     }
 
     /**
      * @return bool
      */
-    public function canEdit()
-    {
+    public function canEdit() {
         return true;
     }
 
     /**
      * @return bool
      */
-    public function candelete()
-    {
+    public function candelete() {
         return false;
     }
 
     /**
      * @return bool
      */
-    public function cancreate()
-    {
+    public function cancreate() {
         return false;
     }
 
@@ -119,8 +110,7 @@ 
      * @param string $property
      * @return mixed
      */
-    public function __get($property)
-    {
+    public function __get($property) {
         if (isset($this->record[$property])) {
             return $this->record[$property];
         }