datasift / storyplayer

src/php/DataSift/Storyplayer/HostLib/VagrantVm.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         $log = usingLog()->startAction('provision new VM');
 
         // make sure we like the provided details
-        foreach(array('name', 'osName', 'homeFolder') as $param) {
+        foreach (array('name', 'osName', 'homeFolder') as $param) {
             if (!isset($vmDetails->$param)) {
                 throw new E5xx_ActionFailed(__METHOD__, "missing vmDetails['{$param}']");
             }

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
             getenv("HOME") . "/.vagrant.d/insecure_private_key"
         ];
 
-        foreach ($keyFilenames as $keyFilename)
-        {
+        foreach ($keyFilenames as $keyFilename) {
             usingLog()->writeToLog("checking if {$keyFilename} exists");
             if (file_exists($keyFilename)) {
                 $log->endAction($keyFilename);

src/php/DataSift/Storyplayer/HostLib/VagrantVms.php

Spacing +9 added lines, -9 removed lines

@@ -138,7 +138,7 @@ 
         $baseFolder = $this->getVagrantDir($groupDef);
 
         // make sure we're happy with details about the machine
-        foreach($groupDef->details->machines as $hostId => $machine) {
+        foreach ($groupDef->details->machines as $hostId => $machine) {
             // TODO: it would be great to autodetect this one day
             if (!isset($machine->osName)) {
                 throw new E5xx_ActionFailed(__METHOD__, "missing groupDef->details->machines['$hostId']->osName");
@@ -149,7 +149,7 @@ 
         }
 
         // make sure the VM is stopped, if it is running
-        $log->addStep('stop vagrant VM in '.$baseFolder.' if already running', function() use($baseFolder) {
+        $log->addStep('stop vagrant VM in ' . $baseFolder . ' if already running', function() use($baseFolder) {
             $command = "vagrant destroy --force";
             $this->runCommandAgainstHostManager($baseFolder, $command);
         });
@@ -167,7 +167,7 @@ 
 
         // let's start the VM
         $command = "vagrant up";
-        $result = $log->addStep('create vagrant VM(s) in '.$baseFolder, function() use($baseFolder, $command) {
+        $result = $log->addStep('create vagrant VM(s) in ' . $baseFolder, function() use($baseFolder, $command) {
             return $this->runCommandAgainstHostManager($baseFolder, $command);
         });
 
@@ -180,14 +180,14 @@ 
         // yes it did!!
 
         // store the details
-        foreach($groupDef->details->machines as $hostId => $machine)
+        foreach ($groupDef->details->machines as $hostId => $machine)
         {
             // we want all the details from the config file
             $vmDetails = clone $machine;
 
             // this allows the story to perform actions against a single
             // machine if required
-            $vmDetails->type        = 'VagrantVm';
+            $vmDetails->type = 'VagrantVm';
 
             // new in v2.x:
             //
@@ -419,8 +419,8 @@ 
      */
     public function setVagrantBridgedInterface() {
         $bridgedIface = $this->determineBridgedInterface();
-        putenv('VAGRANT_BRIDGE_ADAPTER='.$bridgedIface);
-        putenv('VIRTUALBOX_BRIDGE_ADAPTER='.$bridgedIface);
+        putenv('VAGRANT_BRIDGE_ADAPTER=' . $bridgedIface);
+        putenv('VIRTUALBOX_BRIDGE_ADAPTER=' . $bridgedIface);
     }
 
     /**
@@ -436,7 +436,7 @@ 
             // e.g.: "moduleSettings":{"vagrant":{"bridgedIface":"eth0"}}
             $vagrantSettings = fromStoryplayer()->getModuleSetting('vagrant');
             if (!empty($vagrantSettings->bridgedIface)) {
-                $log->endAction('Returning configured '.$vagrantSettings->bridgedIface.' interface');
+                $log->endAction('Returning configured ' . $vagrantSettings->bridgedIface . ' interface');
                 return $vagrantSettings->bridgedIface;
             }
         } catch (E5xx_ActionFailed $e) {
@@ -466,7 +466,7 @@ 
         // now we just need to make sense of it all
         $lines = explode("\n", $result->output);
         $iface = null;
-        foreach($lines as $line) {
+        foreach ($lines as $line) {
             $matches = [];
             if (preg_match("|Name:[\s]+(.*)|", $line, $matches)) {
                 $iface = $matches[1];

Braces +6 added lines, -6 removed lines

@@ -180,8 +180,7 @@ 
         // yes it did!!
 
         // store the details
-        foreach($groupDef->details->machines as $hostId => $machine)
-        {
+        foreach($groupDef->details->machines as $hostId => $machine) {
             // we want all the details from the config file
             $vmDetails = clone $machine;
 
@@ -417,7 +416,8 @@ 
      * Set the VAGRANT_BRIDGE_ADAPTER and VIRTUALBOX_BRIDGE_ADAPTER
      * environmental variables.
      */
-    public function setVagrantBridgedInterface() {
+    public function setVagrantBridgedInterface()
+    {
         $bridgedIface = $this->determineBridgedInterface();
         putenv('VAGRANT_BRIDGE_ADAPTER='.$bridgedIface);
         putenv('VIRTUALBOX_BRIDGE_ADAPTER='.$bridgedIface);
@@ -439,7 +439,8 @@ 
                 $log->endAction('Returning configured '.$vagrantSettings->bridgedIface.' interface');
                 return $vagrantSettings->bridgedIface;
             }
-        } catch (E5xx_ActionFailed $e) {
+        }
+        catch (E5xx_ActionFailed $e) {
             // ignore errors as this setting may not exist
         }
 
@@ -502,8 +503,7 @@ 
             getenv("HOME") . "/.vagrant.d/insecure_private_key"
         ];
 
-        foreach ($keyFilenames as $keyFilename)
-        {
+        foreach ($keyFilenames as $keyFilename) {
             usingLog()->writeToLog("checking if {$keyFilename} exists");
             if (file_exists($keyFilename)) {
                 $log->endAction($keyFilename);

src/php/DataSift/Storyplayer/Injectables/ActiveSystemUnderTestConfigSupport.php

Indentation +4 added lines, -4 removed lines

@@ -57,11 +57,11 @@ 
  */
 trait ActiveSystemUnderTestConfigSupport
 {
-	public $activeSystemUnderTestName;
+    public $activeSystemUnderTestName;
     public $activeSystemUnderTestConfig;
 
-	public function initActiveSystemUnderTestConfigSupport($sutName, $injectables)
-	{
+    public function initActiveSystemUnderTestConfigSupport($sutName, $injectables)
+    {
         // does the system-under-test exist?
         if (!$injectables->knownSystemsUnderTestList->hasEntry($sutName)) {
             throw new E4xx_NoSuchSystemUnderTest($sutName);
@@ -73,5 +73,5 @@ 
 
         // we need to merge the 'roles' section into our chosen test environment
         $injectables->activeTestEnvironmentConfig->mergeSystemUnderTestConfig($this->activeSystemUnderTestConfig);
-	}
+    }
 }

src/php/DataSift/Storyplayer/Injectables/ActiveTestEnvironmentConfigSupport.php

Indentation +4 added lines, -4 removed lines

@@ -57,11 +57,11 @@ 
  */
 trait ActiveTestEnvironmentConfigSupport
 {
-	public $activeTestEnvironmentName;
+    public $activeTestEnvironmentName;
     public $activeTestEnvironmentConfig;
 
-	public function initActiveTestEnvironmentConfigSupport($envName, $injectables)
-	{
+    public function initActiveTestEnvironmentConfigSupport($envName, $injectables)
+    {
         // does the test environment exist?
         if (!$injectables->knownTestEnvironmentsList->hasEntry($envName)) {
             throw new E4xx_NoSuchTestEnvironment($envName);
@@ -72,5 +72,5 @@ 
 
         // remember the environment name
         $this->activeTestEnvironmentName = $envName;
-	}
+    }
 }

src/php/DataSift/Storyplayer/Injectables/E4xx/NoSuchSystemUnderTest.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     public function __construct($sutName)
     {
         $msg = "Unknown system under test '{$sutName}'; we have no config for it" . PHP_EOL . PHP_EOL
-             . "Use 'storyplayer --list-sut' to see the list of known systems under test";
+                . "Use 'storyplayer --list-sut' to see the list of known systems under test";
         parent::__construct(400, $msg, $msg);
     }
 }
\ No newline at end of file

src/php/DataSift/Storyplayer/Injectables/E4xx/NoSuchTestEnvironment.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     public function __construct($envName)
     {
         $msg = "Unknown test environment '{$envName}'; we have no config for it" . PHP_EOL . PHP_EOL
-             . "Use 'storyplayer list-test-environments' to see the list of known test environments";
+                . "Use 'storyplayer list-test-environments' to see the list of known test environments";
         parent::__construct(400, $msg, $msg);
     }
 }
\ No newline at end of file

src/php/DataSift/Storyplayer/OsLib/Base/Unix.php

Spacing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
 
         // SSH in and have a look
         $command = "ps -ef | grep '{$pid}'";
-        $result    = $this->runCommand($hostDetails, $command);
+        $result = $this->runCommand($hostDetails, $command);
 
         // what did we find?
         if ($result->didCommandFail() || empty($result->output)) {

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
         // how do we do this?
         if (isset($hostDetails->hostname)) {
             $ipAddress = gethostbyname($hostDetails->hostname);
-            if ($ipAddress != $hostDetails->hostname)
-            {
+            if ($ipAddress != $hostDetails->hostname) {
                 $log->endAction(["IP address is", $ipAddress]);
                 return $ipAddress;
             }

src/php/DataSift/Storyplayer/OsLib/OsBase.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
             //
             // most of the world uses 127.0.0.1
             // ubuntu uses 127.0.1.1 (no idea why)
-            $validIps = [ '127.0.0.1', '127.0.1.1' ];
+            $validIps = ['127.0.0.1', '127.0.1.1'];
             if (!in_array($hostDetails->ipAddress, $validIps)) {
                 // this hostname is *not* safe
                 //

src/php/DataSift/Storyplayer/Output.php

Spacing +7 added lines, -7 removed lines

@@ -258,10 +258,10 @@ 
     public function startStoryplayer($version, $url, $copyright, $license)
     {
         // enforce our inputs
-        Contract::RequiresValue($version,   is_string($version));
-        Contract::RequiresValue($url,       is_string($url));
+        Contract::RequiresValue($version, is_string($version));
+        Contract::RequiresValue($url, is_string($url));
         Contract::RequiresValue($copyright, is_string($copyright));
-        Contract::RequiresValue($license,   is_string($license));
+        Contract::RequiresValue($license, is_string($license));
 
         // call all of our plugins
         foreach ($this->plugins as $plugin)
@@ -298,7 +298,7 @@ 
     {
         // ensure our inputs!
         Contract::RequiresValue($activity, is_string($activity));
-        Contract::RequiresValue($name,     is_string($name));
+        Contract::RequiresValue($name, is_string($name));
 
         // call our plugins
         foreach ($this->plugins as $plugin)
@@ -364,7 +364,7 @@ 
 
         // inject the captured activity into the phase
         $phaseResult->activityLog = $this->activityLog;
-        $this->activityLog=[];
+        $this->activityLog = [];
 
         // pass the phase on
         foreach ($this->plugins as $plugin)
@@ -447,7 +447,7 @@ 
     {
         // enforce our inputs
         Contract::RequiresValue($phaseName, is_string($phaseName));
-        Contract::RequiresValue($msg,       is_string($msg));
+        Contract::RequiresValue($msg, is_string($msg));
 
         // keep track of what was attempted, in case we need to show
         // the user what was attempted
@@ -477,7 +477,7 @@ 
     {
         // enforce our inputs
         Contract::RequiresValue($phaseName, is_string($phaseName));
-        Contract::RequiresValue($msg,       is_string($msg));
+        Contract::RequiresValue($msg, is_string($msg));
 
         // keep track of what was attempted, in case we need to show
         // the user what was attempted

Braces +21 added lines, -42 removed lines

@@ -179,8 +179,7 @@ 
      */
     public function resetSilentMode()
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->resetSilentMode();
         }
     }
@@ -196,8 +195,7 @@ 
      */
     public function setSilentMode()
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->setSilentMode();
         }
     }
@@ -209,8 +207,7 @@ 
      */
     public function disableColourSupport()
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->disableColourSupport();
         }
     }
@@ -222,8 +219,7 @@ 
      */
     public function enforceColourSupport()
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->enforceColourSupport();
         }
     }
@@ -240,8 +236,7 @@ 
      */
     public function enableColourSupport()
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->enableColourSupport();
         }
     }
@@ -264,8 +259,7 @@ 
         Contract::RequiresValue($license,   is_string($license));
 
         // call all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->startStoryplayer($version, $url, $copyright, $license);
         }
     }
@@ -279,8 +273,7 @@ 
      */
     public function endStoryplayer($duration)
     {
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->endStoryplayer($duration);
         }
     }
@@ -301,8 +294,7 @@ 
         Contract::RequiresValue($name,     is_string($name));
 
         // call our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->startPhaseGroup($activity, $name);
         }
     }
@@ -323,8 +315,7 @@ 
         Contract::Requires($result instanceof PhaseGroup_Result);
 
         // call our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->endPhaseGroup($result);
         }
     }
@@ -341,8 +332,7 @@ 
         // enforce our input type
         Contract::Requires($phase instanceof Phase);
 
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->startPhase($phase);
         }
     }
@@ -367,8 +357,7 @@ 
         $this->activityLog=[];
 
         // pass the phase on
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->endPhase($phase, $phaseResult);
         }
     }
@@ -400,8 +389,7 @@ 
         ];
 
         // call all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logPhaseActivity($msg, $codeLine);
         }
     }
@@ -428,8 +416,7 @@ 
         ];
 
         // call all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logPhaseSubprocessOutput($msg);
         }
     }
@@ -458,8 +445,7 @@ 
         ];
 
         // call all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logPhaseError($phaseName, $msg);
         }
     }
@@ -488,8 +474,7 @@ 
         ];
 
         // call all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logPhaseSkipped($phaseName, $msg);
         }
     }
@@ -508,8 +493,7 @@ 
         Contract::RequiresValue($codeLine, is_array($codeLine));
 
         // pass it on to all of our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logPhaseCodeLine($codeLine);
         }
     }
@@ -528,8 +512,7 @@ 
         Contract::RequiresValue($msg, is_string($msg));
 
         // pass it on to our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logCliError($msg);
         }
     }
@@ -550,8 +533,7 @@ 
         Contract::RequiresValue($e, $e instanceof Exception);
 
         // pass this on to our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logCliErrorWithException($msg, $e);
         }
     }
@@ -570,8 +552,7 @@ 
         Contract::RequiresValue($msg, is_string($msg));
 
         // pass this on to our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logCliWarning($msg);
         }
     }
@@ -590,8 +571,7 @@ 
         Contract::RequiresValue($msg, is_string($msg));
 
         // pass this on to our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logCliInfo($msg);
         }
     }
@@ -614,8 +594,7 @@ 
         // $var can be anything, so there is no contract to enforce
 
         // pass this on to our plugins
-        foreach ($this->plugins as $plugin)
-        {
+        foreach ($this->plugins as $plugin) {
             $plugin->logVardump($name, $var);
         }
     }