silverstripe / deploynaut

code/backends/PackageGenerator.php

Braces +4 added lines, -8 removed lines

@@ -6,8 +6,7 @@ 
  *
  * These package generators can be used by applicable deployment backends.
  */
-abstract class PackageGenerator
-{
+abstract class PackageGenerator {
 
     protected $cache;
 
@@ -31,13 +30,11 @@ 
      */
     abstract public function getIdentifier();
 
-    public function getCache()
-    {
+    public function getCache() {
         return $this->cache;
     }
 
-    public function setCache(PackageCache $cache)
-    {
+    public function setCache(PackageCache $cache) {
         $this->cache = $cache;
     }
 
@@ -51,8 +48,7 @@ 
      *
      * @return string
      */
-    public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log)
-    {
+    public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
         // Fetch through the cache
         if ($this->cache) {
             $identifier .= '-' . get_class($this) . '-' . $this->getIdentifier();

code/backends/SimplePackageGenerator.php

Braces +7 added lines, -14 removed lines

@@ -5,30 +5,25 @@ 
 /**
  * Generates the package directly on the deploynaut server
  */
-class SimplePackageGenerator extends PackageGenerator
-{
+class SimplePackageGenerator extends PackageGenerator {
 
     protected $buildScript = "composer install --prefer-dist --no-dev";
 
-    public function getParamMetadata()
-    {
+    public function getParamMetadata() {
         return array(
             'BuildScript' => array('title' => 'Build script'),
         );
     }
 
-    public function getBuildScript()
-    {
+    public function getBuildScript() {
         return $this->buildScript;
     }
 
-    public function setBuildScript($buildScript)
-    {
+    public function setBuildScript($buildScript) {
         $this->buildScript = $buildScript;
     }
 
-    public function getIdentifier()
-    {
+    public function getIdentifier() {
         // If the build script changes, don't re-use cached items
         return substr(sha1($this->buildScript), 0, 8);
     }
@@ -36,8 +31,7 @@ 
     /**
      * Generate the package
      */
-    public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log)
-    {
+    public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
         $tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
         if (!file_exists($tempPath)) {
             mkdir($tempPath);
@@ -82,8 +76,7 @@ 
      * @param array $processes An array of Symfony\Component\Process\Process objects
      * @param DeploynautLogFile $log The log to send output to
      */
-    protected function executeProcesses($processes, DeploynautLogFile $log)
-    {
+    protected function executeProcesses($processes, DeploynautLogFile $log) {
         foreach ($processes as $process) {
             $process->mustRun(function ($type, $buffer) use ($log) {
                 $log->write($buffer);

code/backends/SizeRestrictedPackageCache.php

Braces +5 added lines, -10 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Class for calling the package generator and caching the results.
  */
-class SizeRestrictedPackageCache implements PackageCache
-{
+class SizeRestrictedPackageCache implements PackageCache {
 
     protected $cacheSize;
     protected $baseDir;
@@ -17,8 +16,7 @@ 
      *
      * @param int $cacheSize the number of package files to keep.
      */
-    public function setCacheSize($cacheSize)
-    {
+    public function setCacheSize($cacheSize) {
         $this->cacheSize = $cacheSize;
     }
 
@@ -29,8 +27,7 @@ 
      *
      * @param string $baseDir The base directory
      */
-    public function setBaseDir($baseDir)
-    {
+    public function setBaseDir($baseDir) {
         $this->baseDir = realpath($baseDir);
     }
 
@@ -91,8 +88,7 @@ 
      *
      * @param string $identifier The unsanitised directory name.
      */
-    protected function sanitiseDirName($identifier)
-    {
+    protected function sanitiseDirName($identifier) {
         $safe = preg_replace('/[^A-Za-z0-9_-]/', '', $identifier);
         return $safe ? $safe : 'null';
     }
@@ -105,8 +101,7 @@ 
      * @param int $count The maximum number of .tar.gz files that can appear in that directory
      * @param DeploynautLogFile $log The log to send removal status messages to
      */
-    protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log)
-    {
+    protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log) {
         $files = glob($dir . '/*.tar.gz');
         if (sizeof($files) > $count) {
             usort($files, function ($a, $b) {

code/control/CheckPipelineStatus.php

Braces +3 added lines, -6 removed lines

@@ -8,10 +8,8 @@ 
  * @package deploynaut
  * @subpackage control
  */
-class CheckPipelineStatus extends Controller
-{
-    public function index()
-    {
+class CheckPipelineStatus extends Controller {
+    public function index() {
         // @TODO Check that we have been called via the daemon
         if (php_sapi_name() != "cli") {
             throw new Exception("CheckPipelineStatus must be run from the command-line.");
@@ -20,8 +18,7 @@ 
         $this->run();
     }
 
-    private function run()
-    {
+    private function run() {
         // Note that a pipeline must be started prior to being picked up by this task
         $runningPipelines = Pipeline::get()->filter('Status', array('Running', 'Rollback'));
 

code/control/ConfirmationMessagingService.php

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
  * @package deploynaut
  * @subpackage control
  */
-interface ConfirmationMessagingService
-{
+interface ConfirmationMessagingService {
 
     /**
      * Sends a message to the specified user

code/control/DNAdmin.php

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-class DNAdmin extends ModelAdmin
-{
+class DNAdmin extends ModelAdmin {
 
     /**
      * @var string

code/control/DNRoot.php

Braces +84 added lines, -168 removed lines

@@ -170,8 +170,7 @@ 
     /**
      * Include requirements that deploynaut needs, such as javascript.
      */
-    public static function include_requirements()
-    {
+    public static function include_requirements() {
 
         // JS should always go to the bottom, otherwise there's the risk that Requirements
         // puts them halfway through the page to the nearest <script> tag. We don't want that.
@@ -209,8 +208,7 @@ 
      *
      * @return boolean
      */
-    public static function FlagSnapshotsEnabled()
-    {
+    public static function FlagSnapshotsEnabled() {
         if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
             return true;
         }
@@ -227,8 +225,7 @@ 
     /**
      * @return ArrayList
      */
-    public static function get_support_links()
-    {
+    public static function get_support_links() {
         $supportLinks = self::config()->support_links;
         if ($supportLinks) {
             return new ArrayList($supportLinks);
@@ -238,8 +235,7 @@ 
     /**
      * @return array
      */
-    public static function get_template_global_variables()
-    {
+    public static function get_template_global_variables() {
         return array(
             'RedisUnavailable' => 'RedisUnavailable',
             'RedisWorkersCount' => 'RedisWorkersCount',
@@ -250,8 +246,7 @@ 
 
     /**
      */
-    public function init()
-    {
+    public function init() {
         parent::init();
 
         if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
@@ -267,8 +262,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return "naut/";
     }
 
@@ -278,8 +272,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         return $this->redirect($this->Link() . 'projects/');
     }
 
@@ -289,8 +282,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function projects(SS_HTTPRequest $request)
-    {
+    public function projects(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects in DNProjectsList() call.
         return $this->customise(array(
             'Title' => 'Projects',
@@ -301,8 +293,7 @@ 
      * @param SS_HTTPRequest $request
      * @return HTMLText
      */
-    public function nav(SS_HTTPRequest $request)
-    {
+    public function nav(SS_HTTPRequest $request) {
         return $this->renderWith('Nav');
     }
 
@@ -310,8 +301,7 @@ 
      * Return a link to the navigation template used for AJAX requests.
      * @return string
      */
-    public function NavLink()
-    {
+    public function NavLink() {
         $currentProject = $this->getCurrentProject();
         $projectName = $currentProject ? $currentProject->Name : null;
         return Controller::join_links(Director::absoluteBaseURL(), 'naut', 'nav', $projectName);
@@ -323,8 +313,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse - HTML
      */
-    public function snapshots(SS_HTTPRequest $request)
-    {
+    public function snapshots(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
         return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots');
     }
@@ -335,8 +324,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function createsnapshot(SS_HTTPRequest $request)
-    {
+    public function createsnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -362,8 +350,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function uploadsnapshot(SS_HTTPRequest $request)
-    {
+    public function uploadsnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -387,8 +374,7 @@ 
      * Return the upload limit for snapshot uploads
      * @return string
      */
-    public function UploadLimit()
-    {
+    public function UploadLimit() {
         return File::format_size(min(
             File::ini2bytes(ini_get('upload_max_filesize')),
             File::ini2bytes(ini_get('post_max_size'))
@@ -401,8 +387,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getUploadSnapshotForm(SS_HTTPRequest $request)
-    {
+    public function getUploadSnapshotForm(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -459,8 +444,7 @@ 
      *
      * @return bool|HTMLText|SS_HTTPResponse
      */
-    public function doUploadSnapshot($data, Form $form)
-    {
+    public function doUploadSnapshot($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -559,8 +543,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getPostSnapshotForm(SS_HTTPRequest $request)
-    {
+    public function getPostSnapshotForm(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -611,8 +594,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doPostSnapshot($data, $form)
-    {
+    public function doPostSnapshot($data, $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $project = $this->getCurrentProject();
@@ -649,8 +631,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse - HTML
      */
-    public function snapshotslog(SS_HTTPRequest $request)
-    {
+    public function snapshotslog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
         return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots Log');
     }
@@ -660,8 +641,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function postsnapshotsuccess(SS_HTTPRequest $request)
-    {
+    public function postsnapshotsuccess(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -695,8 +675,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function project(SS_HTTPRequest $request)
-    {
+    public function project(SS_HTTPRequest $request) {
         return $this->getCustomisedViewSection('ProjectOverview', '', array('IsAdmin' => Permission::check('ADMIN')));
     }
 
@@ -707,8 +686,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function toggleprojectstar(SS_HTTPRequest $request)
-    {
+    public function toggleprojectstar(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->project404Response();
@@ -734,8 +712,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function branch(SS_HTTPRequest $request)
-    {
+    public function branch(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->project404Response();
@@ -756,8 +733,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function environment(SS_HTTPRequest $request)
-    {
+    public function environment(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -785,8 +761,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doDryRun($data, DeployForm $form)
-    {
+    public function doDryRun($data, DeployForm $form) {
         return $this->beginPipeline($data, $form, true);
     }
 
@@ -797,8 +772,7 @@ 
      * @param DeployForm $form
      * @return \SS_HTTPResponse
      */
-    public function startPipeline($data, $form)
-    {
+    public function startPipeline($data, $form) {
         return $this->beginPipeline($data, $form);
     }
 
@@ -810,8 +784,7 @@ 
      * @param bool $isDryRun
      * @return \SS_HTTPResponse
      */
-    protected function beginPipeline($data, DeployForm $form, $isDryRun = false)
-    {
+    protected function beginPipeline($data, DeployForm $form, $isDryRun = false) {
         $buildName = $form->getSelectedBuild($data);
 
         // Performs canView permission check by limiting visible projects
@@ -851,8 +824,7 @@ 
      * @return SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function pipeline(SS_HTTPRequest $request)
-    {
+    public function pipeline(SS_HTTPRequest $request) {
         $params = $request->params();
         $pipeline = Pipeline::get()->byID($params['Identifier']);
 
@@ -883,8 +855,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string
      */
-    public function createenv(SS_HTTPRequest $request)
-    {
+    public function createenv(SS_HTTPRequest $request) {
         $params = $request->params();
         if ($params['Identifier']) {
             $record = DNCreateEnvironment::get()->byId($params['Identifier']);
@@ -913,8 +884,7 @@ 
     }
 
 
-    public function createenvlog(SS_HTTPRequest $request)
-    {
+    public function createenvlog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -947,8 +917,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getCreateEnvironmentForm(SS_HTTPRequest $request)
-    {
+    public function getCreateEnvironmentForm(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
@@ -999,8 +968,7 @@ 
      *
      * @return bool|HTMLText|SS_HTTPResponse
      */
-    public function doCreateEnvironment($data, Form $form)
-    {
+    public function doCreateEnvironment($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
@@ -1030,8 +998,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function metrics(SS_HTTPRequest $request)
-    {
+    public function metrics(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -1052,8 +1019,7 @@ 
      *
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
@@ -1062,8 +1028,7 @@ 
      *
      * @return SS_List
      */
-    public function DNProjectList()
-    {
+    public function DNProjectList() {
         $memberId = Member::currentUserID();
         if (!$memberId) {
             return new ArrayList();
@@ -1081,8 +1046,7 @@ 
     /**
      * @return ArrayList
      */
-    public function getPlatformSpecificStrings()
-    {
+    public function getPlatformSpecificStrings() {
         $strings = $this->config()->platform_specific_strings;
         if ($strings) {
             return new ArrayList($strings);
@@ -1094,8 +1058,7 @@ 
      *
      * @return SS_List
      */
-    public function getStarredProjects()
-    {
+    public function getStarredProjects() {
         $member = Member::currentUser();
         if ($member === null) {
             return new ArrayList();
@@ -1119,8 +1082,7 @@ 
      *
      * @return ArrayList
      */
-    public function Navigation($limit = 5)
-    {
+    public function Navigation($limit = 5) {
         $navigation = new ArrayList();
 
         $currentProject = $this->getCurrentProject();
@@ -1173,8 +1135,7 @@ 
      *
      * @return Form
      */
-    public function getDeployForm($request = null)
-    {
+    public function getDeployForm($request = null) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1220,8 +1181,7 @@ 
      *
      * @return SS_HTTPResponse|string
      */
-    public function gitRevisions(SS_HTTPRequest $request)
-    {
+    public function gitRevisions(SS_HTTPRequest $request) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1372,8 +1332,7 @@ 
      *
      * @return bool
      */
-    protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true)
-    {
+    protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true) {
         $token = SecurityToken::inst();
 
         // Ensure the submitted token has a value
@@ -1399,8 +1358,7 @@ 
      *
      * @return string
      */
-    public function deploySummary(SS_HTTPRequest $request)
-    {
+    public function deploySummary(SS_HTTPRequest $request) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1458,8 +1416,7 @@ 
      * @throws ValidationException
      * @throws null
      */
-    public function startDeploy(SS_HTTPRequest $request)
-    {
+    public function startDeploy(SS_HTTPRequest $request) {
 
         // Ensure the CSRF Token is correct
         if (!$this->checkCsrfToken($request)) {
@@ -1502,8 +1459,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function deploy(SS_HTTPRequest $request)
-    {
+    public function deploy(SS_HTTPRequest $request) {
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
@@ -1538,8 +1494,7 @@ 
      * @return string
      * @throws SS_HTTPResponse_Exception
      */
-    public function deploylog(SS_HTTPRequest $request)
-    {
+    public function deploylog(SS_HTTPRequest $request) {
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
@@ -1575,8 +1530,7 @@ 
      *
      * @return Form
      */
-    public function getDataTransferForm(SS_HTTPRequest $request = null)
-    {
+    public function getDataTransferForm(SS_HTTPRequest $request = null) {
         // Performs canView permission check by limiting visible projects
         $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
             return $item->canBackup();
@@ -1612,8 +1566,7 @@ 
      * @return SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function doDataTransfer($data, Form $form)
-    {
+    public function doDataTransfer($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -1686,8 +1639,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function transfer(SS_HTTPRequest $request)
-    {
+    public function transfer(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -1721,8 +1673,7 @@ 
      * @return string
      * @throws SS_HTTPResponse_Exception
      */
-    public function transferlog(SS_HTTPRequest $request)
-    {
+    public function transferlog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -1761,8 +1712,7 @@ 
      *                            otherwise the state is inferred from the request data.
      * @return Form
      */
-    public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         // Performs canView permission check by limiting visible projects
@@ -1821,8 +1771,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function restoresnapshot(SS_HTTPRequest $request)
-    {
+    public function restoresnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1854,8 +1803,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function deletesnapshot(SS_HTTPRequest $request)
-    {
+    public function deletesnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1881,8 +1829,7 @@ 
      *        from the request data.
      * @return Form
      */
-    public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         // Performs canView permission check by limiting visible projects
@@ -1919,8 +1866,7 @@ 
      * @return bool|SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function doDelete($data, Form $form)
-    {
+    public function doDelete($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -1959,8 +1905,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function movesnapshot(SS_HTTPRequest $request)
-    {
+    public function movesnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1989,8 +1934,7 @@ 
      *
      * @return Form|SS_HTTPResponse
      */
-    public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         $envs = $dataArchive->validTargetEnvironments();
@@ -2030,8 +1974,7 @@ 
      * @throws ValidationException
      * @throws null
      */
-    public function doMove($data, Form $form)
-    {
+    public function doMove($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -2069,8 +2012,7 @@ 
      *
      * @return string
      */
-    public static function RedisUnavailable()
-    {
+    public static function RedisUnavailable() {
         try {
             Resque::queues();
         } catch (Exception $e) {
@@ -2084,16 +2026,14 @@ 
      *
      * @return int
      */
-    public static function RedisWorkersCount()
-    {
+    public static function RedisWorkersCount() {
         return count(Resque_Worker::all());
     }
 
     /**
      * @return array
      */
-    public function providePermissions()
-    {
+    public function providePermissions() {
         return array(
             self::DEPLOYNAUT_BYPASS_PIPELINE => array(
                 'name' => "Bypass Pipeline",
@@ -2137,8 +2077,7 @@ 
     /**
      * @return DNProject|null
      */
-    public function getCurrentProject()
-    {
+    public function getCurrentProject() {
         $projectName = trim($this->getRequest()->param('Project'));
         if (!$projectName) {
             return null;
@@ -2153,8 +2092,7 @@ 
      * @param DNProject|null $project
      * @return DNEnvironment|null
      */
-    public function getCurrentEnvironment(DNProject $project = null)
-    {
+    public function getCurrentEnvironment(DNProject $project = null) {
         if ($this->getRequest()->param('Environment') === null) {
             return null;
         }
@@ -2177,8 +2115,7 @@ 
      *
      * @return string - one of the consts from self::$action_types
      */
-    public function getCurrentActionType()
-    {
+    public function getCurrentActionType() {
         return $this->actionType;
     }
 
@@ -2187,8 +2124,7 @@ 
      *
      * @param string $actionType string - one of the consts from self::$action_types
      */
-    public function setCurrentActionType($actionType)
-    {
+    public function setCurrentActionType($actionType) {
         $this->actionType = $actionType;
     }
 
@@ -2202,8 +2138,7 @@ 
      * @param Member|null $member The {@link Member} to check (or null to check the currently logged in Member)
      * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
      */
-    public function CanViewArchives(Member $member = null)
-    {
+    public function CanViewArchives(Member $member = null) {
         if ($member === null) {
             $member = Member::currentUser();
         }
@@ -2239,8 +2174,7 @@ 
      *
      * @return PaginatedList
      */
-    public function CreateEnvironmentList()
-    {
+    public function CreateEnvironmentList() {
         $project = $this->getCurrentProject();
         if ($project) {
             return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
@@ -2253,8 +2187,7 @@ 
      *
      * @return PaginatedList
      */
-    public function CompleteDataArchives()
-    {
+    public function CompleteDataArchives() {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
 
@@ -2273,8 +2206,7 @@ 
      * @return PaginatedList The list of "pending" data archives which are waiting for a file
      * to be delivered offline by post, and manually uploaded into the system.
      */
-    public function PendingDataArchives()
-    {
+    public function PendingDataArchives() {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
         foreach ($project->DNEnvironmentList() as $env) {
@@ -2290,8 +2222,7 @@ 
     /**
      * @return PaginatedList
      */
-    public function DataTransferLogs()
-    {
+    public function DataTransferLogs() {
         $project = $this->getCurrentProject();
 
         $transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
@@ -2311,8 +2242,7 @@ 
     /**
      * @return null|PaginatedList
      */
-    public function DeployHistory()
-    {
+    public function DeployHistory() {
         if ($env = $this->getCurrentEnvironment()) {
             $history = $env->DeployHistory();
             if ($history->count() > 0) {
@@ -2327,8 +2257,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function project404Response()
-    {
+    protected function project404Response() {
         return new SS_HTTPResponse(
             "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
             404
@@ -2338,8 +2267,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function environment404Response()
-    {
+    protected function environment404Response() {
         $envName = Convert::raw2xml($this->getRequest()->param('Environment'));
         return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
     }
@@ -2350,8 +2278,7 @@ 
      *
      * @return string
      */
-    protected function sendResponse($status, $content)
-    {
+    protected function sendResponse($status, $content) {
         // strip excessive newlines
         $content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
 
@@ -2374,8 +2301,7 @@ 
      *
      * @param string $mode
      */
-    protected function validateSnapshotMode($mode)
-    {
+    protected function validateSnapshotMode($mode) {
         if (!in_array($mode, array('all', 'assets', 'db'))) {
             throw new LogicException('Invalid mode');
         }
@@ -2387,8 +2313,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    protected function getCustomisedViewSection($sectionName, $title = '', $data = array())
-    {
+    protected function getCustomisedViewSection($sectionName, $title = '', $data = array()) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -2408,8 +2333,7 @@ 
      *
      * @return ArrayList
      */
-    public function AmbientMenu()
-    {
+    public function AmbientMenu() {
         $list = new ArrayList();
 
         if (Member::currentUserID()) {
@@ -2432,8 +2356,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function createproject(SS_HTTPRequest $request)
-    {
+    public function createproject(SS_HTTPRequest $request) {
         if ($this->canCreateProjects()) {
             return $this->render(['CurrentTitle' => 'Create Stack']);
         }
@@ -2445,8 +2368,7 @@ 
      *
      * @return bool
      */
-    public function canCreateProjects($member = null)
-    {
+    public function canCreateProjects($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -2460,8 +2382,7 @@ 
     /**
      * @return Form
      */
-    public function CreateProjectForm()
-    {
+    public function CreateProjectForm() {
         $form = Form::create(
             $this,
             __FUNCTION__,
@@ -2476,8 +2397,7 @@ 
     /**
      * @return FieldList
      */
-    protected function getCreateProjectFormFields()
-    {
+    protected function getCreateProjectFormFields() {
         $fields = FieldList::create();
         $fields->merge([
             TextField::create('Name', 'Title')->setDescription('Limited to alphanumeric characters, underscores and hyphens.'),
@@ -2490,8 +2410,7 @@ 
     /**
      * @return FieldList
      */
-    protected function getCreateProjectFormActions()
-    {
+    protected function getCreateProjectFormActions() {
         $fields = FieldList::create(
             FormAction::create('doCreateProject', 'Create Stack')
         );
@@ -2507,8 +2426,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doCreateProject($data, $form)
-    {
+    public function doCreateProject($data, $form) {
         $form->loadDataFrom($data);
         $project = DNProject::create();
 
@@ -2540,8 +2458,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function createprojectprogress(SS_HTTPRequest $request)
-    {
+    public function createprojectprogress(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->httpError(404);
@@ -2591,8 +2508,7 @@ 
         return $response;
     }
 
-    public function checkrepoaccess(SS_HTTPRequest $request)
-    {
+    public function checkrepoaccess(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->httpError(404);

code/control/DeployForm.php

Braces +14 added lines, -28 removed lines

@@ -6,16 +6,14 @@ 
  * @package deploynaut
  * @subpackage control
  */
-abstract class DeployForm_ValidatorBase extends Validator
-{
+abstract class DeployForm_ValidatorBase extends Validator {
 
     /**
      * @param string $fieldName
      * @param string $message
      * @param string $messageType
      */
-    public function validationError($fieldName, $message, $messageType = '')
-    {
+    public function validationError($fieldName, $message, $messageType = '') {
         // Just make any error use the form message
         $this->form->sessionMessage($message, $messageType);
         parent::validationError($fieldName, $message, $messageType);
@@ -28,8 +26,7 @@ 
      * @param string $field
      * @return boolean
      */
-    protected function validateCommit($sha, $field)
-    {
+    protected function validateCommit($sha, $field) {
         // Check selected commit
         if (empty($sha)) {
             $this->validationError(
@@ -60,11 +57,9 @@ 
  * @package deploynaut
  * @subpackage control
  */
-class DeployForm_CommitValidator extends DeployForm_ValidatorBase
-{
+class DeployForm_CommitValidator extends DeployForm_ValidatorBase {
 
-    public function php($data)
-    {
+    public function php($data) {
         // Check release method
         if (empty($data['SelectRelease'])
             || !in_array($data['SelectRelease'], array('Tag', 'Branch', 'Redeploy', 'SHA', 'FilteredCommits'))
@@ -92,11 +87,9 @@ 
  * @package deploynaut
  * @subpackage control
  */
-class DeployForm_PipelineValidator extends DeployForm_ValidatorBase
-{
+class DeployForm_PipelineValidator extends DeployForm_ValidatorBase {
 
-    public function php($data)
-    {
+    public function php($data) {
         return $this->validateCommit(
             $this->form->getSelectedBuild($data),
             'FilteredCommits'
@@ -110,8 +103,7 @@ 
  * @package deploynaut
  * @subpackage control
  */
-class DeployForm extends Form
-{
+class DeployForm extends Form {
 
     /**
      * @param DNRoot $controller
@@ -119,8 +111,7 @@ 
      * @param DNEnvironment $environment
      * @param DNProject $project
      */
-    public function __construct($controller, $name, DNEnvironment $environment, DNProject $project)
-    {
+    public function __construct($controller, $name, DNEnvironment $environment, DNProject $project) {
         if ($environment->HasPipelineSupport()) {
             list($field, $validator, $actions) = $this->setupPipeline($environment, $project);
         } else {
@@ -134,8 +125,7 @@ 
      *
      * @return array
      */
-    protected function setupSimpleDeploy(DNProject $project)
-    {
+    protected function setupSimpleDeploy(DNProject $project) {
         // without a pipeline simply allow any commit to be selected
         $field = $this->buildCommitSelector($project);
         $validator = new DeployForm_CommitValidator();
@@ -153,8 +143,7 @@ 
      * @return array
      * @throws Exception
      */
-    protected function setupPipeline(DNEnvironment $environment, DNProject $project)
-    {
+    protected function setupPipeline(DNEnvironment $environment, DNProject $project) {
         // Determine if commits are filtered
         $canBypass = Permission::check(DNRoot::DEPLOYNAUT_BYPASS_PIPELINE);
         $canDryrun = $environment->DryRunEnabled && Permission::check(DNRoot::DEPLOYNAUT_DRYRUN_PIPELINE);
@@ -214,8 +203,7 @@ 
      * @param DataList|null $pipelineCommits Optional list of pipeline-filtered commits to include
      * @return FormField
      */
-    protected function buildCommitSelector($project, $pipelineCommits = null)
-    {
+    protected function buildCommitSelector($project, $pipelineCommits = null) {
         // Branches
         $branches = array();
         foreach ($project->DNBranchList() as $branch) {
@@ -310,8 +298,7 @@ 
      * @param DataList $commits List of commits
      * @return FormField
      */
-    protected function buildPipelineField($commits)
-    {
+    protected function buildPipelineField($commits) {
         // Get filtered commits
         $filteredCommits = array();
         foreach ($commits as $commit) {
@@ -338,8 +325,7 @@ 
      * @param array $data
      * @return string SHA of selected build
      */
-    public function getSelectedBuild($data)
-    {
+    public function getSelectedBuild($data) {
         if (isset($data['SelectRelease']) && !empty($data[$data['SelectRelease']])) {
             // Filter out the tag/branch name if required
             $array = explode('-', $data[$data['SelectRelease']]);

code/control/DeploynautLogFile.php

Braces +10 added lines, -20 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Simple support class for reading and writing deploynaut job logs
  */
-class DeploynautLogFile
-{
+class DeploynautLogFile {
 
     protected $logFile;
 
@@ -14,8 +13,7 @@ 
      * @param string $logFile The log filename
      * @param string|null $basePath Base path of where logs reside. Defaults to DEPLOYNAUT_LOG_PATH
      */
-    public function __construct($logFile, $basePath = null)
-    {
+    public function __construct($logFile, $basePath = null) {
         $this->logFile = $logFile;
         $this->basePath = $basePath ?: DEPLOYNAUT_LOG_PATH;
     }
@@ -24,8 +22,7 @@ 
      * Set the log filename
      * @param string $filename
      */
-    public function setLogFile($filename)
-    {
+    public function setLogFile($filename) {
         $this->logFile = $filename;
     }
 
@@ -33,8 +30,7 @@ 
      * Set the base path of where logs reside
      * @param string $path
      */
-    public function setBasePath($path)
-    {
+    public function setBasePath($path) {
         $this->basePath = $path;
     }
 
@@ -42,8 +38,7 @@ 
      * Return the un-sanitised log path.
      * @return string
      */
-    public function getRawFilePath()
-    {
+    public function getRawFilePath() {
         return $this->basePath . '/' . $this->logFile;
     }
 
@@ -51,8 +46,7 @@ 
      * Get the sanitised log path.
      * @return string
      */
-    public function getSanitisedLogFilePath()
-    {
+    public function getSanitisedLogFilePath() {
         return $this->basePath . '/' . strtolower(FileNameFilter::create()->filter($this->logFile));
     }
 
@@ -60,8 +54,7 @@ 
      * Return log file path, assuming it exists. Returns NULL if nothing found.
      * @return string|null
      */
-    public function getLogFilePath()
-    {
+    public function getLogFilePath() {
         $path = $this->getSanitisedLogFilePath();
 
         // for backwards compatibility on old logs
@@ -80,8 +73,7 @@ 
      * Write a message line into the log file.
      * @param string $message
      */
-    public function write($message)
-    {
+    public function write($message) {
         // Make sure we write into the old path for existing logs. New logs use the sanitised file path instead.
         $path = file_exists($this->getRawFilePath()) ? $this->getRawFilePath() : $this->getSanitisedLogFilePath();
 
@@ -93,8 +85,7 @@ 
      * Does the log file exist?
      * @return bool
      */
-    public function exists()
-    {
+    public function exists() {
         return (bool)$this->getLogFilePath();
     }
 
@@ -102,8 +93,7 @@ 
      * Return the content of the log file.
      * @return string
      */
-    public function content()
-    {
+    public function content() {
         return $this->exists() ? file_get_contents($this->getLogFilePath()) : 'Log has not been created yet.';
     }
 }