datasift / storyplayer

src/php/DataSift/Storyplayer/ConfigLib/ActiveConfig.php

Doc Comments +6 added lines

@@ -105,11 +105,17 @@
         $activeConfig->roles = $rolesTable->$testEnvName;
 	}
 
+	/**
+	 * @param Injectables $injectables
+	 */
 	public function mergeStoryplayerConfig($injectables, $spConf)
 	{
 		$this->mergeData('storyplayer', $spConf);
 	}
 
+	/**
+	 * @param Injectables $injectables
+	 */
 	public function mergeSystemUnderTestConfig($injectables, SystemUnderTestConfig $sutConfig = null)
 	{
         // do we have a system under test?

Indentation +27 added lines, -27 removed lines

@@ -75,43 +75,43 @@ 
  */
 class ActiveConfig extends WrappedConfig
 {
-	public function init(Injectables $injectables)
-	{
-		// we start off with the built-in config
-		$this->mergeData('storyplayer', $injectables->defaultConfig);
-
-		// these are the initial variables we want
-		$this->setData('storyplayer.ipAddress', $this->getHostIpAddress());
-		$this->setData('storyplayer.currentDir', getcwd());
-		$this->setData('storyplayer.user.home', getenv('HOME'));
-
-		// we also want to link in the hosts and roles tables, to make
-		// it a lot easier for Prose modules
-		$activeConfig         = $this->getConfig();
+    public function init(Injectables $injectables)
+    {
+        // we start off with the built-in config
+        $this->mergeData('storyplayer', $injectables->defaultConfig);
+
+        // these are the initial variables we want
+        $this->setData('storyplayer.ipAddress', $this->getHostIpAddress());
+        $this->setData('storyplayer.currentDir', getcwd());
+        $this->setData('storyplayer.user.home', getenv('HOME'));
+
+        // we also want to link in the hosts and roles tables, to make
+        // it a lot easier for Prose modules
+        $activeConfig         = $this->getConfig();
         $runtimeConfig        = $injectables->getRuntimeConfig();
         $runtimeConfigManager = $injectables->getRuntimeConfigManager();
         $testEnvName          = $injectables->activeTestEnvironmentName;
 
-		$hostsTable = $runtimeConfigManager->getTable($runtimeConfig, 'hosts');
+        $hostsTable = $runtimeConfigManager->getTable($runtimeConfig, 'hosts');
         if (!isset($hostsTable->$testEnvName)) {
             $hostsTable->$testEnvName = new BaseObject;
         }
         $activeConfig->hosts = $hostsTable->$testEnvName;
 
-		$rolesTable = $runtimeConfigManager->getTable($runtimeConfig, 'roles');
+        $rolesTable = $runtimeConfigManager->getTable($runtimeConfig, 'roles');
         if (!isset($rolesTable->$testEnvName)) {
             $rolesTable->$testEnvName = new BaseObject;
         }
         $activeConfig->roles = $rolesTable->$testEnvName;
-	}
+    }
 
-	public function mergeStoryplayerConfig($injectables, $spConf)
-	{
-		$this->mergeData('storyplayer', $spConf);
-	}
+    public function mergeStoryplayerConfig($injectables, $spConf)
+    {
+        $this->mergeData('storyplayer', $spConf);
+    }
 
-	public function mergeSystemUnderTestConfig($injectables, SystemUnderTestConfig $sutConfig = null)
-	{
+    public function mergeSystemUnderTestConfig($injectables, SystemUnderTestConfig $sutConfig = null)
+    {
         // do we have a system under test?
         if (!isset($injectables->activeSystemUnderTestName) || $sutConfig === null) {
             $this->setData('systemundertest', null);
@@ -123,7 +123,7 @@ 
 
         // merge in the loaded config
         $this->mergeData('systemundertest', $sutConfig->getConfig());
-	}
+    }
 
     /**
      *
@@ -131,8 +131,8 @@ 
      * @param  \DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentsConfig|\DataSift\Storyplayer\DefinitionLib\TestEnvironment_Definition $envConfig
      * @return void
      */
-	public function mergeTestEnvironmentConfig($injectables, $envConfig = null)
-	{
+    public function mergeTestEnvironmentConfig($injectables, $envConfig = null)
+    {
         // do we have a test environment?
         if (!isset($injectables->activeTestEnvironmentName) || $envConfig === null) {
             $this->setData('target', null);
@@ -143,8 +143,8 @@ 
         $this->setData('target.name', $injectables->activeTestEnvironmentName);
 
         // merge in the loaded config
-		$this->mergeData('target', $envConfig->getConfig());
-	}
+        $this->mergeData('target', $envConfig->getConfig());
+    }
 
     protected function getHostIpAddress()
     {

Spacing +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
 
 		// we also want to link in the hosts and roles tables, to make
 		// it a lot easier for Prose modules
-		$activeConfig         = $this->getConfig();
+		$activeConfig = $this->getConfig();
         $runtimeConfig        = $injectables->getRuntimeConfig();
         $runtimeConfigManager = $injectables->getRuntimeConfigManager();
         $testEnvName          = $injectables->activeTestEnvironmentName;
@@ -179,7 +179,7 @@ 
                 // does the adapter have an IP address?
                 try {
                     $ipAddress = $netifaces->getIpAddress($adapterToTest);
-                } catch(NetifacesException $e){
+                } catch (NetifacesException $e) {
                     // We couldn't get an IP address
                     $ipAddress = null;
                 }
@@ -213,7 +213,7 @@ 
             // this sucks
             throw new NetifacesException("Unable to determine IP address");
 
-        } catch (NetifacesException $e){
+        } catch (NetifacesException $e) {
             throw new Exception("could not determine IP address of host machine");
         }
     }

Braces +4 added lines, -2 removed lines

@@ -179,7 +179,8 @@ 
                 // does the adapter have an IP address?
                 try {
                     $ipAddress = $netifaces->getIpAddress($adapterToTest);
-                } catch(NetifacesException $e){
+                }
+                catch(NetifacesException $e) {
                     // We couldn't get an IP address
                     $ipAddress = null;
                 }
@@ -213,7 +214,8 @@ 
             // this sucks
             throw new NetifacesException("Unable to determine IP address");
 
-        } catch (NetifacesException $e){
+        }
+        catch (NetifacesException $e) {
             throw new Exception("could not determine IP address of host machine");
         }
     }

src/php/DataSift/Storyplayer/DefinitionLib/TestEnvironment/GroupDefinition.php

Doc Comments +2 added lines, -2 removed lines

@@ -220,7 +220,7 @@ 
     /**
      * how should we provision this environment?
      *
-     * @return array<ProvisioningAdapters>
+     * @return ProvisioningAdapter[]
      */
     public function getProvisioningAdapters()
     {
@@ -265,7 +265,7 @@ 
     /**
      * what hosts exist in this group?
      *
-     * @return array<TestEnvironment_HostDefinition>
+     * @return TestEnvironmentHost[]
      */
     public function getHosts()
     {

src/php/DataSift/Storyplayer/DefinitionLib/TestEnvironment/HostDefinition.php

Doc Comments +3 added lines

@@ -74,6 +74,9 @@
      */
     protected $storySettings;
 
+    /**
+     * @param string $hostId
+     */
     public function __construct(TestEnvironment_GroupDefinition $parentGroup, $hostId)
     {
         $this->setParentGroup($parentGroup);

src/php/DataSift/Storyplayer/functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
  * this function avoids reset()ing the array, so it will not mess with
  * any iteration that you may currently be part-way through
  *
- * @param  array $arrayToSearch
+ * @param  Storyplayer\TestEnvironments\ProvisioningAdapter[] $arrayToSearch
  *         the array to get the first element of
  * @return mixed
  *         the first element of $array, or NULL if the array is empty
@@ -95,7 +95,7 @@ 
 /**
  * Create a new test environment object
  *
- * @return TestEnvironment
+ * @return TestEnvironment_Definition
  *         the test environment object to use in the script
  */
 function newTestEnvironment()

Braces +2 added lines, -1 removed lines

@@ -115,7 +115,8 @@
  * @param  callback $callback the action(s) to attempt
  * @return void
  */
-function tryTo($callback) {
+function tryTo($callback)
+{
     try {
         $callback();
     }

src/php/DataSift/Storyplayer/Reports/TapReport.php

Doc Comments -1 removed lines

@@ -177,7 +177,6 @@
     }
 
     /**
-     * @param integer $level
      * @param string $msg
      * @return void
      */

src/php/Prose/FromEc2Instance.php

Doc Comments +3 added lines

@@ -99,6 +99,9 @@
         return array();
     }
 
+    /**
+     * @return string
+     */
     public function getPublicDnsName()
     {
         // make sure we have a host to work with

src/php/Prose/FromPDOStatement.php

Doc Comments +4 added lines

@@ -62,6 +62,10 @@
  */
 class FromPDOStatement extends Prose
 {
+    /**
+     * @param \DataSift\Storyplayer\PlayerLib\StoryTeller $st
+     * @param PDOStatement[] $args
+     */
     public function __construct($st, $args)
     {
         // call our parent first

Braces +8 added lines, -16 removed lines

@@ -81,8 +81,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction("fetch all rows from the PDO query result");
 
-        try
-        {
+        try {
             $rows = $this->args[0]->fetchAll();
 
             // all done
@@ -90,8 +89,7 @@ 
 
             return $rows;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -101,8 +99,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction("fetch 1 row from the PDO query result");
 
-        try
-        {
+        try {
             $row = $this->args[0]->fetch(PDO::FETCH_ASSOC);
 
             // all done
@@ -110,8 +107,7 @@ 
 
             return $row;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -121,8 +117,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction("fetch 1 row from the PDO query result");
 
-        try
-        {
+        try {
             $row = $this->args[0]->fetch(PDO::FETCH_NUM);
 
             // all done
@@ -130,8 +125,7 @@ 
 
             return $row;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -141,8 +135,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction("fetch 1 row from the PDO query result");
 
-        try
-        {
+        try {
             $row = $this->args[0]->fetch(PDO::FETCH_OBJ);
 
             // all done
@@ -150,8 +143,7 @@ 
 
             return $row;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }

src/php/Prose/FromTestEnvironment.php

Doc Comments +4 added lines, -1 removed lines

@@ -125,6 +125,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $setting
+     */
     public function getModuleSetting($setting)
     {
         // what are we doing?
@@ -154,7 +157,7 @@ 
      * We've standardised on 'getConfig()' as the documented name for this
      * functionality across all three of the config-related modules.
      *
-     * @return object
+     * @return string
      */
     public function getAllSettings()
     {

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 
         // get the details
         $fullPath = 'target.moduleSettings.' . $setting;
-        $config  = $this->st->getConfig();
+        $config = $this->st->getConfig();
 
         $value = null;
         if ($config->hasData($fullPath)) {

src/php/Prose/UsingPDODB.php

Doc Comments +4 added lines

@@ -62,6 +62,10 @@
  */
 class UsingPDODB extends Prose
 {
+    /**
+     * @param \DataSift\Storyplayer\PlayerLib\StoryTeller $st
+     * @param PDO[] $args
+     */
     public function __construct($st, $args)
     {
         // call our parent first

Braces +10 added lines, -20 removed lines

@@ -81,8 +81,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction(["run SQL query:", $sql, "/ with params:", $params, "and driver params:", $driverParams]);
 
-        try
-        {
+        try {
             // create a prepared statement
             //
             // we do this so that we can inject the $params into the SQL statement
@@ -95,8 +94,7 @@ 
             $log->endAction();
             return $stmt;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -106,8 +104,7 @@ 
         // what are we doing?
         $log = usingLog()->startAction(["run raw SQL query:", $sql, "with driver params: ", $driverParams]);
 
-        try
-        {
+        try {
             // execute the prepared statement
             //
             // we do this directly so that you can (hopefully) attempt
@@ -118,8 +115,7 @@ 
             $log->endAction();
             return $stmt;
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -129,15 +125,13 @@ 
         // what are we doing?
         $log = usingLog()->startAction("begin PDO database transaction");
 
-        try
-        {
+        try {
             $this->args[0]->beginTransaction();
 
             // all done
             $log->endAction();
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -147,15 +141,13 @@ 
         // what are we doing?
         $log = usingLog()->startAction("commit PDO database transaction");
 
-        try
-        {
+        try {
             $this->args[0]->commit();
 
             // all done
             $log->endAction();
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }
@@ -165,15 +157,13 @@ 
         // what are we doing?
         $log = usingLog()->startAction("rollback PDO database transaction");
 
-        try
-        {
+        try {
             $this->args[0]->rollBack();
 
             // all done
             $log->endAction();
         }
-        catch (Exception $e)
-        {
+        catch (Exception $e) {
             throw new E5xx_ActionFailed(__METHOD__, $e->getMessage());
         }
     }