silverstripe / deploynaut

code/extensions/FrontendLink.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
     public function updateItemEditForm($form)
     {
-        if ($this->owner->record->hasMethod('Link')) {
+        if($this->owner->record->hasMethod('Link')) {
             $link = sprintf(
                 '<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
                 $this->owner->record->Link()

code/form/DataArchiveFileField.php

Spacing +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@ 
      */
     public function saveInto(DataObjectInterface $record)
     {
-        if (!isset($_FILES[$this->name])) {
+        if(!isset($_FILES[$this->name])) {
             return false;
         }
 
-        if (!($record instanceof DNDataArchive)) {
+        if(!($record instanceof DNDataArchive)) {
             throw new LogicException('Saving into wrong type, expected DNDataArchive');
         }
 
@@ -29,7 +29,7 @@ 
 
         /** @var DNDataTransfer $dataTransfer */
         $dataTransfer = $dataArchive->DataTransfers()->First();
-        if (!$dataTransfer) {
+        if(!$dataTransfer) {
             throw new LogicException('No transfer found');
         }
 
@@ -40,12 +40,12 @@ 
         $absolutePath = $dataArchive->generateFilepath($dataTransfer);
         $relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
         $this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-        if ($this->upload->isError()) {
+        if($this->upload->isError()) {
             return false;
         }
 
         $file = $this->upload->getFile();
-        if ($this->relationAutoSetting) {
+        if($this->relationAutoSetting) {
             // save to record
             $record->{$this->name . 'ID'} = $file->ID;
         }

code/form/TabbedSelectionGroup.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $items = CompositeField::FieldList()->toArray();
         $fields = new ArrayList();
 
-        foreach ($items as $item) {
+        foreach($items as $item) {
             $extra = array(
                 'Selected' => $this->value == $item->getValue(),
             );

code/jobs/CreateEnvJob.php

Spacing +2 added lines, -2 removed lines

@@ -36,13 +36,13 @@
         // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
         try {
             $envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
-            if (!($envCreate && $envCreate->exists())) {
+            if(!($envCreate && $envCreate->exists())) {
                 throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
             }
 
             // This will throw and exception if it fails.
             $envCreate->createEnvironment();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
             echo "[-] CreateEnvJob failed" . PHP_EOL;
             throw $e;

code/jobs/DataTransferJob.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
         $environment = $dataTransfer->Environment();
         $backupDataTransfer = null;
 
-        if (!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
+        if(!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
             $backupDataTransfer = DNDataTransfer::create();
             $backupDataTransfer->EnvironmentID = $environment->ID;
             $backupDataTransfer->Direction = 'get';
@@ -61,7 +61,7 @@ 
                 ))
                 ->exclude('ID', $dataTransfer->ID);
 
-            if ($runningTransfers->count()) {
+            if($runningTransfers->count()) {
                 $runningTransfer = $runningTransfers->first();
                 $log->write(sprintf(
                     '[-] Error: another transfer is in progress (started at %s by %s)',
@@ -77,7 +77,7 @@ 
 
 
             // before we push data to an environment, we'll make a backup first
-            if ($backupDataTransfer) {
+            if($backupDataTransfer) {
                 $log->write('Backing up existing data');
                 $environment->Backend()->dataTransfer(
                     $backupDataTransfer,
@@ -89,10 +89,10 @@ 
                 $dataTransfer,
                 $log
             );
-        } catch (RuntimeException $exc) {
+        } catch(RuntimeException $exc) {
             $log->write($exc->getMessage());
 
-            if ($backupDataTransfer) {
+            if($backupDataTransfer) {
                 $backupDataTransfer->Status = 'Failed';
                 $backupDataTransfer->write();
             }
@@ -102,7 +102,7 @@ 
             throw $exc;
         }
 
-        if ($backupDataTransfer) {
+        if($backupDataTransfer) {
             $backupDataTransfer->Status = 'Finished';
             $backupDataTransfer->write();
         }

code/jobs/DeployJob.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
                 ))
                 ->exclude('ID', $this->args['deploymentID']);
 
-            if ($runningDeployments->count()) {
+            if($runningDeployments->count()) {
                 $runningDeployment = $runningDeployments->first();
                 $log->write(sprintf(
                     '[-] Error: another deployment is in progress (started at %s by %s)',
@@ -63,7 +63,7 @@ 
                 // all options from the DeploymentStrategy merged in, including sha.
                 $this->args
             );
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
             echo "[-] DeployJob failed" . PHP_EOL;
             throw $e;

code/jobs/FetchJob.php

Spacing +14 added lines, -14 removed lines

@@ -42,12 +42,12 @@ 
     {
         set_time_limit(0);
 
-        if (!empty($this->args['logfile'])) {
+        if(!empty($this->args['logfile'])) {
             $this->log = new DeploynautLogFile($this->args['logfile']);
         }
 
         $this->project = DNProject::get()->byId($this->args['projectID']);
-        if (!($this->project && $this->project->exists())) {
+        if(!($this->project && $this->project->exists())) {
             throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
         }
 
@@ -55,7 +55,7 @@ 
 
         // Disallow concurrent git fetches on the same project.
         // Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
-        if (!empty($this->args['fetchID'])) {
+        if(!empty($this->args['fetchID'])) {
             $runningFetches = DNGitFetch::get()
                 ->filter(array(
                     'ProjectID' => $this->project->ID,
@@ -64,14 +64,14 @@ 
                 ))
                 ->exclude('ID', $this->args['fetchID']);
 
-            if ($runningFetches->count()) {
+            if($runningFetches->count()) {
                 $runningFetch = $runningFetches->first();
                 $message = sprintf(
                     'Another fetch is in progress (started at %s by %s)',
                     $runningFetch->dbObject('Created')->Nice(),
                     $runningFetch->Deployer()->Title
                 );
-                if ($this->log) {
+                if($this->log) {
                     $this->log->write($message);
                 }
                 throw new RuntimeException($message);
@@ -81,14 +81,14 @@ 
         // Decide whether we need to just update what we already have
         // or initiate a clone if no local repo exists.
         try {
-            if ($this->project->repoExists() && empty($this->args['forceClone'])) {
+            if($this->project->repoExists() && empty($this->args['forceClone'])) {
                 $this->fetchRepo();
             } else {
                 $this->cloneRepo();
             }
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
-            if ($this->log) {
+            if($this->log) {
                 $this->log->write($e->getMessage());
             }
             throw $e;
@@ -105,7 +105,7 @@ 
 
     protected function cloneRepo()
     {
-        if (file_exists($this->project->getLocalCVSPath())) {
+        if(file_exists($this->project->getLocalCVSPath())) {
             $this->runCommand(sprintf(
                 'rm -rf %s',
                 escapeshellarg($this->project->getLocalCVSPath())
@@ -128,17 +128,17 @@ 
      */
     protected function runCommand($command, $workingDir = null)
     {
-        if (!empty($this->user)) {
+        if(!empty($this->user)) {
             $command = sprintf('sudo -u %s %s', $this->user, $command);
         }
-        if ($this->log) {
+        if($this->log) {
             $this->log->write(sprintf('Running command: %s', $command));
         }
         $process = new \Symfony\Component\Process\Process($command, $workingDir);
         $process->setEnv($this->project->getProcessEnv());
         $process->setTimeout(1800);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException($process->getErrorOutput());
         }
     }
@@ -152,9 +152,9 @@ 
         global $databaseConfig;
         DB::connect($databaseConfig);
 
-        if (!empty($this->args['fetchID'])) {
+        if(!empty($this->args['fetchID'])) {
             $fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-            if ($fetch && $fetch->exists()) {
+            if($fetch && $fetch->exists()) {
                 $fetch->Status = $status;
                 $fetch->write();
             }

code/model/DNBranch.php

Spacing +3 added lines, -3 removed lines

@@ -85,12 +85,12 @@ 
      */
     public function LastUpdated()
     {
-        if ($this->_lastUpdatedCache) {
+        if($this->_lastUpdatedCache) {
             return $this->_lastUpdatedCache;
         }
         try {
             $created = $this->branch->getCommit()->getCommitterDate();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             //occasionally parsing will fail this is a fallback to make it still work
             return new SS_Datetime();
         }
@@ -111,7 +111,7 @@ 
      */
     public function IsOpenByDefault()
     {
-        if ($this->Name() == 'master') {
+        if($this->Name() == 'master') {
             return " open";
         } else {
             return "";

code/model/DNBranchList.php

Spacing +9 added lines, -9 removed lines

@@ -63,20 +63,20 @@ 
 
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return $branches;
         }
 
-        foreach ($repository->getReferences()->getBranches() as $branch) {
+        foreach($repository->getReferences()->getBranches() as $branch) {
             /** @var DNBranch $obj */
             $obj = DNBranch::create($branch, $this->project, $this->data);
-            if ($branch->getName() == 'master') {
+            if($branch->getName() == 'master') {
                 $firstBranch = array($branch->getName() => $obj);
             } else {
                 $branches[$branch->getName()] = $obj;
             }
         }
-        if ($firstBranch) {
+        if($firstBranch) {
             $branches = $firstBranch + $branches;
         }
 
@@ -92,11 +92,11 @@ 
      */
     public function byName($name)
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->getIterator();
         }
 
-        if (isset($this->items[$name])) {
+        if(isset($this->items[$name])) {
             return $this->items[$name];
         }
 
@@ -111,12 +111,12 @@ 
      */
     public function getIterator()
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
-        foreach ($this->items as $i => $item) {
-            if (is_array($item)) {
+        foreach($this->items as $i => $item) {
+            if(is_array($item)) {
                 $this->items[$i] = new ArrayData($item);
             }
         }