silverstripe / deploynaut

code/model/DNDataArchive.php

Braces +23 added lines, -46 removed lines

@@ -47,8 +47,7 @@ 
  * @method ManyManyList DataTransfers()
  *
  */
-class DNDataArchive extends DataObject
-{
+class DNDataArchive extends DataObject {
 
     private static $db = array(
         'UploadToken' => 'Varchar(8)',
@@ -104,8 +103,7 @@ 
 
     private static $_cache_can_download = array();
 
-    public static function get_mode_map()
-    {
+    public static function get_mode_map() {
         return array(
             'all' => 'Database and Assets',
             'db' => 'Database only',
@@ -119,14 +117,12 @@ 
      *
      * @return string
      */
-    public static function generate_upload_token($chars = 8)
-    {
+    public static function generate_upload_token($chars = 8) {
         $generator = new RandomGenerator();
         return strtoupper(substr($generator->randomToken(), 0, $chars));
     }
 
-    public function onBeforeWrite()
-    {
+    public function onBeforeWrite() {
         if (!$this->AuthorID) {
             $this->AuthorID = Member::currentUserID();
         }
@@ -134,13 +130,11 @@ 
         parent::onBeforeWrite();
     }
 
-    public function onAfterDelete()
-    {
+    public function onAfterDelete() {
         $this->ArchiveFile()->delete();
     }
 
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = parent::getCMSFields();
         $fields->removeByName('OriginalEnvironmentID');
         $fields->removeByName('EnvironmentID');
@@ -173,8 +167,7 @@ 
         return $fields;
     }
 
-    public function getDefaultSearchContext()
-    {
+    public function getDefaultSearchContext() {
         $context = parent::getDefaultSearchContext();
         $context->getFields()->dataFieldByName('Mode')->setHasEmptyDefault(true);
 
@@ -187,8 +180,7 @@ 
      *
      * @return string The human-readable size of this archive file
      */
-    public function FileSize()
-    {
+    public function FileSize() {
         if ($this->ArchiveFile()->exists()) {
             return $this->ArchiveFile()->getSize();
         } else {
@@ -196,8 +188,7 @@ 
         }
     }
 
-    public function getModeNice()
-    {
+    public function getModeNice() {
         if ($this->Mode == 'all') {
             return 'database and assets';
         } else {
@@ -212,8 +203,7 @@ 
      *
      * @return boolean
      */
-    public function isPending()
-    {
+    public function isPending() {
         return !($this->ArchiveFileID);
     }
 
@@ -222,8 +212,7 @@ 
      *
      * @param Member|null $member The {@link Member} object to test against.
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return ($this->canRestore($member) || $this->canDownload($member));
     }
 
@@ -234,8 +223,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return true if $member (or the currently logged in member if null) can upload this archive
      */
-    public function canRestore($member = null)
-    {
+    public function canRestore($member = null) {
         $memberID = $member ? $member->ID : Member::currentUserID();
         if (!$memberID) {
             return false;
@@ -256,8 +244,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return true if $member (or the currently logged in member if null) can download this archive
      */
-    public function canDownload($member = null)
-    {
+    public function canDownload($member = null) {
         $memberID = $member ? $member->ID : Member::currentUserID();
         if (!$memberID) {
             return false;
@@ -276,8 +263,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return boolean if $member (or the currently logged in member if null) can delete this archive
      */
-    public function canDelete($member = null)
-    {
+    public function canDelete($member = null) {
         return $this->Environment()->canDeleteArchive($member);
     }
 
@@ -289,8 +275,7 @@ 
      *
      * @return boolean true if $member can upload archives linked to this environment, false if they can't.
      */
-    public function canMoveTo($targetEnv, $member = null)
-    {
+    public function canMoveTo($targetEnv, $member = null) {
         if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
             // We don't permit moving snapshots between projects at this stage.
             return false;
@@ -327,8 +312,7 @@ 
      *
      * @return ArrayList List of valid environments.
      */
-    public function validTargetEnvironments()
-    {
+    public function validTargetEnvironments() {
         $archive = $this;
         $envs = $this->Environment()->Project()->DNEnvironmentList()
             ->filterByCallback(function ($item) use ($archive) {
@@ -342,8 +326,7 @@ 
      * Returns a unique filename, including project/environment/timestamp details.
      * @return string
      */
-    public function generateFilename(DNDataTransfer $dataTransfer)
-    {
+    public function generateFilename(DNDataTransfer $dataTransfer) {
         $generator = new RandomGenerator();
         $filter = FileNameFilter::create();
 
@@ -364,8 +347,7 @@ 
      * @param DNDataTransfer
      * @return string Absolute file path
      */
-    public function generateFilepath(DNDataTransfer $dataTransfer)
-    {
+    public function generateFilepath(DNDataTransfer $dataTransfer) {
         $data = DNData::inst();
         $transferDir = $data->getDataTransferDir();
         $filter = FileNameFilter::create();
@@ -386,8 +368,7 @@ 
      * @param DNDataTransfer $dataTransfer
      * @return bool
      */
-    public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer)
-    {
+    public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer) {
         $sspakFilepath = ltrim(
             str_replace(
                 array(ASSETS_PATH, realpath(ASSETS_PATH)),
@@ -431,8 +412,7 @@ 
      * @throws RuntimeException
      * @return bool
      */
-    public function extractArchive($workingDir = null)
-    {
+    public function extractArchive($workingDir = null) {
         if (!is_dir($workingDir)) {
             mkdir($workingDir, 0700, true);
         }
@@ -490,8 +470,7 @@ 
      * @param string|null $mode "db", "assets", or "all". This is the content we're checking for. Default to the archive setting
      * @return ValidationResult
      */
-    public function validateArchiveContents($mode = null)
-    {
+    public function validateArchiveContents($mode = null) {
         $mode = $mode ?: $this->Mode;
         $result = new ValidationResult();
 
@@ -539,8 +518,7 @@ 
      * @throws RuntimeException
      * @return bool
      */
-    public function fixArchivePermissions($workingDir)
-    {
+    public function fixArchivePermissions($workingDir) {
         $fixCmds = array(
             // The directories need to have permissions changed one by one (hence the ; instead of +),
             // otherwise we might end up having no +x access to a directory deeper down.
@@ -567,8 +545,7 @@ 
      * @param string|null $workingDir The path of where the sspak has been extracted to
      * @return bool
      */
-    public function setArchiveFromFiles($workingDir)
-    {
+    public function setArchiveFromFiles($workingDir) {
         $command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
         if ($this->Mode == 'db') {
             $command .= sprintf(' --db=%s/database.sql', $workingDir);

code/model/DNEnvironment.php

Braces +59 added lines, -118 removed lines

@@ -39,8 +39,7 @@ 
  * @method ManyManyList PipelineCancellers()
  * @method ManyManyList PipelineCancellerGroups()
  */
-class DNEnvironment extends DataObject
-{
+class DNEnvironment extends DataObject {
 
     /**
      * If this is set to a full pathfile, it will be used as template
@@ -168,8 +167,7 @@ 
      * @param string $path
      * @return \DNEnvironment
      */
-    public static function create_from_path($path)
-    {
+    public static function create_from_path($path) {
         $e = DNEnvironment::create();
         $e->Filename = $path;
         $e->Name = basename($e->Filename, '.rb');
@@ -188,8 +186,7 @@ 
      *
      * @return DeploymentBackend
      */
-    public function Backend()
-    {
+    public function Backend() {
         $backends = array_keys($this->config()->get('allowed_backends', Config::FIRST_SET));
         switch (sizeof($backends)) {
         // Nothing allowed, use the default value "DeploymentBackend"
@@ -213,8 +210,7 @@ 
         return Injector::inst()->get($backend);
     }
 
-    public function Menu()
-    {
+    public function Menu() {
         $list = new ArrayList();
 
         $controller = Controller::curr();
@@ -236,8 +232,7 @@ 
      * Return the current object from $this->Menu()
      * Good for making titles and things
      */
-    public function CurrentMenu()
-    {
+    public function CurrentMenu() {
         return $this->Menu()->filter('IsSection', true)->First();
     }
 
@@ -247,13 +242,11 @@ 
      * @param string $separator The string used when concatenating project with env name
      * @return string
      */
-    public function getFullName($separator = ':')
-    {
+    public function getFullName($separator = ':') {
         return sprintf('%s%s%s', $this->Project()->Name, $separator, $this->Name);
     }
 
-    public function getBareURL()
-    {
+    public function getBareURL() {
         $url = parse_url($this->URL);
         if (isset($url['host'])) {
             return strtolower($url['host']);
@@ -263,8 +256,7 @@ 
     /**
      * @return boolean true if there is a pipeline for the current environment.
      */
-    public function HasPipelineSupport()
-    {
+    public function HasPipelineSupport() {
         $config = $this->GenericPipelineConfig();
         return $config instanceof ArrayData && isset($config->Steps);
     }
@@ -275,8 +267,7 @@ 
      *
      * @return Pipeline
      */
-    public function GenericPipeline()
-    {
+    public function GenericPipeline() {
         $pipeline = Pipeline::create();
         $pipeline->EnvironmentID = $this->ID;
         return $pipeline;
@@ -287,8 +278,7 @@ 
      *
      * @return ArrayData
      */
-    public function GenericPipelineConfig()
-    {
+    public function GenericPipelineConfig() {
         $config = $this->loadPipelineConfig();
         if ($config) {
             return self::array_to_viewabledata($config);
@@ -300,8 +290,7 @@ 
      *
      * @return array
      */
-    public function loadPipelineConfig()
-    {
+    public function loadPipelineConfig() {
         require_once 'thirdparty/spyc/spyc.php';
 
         $path = $this->getPipelineFilename();
@@ -316,8 +305,7 @@ 
      * `DependsOnEnvironment` - these are used together to find the {@link DNEnvironment} that this environment should
      * rely on.
      */
-    public function DependsOnEnvironment()
-    {
+    public function DependsOnEnvironment() {
         if ($this->HasPipelineSupport()) {
             $pipeline = $this->GenericPipeline();
             return $pipeline->getDependentEnvironment();
@@ -329,8 +317,7 @@ 
     /**
      * @return bool true if there is a currently running Pipeline, and false if there isn't
      */
-    public function HasCurrentPipeline()
-    {
+    public function HasCurrentPipeline() {
         return $this->CurrentPipeline() && $this->CurrentPipeline()->isInDB();
     }
 
@@ -340,16 +327,14 @@ 
      *
      * @return DataObject|null The currently running pipeline, or null if there isn't any.
      */
-    public function CurrentPipeline()
-    {
+    public function CurrentPipeline() {
         return $this->Pipelines()->filter('Status', array('Running', 'Rollback'))->first();
     }
 
     /**
      * @return bool true if the current user can cancel a running pipeline
      */
-    public function CanCancelPipeline()
-    {
+    public function CanCancelPipeline() {
         // do we have a current pipeline
         if ($this->HasCurrentPipeline()) {
             return $this->CurrentPipeline()->canAbort();
@@ -363,8 +348,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -392,8 +376,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canDeploy($member = null)
-    {
+    public function canDeploy($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -423,8 +406,7 @@ 
      * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
      * @return boolean true if $member can restore, and false if they can't.
      */
-    public function canRestore($member = null)
-    {
+    public function canRestore($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -454,8 +436,7 @@ 
      * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
      * @return boolean true if $member can backup, and false if they can't.
      */
-    public function canBackup($member = null)
-    {
+    public function canBackup($member = null) {
         $project = $this->Project();
         if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
             return false;
@@ -494,8 +475,7 @@ 
      * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
      * @return boolean true if $member can upload archives linked to this environment, false if they can't.
      */
-    public function canUploadArchive($member = null)
-    {
+    public function canUploadArchive($member = null) {
         $project = $this->Project();
         if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
             return false;
@@ -530,8 +510,7 @@ 
      * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
      * @return boolean true if $member can download archives from this environment, false if they can't.
      */
-    public function canDownloadArchive($member = null)
-    {
+    public function canDownloadArchive($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -560,8 +539,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canAbort($member = null)
-    {
+    public function canAbort($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -583,8 +561,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canApprove($member = null)
-    {
+    public function canApprove($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -606,8 +583,7 @@ 
      * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
      * @return boolean true if $member can delete archives from this environment, false if they can't.
      */
-    public function canDeleteArchive($member = null)
-    {
+    public function canDeleteArchive($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -635,8 +611,7 @@ 
      *
      * @return string
      */
-    public function getDeployersList()
-    {
+    public function getDeployersList() {
         return implode(
             ", ",
             array_merge(
@@ -651,8 +626,7 @@ 
      *
      * @return string
      */
-    public function getCanRestoreMembersList()
-    {
+    public function getCanRestoreMembersList() {
         return implode(
             ", ",
             array_merge(
@@ -667,8 +641,7 @@ 
      *
      * @return string
      */
-    public function getCanBackupMembersList()
-    {
+    public function getCanBackupMembersList() {
         return implode(
             ", ",
             array_merge(
@@ -684,8 +657,7 @@ 
      *
      * @return string
      */
-    public function getArchiveUploadersList()
-    {
+    public function getArchiveUploadersList() {
         return implode(
             ", ",
             array_merge(
@@ -700,8 +672,7 @@ 
      *
      * @return string
      */
-    public function getArchiveDownloadersList()
-    {
+    public function getArchiveDownloadersList() {
         return implode(
             ", ",
             array_merge(
@@ -716,8 +687,7 @@ 
      *
      * @return string
      */
-    public function getArchiveDeletersList()
-    {
+    public function getArchiveDeletersList() {
         return implode(
             ", ",
             array_merge(
@@ -732,8 +702,7 @@ 
      *
      * @return string
      */
-    public function getPipelineApproversList()
-    {
+    public function getPipelineApproversList() {
         return implode(
             ", ",
             array_merge(
@@ -748,8 +717,7 @@ 
      *
      * @return string
      */
-    public function getPipelineCancellersList()
-    {
+    public function getPipelineCancellersList() {
         return implode(
             ", ",
             array_merge(
@@ -762,8 +730,7 @@ 
     /**
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
@@ -775,8 +742,7 @@ 
      *
      * @return false|DNDeployment
      */
-    public function CurrentBuild()
-    {
+    public function CurrentBuild() {
         // The DeployHistory function is far too slow to use for this
 
         /** @var DNDeployment $deploy */
@@ -815,8 +781,7 @@ 
      *
      * @return ArrayList
      */
-    public function DeployHistory()
-    {
+    public function DeployHistory() {
         return $this->Deployments()
             ->where('SHA IS NOT NULL')
             ->sort('LastEdited DESC');
@@ -826,8 +791,7 @@ 
      * @param string $sha
      * @return array
      */
-    protected function getCommitData($sha)
-    {
+    protected function getCommitData($sha) {
         try {
             $repo = $this->Project()->getRepository();
             if ($repo !== false) {
@@ -855,8 +819,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return $this->Project()->Link() . "/environment/" . $this->Name;
     }
 
@@ -864,8 +827,7 @@ 
      * Is this environment currently at the root level of the controller that handles it?
      * @return bool
      */
-    public function isCurrent()
-    {
+    public function isCurrent() {
         return $this->isSection() && Controller::curr()->getAction() == 'environment';
     }
 
@@ -873,8 +835,7 @@ 
      * Is this environment currently in a controller that is handling it or performing a sub-task?
      * @return bool
      */
-    public function isSection()
-    {
+    public function isSection() {
         $controller = Controller::curr();
         $environment = $controller->getField('CurrentEnvironment');
         return $environment && $environment->ID == $this->ID;
@@ -890,8 +851,7 @@ 
      * @param array $members List of members
      * @return FieldGroup
      */
-    protected function buildPermissionField($groupField, $memberField, $groups, $members)
-    {
+    protected function buildPermissionField($groupField, $memberField, $groups, $members) {
         return FieldGroup::create(
             ListboxField::create($groupField, false, $groups)
                 ->setMultiple(true)
@@ -910,8 +870,7 @@ 
     /**
      * @return FieldList
      */
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = new FieldList(new TabSet('Root'));
 
         $project = $this->Project();
@@ -1090,8 +1049,7 @@ 
     /**
      * @param FieldList $fields
      */
-    protected function setDeployConfigurationFields(&$fields)
-    {
+    protected function setDeployConfigurationFields(&$fields) {
         if (!$this->config()->get('allow_web_editing')) {
             return;
         }
@@ -1115,8 +1073,7 @@ 
     /**
      * @param FieldList $fields
      */
-    protected function setPipelineConfigurationFields($fields)
-    {
+    protected function setPipelineConfigurationFields($fields) {
         if (!$this->config()->get('allow_web_editing')) {
             return;
         }
@@ -1144,8 +1101,7 @@ 
 
     /**
      */
-    public function onBeforeWrite()
-    {
+    public function onBeforeWrite() {
         parent::onBeforeWrite();
         if ($this->Name && $this->Name . '.rb' != $this->Filename) {
             $this->Filename = $this->Name . '.rb';
@@ -1155,8 +1111,7 @@ 
         $this->writePipelineFile();
     }
 
-    public function onAfterWrite()
-    {
+    public function onAfterWrite() {
         parent::onAfterWrite();
 
         if ($this->Usage == 'Production' || $this->Usage == 'UAT') {
@@ -1176,8 +1131,7 @@ 
     /**
      * Ensure that environment paths are setup on the local filesystem
      */
-    protected function checkEnvironmentPath()
-    {
+    protected function checkEnvironmentPath() {
         // Create folder if it doesn't exist
         $configDir = dirname($this->getConfigFilename());
         if (!file_exists($configDir) && $configDir) {
@@ -1188,8 +1142,7 @@ 
     /**
      * Write the deployment config file to filesystem
      */
-    protected function writeConfigFile()
-    {
+    protected function writeConfigFile() {
         if (!$this->config()->get('allow_web_editing')) {
             return;
         }
@@ -1209,8 +1162,7 @@ 
     /**
      * Write the pipeline config file to filesystem
      */
-    protected function writePipelineFile()
-    {
+    protected function writePipelineFile() {
         if (!$this->config()->get('allow_web_editing')) {
             return;
         }
@@ -1227,8 +1179,7 @@ 
     /**
      * Delete any related config files
      */
-    public function onAfterDelete()
-    {
+    public function onAfterDelete() {
         parent::onAfterDelete();
         // Create a basic new environment config from a template
         if ($this->config()->get('allow_web_editing') && $this->envFileExists()) {
@@ -1244,8 +1195,7 @@ 
     /**
      * @return string
      */
-    protected function getEnvironmentConfig()
-    {
+    protected function getEnvironmentConfig() {
         if (!$this->envFileExists()) {
             return '';
         }
@@ -1255,8 +1205,7 @@ 
     /**
      * @return boolean
      */
-    protected function envFileExists()
-    {
+    protected function envFileExists() {
         if (!$this->getConfigFilename()) {
             return false;
         }
@@ -1268,8 +1217,7 @@ 
      *
      * @return string
      */
-    public function getConfigFilename()
-    {
+    public function getConfigFilename() {
         if (!$this->Project()->exists()) {
             return '';
         }
@@ -1285,8 +1233,7 @@ 
      *
      * @return string
      */
-    public function getPipelineFilename()
-    {
+    public function getPipelineFilename() {
         $name = $this->getConfigFilename();
         if (!$name) {
             return null;
@@ -1302,8 +1249,7 @@ 
      *
      * @return boolean
      */
-    protected function pipelineFileExists()
-    {
+    protected function pipelineFileExists() {
         $filename = $this->getPipelineFilename();
         if (empty($filename)) {
             return false;
@@ -1319,8 +1265,7 @@ 
      * @return object Either an {@link ArrayList} or {@link ArrayData} object, or the original item ($array) if $array
      * isn't an array.
      */
-    public static function array_to_viewabledata($array)
-    {
+    public static function array_to_viewabledata($array) {
         // Don't transform non-arrays
         if (!is_array($array)) {
             return $array;
@@ -1354,8 +1299,7 @@ 
      *
      * @return DataList
      */
-    public function getDependentFilteredCommits()
-    {
+    public function getDependentFilteredCommits() {
         // check if this environment depends on another environemnt
         $dependsOnEnv = $this->DependsOnEnvironment();
         if (empty($dependsOnEnv)) {
@@ -1386,8 +1330,7 @@ 
      *
      * @param DeploynautLogFile $log
      */
-    public function enableMaintenace($log)
-    {
+    public function enableMaintenace($log) {
         $this->Backend()
             ->enableMaintenance($this, $log, $this->Project());
     }
@@ -1397,14 +1340,12 @@ 
      *
      * @param DeploynautLogFile $log
      */
-    public function disableMaintenance($log)
-    {
+    public function disableMaintenance($log) {
         $this->Backend()
             ->disableMaintenance($this, $log, $this->Project());
     }
 
-    protected function validate()
-    {
+    protected function validate() {
         $result = parent::validate();
         $backend = $this->Backend();
 

code/model/DNFailedCommits.php

Braces +2 added lines, -4 removed lines

@@ -6,13 +6,11 @@
  *  Class to represent failed commits
  *
  */
-class DNFailedCommits extends DNFilteredCommits
-{
+class DNFailedCommits extends DNFilteredCommits {
 
     private $description = 'Commits that have failed in the past';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Failed');
     }

code/model/DNFilteredCommits.php

Braces +5 added lines, -10 removed lines

@@ -27,8 +27,7 @@ 
  *    PerformTestOn: 'ThisEnvironment'
  *
  */
-class DNFilteredCommits extends Object
-{
+class DNFilteredCommits extends Object {
 
     public $env;
 
@@ -39,13 +38,11 @@ 
     // default sort to be by the latest commit
     protected $sort = 'DESC';
 
-    public function setFilter($filter = 'Finished')
-    {
+    public function setFilter($filter = 'Finished') {
         $this->filter = $filter;
     }
 
-    public function getCommits()
-    {
+    public function getCommits() {
         if (!isset($this->env)) {
             $this->environmentNotSetException();
         }
@@ -56,8 +53,7 @@ 
         return $successfulCommits;
     }
 
-    public function getLatestCommit()
-    {
+    public function getLatestCommit() {
         if (!isset($this->env)) {
             $this->environmentNotSetException();
         }
@@ -65,8 +61,7 @@ 
         return $commits->first();
     }
 
-    private function environmentNotSetException()
-    {
+    private function environmentNotSetException() {
         throw new Exception($this->environmentExceptionError);
     }
 }

code/model/DNFinishedCommits.php

Braces +2 added lines, -4 removed lines

@@ -6,15 +6,13 @@
  *  Class to represent finished commits
  *
  */
-class DNFinishedCommits extends DNFilteredCommits
-{
+class DNFinishedCommits extends DNFilteredCommits {
     /**
      * @var string
      */
     private $description = 'Commits successfully deployed in the past';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Finished');
     }

code/model/DNProject.php

Braces +63 added lines, -126 removed lines

@@ -12,8 +12,7 @@ 
  * @method ManyManyList Viewers()
  * @method ManyManyList StarredBy()
  */
-class DNProject extends DataObject
-{
+class DNProject extends DataObject {
 
     /**
      * @var array
@@ -103,8 +102,7 @@ 
      * @param string $path
      * @return \DNProject
      */
-    public static function create_from_path($path)
-    {
+    public static function create_from_path($path) {
         $project = DNProject::create();
         $project->Name = $path;
         $project->write();
@@ -123,8 +121,7 @@ 
      * @param int $round Number of decimal places to round to
      * @return double The used quota size in MB
      */
-    public function getUsedQuotaMB($round = 2)
-    {
+    public function getUsedQuotaMB($round = 2) {
         $size = 0;
 
         foreach ($this->Environments() as $environment) {
@@ -144,8 +141,7 @@ 
      *
      * @return string|int The quota size in MB
      */
-    public function getDiskQuotaMB()
-    {
+    public function getDiskQuotaMB() {
         $size = $this->getField('DiskQuotaMB');
 
         if (empty($size)) {
@@ -161,8 +157,7 @@ 
      *
      * @return boolean
      */
-    public function HasExceededDiskQuota()
-    {
+    public function HasExceededDiskQuota() {
         return $this->getUsedQuotaMB(0) >= $this->getDiskQuotaMB();
     }
 
@@ -171,8 +166,7 @@ 
      *
      * @return boolean
      */
-    public function HasDiskQuota()
-    {
+    public function HasDiskQuota() {
         return $this->getDiskQuotaMB() > 0;
     }
 
@@ -181,8 +175,7 @@ 
      *
      * @return int
      */
-    public function DiskQuotaUsagePercent()
-    {
+    public function DiskQuotaUsagePercent() {
         $quota = $this->getDiskQuotaMB();
         if ($quota > 0) {
             return $this->getUsedQuotaMB() * 100 / $quota;
@@ -195,8 +188,7 @@ 
      *
      * @return ArrayList
      */
-    public function Menu()
-    {
+    public function Menu() {
         $list = new ArrayList();
 
         $controller = Controller::curr();
@@ -221,8 +213,7 @@ 
      *
      * @return bool
      */
-    public function isCurrent()
-    {
+    public function isCurrent() {
         return $this->isSection() && Controller::curr()->getAction() == 'project';
     }
 
@@ -232,8 +223,7 @@ 
      *
      * @return DataObject
      */
-    public function CurrentMenu()
-    {
+    public function CurrentMenu() {
         return $this->Menu()->filter('IsSection', true)->First();
     }
 
@@ -242,8 +232,7 @@ 
      *
      * @return bool
      */
-    public function isSection()
-    {
+    public function isSection() {
         $controller = Controller::curr();
         $project = $controller->getField('CurrentProject');
         return $project && $this->ID == $project->ID;
@@ -255,8 +244,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -273,8 +261,7 @@ 
      *
      * @return bool
      */
-    public function canRestore($member = null)
-    {
+    public function canRestore($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -294,8 +281,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canBackup($member = null)
-    {
+    public function canBackup($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -315,8 +301,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canUploadArchive($member = null)
-    {
+    public function canUploadArchive($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -336,8 +321,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canDownloadArchive($member = null)
-    {
+    public function canDownloadArchive($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -363,8 +347,7 @@ 
      *
      * @return bool
      */
-    public function canCreateEnvironments($member = null)
-    {
+    public function canCreateEnvironments($member = null) {
         $envType = $this->AllowedEnvironmentType;
         if ($envType) {
             $env = Injector::inst()->get($envType);
@@ -378,8 +361,7 @@ 
     /**
      * @return DataList
      */
-    public function DataArchives()
-    {
+    public function DataArchives() {
         $envIds = $this->Environments()->column('ID');
         return DNDataArchive::get()->filter('EnvironmentID', $envIds);
     }
@@ -390,8 +372,7 @@ 
      *
      * @return DataList
      */
-    public function PendingManualUploadDataArchives()
-    {
+    public function PendingManualUploadDataArchives() {
         return $this->DataArchives()->filter('ArchiveFileID', null);
     }
 
@@ -405,8 +386,7 @@ 
      *
      * @return array
      */
-    public function getProcessEnv()
-    {
+    public function getProcessEnv() {
         if (file_exists($this->getPrivateKeyPath())) {
             // Key-pair is available, use it.
             $processEnv = array(
@@ -426,16 +406,14 @@ 
      *
      * @return string
      */
-    public function getViewersList()
-    {
+    public function getViewersList() {
         return implode(", ", $this->Viewers()->column("Title"));
     }
 
     /**
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
@@ -444,8 +422,7 @@ 
      *
      * @return DNReferenceList
      */
-    public function DNBuildList()
-    {
+    public function DNBuildList() {
         return DNReferenceList::create($this, $this->DNData());
     }
 
@@ -454,8 +431,7 @@ 
      *
      * @return DNBranchList
      */
-    public function DNBranchList()
-    {
+    public function DNBranchList() {
         if ($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
@@ -467,8 +443,7 @@ 
      *
      * @return DNReferenceList
      */
-    public function DNTagList()
-    {
+    public function DNTagList() {
         if ($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
@@ -478,8 +453,7 @@ 
     /**
      * @return false|Gitonomy\Git\Repository
      */
-    public function getRepository()
-    {
+    public function getRepository() {
         if (!$this->repoExists()) {
             return false;
         }
@@ -493,8 +467,7 @@ 
      *
      * @return ArrayList
      */
-    public function DNEnvironmentList()
-    {
+    public function DNEnvironmentList() {
         if (!self::$_current_member_cache) {
             self::$_current_member_cache = Member::currentUser();
         }
@@ -514,8 +487,7 @@ 
      * @param string $usage
      * @return ArrayList
      */
-    public function EnvironmentsByUsage($usage)
-    {
+    public function EnvironmentsByUsage($usage) {
         return $this->DNEnvironmentList()->filter('Usage', $usage);
     }
 
@@ -524,8 +496,7 @@ 
      *
      * @return false|DNDeployment
      */
-    public function currentBuilds()
-    {
+    public function currentBuilds() {
         if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
             $currentBuilds = array();
             foreach ($this->Environments() as $env) {
@@ -540,16 +511,14 @@ 
      * @param string
      * @return string
      */
-    public function Link($action = '')
-    {
+    public function Link($action = '') {
         return Controller::join_links("naut", "project", $this->Name, $action);
     }
 
     /**
      * @return string|null
      */
-    public function CreateEnvironmentLink()
-    {
+    public function CreateEnvironmentLink() {
         if ($this->canCreateEnvironments()) {
             return $this->Link('createenv');
         }
@@ -559,16 +528,14 @@ 
     /**
      * @return string
      */
-    public function ToggleStarLink()
-    {
+    public function ToggleStarLink() {
         return $this->Link('/star');
     }
 
     /**
      * @return bool
      */
-    public function IsStarred()
-    {
+    public function IsStarred() {
         $member = Member::currentUser();
         if ($member === null) {
             return false;
@@ -584,16 +551,14 @@ 
      * @param string $action
      * @return string
      */
-    public function APILink($action)
-    {
+    public function APILink($action) {
         return Controller::join_links("naut", "api", $this->Name, $action);
     }
 
     /**
      * @return FieldList
      */
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = parent::getCMSFields();
 
         /** @var GridField $environments */
@@ -653,8 +618,7 @@ 
      *
      * @param FieldList $fields
      */
-    public function setCreateProjectFolderField(&$fields)
-    {
+    public function setCreateProjectFolderField(&$fields) {
         // Check if the capistrano project folder exists
         if (!$this->Name) {
             return;
@@ -675,16 +639,14 @@ 
     /**
      * @return boolean
      */
-    public function projectFolderExists()
-    {
+    public function projectFolderExists() {
         return file_exists($this->getProjectFolderPath());
     }
 
     /**
      * @return bool
      */
-    public function repoExists()
-    {
+    public function repoExists() {
         return file_exists(sprintf('%s/HEAD', $this->getLocalCVSPath()));
     }
 
@@ -692,8 +654,7 @@ 
      * Setup a job to clone a git repository.
      * @return string resque token
      */
-    public function cloneRepo()
-    {
+    public function cloneRepo() {
         // Avoid this being called multiple times in the same request
         if (!isset(self::$has_cloned_cache[$this->ID])) {
             $fetch = DNGitFetch::create();
@@ -712,13 +673,11 @@ 
     /**
      * @return string
      */
-    public function getLocalCVSPath()
-    {
+    public function getLocalCVSPath() {
         return sprintf('%s/%s', DEPLOYNAUT_LOCAL_VCS_PATH, $this->Name);
     }
 
-    public function onBeforeWrite()
-    {
+    public function onBeforeWrite() {
         parent::onBeforeWrite();
 
         if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
@@ -726,8 +685,7 @@ 
         }
     }
 
-    public function onAfterWrite()
-    {
+    public function onAfterWrite() {
         parent::onAfterWrite();
 
         if (!$this->CVSPath) {
@@ -743,8 +701,7 @@ 
     /**
      * Delete related environments and folders
      */
-    public function onAfterDelete()
-    {
+    public function onAfterDelete() {
         parent::onAfterDelete();
 
         // Delete related environments
@@ -773,8 +730,7 @@ 
      *
      * @return string|void
      */
-    public function getPublicKey()
-    {
+    public function getPublicKey() {
         $key = $this->getPublicKeyPath();
 
         if (file_exists($key)) {
@@ -787,8 +743,7 @@ 
      *
      * @return string|null
      */
-    public function getPublicKeyPath()
-    {
+    public function getPublicKeyPath() {
         if ($privateKey = $this->getPrivateKeyPath()) {
             return $privateKey . '.pub';
         }
@@ -800,8 +755,7 @@ 
      *
      * @return string|null
      */
-    public function getPrivateKeyPath()
-    {
+    public function getPrivateKeyPath() {
         $keyDir = $this->getKeyDir();
         if (!empty($keyDir)) {
             $filter = FileNameFilter::create();
@@ -816,8 +770,7 @@ 
      *
      * @return string|null
      */
-    public function getKeyDir()
-    {
+    public function getKeyDir() {
         $keyDir = $this->DNData()->getKeyDir();
         if (!$keyDir) {
             return null;
@@ -835,8 +788,7 @@ 
      * @param FieldList $fields
      * @param GridField $environments
      */
-    protected function setEnvironmentFields(&$fields, $environments)
-    {
+    protected function setEnvironmentFields(&$fields, $environments) {
         if (!$environments) {
             return;
         }
@@ -860,8 +812,7 @@ 
      *
      * @return void|string
      */
-    public function getRepositoryURL()
-    {
+    public function getRepositoryURL() {
         $showUrl = Config::inst()->get($this->class, 'show_repository_url');
         if ($showUrl) {
             return $this->CVSPath;
@@ -911,8 +862,7 @@ 
      *
      * @return ArrayData
      */
-    public function getRepositoryInterface()
-    {
+    public function getRepositoryInterface() {
         $interfaces = $this->config()->repository_interfaces;
 
         /* Look for each whitelisted hostname */
@@ -955,8 +905,7 @@ 
     /**
      * @return string
      */
-    protected function getProjectFolderPath()
-    {
+    protected function getProjectFolderPath() {
         return sprintf('%s/%s', $this->DNData()->getEnvironmentDir(), $this->Name);
     }
 
@@ -966,8 +915,7 @@ 
      * @param string $code
      * @return SS_List
      */
-    public function whoIsAllowed($code)
-    {
+    public function whoIsAllowed($code) {
         return $this->whoIsAllowedAny(array($code));
     }
 
@@ -978,8 +926,7 @@ 
      * @param array|string $codes
      * @return SS_List
      */
-    public function whoIsAllowedAny($codes)
-    {
+    public function whoIsAllowedAny($codes) {
         if (!is_array($codes)) {
             $codes = array($codes);
         }
@@ -1007,8 +954,7 @@ 
      *
      * @return bool
      */
-    public function allowed($code, $member = null)
-    {
+    public function allowed($code, $member = null) {
         return $this->allowedAny(array($code), $member);
     }
 
@@ -1020,8 +966,7 @@ 
      *
      * @return bool
      */
-    public function groupAllowed($permissionCode, Group $group)
-    {
+    public function groupAllowed($permissionCode, Group $group) {
         $viewers = $this->Viewers();
         if (!$viewers->find('ID', $group->ID)) {
             return false;
@@ -1041,8 +986,7 @@ 
      *
      * @return bool
      */
-    public function allowedAny($codes, $member = null)
-    {
+    public function allowedAny($codes, $member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -1060,8 +1004,7 @@ 
      *
      * @return bool
      */
-    public function isProjectReady()
-    {
+    public function isProjectReady() {
         if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
             // We're still creating the initial environments for this project so we're
             // not quite done
@@ -1090,8 +1033,7 @@ 
      *
      * @return SS_List
      */
-    public function getRunningEnvironmentCreations()
-    {
+    public function getRunningEnvironmentCreations() {
         return $this->CreateEnvironments()
             ->filter('Status', ['Queued', 'Started']);
     }
@@ -1101,8 +1043,7 @@ 
      *
      * @return DataList
      */
-    public function getInitialEnvironmentCreations()
-    {
+    public function getInitialEnvironmentCreations() {
         return $this->CreateEnvironments()->filter('IsInitialEnvironment', true);
     }
 
@@ -1111,8 +1052,7 @@ 
      *
      * @return DataList
      */
-    public function getRunningInitialEnvironmentCreations()
-    {
+    public function getRunningInitialEnvironmentCreations() {
         return $this->getInitialEnvironmentCreations()
             ->filter('Status', ['Queued', 'Started']);
     }
@@ -1122,8 +1062,7 @@ 
      *
      * @return DataList
      */
-    public function getCompleteInitialEnvironmentCreations()
-    {
+    public function getCompleteInitialEnvironmentCreations() {
         return $this->getInitialEnvironmentCreations()
             ->exclude('Status', ['Queued', 'Started']);
     }
@@ -1131,8 +1070,7 @@ 
     /**
      * @return ValidationResult
      */
-    protected function validate()
-    {
+    protected function validate() {
         $validation = parent::validate();
         if ($validation->valid()) {
             if (empty($this->Name)) {
@@ -1164,8 +1102,7 @@ 
      *
      * @return bool
      */
-    public function canCreate($member = null)
-    {
+    public function canCreate($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }

code/model/DNQueuedCommits.php

Braces +2 added lines, -4 removed lines

@@ -6,13 +6,11 @@
  *  Class to represent queued commits
  *
  */
-class DNQueuedCommits extends DNFilteredCommits
-{
+class DNQueuedCommits extends DNFilteredCommits {
 
     private $description = 'Commits that are currently queued';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Queued');
     }

code/model/DNReference.php

Braces +5 added lines, -10 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class DNReference extends ViewableData
-{
+class DNReference extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Reference
@@ -14,23 +13,19 @@ 
         'Filename' => 'Text'
     );
 
-    public function __construct(Gitonomy\Git\Reference $reference)
-    {
+    public function __construct(Gitonomy\Git\Reference $reference) {
         $this->reference = $reference;
     }
 
-    public function Name()
-    {
+    public function Name() {
         return $this->reference->getName();
     }
 
-    public function FullName()
-    {
+    public function FullName() {
         return $this->reference->getCommitHash();
     }
 
-    public function Filename()
-    {
+    public function Filename() {
         return $this->reference->getFullname();
     }
 }

code/model/DNReferenceList.php

Braces +8 added lines, -16 removed lines

@@ -2,8 +2,7 @@ 
 
 use Gitonomy\Git\Reference;
 
-class DNReferenceList extends ArrayList
-{
+class DNReferenceList extends ArrayList {
 
     /**
      * @var string
@@ -53,16 +52,14 @@ 
     /**
      * @param $refsDir
      */
-    public static function set_refs_dir($refsDir)
-    {
+    public static function set_refs_dir($refsDir) {
         self::$refs_dir = $refsDir;
     }
 
     /**
      * @return string
      */
-    public static function get_refs_dir()
-    {
+    public static function get_refs_dir() {
         return self::$refs_dir;
     }
 
@@ -92,8 +89,7 @@ 
      * @param int $limit
      * @return DNReferenceList
      */
-    public function setLimit($limit)
-    {
+    public function setLimit($limit) {
         $this->limit = $limit;
         return $this;
     }
@@ -101,8 +97,7 @@ 
     /**
      * @return array
      */
-    protected function getReferences()
-    {
+    protected function getReferences() {
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
         } catch (Exception $e) {
@@ -160,8 +155,7 @@ 
      * @param string $hash
      * @return DNCommit
      */
-    public function byName($hash)
-    {
+    public function byName($hash) {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
@@ -186,8 +180,7 @@ 
         return $found;
     }
 
-    public function Count()
-    {
+    public function Count() {
         $this->getIterator();
         return parent::Count();
     }
@@ -198,8 +191,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator()
-    {
+    public function getIterator() {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;