silverstripe / deploynaut

code/form/TabbedSelectionGroup.php

Braces +2 added lines, -4 removed lines

@@ -1,13 +1,11 @@
 <?php
 
-class TabbedSelectionGroup extends SelectionGroup
-{
+class TabbedSelectionGroup extends SelectionGroup {
 
     /**
      * @return ArrayList
      */
-    public function FieldList()
-    {
+    public function FieldList() {
         $items = CompositeField::FieldList()->toArray();
         $fields = new ArrayList();
 

code/jobs/CreateEnvJob.php

Braces +6 added lines, -12 removed lines

@@ -1,6 +1,5 @@ 
 <?php
-class CreateEnvJob
-{
+class CreateEnvJob {
 
     /**
      *
@@ -11,8 +10,7 @@ 
     /**
      *
      */
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
@@ -21,8 +19,7 @@ 
      *
      * @global array $databaseConfig
      */
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
@@ -30,8 +27,7 @@ 
     /**
      *
      */
-    public function perform()
-    {
+    public function perform() {
         echo "[-] CreateEnvJob starting" . PHP_EOL;
         // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
         try {
@@ -55,8 +51,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
 
@@ -69,8 +64,7 @@ 
      *
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/DataTransferJob.php

Braces +6 added lines, -12 removed lines

@@ -7,28 +7,24 @@ 
  * @package deploynaut
  * @subpackage jobs
  */
-class DataTransferJob
-{
+class DataTransferJob {
 
     /**
      * set by a resque worker
      */
     public $args = array();
 
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         echo "[-] DataTransferJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
@@ -114,8 +110,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
         $env = DNDataTransfer::get()->byID($this->args['dataTransferID']);
@@ -126,8 +121,7 @@ 
     /**
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/DeployJob.php

Braces +6 added lines, -12 removed lines

@@ -3,28 +3,24 @@ 
 /**
  * Runs a deployment via the most appropriate backend
  */
-class DeployJob
-{
+class DeployJob {
 
     /**
      * @var array
      */
     public $args;
 
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         echo "[-] DeployJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
@@ -75,8 +71,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
         $dnDeployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -87,8 +82,7 @@ 
     /**
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/FetchJob.php

Braces +8 added lines, -16 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class FetchJob
-{
+class FetchJob {
 
     public $args;
 
@@ -23,8 +22,7 @@ 
     /**
      * @global array $databaseConfig
      */
-    public function setUp()
-    {
+    public function setUp() {
         global $databaseConfig;
         DB::connect($databaseConfig);
 
@@ -32,14 +30,12 @@ 
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         set_time_limit(0);
 
         if (!empty($this->args['logfile'])) {
@@ -95,16 +91,14 @@ 
         }
     }
 
-    protected function fetchRepo()
-    {
+    protected function fetchRepo() {
         $this->runCommand(
             'git fetch -p origin +refs/heads/*:refs/heads/* --tags',
             $this->project->getLocalCVSPath()
         );
     }
 
-    protected function cloneRepo()
-    {
+    protected function cloneRepo() {
         if (file_exists($this->project->getLocalCVSPath())) {
             $this->runCommand(sprintf(
                 'rm -rf %s',
@@ -126,8 +120,7 @@ 
      * @param string|null $workingDir The working dir to run command in
      * @throws RuntimeException
      */
-    protected function runCommand($command, $workingDir = null)
-    {
+    protected function runCommand($command, $workingDir = null) {
         if (!empty($this->user)) {
             $command = sprintf('sudo -u %s %s', $this->user, $command);
         }
@@ -147,8 +140,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
 

code/jobs/PingJob.php

Braces +4 added lines, -8 removed lines

@@ -4,8 +4,7 @@ 
  * Runs a capistrano job that will check the connection and that all folders with
  * permission are setup correctly
  */
-class PingJob
-{
+class PingJob {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
     /**
      * @global array $databaseConfig
      */
-    public function setUp()
-    {
+    public function setUp() {
         global $databaseConfig;
         DB::connect($databaseConfig);
         chdir(BASE_PATH);
@@ -25,16 +23,14 @@ 
     /**
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
     /**
      * Do the actual job by calling the appropiate backend
      */
-    public function perform()
-    {
+    public function perform() {
         echo "[-] PingJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();

code/model/DNBranch.php

Braces +9 added lines, -18 removed lines

@@ -5,8 +5,7 @@ 
  *
  * @method string getName()
  */
-class DNBranch extends ViewableData
-{
+class DNBranch extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Reference\Branch
@@ -37,28 +36,24 @@ 
      * @param DNProject $project
      * @param DNData $data
      */
-    public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data)
-    {
+    public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data) {
         $this->branch = $branch;
         $this->project = $project;
         $this->data = $data;
     }
 
-    public function __toString()
-    {
+    public function __toString() {
         return $this->Name();
     }
 
     /**
      * @return string
      */
-    public function Name()
-    {
+    public function Name() {
         return (string)htmlentities($this->branch->getName());
     }
 
-    public function Link()
-    {
+    public function Link() {
         // Use a get-var for branch so that it can handle unsafe chars better
         return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
     }
@@ -66,16 +61,14 @@ 
     /**
      * @return string
      */
-    public function SHA()
-    {
+    public function SHA() {
         return (string)htmlentities($this->branch->getCommit()->getHash());
     }
 
     /**
      * Provides a DNBuildList of builds found in this project.
      */
-    public function DNBuildList()
-    {
+    public function DNBuildList() {
         $blockBranch = $this->branch->getName() == 'master' ? null : 'master';
         return DNReferenceList::create($this->project, $this->data, $this->branch, $blockBranch);
     }
@@ -83,8 +76,7 @@ 
     /**
      * @return SS_Datetime
      */
-    public function LastUpdated()
-    {
+    public function LastUpdated() {
         if ($this->_lastUpdatedCache) {
             return $this->_lastUpdatedCache;
         }
@@ -109,8 +101,7 @@ 
     /**
      * @return string
      */
-    public function IsOpenByDefault()
-    {
+    public function IsOpenByDefault() {
         if ($this->Name() == 'master') {
             return " open";
         } else {

code/model/DNBranchList.php

Braces +7 added lines, -14 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Class DNBranchList
  */
-class DNBranchList extends ArrayList
-{
+class DNBranchList extends ArrayList {
 
     /**
      * @var string
@@ -31,13 +30,11 @@ 
      */
     protected $data;
 
-    public static function set_refs_dir($refsDir)
-    {
+    public static function set_refs_dir($refsDir) {
         self::$refs_dir = $refsDir;
     }
 
-    public static function get_refs_dir()
-    {
+    public static function get_refs_dir() {
         return self::$refs_dir;
     }
 
@@ -45,8 +42,7 @@ 
      * @param DNProject $project
      * @param DNData $data
      */
-    public function __construct(DNProject $project, DNData $data)
-    {
+    public function __construct(DNProject $project, DNData $data) {
         $this->project = $project;
         $this->data = $data;
         parent::__construct(array());
@@ -55,8 +51,7 @@ 
     /**
      * @return array
      */
-    protected function getReferences()
-    {
+    protected function getReferences() {
         $branches = array();
         // Placeholder to put master branch first
         $firstBranch = null;
@@ -90,8 +85,7 @@ 
      *
      * @return string
      */
-    public function byName($name)
-    {
+    public function byName($name) {
         if ($this->loaded === false) {
             $this->getIterator();
         }
@@ -109,8 +103,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator()
-    {
+    public function getIterator() {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;

code/model/DNCommit.php

Braces +12 added lines, -24 removed lines

@@ -1,6 +1,5 @@ 
 <?php
-class DNCommit extends ViewableData
-{
+class DNCommit extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Commit
@@ -62,8 +61,7 @@ 
      * @param DNData $data
      * @param string|null $ownerBranchName
      */
-    public function __construct(Gitonomy\Git\Commit $commit, DNProject $project, DNData $data, $ownerBranchName = null)
-    {
+    public function __construct(Gitonomy\Git\Commit $commit, DNProject $project, DNData $data, $ownerBranchName = null) {
         $this->commit = $commit;
         $this->buildname = $commit->getHash();
         $this->project = $project;
@@ -75,8 +73,7 @@ 
      * Return the hash of the commit, used to name this commit.
      * @return string
      */
-    public function Name()
-    {
+    public function Name() {
         if ($this->name == null) {
             $this->name = $this->commit->getFixedShortHash(8);
         }
@@ -88,8 +85,7 @@ 
      * Return the full SHA of the commit.
      * @return string
      */
-    public function SHA()
-    {
+    public function SHA() {
         return htmlentities($this->commit->getHash());
     }
 
@@ -97,8 +93,7 @@ 
      * Return the first line of the commit message.
      * @return string
      */
-    public function SubjectMessage()
-    {
+    public function SubjectMessage() {
         if ($this->subjectMessage == null) {
             $this->subjectMessage = $this->commit->getSubjectMessage();
         }
@@ -106,8 +101,7 @@ 
         return htmlentities($this->subjectMessage);
     }
 
-    public function BodyMessage()
-    {
+    public function BodyMessage() {
         if ($this->bodyMessage == null) {
             $this->bodyMessage = $this->commit->getBodyMessage();
         }
@@ -118,8 +112,7 @@ 
     /**
      * @return ArrayList
      */
-    public function References()
-    {
+    public function References() {
         if ($this->references !== null) {
             return $this->references;
         }
@@ -141,24 +134,21 @@ 
     /**
      * @return string
      */
-    public function FullName()
-    {
+    public function FullName() {
         return htmlentities($this->commit->getHash());
     }
 
     /**
      * @return string
      */
-    public function Filename()
-    {
+    public function Filename() {
         return htmlentities($this->commit->getHash());
     }
 
     /**
      * @return ArrayList
      */
-    public function CurrentlyDeployedTo()
-    {
+    public function CurrentlyDeployedTo() {
         $environments = $this->project->Environments();
         $envList = new ArrayList();
         foreach ($environments as $environment) {
@@ -181,8 +171,7 @@ 
      * @param string $environmentName
      * @return boolean True if this release has ever been deployed to the given environment
      */
-    public function EverDeployedTo($environmentName)
-    {
+    public function EverDeployedTo($environmentName) {
         $environments = $this->project->Environments()->filter('Name', $environmentName);
         if (!$environments->count()) {
             return false;
@@ -204,8 +193,7 @@ 
     /**
      * @return SS_Datetime
      */
-    public function Created()
-    {
+    public function Created() {
         $created = $this->commit->getCommitterDate();
 
         // gitonomy sets the time to UTC, so now we set the timezone to