silverstripe / deploynaut

code/model/steps/UserConfirmationStep.php

Spacing +17 added lines, -17 removed lines

@@ -150,14 +150,14 @@ 
         parent::start();
 
         // Just in case this step is being mistakenly restarted
-        if ($this->hasResponse()) {
+        if($this->hasResponse()) {
             $this->log("{$this->Title} has already been processed with a response of {$this->Approval}");
             $this->markFailed();
             return false;
         }
 
         // Begin or process this step
-        switch ($this->Status) {
+        switch($this->Status) {
             case 'Started':
                 return $this->checkStatus();
             case 'Queued':
@@ -188,7 +188,7 @@ 
     public function approve()
     {
         // Check permission
-        if (!$this->canApprove()) {
+        if(!$this->canApprove()) {
             return Security::permissionFailure(
                 null,
                 _t("UserConfirmationStep.DENYAPPROVE", "You do not have permission to approve this deployment")
@@ -196,7 +196,7 @@ 
         }
 
         // Skip subsequent approvals if already approved / rejected
-        if ($this->hasResponse()) {
+        if($this->hasResponse()) {
             return;
         }
 
@@ -217,7 +217,7 @@ 
     public function reject()
     {
         // Check permission
-        if (!$this->canApprove()) {
+        if(!$this->canApprove()) {
             return Security::permissionFailure(
                 null,
                 _t("UserConfirmationStep.DENYREJECT", "You do not have permission to reject this deployment")
@@ -225,7 +225,7 @@ 
         }
 
         // Skip subsequent approvals if already approved / rejected
-        if ($this->hasResponse()) {
+        if($this->hasResponse()) {
             return;
         }
 
@@ -247,7 +247,7 @@ 
     {
         // For running or queued tasks ensure that we have not exceeded
         // a reasonable time-elapsed to consider this job inactive
-        if ($this->isTimedOut()) {
+        if($this->isTimedOut()) {
             $days = round($this->MaxDuration / (24.0 * 3600.0), 1);
             $logMessage = "{$this->Title} took longer than {$this->MaxDuration} seconds ($days days) to be approved "
                 . "and has timed out";
@@ -258,7 +258,7 @@ 
         }
 
         // If operating on a delayed notification schedule, determine if there are further groups who should be notified
-        if ($delay = $this->getConfigSetting('RecipientsDelay')) {
+        if($delay = $this->getConfigSetting('RecipientsDelay')) {
             // Check group that should have been notified by now
             $age = $this->getAge();
             $escallateGroup = intval($age / $delay);
@@ -266,7 +266,7 @@ 
             $lastGroup = count($recipients) - 1;
             // If we can notify the next group, do so
             // We only escallate one group at a time to ensure correct order is followed
-            if ($this->NotifiedGroup < $lastGroup && $this->NotifiedGroup < $escallateGroup) {
+            if($this->NotifiedGroup < $lastGroup && $this->NotifiedGroup < $escallateGroup) {
                 $this->NotifiedGroup++;
                 $groupDescription = is_array($recipients[$this->NotifiedGroup])
                     ? implode(',', $recipients[$this->NotifiedGroup])
@@ -295,7 +295,7 @@ 
         $this->log("Starting {$this->Title}...");
         // Determine if we should use delayed notification
         $recipientGroup = 'all';
-        if ($this->getConfigSetting('RecipientsDelay')) {
+        if($this->getConfigSetting('RecipientsDelay')) {
             $this->NotifiedGroup = $recipientGroup = 0;
         }
         // Send to selected group
@@ -358,9 +358,9 @@ 
         $author = $this->Pipeline()->Author();
 
         // Send message to requester
-        if ($recipientGroup === 'all' || $recipientGroup === 0) {
+        if($recipientGroup === 'all' || $recipientGroup === 0) {
             list($subject, $message) = $this->generateMessageTemplate(self::ROLE_REQUESTER, $messageID);
-            if ($subject && $message) {
+            if($subject && $message) {
                 $this->log("{$this->Title} sending $messageID message to {$author->Email}");
                 $extra = array('subject' => $subject);
                 $this->messagingService->sendMessage($this, $message, $author, array_merge($arguments, $extra));
@@ -369,19 +369,19 @@ 
 
         // Filter recipients based on group
         $recipients = $this->getConfigSetting('Recipients');
-        if (is_array($recipients) && $recipientGroup !== 'all') {
+        if(is_array($recipients) && $recipientGroup !== 'all') {
             $recipients = isset($recipients[$recipientGroup])
                 ? $recipients[$recipientGroup]
                 : null;
         }
-        if (empty($recipients)) {
+        if(empty($recipients)) {
             $this->log("Skipping sending message to empty recipients");
             return;
         }
 
         // Send to recipients
         list($subject, $message) = $this->generateMessageTemplate(self::ROLE_RECIPIENT, $messageID);
-        if ($subject && $message && $recipients) {
+        if($subject && $message && $recipients) {
             $recipientsStr = is_array($recipients) ? implode(',', $recipients) : $recipients;
             $this->log("{$this->Title} sending $messageID message to $recipientsStr");
             $extra = array('subject' => $subject);
@@ -393,7 +393,7 @@ 
     {
 
         // Don't show options if this step has already been confirmed
-        if ($this->hasResponse() || !$this->isRunning()) {
+        if($this->hasResponse() || !$this->isRunning()) {
             return;
         }
 
@@ -403,7 +403,7 @@ 
     public function allowedActions()
     {
         // Don't show options if this step has already been confirmed or can't be confirmed
-        if ($this->hasResponse() || !$this->isRunning() || !$this->canApprove()) {
+        if($this->hasResponse() || !$this->isRunning() || !$this->canApprove()) {
             return parent::allowedActions();
         }
 

code/queuereport/ResqueJob.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
      */
     public function __get($property)
     {
-        if (isset($this->record[$property])) {
+        if(isset($this->record[$property])) {
             return $this->record[$property];
         }
         return null;

code/queuereport/ResqueQueue.php

Spacing +4 added lines, -4 removed lines

@@ -55,16 +55,16 @@ 
         $jobs = new ArrayList();
 
         $resqueJobs = Resque::redis()->lrange('queue:' . $this->Name, 0, -1);
-        if (!$resqueJobs) {
+        if(!$resqueJobs) {
             $jobs->push(new ResqueJob(array(
                 'Name' => 'null',
                 'Value' => 'null',
             )));
             return $jobs;
         }
-        foreach ($resqueJobs as $idx => $job) {
+        foreach($resqueJobs as $idx => $job) {
             $stdClass = json_decode($job);
-            if ($stdClass->class === 'CapistranoDeploy' || $stdClass->class === 'DeployJob') {
+            if($stdClass->class === 'CapistranoDeploy' || $stdClass->class === 'DeployJob') {
                 $value = $stdClass->args[0]->projectName
                     . ':' . $stdClass->args[0]->environment
                     . ' - ' . $stdClass->args[0]->sha;
@@ -121,7 +121,7 @@ 
      */
     public function __get($property)
     {
-        if (isset($this->record[$property])) {
+        if(isset($this->record[$property])) {
             return $this->record[$property];
         }
         return null;

code/queuereport/ResqueReport.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     {
         $queues = Resque::queues();
         $queueList = new ArrayList();
-        foreach ($queues as $idx => $queue) {
+        foreach($queues as $idx => $queue) {
             $queueList->push(new ResqueQueue(array(
                 'ID' => ($idx + 1),
                 'Name' => $queue,

code/tasks/DNMigrate1_1to1_2.php

Spacing +6 added lines, -6 removed lines

@@ -12,11 +12,11 @@ 
     {
         $projects = DNProject::get();
 
-        foreach ($projects as $project) {
+        foreach($projects as $project) {
             $environments = $project->DNEnvironmentList();
-            foreach ($environments as $environment) {
+            foreach($environments as $environment) {
                 $newFilename = basename($environment->Filename);
-                if ($environment->Filename != $newFilename) {
+                if($environment->Filename != $newFilename) {
                     echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
                     $environment->Filename = $newFilename;
                     $environment->write();
@@ -26,13 +26,13 @@ 
 
         $warnings = false;
         // Check if all project folders exists
-        foreach ($projects as $project) {
-            if (!$project->projectFolderExists()) {
+        foreach($projects as $project) {
+            if(!$project->projectFolderExists()) {
                 $warnings = true;
                 echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
             }
         }
-        if ($warnings) {
+        if($warnings) {
             exit(1);
         }
     }

code/tasks/SyncProjectsAndEnvironments.php

Spacing +22 added lines, -22 removed lines

@@ -11,15 +11,15 @@ 
         $remove = true;
         $dryRun = true;
 
-        if ($request && $request->requestVar('remove') !== null) {
+        if($request && $request->requestVar('remove') !== null) {
             $remove = (bool)$request->requestVar('remove');
         }
 
-        if ($request && $request->requestVar('dryrun') !== null) {
+        if($request && $request->requestVar('dryrun') !== null) {
             $dryRun = (bool)$request->requestVar('dryrun');
         }
 
-        if ($dryRun) {
+        if($dryRun) {
             echo "Running in dry run mode, no changes commited, ";
             echo "the output shows a prediction on what will happen." . PHP_EOL;
             echo "To skip dryrun, run the task like this:" . PHP_EOL;
@@ -32,7 +32,7 @@ 
 
         // Sync projects
         $projects = DNProject::get();
-        if ($remove) {
+        if($remove) {
             $this->echoHeader('Removing obsolete projects');
             $this->removeObsoleteProjects($projectPaths, $dryRun);
         }
@@ -40,7 +40,7 @@ 
         $this->syncProjectPaths($projectPaths, $dryRun);
 
         $this->echoHeader('Syncing environment files');
-        foreach ($projects as $project) {
+        foreach($projects as $project) {
             $this->echoHeader($project->Name);
             // Sync environments for each project
             $environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -60,18 +60,18 @@ 
     {
         $list = $project->Environments();
 
-        $basePaths = array_map(function ($path) {
+        $basePaths = array_map(function($path) {
             return basename($path);
         }, $paths);
 
         $removeList = $list->filter('Filename:not', $basePaths);
-        if ($removeList->count() === 0) {
+        if($removeList->count() === 0) {
             return;
         }
 
-        foreach ($removeList as $remove) {
+        foreach($removeList as $remove) {
             $this->message('Removing "' . basename($remove->Name) . '" from db');
-            if (!$dryRun) {
+            if(!$dryRun) {
                 $removeList->remove($remove);
             }
         }
@@ -87,13 +87,13 @@ 
     protected function removeObsoleteProjects($paths, $dryrun = false)
     {
         $removeList = DNProject::get()->filter('Name:not', $paths);
-        if ($removeList->count() == 0) {
+        if($removeList->count() == 0) {
             return;
         }
 
-        foreach ($removeList as $remove) {
+        foreach($removeList as $remove) {
             $this->message($remove->Name . ' ' . $remove->Path);
-            if (!$dryrun) {
+            if(!$dryrun) {
                 $removeList->remove($remove);
             }
         }
@@ -111,22 +111,22 @@ 
         $list = $project->Environments();
 
         // Normalise paths in DB
-        foreach ($list as $item) {
+        foreach($list as $item) {
             $real = realpath($item->Filename);
-            if ($real && $real != $item->Filename) {
+            if($real && $real != $item->Filename) {
                 $item->Filename = $real;
                 $item->write();
             }
         }
 
-        foreach ($paths as $path) {
+        foreach($paths as $path) {
             $path = basename($path);
-            if ($list->filter('Filename', $path)->count()) {
+            if($list->filter('Filename', $path)->count()) {
                 continue;
             }
 
             $this->message('Adding "' . basename($path) . '" to db');
-            if (!$dryRun) {
+            if(!$dryRun) {
                 $environment = DNEnvironment::create_from_path($path);
                 $environment->ProjectID = $project->ID;
                 $environment->write();
@@ -142,10 +142,10 @@ 
      */
     public function syncProjectPaths($paths, $dryRun = false)
     {
-        foreach ($paths as $path) {
-            if (!DNProject::get()->filter('Name', $path)->count()) {
+        foreach($paths as $path) {
+            if(!DNProject::get()->filter('Name', $path)->count()) {
                 $this->message($path);
-                if (!$dryRun) {
+                if(!$dryRun) {
                     DNProject::create_from_path($path)->write();
                 }
             }
@@ -157,7 +157,7 @@ 
      */
     protected function message($text)
     {
-        if (PHP_SAPI !== 'cli') {
+        if(PHP_SAPI !== 'cli') {
             $text = '<p>' . $text . '</p>' . PHP_EOL;
         }
         echo ' - ' . $text . PHP_EOL;
@@ -168,7 +168,7 @@ 
      */
     protected function echoHeader($text)
     {
-        if (PHP_SAPI !== 'cli') {
+        if(PHP_SAPI !== 'cli') {
             echo '<h2>' . $text . '</h2>' . PHP_EOL;
         } else {
             echo '# ' . $text . PHP_EOL;