datasift / storyplayer

src/php/DataSift/Storyplayer/PlayerLib/Tale/Loader.php

Indentation +58 added lines, -58 removed lines

@@ -58,70 +58,70 @@
  */
 class Tale_Loader
 {
-	/**
-	 * singleton - do not instantiate
-	 * @codeCoverageIgnore
-	 */
-	protected function __construct()
-	{
-		// do nothing
-	}
+    /**
+     * singleton - do not instantiate
+     * @codeCoverageIgnore
+     */
+    protected function __construct()
+    {
+        // do nothing
+    }
 
-	/**
-	 * load a story, throwing exceptions if problems are detected
-	 *
-	 * @param  string $filename
-	 *         path to the PHP file containing the story
-	 * @return Story
-	 *         the story object
-	 */
-	static public function loadTale($filename)
-	{
-		if (!file_exists($filename)) {
-			throw new E5xx_InvalidStoryListFile("Cannot find file '{$filename}' to load");
-		}
+    /**
+     * load a story, throwing exceptions if problems are detected
+     *
+     * @param  string $filename
+     *         path to the PHP file containing the story
+     * @return Story
+     *         the story object
+     */
+    static public function loadTale($filename)
+    {
+        if (!file_exists($filename)) {
+            throw new E5xx_InvalidStoryListFile("Cannot find file '{$filename}' to load");
+        }
 
-		// load the contents
-		$contents = file_get_contents($filename);
+        // load the contents
+        $contents = file_get_contents($filename);
 
-		// does it decode?
-		$tale = json_decode($contents);
-		if (!$tale) {
-			throw new E4xx_InvalidStoryListFile("Story list '{$filename}' does not contain valid JSON");
-		}
+        // does it decode?
+        $tale = json_decode($contents);
+        if (!$tale) {
+            throw new E4xx_InvalidStoryListFile("Story list '{$filename}' does not contain valid JSON");
+        }
 
-		// does it have the elements we require?
-		if (!isset($tale->stories)) {
-			throw new E4xx_InvalidStoryListFile("Story list '{$filename}' does not contain a 'stories' element");
-		}
-		if (!is_array($tale->stories)) {
-			throw new E4xx_InvalidStoryListFile("The 'stories' element in the story list '{$filename}' must be an array");
-		}
-		if (count($tale->stories) == 0) {
-			throw new E4xx_InvalidStoryListFile("The 'stories' element in the story list '{$filename}' cannot be an empty array");
-		}
+        // does it have the elements we require?
+        if (!isset($tale->stories)) {
+            throw new E4xx_InvalidStoryListFile("Story list '{$filename}' does not contain a 'stories' element");
+        }
+        if (!is_array($tale->stories)) {
+            throw new E4xx_InvalidStoryListFile("The 'stories' element in the story list '{$filename}' must be an array");
+        }
+        if (count($tale->stories) == 0) {
+            throw new E4xx_InvalidStoryListFile("The 'stories' element in the story list '{$filename}' cannot be an empty array");
+        }
 
-		// our base directory to search from
-		$storiesBasedir = dirname($filename);
+        // our base directory to search from
+        $storiesBasedir = dirname($filename);
 
-		// do all of the stories in the list exist?
-		foreach ($tale->stories as $index => $storyFile) {
- 			$realStoryFile = $storiesBasedir . DIRECTORY_SEPARATOR . $storyFile;
-			if (file_exists($realStoryFile)) {
-				throw new E4xx_InvalidStoryListFile("Cannot find the story file '{$realStoryFile}' on disk");
-			}
-			$tale->stories[$index] = $realStoryFile;
-		}
+        // do all of the stories in the list exist?
+        foreach ($tale->stories as $index => $storyFile) {
+                $realStoryFile = $storiesBasedir . DIRECTORY_SEPARATOR . $storyFile;
+            if (file_exists($realStoryFile)) {
+                throw new E4xx_InvalidStoryListFile("Cannot find the story file '{$realStoryFile}' on disk");
+            }
+            $tale->stories[$index] = $realStoryFile;
+        }
 
-		// inject defaults for optional fields
-		if (!isset($tale->options)) {
-			$tale->options = new stdClass();
-		}
-		if (!isset($tale->options->reuseTestEnvironment)) {
-			$tale->options->reuseTestEnvironment = false;
-		}
+        // inject defaults for optional fields
+        if (!isset($tale->options)) {
+            $tale->options = new stdClass();
+        }
+        if (!isset($tale->options->reuseTestEnvironment)) {
+            $tale->options->reuseTestEnvironment = false;
+        }
 
-		// all done
-		return $tale;
-	}
+        // all done
+        return $tale;
+    }
 }
\ No newline at end of file

src/php/DataSift/Storyplayer/PlayerLib/TestEnvironment/Player.php

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 
         // now we need to play whatever runs against this
         // test environment
-        foreach ($this->wrappedPlayers as $wrappedPlayer)
-        {
+        foreach ($this->wrappedPlayers as $wrappedPlayer) {
             // play the wrapped item
             //
             // this is normally a story

src/php/DataSift/Storyplayer/ProvisioningLib/Provisioners/AnsibleProvisioner.php

Indentation +2 added lines, -2 removed lines

@@ -175,8 +175,8 @@
 
         // build the command for Ansible
         $command = 'ansible-playbook -i "' . $inventoryFile . '"'
-                 . ' "--private-key=' . $sshKeyFile . '"'
-                 . ' "--user=' . $sshUsername . '"';
+                    . ' "--private-key=' . $sshKeyFile . '"'
+                    . ' "--user=' . $sshUsername . '"';
 
         $command .= ' "' . $ansibleSettings->dir . DIRECTORY_SEPARATOR . $ansibleSettings->playbook . '"';
 

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
             if (isset($machine->params)) {
                 $params = [];
                 foreach ($machine->params as $paramName => $paramValue) {
-                    $params[$paramName] = fromConfig()->get('hosts.' . $hostId . '.params.'.$paramName);
+                    $params[$paramName] = fromConfig()->get('hosts.' . $hostId . '.params.' . $paramName);
                 }
                 if (count($params)) {
                     usingProvisioningDefinition($provDef)->addParams($params)->toHost($hostId);
@@ -111,7 +111,7 @@ 
         $rolesToHosts = array();
 
         // build up the list of roles
-        foreach($hosts as $hostId => $hostProps) {
+        foreach ($hosts as $hostId => $hostProps) {
             // what is the host's IP address?
             $ipAddress = fromHost($hostId)->getIpAddress();
 
@@ -154,7 +154,7 @@ 
         $sshKeyFile  = null;
 
         // now we need to write out the host files
-        foreach($hosts as $hostId => $hostProps) {
+        foreach ($hosts as $hostId => $hostProps) {
             // what is the host's IP address?
             $ipAddress   = fromHost($hostId)->getIpAddress();
             $sshUsername = fromHost($hostId)->getSshUsername();
@@ -236,7 +236,7 @@ 
         // does the target folder exist?
         $hostVarsFolder = dirname($filename);
         if (!file_exists($hostVarsFolder)) {
-            mkdir ($hostVarsFolder);
+            mkdir($hostVarsFolder);
         }
 
         // write the data

src/php/DataSift/Storyplayer/ProvisioningLib/Provisioners/DsbuildProvisioner.php

Spacing +8 added lines, -8 removed lines

@@ -88,7 +88,7 @@ 
             if (isset($machine->params)) {
                 $params = [];
                 foreach ($machine->params as $paramName => $paramValue) {
-                    $params[$paramName]  = fromConfig()->get('hosts.' . $hostId . '.params.'.$paramName);
+                    $params[$paramName] = fromConfig()->get('hosts.' . $hostId . '.params.' . $paramName);
                 }
                 if (count($params)) {
                     usingProvisioningDefinition($provDef)->addParams($params)->toHost($hostId);
@@ -110,7 +110,7 @@ 
         $dsbuildParams = new BaseObject;
 
         // build up the list of settings to write out
-        foreach($hosts as $hostId => $hostProps) {
+        foreach ($hosts as $hostId => $hostProps) {
             // what is the host's IP address?
             $ipAddress = fromHost($hostId)->getIpAddress();
 
@@ -132,7 +132,7 @@ 
         // at this point, we are ready to attempt provisioning
         //
         // provision each host in the order that they're listed
-        foreach($hosts as $hostId => $hostProps) {
+        foreach ($hosts as $hostId => $hostProps) {
             // which dsbuildfile are we going to run?
             $hostDir = fromHost($hostId)->getLocalFolder();
             $dsbuildFilename = $this->getDsbuildFilename($hostDir, $provConfig, $hostId);
@@ -148,11 +148,11 @@ 
             // copy the dsbuildparams files to the target machine using scp
             // NOTE: the "vagrant rsync" command seems not working with some Vagrant provisioners (e.g. OpenStack)
             $command = 'scp'
-                .' '.$dsbuildParams->{'hosts_'.$hostId.'_scpOptions_0'}
-                .' '.$dsbuildParams->{'hosts_'.$hostId.'_scpOptions_1'}
+                .' ' . $dsbuildParams->{'hosts_' . $hostId . '_scpOptions_0'}
+                .' ' . $dsbuildParams->{'hosts_' . $hostId . '_scpOptions_1'}
                 .' dsbuildparams.*'
-                .' '.$dsbuildParams->{'hosts_'.$hostId.'_sshUsername'}
-                .'@'.$dsbuildParams->{'hosts_'.$hostId.'_ipAddress'}
+                .' ' . $dsbuildParams->{'hosts_' . $hostId . '_sshUsername'}
+                .'@' . $dsbuildParams->{'hosts_' . $hostId . '_ipAddress'}
                 .':/vagrant/';
             $result = $commandRunner->runSilently($command);
 
@@ -229,7 +229,7 @@ 
      * @return array
      *         the flattened data
      */
-    protected function flattenData($inputData, $prefix="")
+    protected function flattenData($inputData, $prefix = "")
     {
         $retval = [];
 

Braces +1 added lines, -2 removed lines

@@ -233,8 +233,7 @@
     {
         $retval = [];
 
-        foreach ($inputData as $name => $dataToFlatten)
-        {
+        foreach ($inputData as $name => $dataToFlatten) {
             if (is_object($dataToFlatten) || is_array($dataToFlatten)) {
                 $retval = array_merge($retval, $this->flattenData($dataToFlatten, $prefix . $name . "_"));
             }

src/php/DataSift/Storyplayer/Reports/JUnitReport.php

Spacing +24 added lines, -24 removed lines

@@ -130,40 +130,40 @@ 
     public function endStoryplayer($duration)
     {
         // generate the XML
-        $junitxml = '<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL;
+        $junitxml = '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL;
         $junitxml .= '<testsuite'
-            .' id="'.$this->testsuite['id'].'"'
-            .' name="'.$this->testsuite['name'].'"'
-            .' tests="'.$this->testsuite['tests'].'"'
-            .' disabled="'.$this->testsuite['disabled'].'"'
-            .' errors="'.$this->testsuite['errors'].'"'
-            .' failures="'.$this->testsuite['failures'].'"'
-            .' skipped="'.$this->testsuite['skipped'].'"'
-            .' time="'.round($duration, 6).'"'
-            .' timestamp="'.$this->testsuite['timestamp'].'">'.PHP_EOL;
+            .' id="' . $this->testsuite['id'] . '"'
+            .' name="' . $this->testsuite['name'] . '"'
+            .' tests="' . $this->testsuite['tests'] . '"'
+            .' disabled="' . $this->testsuite['disabled'] . '"'
+            .' errors="' . $this->testsuite['errors'] . '"'
+            .' failures="' . $this->testsuite['failures'] . '"'
+            .' skipped="' . $this->testsuite['skipped'] . '"'
+            .' time="' . round($duration, 6) . '"'
+            .' timestamp="' . $this->testsuite['timestamp'] . '">' . PHP_EOL;
 
         foreach ($this->testsuite['testcase'] as $testcase) {
-            $junitxml .= "\t".'<testcase'
-                .' name="'.$testcase['name'].'"'
-                .' assertions="'.$testcase['assertions'].'"'
-                .' classname="'.$testcase['classname'].'"'
-                .' status="'.$testcase['status'].'"'
-                .' time="'.round($testcase['time'], 6).'">'.PHP_EOL;
+            $junitxml .= "\t" . '<testcase'
+                .' name="' . $testcase['name'] . '"'
+                .' assertions="' . $testcase['assertions'] . '"'
+                .' classname="' . $testcase['classname'] . '"'
+                .' status="' . $testcase['status'] . '"'
+                .' time="' . round($testcase['time'], 6) . '">' . PHP_EOL;
 
             if ($testcase['skipped']) {
-                $junitxml .= "\t\t".'<skipped/>'.PHP_EOL;
+                $junitxml .= "\t\t" . '<skipped/>' . PHP_EOL;
             }
             if ($testcase['failure']) {
-                $junitxml .= "\t\t".'<failure/>'.PHP_EOL;
+                $junitxml .= "\t\t" . '<failure/>' . PHP_EOL;
             }
             if ($testcase['error']) {
-                $junitxml .= "\t\t".'<error/>'.PHP_EOL;
+                $junitxml .= "\t\t" . '<error/>' . PHP_EOL;
             }
 
-            $junitxml .= "\t".'</testcase>'.PHP_EOL;
+            $junitxml .= "\t" . '</testcase>' . PHP_EOL;
         }
 
-        $junitxml .= '</testsuite>'.PHP_EOL;
+        $junitxml .= '</testsuite>' . PHP_EOL;
 
         file_put_contents($this->filename, $junitxml);
     }
@@ -180,10 +180,10 @@ 
         $name = htmlspecialchars($name, ENT_QUOTES | ENT_XML1, 'UTF-8');
         $this->testcase = array(
             'name'       => $name,
-            'assertions' => 0,     // number of assertions in the test case
+            'assertions' => 0, // number of assertions in the test case
             'classname'  => $name, // full class name for the class the test method is in
-            'status'     => '',    // result status string
-            'time'       => 0,     // time taken (in seconds) to execute the test
+            'status'     => '', // result status string
+            'time'       => 0, // time taken (in seconds) to execute the test
             'skipped'    => false,
             'failure'    => false,
             'error'      => false,

src/php/DataSift/Storyplayer/Reports/JsonReport.php

Braces +2 added lines, -1 removed lines

@@ -100,7 +100,8 @@
         $this->silentActivity = true;
     }
 
-    public function __construct($args) {
+    public function __construct($args)
+    {
         if (isset($args['filename'])) {
             $this->filename = $args['filename'];
         }

src/php/DataSift/Storyplayer/TestEnvironmentsLib/HardCodedTestEnvironments.php

Spacing +2 added lines, -2 removed lines

@@ -71,14 +71,14 @@
     {
         // defaults for the local computer
         $rolesConfig = new BaseObject;
-        $rolesConfig->roles = [ '*' ];
+        $rolesConfig->roles = ['*'];
 
         $config = &$this->newConfig('localhost')->getConfig();
         $config->groups = new BaseObject;
         $config->groups->{'0'} = new BaseObject;
         $config->groups->{'0'}->type = "Blackboxes";
         $config->groups->{'0'}->details = new BaseObject;
-        $config->groups->{'0'}->details->machines = [ $rolesConfig ];
+        $config->groups->{'0'}->details->machines = [$rolesConfig];
 
         // all done
     }

src/php/DataSift/Storyplayer/TestEnvironmentsLib/TestEnvironmentConfig.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
                         if (!isset($machine->params)) {
                             $machine->params = new BaseObject;
                         }
-                        else if (! $machine->params instanceof BaseObject) {
+                        else if (!$machine->params instanceof BaseObject) {
                             $tmp = new BaseObject;
                             $tmp->mergeFrom($machine->params);
                             $machine->params = $tmp;

src/php/DataSift/Storyplayer/ValidationLib/MustBeValidStoryTemplate.php

Indentation +4 added lines, -4 removed lines

@@ -72,16 +72,16 @@
         // we need a valid PHP class
         if (!class_exists($value))
         {
-        	$result->addError(static::MSG_NOTVALIDCLASS);
-        	return $result;
+            $result->addError(static::MSG_NOTVALIDCLASS);
+            return $result;
         }
 
         // the class must be a StoryTemplate
         $refClass = new ReflectionClass($value);
         if (!$refClass->isSubclassOf('DataSift\Storyplayer\PlayerLib\StoryTemplate'))
         {
-        	$result->addError(static::MSG_NOTVALIDTEMPLATE);
-        	return $result;
+            $result->addError(static::MSG_NOTVALIDTEMPLATE);
+            return $result;
         }
 
         // all done

Braces +3 added lines, -6 removed lines

@@ -64,22 +64,19 @@
 
     public function validate($value, ValidationResult $result = null)
     {
-        if ($result === null)
-        {
+        if ($result === null) {
             $result = new ValidationResult($value);
         }
 
         // we need a valid PHP class
-        if (!class_exists($value))
-        {
+        if (!class_exists($value)) {
         	$result->addError(static::MSG_NOTVALIDCLASS);
         	return $result;
         }
 
         // the class must be a StoryTemplate
         $refClass = new ReflectionClass($value);
-        if (!$refClass->isSubclassOf('Storyplayer\Stories\StoryTemplate'))
-        {
+        if (!$refClass->isSubclassOf('Storyplayer\Stories\StoryTemplate')) {
         	$result->addError(static::MSG_NOTVALIDTEMPLATE);
         	return $result;
         }