datasift / storyplayer

src/php/DataSift/Storyplayer/DeviceLib/HardCodedDevices.php

Spacing +3 added lines, -3 removed lines

@@ -72,17 +72,17 @@
         // defaults for Chrome, running locally
         $config = $this->newConfig('chrome')->getConfig();
         $config->adapter = 'LocalWebDriver';
-        $config->browser  = 'chrome';
+        $config->browser = 'chrome';
 
         // defaults for Firefox, running locally
         $config = $this->newConfig('firefox')->getConfig();
         $config->adapter = 'LocalWebDriver';
-        $config->browser  = 'firefox';
+        $config->browser = 'firefox';
 
         // defaults for Safari, running locally
         $config = $this->newConfig('safari')->getConfig();
         $config->adapter = 'LocalWebDriver';
-        $config->browser  = 'safari';
+        $config->browser = 'safari';
 
         // ----------------------------------------------------------------
         //

src/php/DataSift/Storyplayer/DeviceLib/KnownDevices.php

Spacing +3 added lines, -3 removed lines

@@ -70,17 +70,17 @@
         // defaults for Chrome, running locally
         $this->chrome = new BaseObject;
         $this->chrome->adapter = 'LocalWebDriver';
-        $this->chrome->browser  = 'chrome';
+        $this->chrome->browser = 'chrome';
 
         // defaults for Firefox, running locally
         $this->firefox = new BaseObject;
         $this->firefox->adapter = 'LocalWebDriver';
-        $this->firefox->browser  = 'firefox';
+        $this->firefox->browser = 'firefox';
 
         // defaults for Safari, running locally
         $this->safari = new BaseObject;
         $this->safari->adapter = 'LocalWebDriver';
-        $this->safari->browser  = 'safari';
+        $this->safari->browser = 'safari';
 
         // ----------------------------------------------------------------
         //

src/php/DataSift/Storyplayer/DeviceLib/SauceLabsWebDriverAdapter.php

Indentation +4 added lines, -4 removed lines

@@ -73,10 +73,10 @@
 
         // build the Sauce Labs url
         $url = "http://"
-             . urlencode($this->browserDetails->saucelabs->username)
-             . ':'
-             . urlencode($this->browserDetails->saucelabs->accesskey)
-             . '@ondemand.saucelabs.com/wd/hub';
+                . urlencode($this->browserDetails->saucelabs->username)
+                . ':'
+                . urlencode($this->browserDetails->saucelabs->accesskey)
+                . '@ondemand.saucelabs.com/wd/hub';
 
         // build the Sauce Labs capabilities array
         $desiredCapabilities = $this->browserDetails->desiredCapabilities;

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         // due to encoding errors at SauceLabs, we can't use '>' as a
         // delimiter in the story's name
         $story = $st->getStory();
-        $desiredCapabilities['name'] = $st->getTestEnvironmentName() . ' / ' . $st->getCurrentPhase() . ': ' . $st->getCurrentPhaseName() . ' / '. $story->getName();
+        $desiredCapabilities['name'] = $st->getTestEnvironmentName() . ' / ' . $st->getCurrentPhase() . ': ' . $st->getCurrentPhaseName() . ' / ' . $story->getName();
 
         // create the browser session
         $webDriver = new WebDriverClient($url);

Braces +2 added lines, -4 removed lines

@@ -104,15 +104,13 @@
     public function stop()
     {
         // stop the web browser
-        if (is_object($this->browserSession))
-        {
+        if (is_object($this->browserSession)) {
             $this->browserSession->close();
             $this->browserSession = null;
         }
 
         // now stop the proxy
-        if (is_object($this->proxySession))
-        {
+        if (is_object($this->proxySession)) {
             try {
                 $this->proxySession->close();
             }

src/php/DataSift/Storyplayer/HostLib/Ec2Vm.php

Braces +5 added lines, -10 removed lines

@@ -140,8 +140,7 @@ 
                 }
             });
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             // something went wrong
             $log->endAction("VM failed to provision :(");
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
@@ -163,8 +162,7 @@ 
                 $vmDetails->ec2Instance = $response['Instances'][0];
             });
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             // something went wrong
             $log->endAction("VM failed to start :(");
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
@@ -236,8 +234,7 @@ 
                 $vmDetails->ec2Instance = $response['Instances'][0];
             });
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             // something went wrong
             $log->endAction("VM failed to start :(");
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
@@ -299,8 +296,7 @@ 
                 $vmDetails->ec2Instance = $response['Instances'][0];
             });
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             // something went wrong
             $log->endAction("VM failed to stop :(");
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
@@ -374,8 +370,7 @@ 
                 ));
             });
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             // something went wrong
             $log->endAction("VM failed to terminate :(");
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());

Spacing +9 added lines, -9 removed lines

@@ -89,10 +89,10 @@ 
     public function createHost($vmDetails, $provisioningVars = array())
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction('provision new VM');
+        $log = Log::usingLog()->startAction('provision new VM');
 
         // make sure we like the provided details
-        foreach(array('name', 'environment', 'osName', 'amiId', 'securityGroup') as $param) {
+        foreach (array('name', 'environment', 'osName', 'amiId', 'securityGroup') as $param) {
             if (!isset($vmDetails->$param)) {
                 throw Exceptions::newActionFailedException(__METHOD__, "missing vmDetails['{$param}']");
             }
@@ -132,7 +132,7 @@ 
                     $client->createTags(array(
                         'Resources' => array($response['Instances'][0]['InstanceId']),
                         'Tags' => array(
-                            array (
+                            array(
                                 'Key' => 'Name',
                                 'Value' => $vmDetails->ec2Name
                             )
@@ -199,7 +199,7 @@ 
     public function startHost($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("start VM");
+        $log = Log::usingLog()->startAction("start VM");
 
         // is the VM actually running?
         if ($this->isRunning($vmDetails)) {
@@ -264,7 +264,7 @@ 
     public function stopHost($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("stop VM");
+        $log = Log::usingLog()->startAction("stop VM");
 
         // is the VM actually running?
         if (!$this->isRunning($vmDetails)) {
@@ -319,7 +319,7 @@ 
     public function restartHost($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("restart VM");
+        $log = Log::usingLog()->startAction("restart VM");
 
         // stop and start
         $this->stopHost($vmDetails);
@@ -350,7 +350,7 @@ 
     public function destroyHost($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("destroy VM");
+        $log = Log::usingLog()->startAction("destroy VM");
 
         // get our Ec2 client from the SDK
         $client = fromAws()->getEc2Client();
@@ -419,7 +419,7 @@ 
     public function isRunning($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("determine status of EC2 VM '{$vmDetails->hostId}'");
+        $log = Log::usingLog()->startAction("determine status of EC2 VM '{$vmDetails->hostId}'");
 
         // get the instance data
         $instance = fromEc2()->getInstance($vmDetails->hostId);
@@ -446,7 +446,7 @@ 
     public function determineIpAddress($vmDetails)
     {
         // what are we doing?
-        $log =Log::usingLog()->startAction("determine IP address of EC2 VM '{$vmDetails->hostId}'");
+        $log = Log::usingLog()->startAction("determine IP address of EC2 VM '{$vmDetails->hostId}'");
 
         // we need to get a fresh copy of the instance details
         $dnsName = fromEc2Instance($vmDetails->hostId)->getPublicDnsName();

src/php/DataSift/Storyplayer/HostLib/PhysicalHosts.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
         if (empty($groupDef->details->machines)) {
             throw new E5xx_ActionFailed(__METHOD__, "groupDef->details->machines cannot be empty");
         }
-        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->roles)) {
                 throw new E5xx_ActionFailed(__METHOD__, "missing groupDef->details->machines['$hostId']->roles");
@@ -123,7 +123,7 @@ 
         // if it is not, that is NOT our responsibility
 
         // 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;

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
         // if it is not, that is NOT our responsibility
 
         // 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;
 
@@ -205,8 +204,7 @@ 
         $log = usingLog()->startAction("de-register blackbox(es)");
 
         // de-register all the hosts
-        foreach ($groupDef->details->machines as $hostId => $machine)
-        {
+        foreach ($groupDef->details->machines as $hostId => $machine) {
             foreach ($machine->roles as $role) {
                 usingRolesTable()->removeHostFromAllRoles($hostId);
             }

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

@@ -181,8 +181,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;
 
@@ -418,7 +417,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);
@@ -440,7 +440,8 @@ 
                 $log->endAction('Returning configured '.$vagrantSettings->bridgedIface.' interface');
                 return $vagrantSettings->bridgedIface;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             // ignore errors as this setting may not exist
         }
 
@@ -503,8 +504,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;
-	}
+    }
 }