silverstripe / deploynaut

code/model/DNData.php

Spacing +12 added lines, -12 removed lines

@@ -55,7 +55,7 @@ 
         parent::__construct();
 
         // Better to use injector to set these
-        if (func_num_args() == 0) {
+        if(func_num_args() == 0) {
             return;
         }
         Deprecation::notice(
@@ -85,7 +85,7 @@ 
      */
     public function setEnvironmentDir($environmentDir)
     {
-        if ($environmentDir[0] != "/") {
+        if($environmentDir[0] != "/") {
             $environmentDir = BASE_PATH . '/' . $environmentDir;
         }
         $this->environmentDir = realpath($environmentDir) ?: $environmentDir;
@@ -108,7 +108,7 @@ 
      */
     public function setKeyDir($keyDir)
     {
-        if ($keyDir[0] != "/") {
+        if($keyDir[0] != "/") {
             $keyDir = BASE_PATH . '/' . $keyDir;
         }
         $this->keyDir = realpath($keyDir) ?: $keyDir;
@@ -154,10 +154,10 @@ 
      */
     public function setDataTransferDir($transferDir)
     {
-        if ($transferDir[0] != "/") {
+        if($transferDir[0] != "/") {
             $transferDir = BASE_PATH . '/' . $transferDir;
         }
-        if (strpos($transferDir, ASSETS_PATH) === false) {
+        if(strpos($transferDir, ASSETS_PATH) === false) {
             throw new LogicException(sprintf(
                 'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
                 $transferDir
@@ -186,16 +186,16 @@ 
     public function getProjectPaths()
     {
         $paths = array();
-        if (!file_exists($this->getEnvironmentDir())) {
+        if(!file_exists($this->getEnvironmentDir())) {
             $eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
             . 'first and add some projects to it.';
             throw new Exception($eMessage);
         }
-        foreach (scandir($this->getEnvironmentDir()) as $project) {
+        foreach(scandir($this->getEnvironmentDir()) as $project) {
             // Exlcude dot-prefixed directories (.git was getting in the way)
-            if (preg_match('/^[^\.]/', $project)) {
+            if(preg_match('/^[^\.]/', $project)) {
                 $path = $this->getEnvironmentDir() . '/' . $project;
-                if (is_dir($path) && $project != '.' && $project != '..') {
+                if(is_dir($path) && $project != '.' && $project != '..') {
                     $paths[] = $project;
                 }
             }
@@ -213,12 +213,12 @@ 
         $baseDir = $this->getEnvironmentDir() . '/' . $project;
 
         $paths = array();
-        if (!file_exists($baseDir)) {
+        if(!file_exists($baseDir)) {
             throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
         }
         // Search the directory for config files.
-        foreach (scandir($baseDir) as $environmentFile) {
-            if (preg_match('/\.rb$/', $environmentFile)) {
+        foreach(scandir($baseDir) as $environmentFile) {
+            if(preg_match('/\.rb$/', $environmentFile)) {
                 // Config found, wrap it into an object.
                 $paths[] = "$baseDir/$environmentFile";
             }

code/model/DNDataArchive.php

Spacing +30 added lines, -30 removed lines

@@ -127,7 +127,7 @@ 
 
     public function onBeforeWrite()
     {
-        if (!$this->AuthorID) {
+        if(!$this->AuthorID) {
             $this->AuthorID = Member::currentUserID();
         }
 
@@ -189,7 +189,7 @@ 
      */
     public function FileSize()
     {
-        if ($this->ArchiveFile()->exists()) {
+        if($this->ArchiveFile()->exists()) {
             return $this->ArchiveFile()->getSize();
         } else {
             return "N/A";
@@ -198,7 +198,7 @@ 
 
     public function getModeNice()
     {
-        if ($this->Mode == 'all') {
+        if($this->Mode == 'all') {
             return 'database and assets';
         } else {
             return $this->Mode;
@@ -237,12 +237,12 @@ 
     public function canRestore($member = null)
     {
         $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
+        if(!$memberID) {
             return false;
         }
 
         $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_restore[$key])) {
+        if(!isset(self::$_cache_can_restore[$key])) {
             self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
         }
 
@@ -259,12 +259,12 @@ 
     public function canDownload($member = null)
     {
         $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
+        if(!$memberID) {
             return false;
         }
 
         $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_download[$key])) {
+        if(!isset(self::$_cache_can_download[$key])) {
             self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
         }
         return self::$_cache_can_download[$key];
@@ -291,27 +291,27 @@ 
      */
     public function canMoveTo($targetEnv, $member = null)
     {
-        if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+        if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
             // We don't permit moving snapshots between projects at this stage.
             return false;
         }
 
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
         // Must be logged in to check permissions
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
         // Admin can always move.
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         // Checks if the user can actually access the archive.
-        if (!$this->canDownload($member)) {
+        if(!$this->canDownload($member)) {
             return false;
         }
 
@@ -331,7 +331,7 @@ 
     {
         $archive = $this;
         $envs = $this->Environment()->Project()->DNEnvironmentList()
-            ->filterByCallback(function ($item) use ($archive) {
+            ->filterByCallback(function($item) use ($archive) {
                 return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
             });
 
@@ -412,7 +412,7 @@ 
         // Note that with CapistranoDeploymentBackend the file won't be available yet, as it
         // gets put in place immediately after this method gets called. In which case, it will
         // be hashed in setArchiveFromFiles()
-        if (file_exists($file->FullPath)) {
+        if(file_exists($file->FullPath)) {
             $this->ArchiveFileHash = md5_file($file->FullPath);
         }
         $this->ArchiveFileID = $file->ID;
@@ -433,11 +433,11 @@ 
      */
     public function extractArchive($workingDir = null)
     {
-        if (!is_dir($workingDir)) {
+        if(!is_dir($workingDir)) {
             mkdir($workingDir, 0700, true);
         }
 
-        $cleanupFn = function () use ($workingDir) {
+        $cleanupFn = function() use ($workingDir) {
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
             $process->run();
         };
@@ -451,28 +451,28 @@ 
         ));
         $process->setTimeout(3600);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             $cleanupFn();
             throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
         }
 
         // Extract database.sql.gz to <workingdir>/database.sql
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+        if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
             $process = new Process('gunzip database.sql.gz', $workingDir);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 $cleanupFn();
                 throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
             }
         }
 
         // Extract assets.tar.gz to <workingdir>/assets/
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+        if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
             $process = new Process('tar xzf assets.tar.gz', $workingDir);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 $cleanupFn();
                 throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
             }
@@ -497,7 +497,7 @@ 
 
         $file = $this->ArchiveFile()->FullPath;
 
-        if (!is_readable($file)) {
+        if(!is_readable($file)) {
             $result->error(sprintf('SSPak file "%s" cannot be read.', $file));
             return $result;
         }
@@ -505,19 +505,19 @@ 
         $process = new Process(sprintf('tar -tf %s', escapeshellarg($file)));
         $process->setTimeout(120);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
         }
 
         $output = explode(PHP_EOL, $process->getOutput());
         $files = array_filter($output);
 
-        if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+        if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
             $result->error('The snapshot is missing the database.');
             return $result;
         }
 
-        if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+        if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
             $result->error('The snapshot is missing assets.');
             return $result;
         }
@@ -548,11 +548,11 @@ 
             sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
         );
 
-        foreach ($fixCmds as $cmd) {
+        foreach($fixCmds as $cmd) {
             $process = new Process($cmd);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 throw new RuntimeException($process->getErrorOutput());
             }
         }
@@ -570,9 +570,9 @@ 
     public function setArchiveFromFiles($workingDir)
     {
         $command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
-        if ($this->Mode == 'db') {
+        if($this->Mode == 'db') {
             $command .= sprintf(' --db=%s/database.sql', $workingDir);
-        } elseif ($this->Mode == 'assets') {
+        } elseif($this->Mode == 'assets') {
             $command .= sprintf(' --assets=%s/assets', $workingDir);
         } else {
             $command .= sprintf(' --db=%s/database.sql --assets=%s/assets', $workingDir, $workingDir);
@@ -581,7 +581,7 @@ 
         $process = new Process($command, $workingDir);
         $process->setTimeout(3600);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException($process->getErrorOutput());
         }
 

code/model/DNEnvironment.php

Spacing +95 added lines, -95 removed lines

@@ -191,7 +191,7 @@ 
     public function Backend()
     {
         $backends = array_keys($this->config()->get('allowed_backends', Config::FIRST_SET));
-        switch (sizeof($backends)) {
+        switch(sizeof($backends)) {
         // Nothing allowed, use the default value "DeploymentBackend"
             case 0:
                 $backend = "DeploymentBackend";
@@ -205,7 +205,7 @@ 
             // Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
             default:
                 $backend = $this->BackendIdentifier;
-                if (!in_array($backend, $backends)) {
+                if(!in_array($backend, $backends)) {
                     $backend = $backends[0];
                 }
         }
@@ -255,7 +255,7 @@ 
     public function getBareURL()
     {
         $url = parse_url($this->URL);
-        if (isset($url['host'])) {
+        if(isset($url['host'])) {
             return strtolower($url['host']);
         }
     }
@@ -290,7 +290,7 @@ 
     public function GenericPipelineConfig()
     {
         $config = $this->loadPipelineConfig();
-        if ($config) {
+        if($config) {
             return self::array_to_viewabledata($config);
         }
     }
@@ -305,7 +305,7 @@ 
         require_once 'thirdparty/spyc/spyc.php';
 
         $path = $this->getPipelineFilename();
-        if (file_exists($path)) {
+        if(file_exists($path)) {
             return Spyc::YAMLLoad($path);
         }
     }
@@ -318,7 +318,7 @@ 
      */
     public function DependsOnEnvironment()
     {
-        if ($this->HasPipelineSupport()) {
+        if($this->HasPipelineSupport()) {
             $pipeline = $this->GenericPipeline();
             return $pipeline->getDependentEnvironment();
         }
@@ -351,7 +351,7 @@ 
     public function CanCancelPipeline()
     {
         // do we have a current pipeline
-        if ($this->HasCurrentPipeline()) {
+        if($this->HasCurrentPipeline()) {
             return $this->CurrentPipeline()->canAbort();
         }
         return false;
@@ -365,20 +365,20 @@ 
      */
     public function canView($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         // if no Viewers or ViewerGroups defined, fallback to DNProject::canView permissions
-        if ($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
+        if($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
             return $this->Viewers()->byID($member->ID)
                 || $member->inGroups($this->ViewerGroups());
         }
@@ -394,20 +394,20 @@ 
      */
     public function canDeploy($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) {
                 return true;
             }
         }
@@ -425,20 +425,20 @@ 
      */
     public function canRestore($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         }
@@ -457,24 +457,24 @@ 
     public function canBackup($member = null)
     {
         $project = $this->Project();
-        if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+        if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
             return false;
         }
 
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
         // Must be logged in to check permissions
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         }
@@ -497,24 +497,24 @@ 
     public function canUploadArchive($member = null)
     {
         $project = $this->Project();
-        if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+        if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
             return false;
         }
 
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         }
@@ -532,20 +532,20 @@ 
      */
     public function canDownloadArchive($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         }
@@ -562,14 +562,14 @@ 
      */
     public function canAbort($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
@@ -585,14 +585,14 @@ 
      */
     public function canApprove($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
         return $this->PipelineApprovers()->byID($member->ID)
@@ -608,20 +608,20 @@ 
      */
     public function canDeleteArchive($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
         // Must be logged in to check permissions
 
-        if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-            if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+        if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+            if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         } else {
-            if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+            if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
                 return true;
             }
         }
@@ -785,18 +785,18 @@ 
             'Status' => 'Finished'
         ))->sort('LastEdited DESC')->first();
 
-        if (!$deploy || (!$deploy->SHA)) {
+        if(!$deploy || (!$deploy->SHA)) {
             return false;
         }
 
         $repo = $this->Project()->getRepository();
-        if (!$repo) {
+        if(!$repo) {
             return $deploy;
         }
 
         try {
             $commit = $repo->getCommit($deploy->SHA);
-            if ($commit) {
+            if($commit) {
                 $deploy->Message = Convert::raw2xml($commit->getMessage());
                 $deploy->Committer = Convert::raw2xml($commit->getCommitterName());
                 $deploy->CommitDate = $commit->getCommitterDate()->Format('d/m/Y g:ia');
@@ -804,7 +804,7 @@ 
                 $deploy->AuthorDate = $commit->getAuthorDate()->Format('d/m/Y g:ia');
             }
             // We can't find this SHA, so we ignore adding a commit message to the deployment
-        } catch (Exception $ex) {
+        } catch(Exception $ex) {
         }
 
         return $deploy;
@@ -830,7 +830,7 @@ 
     {
         try {
             $repo = $this->Project()->getRepository();
-            if ($repo !== false) {
+            if($repo !== false) {
                 $commit = new \Gitonomy\Git\Commit($repo, $sha);
                 return [
                     'AuthorName' => (string)Convert::raw2xml($commit->getAuthorName()),
@@ -840,7 +840,7 @@ 
                     'Hash' => Convert::raw2xml($commit->getHash())
                 ];
             }
-        } catch (\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
+        } catch(\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
             SS_Log::log($exc, SS_Log::WARN);
         }
         return array(
@@ -915,12 +915,12 @@ 
         $fields = new FieldList(new TabSet('Root'));
 
         $project = $this->Project();
-        if ($project && $project->exists()) {
+        if($project && $project->exists()) {
             $viewerGroups = $project->Viewers();
             $groups = $viewerGroups->sort('Title')->map()->toArray();
             $members = array();
-            foreach ($viewerGroups as $group) {
-                foreach ($group->Members()->map() as $k => $v) {
+            foreach($viewerGroups as $group) {
+                foreach($group->Members()->map() as $k => $v) {
                     $members[$k] = $v;
                 }
             }
@@ -957,7 +957,7 @@ 
         // Backend identifier - pick from a named list of configurations specified in YML config
         $backends = $this->config()->get('allowed_backends', Config::FIRST_SET);
         // If there's only 1 backend, then user selection isn't needed
-        if (sizeof($backends) > 1) {
+        if(sizeof($backends) > 1) {
             $fields->addFieldToTab('Root.Main', DropdownField::create('BackendIdentifier', 'Deployment backend')
                 ->setSource($backends)
                 ->setDescription('What kind of deployment system should be used to deploy to this environment'));
@@ -1037,14 +1037,14 @@ 
         ));
 
         // The Main.DeployConfig
-        if ($this->Project()->exists()) {
+        if($this->Project()->exists()) {
             $this->setDeployConfigurationFields($fields);
         }
 
         // The DataArchives
         $dataArchiveConfig = GridFieldConfig_RecordViewer::create();
         $dataArchiveConfig->removeComponentsByType('GridFieldAddNewButton');
-        if (class_exists('GridFieldBulkManager')) {
+        if(class_exists('GridFieldBulkManager')) {
             $dataArchiveConfig->addComponent(new GridFieldBulkManager());
         }
         $dataArchive = GridField::create('DataArchives', 'Data Archives', $this->DataArchives(), $dataArchiveConfig);
@@ -1054,10 +1054,10 @@ 
         $this->setPipelineConfigurationFields($fields);
 
         // Pipelines
-        if ($this->Pipelines()->Count()) {
+        if($this->Pipelines()->Count()) {
             $pipelinesConfig = GridFieldConfig_RecordEditor::create();
             $pipelinesConfig->removeComponentsByType('GridFieldAddNewButton');
-            if (class_exists('GridFieldBulkManager')) {
+            if(class_exists('GridFieldBulkManager')) {
                 $pipelinesConfig->addComponent(new GridFieldBulkManager());
             }
             $pipelines = GridField::create('Pipelines', 'Pipelines', $this->Pipelines(), $pipelinesConfig);
@@ -1067,7 +1067,7 @@ 
         // Deployments
         $deploymentsConfig = GridFieldConfig_RecordEditor::create();
         $deploymentsConfig->removeComponentsByType('GridFieldAddNewButton');
-        if (class_exists('GridFieldBulkManager')) {
+        if(class_exists('GridFieldBulkManager')) {
             $deploymentsConfig->addComponent(new GridFieldBulkManager());
         }
         $deployments = GridField::create('Deployments', 'Deployments', $this->Deployments(), $deploymentsConfig);
@@ -1092,11 +1092,11 @@ 
      */
     protected function setDeployConfigurationFields(&$fields)
     {
-        if (!$this->config()->get('allow_web_editing')) {
+        if(!$this->config()->get('allow_web_editing')) {
             return;
         }
 
-        if ($this->envFileExists()) {
+        if($this->envFileExists()) {
             $deployConfig = new TextareaField('DeployConfig', 'Deploy config', $this->getEnvironmentConfig());
             $deployConfig->setRows(40);
             $fields->insertAfter($deployConfig, 'Filename');
@@ -1117,7 +1117,7 @@ 
      */
     protected function setPipelineConfigurationFields($fields)
     {
-        if (!$this->config()->get('allow_web_editing')) {
+        if(!$this->config()->get('allow_web_editing')) {
             return;
         }
         $config = $this->pipelineFileExists()
@@ -1125,7 +1125,7 @@ 
             : '';
         $deployConfig = new TextareaField('PipelineConfig', 'Pipeline config', $config);
         $deployConfig->setRows(40);
-        if (!$this->pipelineFileExists()) {
+        if(!$this->pipelineFileExists()) {
             $deployConfig->setDescription(
                 "No pipeline is configured for this environment. Saving content here will generate a new template."
             );
@@ -1147,7 +1147,7 @@ 
     public function onBeforeWrite()
     {
         parent::onBeforeWrite();
-        if ($this->Name && $this->Name . '.rb' != $this->Filename) {
+        if($this->Name && $this->Name . '.rb' != $this->Filename) {
             $this->Filename = $this->Name . '.rb';
         }
         $this->checkEnvironmentPath();
@@ -1159,13 +1159,13 @@ 
     {
         parent::onAfterWrite();
 
-        if ($this->Usage == 'Production' || $this->Usage == 'UAT') {
+        if($this->Usage == 'Production' || $this->Usage == 'UAT') {
             $conflicting = DNEnvironment::get()
                 ->filter('ProjectID', $this->ProjectID)
                 ->filter('Usage', $this->Usage)
                 ->exclude('ID', $this->ID);
 
-            foreach ($conflicting as $otherEnvironment) {
+            foreach($conflicting as $otherEnvironment) {
                 $otherEnvironment->Usage = 'Unspecified';
                 $otherEnvironment->write();
             }
@@ -1180,7 +1180,7 @@ 
     {
         // Create folder if it doesn't exist
         $configDir = dirname($this->getConfigFilename());
-        if (!file_exists($configDir) && $configDir) {
+        if(!file_exists($configDir) && $configDir) {
             mkdir($configDir, 0777, true);
         }
     }
@@ -1190,18 +1190,18 @@ 
      */
     protected function writeConfigFile()
     {
-        if (!$this->config()->get('allow_web_editing')) {
+        if(!$this->config()->get('allow_web_editing')) {
             return;
         }
 
         // Create a basic new environment config from a template
-        if (!$this->envFileExists()
+        if(!$this->envFileExists()
             && $this->Filename
             && $this->CreateEnvConfig
         ) {
             $templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
             file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
-        } elseif ($this->envFileExists() && $this->DeployConfig) {
+        } elseif($this->envFileExists() && $this->DeployConfig) {
             file_put_contents($this->getConfigFilename(), $this->DeployConfig);
         }
     }
@@ -1211,14 +1211,14 @@ 
      */
     protected function writePipelineFile()
     {
-        if (!$this->config()->get('allow_web_editing')) {
+        if(!$this->config()->get('allow_web_editing')) {
             return;
         }
         $path = $this->getPipelineFilename();
-        if ($this->PipelineConfig) {
+        if($this->PipelineConfig) {
             // Update file
             file_put_contents($path, $this->PipelineConfig);
-        } elseif ($this->isChanged('PipelineConfig') && file_exists($path)) {
+        } elseif($this->isChanged('PipelineConfig') && file_exists($path)) {
             // Remove file if deleted
             unlink($path);
         }
@@ -1231,12 +1231,12 @@ 
     {
         parent::onAfterDelete();
         // Create a basic new environment config from a template
-        if ($this->config()->get('allow_web_editing') && $this->envFileExists()) {
+        if($this->config()->get('allow_web_editing') && $this->envFileExists()) {
             unlink($this->getConfigFilename());
         }
 
         $create = $this->CreateEnvironment();
-        if ($create && $create->exists()) {
+        if($create && $create->exists()) {
             $create->delete();
         }
     }
@@ -1246,7 +1246,7 @@ 
      */
     protected function getEnvironmentConfig()
     {
-        if (!$this->envFileExists()) {
+        if(!$this->envFileExists()) {
             return '';
         }
         return file_get_contents($this->getConfigFilename());
@@ -1257,7 +1257,7 @@ 
      */
     protected function envFileExists()
     {
-        if (!$this->getConfigFilename()) {
+        if(!$this->getConfigFilename()) {
             return false;
         }
         return file_exists($this->getConfigFilename());
@@ -1270,10 +1270,10 @@ 
      */
     public function getConfigFilename()
     {
-        if (!$this->Project()->exists()) {
+        if(!$this->Project()->exists()) {
             return '';
         }
-        if (!$this->Filename) {
+        if(!$this->Filename) {
             return '';
         }
         return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
@@ -1288,11 +1288,11 @@ 
     public function getPipelineFilename()
     {
         $name = $this->getConfigFilename();
-        if (!$name) {
+        if(!$name) {
             return null;
         }
         $path = pathinfo($name);
-        if ($path) {
+        if($path) {
             return $path['dirname'] . '/' . $path['filename'] . '.yml';
         }
     }
@@ -1305,7 +1305,7 @@ 
     protected function pipelineFileExists()
     {
         $filename = $this->getPipelineFilename();
-        if (empty($filename)) {
+        if(empty($filename)) {
             return false;
         }
         return file_exists($filename);
@@ -1322,24 +1322,24 @@ 
     public static function array_to_viewabledata($array)
     {
         // Don't transform non-arrays
-        if (!is_array($array)) {
+        if(!is_array($array)) {
             return $array;
         }
 
         // Figure out whether this is indexed or associative
         $keys = array_keys($array);
         $assoc = ($keys != array_keys($keys));
-        if ($assoc) {
+        if($assoc) {
             // Treat as viewable data
             $data = new ArrayData(array());
-            foreach ($array as $key => $value) {
+            foreach($array as $key => $value) {
                 $data->setField($key, self::array_to_viewabledata($value));
             }
             return $data;
         } else {
             // Treat this as basic non-associative list
             $list = new ArrayList();
-            foreach ($array as $value) {
+            foreach($array as $value) {
                 $list->push(self::array_to_viewabledata($value));
             }
             return $list;
@@ -1358,7 +1358,7 @@ 
     {
         // check if this environment depends on another environemnt
         $dependsOnEnv = $this->DependsOnEnvironment();
-        if (empty($dependsOnEnv)) {
+        if(empty($dependsOnEnv)) {
             return null;
         }
 
@@ -1367,12 +1367,12 @@ 
         $filter = isset($config->PipelineConfig->FilteredCommits)
             ? $config->PipelineConfig->FilteredCommits
             : null;
-        if (empty($filter)) {
+        if(empty($filter)) {
             return null;
         }
 
         // Create and execute filter
-        if (!class_exists($filter)) {
+        if(!class_exists($filter)) {
             throw new Exception(sprintf("Class %s does not exist", $filter));
         }
         $commitClass = $filter::create();
@@ -1408,7 +1408,7 @@ 
         $result = parent::validate();
         $backend = $this->Backend();
 
-        if (strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
+        if(strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
             $result->error('"test" is not a valid environment name when using Capistrano backend.');
         }
 

code/model/DNFilteredCommits.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 
     public function getCommits()
     {
-        if (!isset($this->env)) {
+        if(!isset($this->env)) {
             $this->environmentNotSetException();
         }
         $successfulCommits =
@@ -58,7 +58,7 @@ 
 
     public function getLatestCommit()
     {
-        if (!isset($this->env)) {
+        if(!isset($this->env)) {
             $this->environmentNotSetException();
         }
         $commits = $this->getCommits();

code/model/DNProject.php

Spacing +73 added lines, -73 removed lines

@@ -111,7 +111,7 @@ 
 
         // add the administrators group as the viewers of the new project
         $adminGroup = Group::get()->filter('Code', 'administrators')->first();
-        if ($adminGroup && $adminGroup->exists()) {
+        if($adminGroup && $adminGroup->exists()) {
             $project->Viewers()->add($adminGroup);
         }
         return $project;
@@ -127,8 +127,8 @@ 
     {
         $size = 0;
 
-        foreach ($this->Environments() as $environment) {
-            foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
+        foreach($this->Environments() as $environment) {
+            foreach($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
                 $size += $archive->ArchiveFile()->getAbsoluteSize();
             }
         }
@@ -148,7 +148,7 @@ 
     {
         $size = $this->getField('DiskQuotaMB');
 
-        if (empty($size)) {
+        if(empty($size)) {
             $defaults = $this->config()->get('defaults');
             $size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
         }
@@ -184,7 +184,7 @@ 
     public function DiskQuotaUsagePercent()
     {
         $quota = $this->getDiskQuotaMB();
-        if ($quota > 0) {
+        if($quota > 0) {
             return $this->getUsedQuotaMB() * 100 / $quota;
         }
         return 100;
@@ -202,7 +202,7 @@ 
         $controller = Controller::curr();
         $actionType = $controller->getField('CurrentActionType');
 
-        if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
+        if(DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
             $list->push(new ArrayData(array(
                 'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
                 'Title' => 'Snapshots',
@@ -257,11 +257,11 @@ 
      */
     public function canView($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
@@ -275,7 +275,7 @@ 
      */
     public function canRestore($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -285,7 +285,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canRestore($member);
         })->Count();
     }
@@ -296,7 +296,7 @@ 
      */
     public function canBackup($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -306,7 +306,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canBackup($member);
         })->Count();
     }
@@ -317,7 +317,7 @@ 
      */
     public function canUploadArchive($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -327,7 +327,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canUploadArchive($member);
         })->Count();
     }
@@ -338,7 +338,7 @@ 
      */
     public function canDownloadArchive($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -348,7 +348,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canDownloadArchive($member);
         })->Count();
     }
@@ -366,9 +366,9 @@ 
     public function canCreateEnvironments($member = null)
     {
         $envType = $this->AllowedEnvironmentType;
-        if ($envType) {
+        if($envType) {
             $env = Injector::inst()->get($envType);
-            if ($env instanceof EnvironmentCreateBackend) {
+            if($env instanceof EnvironmentCreateBackend) {
                 return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
             }
         }
@@ -407,7 +407,7 @@ 
      */
     public function getProcessEnv()
     {
-        if (file_exists($this->getPrivateKeyPath())) {
+        if(file_exists($this->getPrivateKeyPath())) {
             // Key-pair is available, use it.
             $processEnv = array(
                 'IDENT_KEY' => $this->getPrivateKeyPath(),
@@ -456,7 +456,7 @@ 
      */
     public function DNBranchList()
     {
-        if ($this->CVSPath && !$this->repoExists()) {
+        if($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
         return DNBranchList::create($this, $this->DNData());
@@ -469,7 +469,7 @@ 
      */
     public function DNTagList()
     {
-        if ($this->CVSPath && !$this->repoExists()) {
+        if($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
         return DNReferenceList::create($this, $this->DNData(), null, null, true);
@@ -480,7 +480,7 @@ 
      */
     public function getRepository()
     {
-        if (!$this->repoExists()) {
+        if(!$this->repoExists()) {
             return false;
         }
 
@@ -495,17 +495,17 @@ 
      */
     public function DNEnvironmentList()
     {
-        if (!self::$_current_member_cache) {
+        if(!self::$_current_member_cache) {
             self::$_current_member_cache = Member::currentUser();
         }
 
-        if (self::$_current_member_cache === false) {
+        if(self::$_current_member_cache === false) {
             return new ArrayList();
         }
 
         $currentMember = self::$_current_member_cache;
         return $this->Environments()
-            ->filterByCallBack(function ($item) use ($currentMember) {
+            ->filterByCallBack(function($item) use ($currentMember) {
                 return $item->canView($currentMember);
             });
     }
@@ -526,14 +526,14 @@ 
      */
     public function currentBuilds()
     {
-        if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+        if(!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
             $currentBuilds = array();
-            foreach ($this->Environments() as $env) {
+            foreach($this->Environments() as $env) {
                 $currentBuilds[$env->Name] = $env->CurrentBuild();
             }
-            self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
+            self::$relation_cache['currentBuilds.' . $this->ID] = $currentBuilds;
         }
-        return self::$relation_cache['currentBuilds.'.$this->ID];
+        return self::$relation_cache['currentBuilds.' . $this->ID];
     }
 
     /**
@@ -550,7 +550,7 @@ 
      */
     public function CreateEnvironmentLink()
     {
-        if ($this->canCreateEnvironments()) {
+        if($this->canCreateEnvironments()) {
             return $this->Link('createenv');
         }
         return null;
@@ -570,11 +570,11 @@ 
     public function IsStarred()
     {
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return false;
         }
         $favourited = $this->StarredBy()->filter('MemberID', $member->ID);
-        if ($favourited->count() == 0) {
+        if($favourited->count() == 0) {
             return false;
         }
         return true;
@@ -631,7 +631,7 @@ 
 
         $environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
         $types = array();
-        foreach ($environmentTypes as $type) {
+        foreach($environmentTypes as $type) {
             $types[$type] = $type;
         }
 
@@ -656,11 +656,11 @@ 
     public function setCreateProjectFolderField(&$fields)
     {
         // Check if the capistrano project folder exists
-        if (!$this->Name) {
+        if(!$this->Name) {
             return;
         }
 
-        if ($this->projectFolderExists()) {
+        if($this->projectFolderExists()) {
             return;
         }
 
@@ -695,7 +695,7 @@ 
     public function cloneRepo()
     {
         // Avoid this being called multiple times in the same request
-        if (!isset(self::$has_cloned_cache[$this->ID])) {
+        if(!isset(self::$has_cloned_cache[$this->ID])) {
             $fetch = DNGitFetch::create();
             $fetch->ProjectID = $this->ID;
             $fetch->write();
@@ -721,7 +721,7 @@ 
     {
         parent::onBeforeWrite();
 
-        if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
+        if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
             mkdir($this->getProjectFolderPath());
         }
     }
@@ -730,12 +730,12 @@ 
     {
         parent::onAfterWrite();
 
-        if (!$this->CVSPath) {
+        if(!$this->CVSPath) {
             return;
         }
 
         $changedFields = $this->getChangedFields(true, 2);
-        if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+        if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
             $this->cloneRepo();
         }
     }
@@ -748,22 +748,22 @@ 
         parent::onAfterDelete();
 
         // Delete related environments
-        foreach ($this->Environments() as $env) {
+        foreach($this->Environments() as $env) {
             $env->delete();
         }
 
         // Delete local repository
-        if (file_exists($this->getLocalCVSPath())) {
+        if(file_exists($this->getLocalCVSPath())) {
             Filesystem::removeFolder($this->getLocalCVSPath());
         }
 
         // Delete project template
-        if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+        if(file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
             Filesystem::removeFolder($this->getProjectFolderPath());
         }
 
         // Delete the deploy key
-        if (file_exists($this->getKeyDir())) {
+        if(file_exists($this->getKeyDir())) {
             Filesystem::removeFolder($this->getKeyDir());
         }
     }
@@ -777,7 +777,7 @@ 
     {
         $key = $this->getPublicKeyPath();
 
-        if (file_exists($key)) {
+        if(file_exists($key)) {
             return trim(file_get_contents($key));
         }
     }
@@ -789,7 +789,7 @@ 
      */
     public function getPublicKeyPath()
     {
-        if ($privateKey = $this->getPrivateKeyPath()) {
+        if($privateKey = $this->getPrivateKeyPath()) {
             return $privateKey . '.pub';
         }
         return null;
@@ -803,7 +803,7 @@ 
     public function getPrivateKeyPath()
     {
         $keyDir = $this->getKeyDir();
-        if (!empty($keyDir)) {
+        if(!empty($keyDir)) {
             $filter = FileNameFilter::create();
             $name = $filter->filter($this->Name);
             return $keyDir . '/' . $name;
@@ -819,7 +819,7 @@ 
     public function getKeyDir()
     {
         $keyDir = $this->DNData()->getKeyDir();
-        if (!$keyDir) {
+        if(!$keyDir) {
             return null;
         }
 
@@ -837,7 +837,7 @@ 
      */
     protected function setEnvironmentFields(&$fields, $environments)
     {
-        if (!$environments) {
+        if(!$environments) {
             return;
         }
 
@@ -846,7 +846,7 @@ 
         $environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
         $environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
         $environments->getConfig()->removeComponentsByType('GridFieldPageCount');
-        if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+        if(Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
             $addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
             $addNewRelease->setButtonName('Add');
             $environments->getConfig()->addComponent($addNewRelease);
@@ -863,7 +863,7 @@ 
     public function getRepositoryURL()
     {
         $showUrl = Config::inst()->get($this->class, 'show_repository_url');
-        if ($showUrl) {
+        if($showUrl) {
             return $this->CVSPath;
         }
     }
@@ -916,9 +916,9 @@ 
         $interfaces = $this->config()->repository_interfaces;
 
         /* Look for each whitelisted hostname */
-        foreach ($interfaces as $host => $interface) {
+        foreach($interfaces as $host => $interface) {
             /* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-            if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+            if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
                 $path = $match[2];
 
                 $scheme = isset($interface['scheme']) ? $interface['scheme'] : 'https';
@@ -927,13 +927,13 @@ 
 
                 $components = explode('.', $host);
 
-                foreach ($regex as $pattern => $replacement) {
+                foreach($regex as $pattern => $replacement) {
                     $path = preg_replace('/' . $pattern . '/', $replacement, $path);
                 }
 
                 $uxurl = Controller::join_links($scheme . '://', $host, $path);
 
-                if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
+                if(array_key_exists('commit', $interface) && $interface['commit'] == false) {
                     $commiturl = false;
                 } else {
                     $commiturl = Controller::join_links(
@@ -980,7 +980,7 @@ 
      */
     public function whoIsAllowedAny($codes)
     {
-        if (!is_array($codes)) {
+        if(!is_array($codes)) {
             $codes = array($codes);
         }
 
@@ -1023,11 +1023,11 @@ 
     public function groupAllowed($permissionCode, Group $group)
     {
         $viewers = $this->Viewers();
-        if (!$viewers->find('ID', $group->ID)) {
+        if(!$viewers->find('ID', $group->ID)) {
             return false;
         }
         $groups = Permission::get_groups_by_permission($permissionCode);
-        if (!$groups->find('ID', $group->ID)) {
+        if(!$groups->find('ID', $group->ID)) {
             return false;
         }
         return true;
@@ -1043,16 +1043,16 @@ 
      */
     public function allowedAny($codes, $member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         $hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-        return ($hits>0 ? true : false);
+        return ($hits > 0 ? true : false);
     }
 
     /**
@@ -1062,7 +1062,7 @@ 
      */
     public function isProjectReady()
     {
-        if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
+        if($this->getRunningInitialEnvironmentCreations()->count() > 0) {
             // We're still creating the initial environments for this project so we're
             // not quite done
             return false;
@@ -1071,13 +1071,13 @@ 
         // Provide a hook for further checks. Logic stolen from
         // {@see DataObject::extendedCan()}
         $isDone = $this->extend('isProjectReady');
-        if ($isDone && is_array($isDone)) {
-            $isDone = array_filter($isDone, function ($val) {
+        if($isDone && is_array($isDone)) {
+            $isDone = array_filter($isDone, function($val) {
                 return !is_null($val);
             });
 
             // If anything returns false then we're not ready.
-            if ($isDone) {
+            if($isDone) {
                 return min($isDone);
             }
         }
@@ -1134,25 +1134,25 @@ 
     protected function validate()
     {
         $validation = parent::validate();
-        if ($validation->valid()) {
-            if (empty($this->Name)) {
+        if($validation->valid()) {
+            if(empty($this->Name)) {
                 return $validation->error('The stack must have a name.');
             }
 
             // The name is used to build filepaths so should be restricted
-            if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
+            if(!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
                 return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
             }
 
-            if (empty($this->CVSPath)) {
+            if(empty($this->CVSPath)) {
                 return $validation->error('You must provide a repository URL.');
             }
 
             $existing = DNProject::get()->filter('Name', $this->Name);
-            if ($this->ID) {
+            if($this->ID) {
                 $existing = $existing->exclude('ID', $this->ID);
             }
-            if ($existing->count() > 0) {
+            if($existing->count() > 0) {
                 return $validation->error('A stack already exists with that name.');
             }
         }
@@ -1166,14 +1166,14 @@ 
      */
     public function canCreate($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 

code/model/DNReferenceList.php

Spacing +18 added lines, -18 removed lines

@@ -105,23 +105,23 @@ 
     {
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return array();
         }
 
-        if ($this->getTags) {
-            if ($this->reference) {
+        if($this->getTags) {
+            if($this->reference) {
                 throw new LogicException("Can't have \$reference and \$getTags both set");
             }
             $log = $repository->getReferences()->getTags();
-        } elseif ($this->reference) {
+        } elseif($this->reference) {
             $log = $this->reference->getLog();
         } else {
             $log = $repository->getLog();
         }
 
-        if ($this->limit) {
-            if (is_array($log)) {
+        if($this->limit) {
+            if(is_array($log)) {
                 $limitedLog = array_slice($log, 0, $this->limit);
             } else {
                 $limitedLog = $log->setLimit($this->limit);
@@ -132,18 +132,18 @@ 
 
         // cache them for look up in byName
         $builds = array();
-        foreach ($limitedLog as $reference) {
-            if (!empty($this->blockBranch)) {
+        foreach($limitedLog as $reference) {
+            if(!empty($this->blockBranch)) {
                 $branchesIncluding = GitonomyCache::getIncludingBranches($reference);
-                foreach ($branchesIncluding as $candidate) {
-                    if ($candidate->getName() == $this->blockBranch) {
+                foreach($branchesIncluding as $candidate) {
+                    if($candidate->getName() == $this->blockBranch) {
                         // Break out of the function
                         return $builds;
                     }
                 }
             }
 
-            if ($this->getTags) {
+            if($this->getTags) {
                 $builds[] = DNTag::create($reference, $this->project, $this->data);
             } else {
                 $name = $this->reference ? $this->reference->getName() : '';
@@ -162,7 +162,7 @@ 
      */
     public function byName($hash)
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
@@ -170,14 +170,14 @@ 
         // The item might not be in the list because of the limit, try to find
         // in an older version and add it to the list.
         $found = null;
-        foreach ($this->items as $item) {
-            if ($item->SHA() == $hash) {
+        foreach($this->items as $item) {
+            if($item->SHA() == $hash) {
                 $found = $item;
                 break;
             }
         }
 
-        if ($found === null) {
+        if($found === null) {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
             $commit = new Gitonomy\Git\Commit($repository, $hash);
             $found = DNCommit::create($commit, $this->project, $this->data);
@@ -200,12 +200,12 @@ 
      */
     public function getIterator()
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
-        foreach ($this->items as $item) {
-            if (is_array($item)) {
+        foreach($this->items as $item) {
+            if(is_array($item)) {
                 $this->items[] = new ArrayData($item);
             }
         }

code/model/GitonomyCache.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     public static function getIncludingBranches($commit)
     {
         $cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
-        if (!isset(self::$cache[$cacheKey])) {
+        if(!isset(self::$cache[$cacheKey])) {
             self::$cache[$cacheKey] = $commit->getIncludingBranches();
         }
         return self::$cache[$cacheKey];

code/model/Pipeline.php

Spacing +67 added lines, -67 removed lines

@@ -229,7 +229,7 @@ 
     {
         // Workaround fixed in https://github.com/silverstripe/silverstripe-framework/pull/3201
         // Remove this once we update to a version of framework which supports this
-        if ($property === 'MessagingService') {
+        if($property === 'MessagingService') {
             return !empty($this->messagingService);
         }
         return parent::__isset($property);
@@ -273,10 +273,10 @@ 
     {
         // Owner can abort
         $member = $member ?: Member::currentUser();
-        if (!$member) {
+        if(!$member) {
             return false;
         }
-        if ($member->ID == $this->AuthorID) {
+        if($member->ID == $this->AuthorID) {
             return true;
         }
 
@@ -291,11 +291,11 @@ 
      */
     public function getRunningDescription()
     {
-        if (!$this->isActive()) {
+        if(!$this->isActive()) {
             return 'This pipeline is not currently running';
         }
         $result = '';
-        if ($step = $this->CurrentStep()) {
+        if($step = $this->CurrentStep()) {
             $result = $step->getRunningDescription();
         }
         return $result ?: 'This pipeline is currently running';
@@ -308,13 +308,13 @@ 
      */
     public function RunningOptions()
     {
-        if (!$this->isActive()) {
+        if(!$this->isActive()) {
             return null;
         }
         $actions = array();
 
         // Let current step update the current list of options
-        if (($step = $this->CurrentStep()) && ($step->isRunning())) {
+        if(($step = $this->CurrentStep()) && ($step->isRunning())) {
             $actions = $step->allowedActions();
         }
         return new ArrayList($actions);
@@ -327,7 +327,7 @@ 
      */
     public function LogOptions()
     {
-        if (!$this->isActive()) {
+        if(!$this->isActive()) {
             return null;
         }
 
@@ -338,14 +338,14 @@ 
             'Link' => $this->Link()
         );
 
-        if ($this->PreviousSnapshotID > 0) {
+        if($this->PreviousSnapshotID > 0) {
             $logs[] = array(
                 'ButtonText' => 'Snapshot Log',
                 'Link' => $this->PreviousSnapshot()->Link()
             );
         }
 
-        if ($this->CurrentDeploymentID > 0) {
+        if($this->CurrentDeploymentID > 0) {
             $logs[] = array(
                 'ButtonText' => 'Deployment Log',
                 'Link' => $this->CurrentDeployment()->Link()
@@ -354,16 +354,16 @@ 
 
         // Get logs from rollback steps (only for RollbackSteps).
         $rollbackSteps = array($this->RollbackStep1(), $this->RollbackStep2());
-        foreach ($rollbackSteps as $rollback) {
-            if ($rollback->exists() && $rollback->ClassName == 'RollbackStep') {
-                if ($rollback->RollbackDeploymentID > 0) {
+        foreach($rollbackSteps as $rollback) {
+            if($rollback->exists() && $rollback->ClassName == 'RollbackStep') {
+                if($rollback->RollbackDeploymentID > 0) {
                     $logs[] = array(
                         'ButtonText' => 'Rollback Log',
                         'Link' => $rollback->RollbackDeployment()->Link()
                     );
                 }
 
-                if ($rollback->RollbackDatabaseID > 0) {
+                if($rollback->RollbackDatabaseID > 0) {
                     $logs[] = array(
                         'ButtonText' => 'Rollback DB Log',
                         'Link' => $rollback->RollbackDatabase()->Link()
@@ -394,15 +394,15 @@ 
     {
         // Lazy load if necessary
         $data = null;
-        if (!$this->Config && ($data = $this->Environment()->loadPipelineConfig())) {
+        if(!$this->Config && ($data = $this->Environment()->loadPipelineConfig())) {
             $this->Config = serialize($data);
         }
 
         // Merge with defaults
-        if ($this->Config) {
-            if (!$this->mergedConfig) {
+        if($this->Config) {
+            if(!$this->mergedConfig) {
                 $this->mergedConfig = $data ?: unserialize($this->Config);
-                if ($default = self::config()->default_config) {
+                if($default = self::config()->default_config) {
                     Config::merge_array_low_into_high($this->mergedConfig, $default);
                 }
             }
@@ -430,8 +430,8 @@ 
     {
         $source = $this->getConfigData();
 
-        foreach (func_get_args() as $setting) {
-            if (empty($source[$setting])) {
+        foreach(func_get_args() as $setting) {
+            if(empty($source[$setting])) {
                 return null;
             }
             $source = $source[$setting];
@@ -481,7 +481,7 @@ 
                 ->performReadonlyTransformation()
         ));
 
-        if ($log = $this->LogContent()) {
+        if($log = $this->LogContent()) {
             $fields->addFieldToTab(
                 'Root.Main',
                 ToggleCompositeField::create(
@@ -510,12 +510,12 @@ 
         // dependent environment not available
         $projectName = $this->getConfigSetting('PipelineConfig', 'DependsOnProject');
         $environmentName = $this->getConfigSetting('PipelineConfig', 'DependsOnEnvironment');
-        if (empty($projectName) || empty($environmentName)) {
+        if(empty($projectName) || empty($environmentName)) {
             return null;
         }
 
         $project = DNProject::get()->filter('Name', $projectName)->first();
-        if (!($project && $project->exists())) {
+        if(!($project && $project->exists())) {
             throw new Exception(sprintf('Could not find dependent project "%s"', $projectName));
         }
 
@@ -524,7 +524,7 @@ 
             'Name' => $environmentName
         ))->first();
 
-        if (!($environment && $environment->exists())) {
+        if(!($environment && $environment->exists())) {
             throw new Exception(sprintf(
                 'Could not find dependent environment "%s" in project "%s"',
                 $environmentName,
@@ -548,13 +548,13 @@ 
     {
         $stepClass = isset($stepConfig['Class']) ? $stepConfig['Class'] : $stepConfig;
 
-        if (empty($stepClass)) {
+        if(empty($stepClass)) {
             throw new Exception(
                 sprintf('Missing or empty Class specifier for step "%s"', $name)
             );
         }
 
-        if (!is_subclass_of($stepClass, 'PipelineStep')) {
+        if(!is_subclass_of($stepClass, 'PipelineStep')) {
             throw new Exception(
                 sprintf('%s is not a valid "Class" field name for step "%s"', var_export($stepClass, true), $name)
             );
@@ -588,18 +588,18 @@ 
         // Ensure there are no other running {@link Pipeline} objects for this {@link DNEnvironment}
         // Requires that $this->EnvironmentID has been set
         $env = $this->Environment();
-        if (!($env && $env->exists())) {
+        if(!($env && $env->exists())) {
             throw new LogicException("This pipeline needs a valid environment to run on.");
         }
 
-        if ($env->HasCurrentPipeline()) {
+        if($env->HasCurrentPipeline()) {
             throw new LogicException("You can only run one pipeline at a time on this environment.");
         }
 
         $this->write(); // ensure we've written this record first
 
         // Instantiate steps.
-        foreach ($this->getConfigSetting('Steps') as $name => $stepConfig) {
+        foreach($this->getConfigSetting('Steps') as $name => $stepConfig) {
             $this->pushPipelineStep($name, $stepConfig);
         }
 
@@ -620,7 +620,7 @@ 
         $this->log("Pipeline completed successfully.");
         $this->write();
         // Some steps may pre-emptively send a success message before the pipeline itself has completed
-        if ($this->LastMessageSent !== self::ALERT_SUCCESS) {
+        if($this->LastMessageSent !== self::ALERT_SUCCESS) {
             $this->sendMessage(self::ALERT_SUCCESS);
         }
     }
@@ -677,15 +677,15 @@ 
         $success = true;
         $rollback1 = $this->RollbackStep1();
         $rollback2 = $this->RollbackStep2();
-        if (!empty($rollback1) && $rollback1->Status == 'Failed') {
+        if(!empty($rollback1) && $rollback1->Status == 'Failed') {
             $success = false;
         }
-        if (!empty($rollback2) && $rollback2->Status == 'Failed') {
+        if(!empty($rollback2) && $rollback2->Status == 'Failed') {
             $success = false;
         }
 
         // Send messages.
-        if ($success) {
+        if($success) {
             $this->log("Pipeline failed, but rollback completed successfully.");
             $this->sendMessage(self::ALERT_ROLLBACK_SUCCESS);
         } else {
@@ -715,7 +715,7 @@ 
 
         // Add smoke test step, if available, for later processing.
         $configRollback2 = $this->getConfigSetting('RollbackStep2');
-        if ($configRollback2) {
+        if($configRollback2) {
             $stepRollback2 = $this->pushPipelineStep('RollbackStep2', $configRollback2);
             $this->RollbackStep2ID = $stepRollback2->ID;
         }
@@ -734,24 +734,24 @@ 
     protected function canStartRollback()
     {
         // The rollback cannot run twice.
-        if ($this->isRollback()) {
+        if($this->isRollback()) {
             return false;
         }
 
         // Rollbacks must be configured.
-        if (!$this->getConfigSetting('RollbackStep1')) {
+        if(!$this->getConfigSetting('RollbackStep1')) {
             return false;
         }
 
         // On dryrun let rollback run
-        if ($this->DryRun) {
+        if($this->DryRun) {
             return true;
         }
 
         // Pipeline must have ran a deployment to be able to rollback.
         $deploy = $this->CurrentDeployment();
         $previous = $this->PreviousDeployment();
-        if (!$deploy->exists() || !$previous->exists()) {
+        if(!$deploy->exists() || !$previous->exists()) {
             return false;
         }
 
@@ -769,22 +769,22 @@ 
     {
         // Abort all running or queued steps.
         $steps = $this->Steps();
-        foreach ($steps as $step) {
-            if ($step->isQueued() || $step->isRunning()) {
+        foreach($steps as $step) {
+            if($step->isQueued() || $step->isRunning()) {
                 $step->abort();
             }
         }
 
-        if ($this->canStartRollback()) {
+        if($this->canStartRollback()) {
             $this->beginRollback();
-        } elseif ($this->isRollback()) {
+        } elseif($this->isRollback()) {
             $this->finaliseRollback();
         } else {
             // Not able to roll back - fail immediately.
             $this->Status = 'Failed';
             $this->log("Pipeline failed, not running rollback (not configured or not applicable yet).");
             $this->write();
-            if ($notify) {
+            if($notify) {
                 $this->sendMessage(self::ALERT_FAILURE);
             }
         }
@@ -822,8 +822,8 @@ 
 
         // Abort all running or queued steps.
         $steps = $this->Steps();
-        foreach ($steps as $step) {
-            if ($step->isQueued() || $step->isRunning()) {
+        foreach($steps as $step) {
+            if($step->isQueued() || $step->isRunning()) {
                 $step->abort();
             }
         }
@@ -857,7 +857,7 @@ 
     public function injectMessageReplacements($message, $subject, $substitutions)
     {
         // Handle empty messages
-        if (empty($subject) && empty($message)) {
+        if(empty($subject) && empty($message)) {
             return array(null, null);
         }
 
@@ -887,7 +887,7 @@ 
     {
         // Check message, subject, and additional arguments to include
         list($subject, $message) = $this->generateMessageTemplate($messageID);
-        if (empty($subject) || empty($message)) {
+        if(empty($subject) || empty($message)) {
             $this->log("Skipping sending message. None configured for $messageID");
             return true;
         }
@@ -903,7 +903,7 @@ 
         );
 
         // Send message to author
-        if ($author = $this->Author()) {
+        if($author = $this->Author()) {
             $this->log("Pipeline sending $messageID message to {$author->Email}");
             $this->messagingService->sendMessage($this, $message, $author, $arguments);
         } else {
@@ -912,7 +912,7 @@ 
 
         // Get additional recipients
         $recipients = $this->getConfigSetting('PipelineConfig', 'Recipients', $messageID);
-        if (empty($recipients)) {
+        if(empty($recipients)) {
             $this->log("Skipping sending message to empty recipients");
         } else {
             $recipientsStr = is_array($recipients) ? implode(',', $recipients) : $recipients;
@@ -944,11 +944,11 @@ 
     {
         $message = "";
 
-        if (!$this->isActive()) {
+        if(!$this->isActive()) {
             $message = "Pipeline::checkPipelineStatus() should only be called on running or rolling back pipelines.";
         }
 
-        if (!$this->ID || !$this->isInDB()) {
+        if(!$this->ID || !$this->isInDB()) {
             $message = "Pipeline::checkPipelineStatus() can only be called on pipelines already saved.";
         }
 
@@ -956,7 +956,7 @@ 
             ? $this->CurrentStep()
             : null;
 
-        if ($currentStep && $currentStep->PipelineID != $this->ID) {
+        if($currentStep && $currentStep->PipelineID != $this->ID) {
             $message = sprintf(
                 "The current step (#%d) has a pipeline ID (#%d) that doesn't match this pipeline's ID (#%d).",
                 $currentStep->ID,
@@ -965,13 +965,13 @@ 
             );
         }
 
-        if ($message) {
+        if($message) {
             $this->log($message);
             throw new LogicException($message);
         }
 
         // Fallback check only: this shouldn't be called unless a {@link PipelineStep} has been implemented incorrectly
-        if ($currentStep && $currentStep->isFailed() && !$this->isFailed() && !$this->isRollback()) {
+        if($currentStep && $currentStep->isFailed() && !$this->isFailed() && !$this->isRollback()) {
             $this->log(sprintf("Marking pipeline step (#%d) as failed - this pipeline step needs to be amended to mark"
                 . " the pipeline (as well as itself) as failed to ensure consistency.",
                 $this->CurrentStep()->ID
@@ -983,22 +983,22 @@ 
 
         // If this is the first time the Pipeline is run, then we don't have a CurrentStep, so set it,
         // start it running, and return
-        if (!$currentStep) {
+        if(!$currentStep) {
             $step = $this->Steps()->first();
             $this->CurrentStepID = $step->ID;
             $this->write();
 
             $this->log("Starting first pipeline step...");
             $step->start();
-        } elseif ($currentStep->isFinished()) {
+        } elseif($currentStep->isFinished()) {
             // Sort through the list of {@link PipelineStep} objects to find the next step we need to start.
             $this->log("Finding next step to execute...");
             $nextStep = $this->findNextStep();
 
-            if (!$nextStep) {
+            if(!$nextStep) {
 
                 // Special handling, since the main pipeline has already failed at this stage.
-                if ($this->isRollback()) {
+                if($this->isRollback()) {
                     $this->finaliseRollback();
                     return false;
                 }
@@ -1008,7 +1008,7 @@ 
                     'PipelineID' => $this->ID,
                     'Status' => 'Failed'
                 ))->count();
-                if ($failedSteps) {
+                if($failedSteps) {
                     $this->log('At least one of the steps has failed marking the pipeline as failed');
                     $this->markFailed();
                     return false;
@@ -1025,7 +1025,7 @@ 
                 $nextStep->start();
             }
         // if the current step is failing run it again
-        } elseif ($step = $this->CurrentStep()) {
+        } elseif($step = $this->CurrentStep()) {
             $step->start();
         }
     }
@@ -1093,11 +1093,11 @@ 
         $caller['line'] = $bt[($index - 1)]['line']; // Overwrite line and file to be the the line/file that actually
         $caller['file'] = $bt[($index - 1)]['file']; // called the function, not where the function is defined.
         // In case it wasn't called from a class
-        if (!isset($caller['class'])) {
+        if(!isset($caller['class'])) {
             $caller['class'] = '';
         }
         // In case it doesn't have a type (wasn't called from class)
-        if (!isset($caller['type'])) {
+        if(!isset($caller['type'])) {
             $caller['type'] = '';
         }
 
@@ -1118,15 +1118,15 @@ 
      */
     public function getLogger()
     {
-        if (!$this->isInDB()) {
+        if(!$this->isInDB()) {
             throw new RuntimeException("Can't write to a log file until we know the database ID.");
         }
 
-        if (!$this->Environment()) {
+        if(!$this->Environment()) {
             throw new RuntimeException("Can't write to a log file until we have an Environment.");
         }
 
-        if ($this->Environment() && !$this->Environment()->Project()) {
+        if($this->Environment() && !$this->Environment()->Project()) {
             throw new RuntimeException("Can't write to a log file until we have the Environment's project.");
         }
 
@@ -1186,9 +1186,9 @@ 
      */
     public function LogContent()
     {
-        if ($this->exists() && $this->Environment()) {
+        if($this->exists() && $this->Environment()) {
             $logger = $this->getLogger();
-            if ($logger->exists()) {
+            if($logger->exists()) {
                 return $logger->content();
             }
         }

code/model/jobs/DNCreateEnvironment.php

Spacing +7 added lines, -7 removed lines

@@ -120,9 +120,9 @@ 
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status
-        if ($statusCode === false) {
+        if($statusCode === false) {
             // Translate from the DNDeployment.Status to the Resque job status for UI purposes
-            switch ($this->Status) {
+            switch($this->Status) {
                 case 'Finished':
                     return 'Complete';
                 case 'Started':
@@ -150,11 +150,11 @@ 
             'projectName' => $project->Name
         );
 
-        if (!$this->CreatorID) {
+        if(!$this->CreatorID) {
             $this->CreatorID = Member::currentUserID();
         }
 
-        if ($this->CreatorID) {
+        if($this->CreatorID) {
             $creator = $this->Creator();
             $message = sprintf(
                 'Environment creation for project %s initiated by %s (%s), with IP address %s',
@@ -184,7 +184,7 @@ 
     public function createEnvironment()
     {
         $backend = $this->getBackend();
-        if ($backend) {
+        if($backend) {
             return $backend->createEnvironment($this);
         }
         throw new Exception("Unable to find backend.");
@@ -199,9 +199,9 @@ 
     public function getBackend()
     {
         $data = unserialize($this->Data);
-        if (isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
+        if(isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
             $env = Injector::inst()->get($data['EnvironmentType']);
-            if ($env instanceof EnvironmentCreateBackend) {
+            if($env instanceof EnvironmentCreateBackend) {
                 return $env;
             } else {
                 throw new Exception("Invalid backend: " . $data['EnvironmentType']);