datasift / storyplayer

src/php/DataSift/Storyplayer/Cli/Feature/TestUsersSupport.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
         if (isset($engine->options->readOnlyTestUsers) && $engine->options->readOnlyTestUsers) {
             usingUsers()->setUsersFileIsReadOnly();
         }
-        else
-        {
+        else {
             $setting = fromTestEnvironment()->getModuleSetting("users.readOnly");
             if ($setting === true) {
                 usingUsers()->setUsersFileIsReadOnly();

src/php/DataSift/Storyplayer/Cli/Install/Command.php

Spacing +13 added lines, -13 removed lines

@@ -123,43 +123,43 @@
         $downloader = new FileDownloader();
 
         // let's get the files downloaded
-        foreach ($filesToDownload as $file){
+        foreach ($filesToDownload as $file) {
 
-            if (!is_object($file->url)){
+            if (!is_object($file->url)) {
                 $url = $file->url;
             } else {
                 $platform = strtolower(php_uname("s") . '/' . php_uname("m"));
-                if (isset($file->url->{$platform})){
+                if (isset($file->url->{$platform})) {
                     $url = $file->url->{$platform};
-                } else if (isset($file->url->generic)){
-                    $url =  $file->url->generic;
+                } else if (isset($file->url->generic)) {
+                    $url = $file->url->generic;
                 }
             }
 
-            if (!isset($url)){
-                throw new Exception("No supported downloads for ".$file->name);
+            if (!isset($url)) {
+                throw new Exception("No supported downloads for " . $file->name);
             }
 
             // How big is the file?
             // via http://www.php.net/manual/en/function.filesize.php#84130
-            $headers = array_change_key_case(get_headers($url, 1),CASE_LOWER);
-            if ( !preg_match('/HTTP\/1\.(0|1) 200 OK/', $headers[0] ) ) {
+            $headers = array_change_key_case(get_headers($url, 1), CASE_LOWER);
+            if (!preg_match('/HTTP\/1\.(0|1) 200 OK/', $headers[0])) {
                 $fileSize = $headers['content-length'][1];
             } else {
                 $fileSize = $headers['content-length'];
             }
 
             // Update the user on what's going on
-            echo "Downloading: " . $url.' ('.round($fileSize/1024/1024, 3).'mb)'.PHP_EOL;
+            echo "Downloading: " . $url . ' (' . round($fileSize / 1024 / 1024, 3) . 'mb)' . PHP_EOL;
 
             // Download it
             $fileBase = basename($url);
-            $downloader->download($url, "./vendor/bin/".$fileBase);
+            $downloader->download($url, "./vendor/bin/" . $fileBase);
 
             // Make sure that the relevant files are executable
             if (isset($file->makeExecutable)) {
-                foreach ($file->makeExecutable as $exec){
-                    chmod("./vendor/bin/".$exec, 0755);
+                foreach ($file->makeExecutable as $exec) {
+                    chmod("./vendor/bin/" . $exec, 0755);
                 }
             }
         }

Braces +11 added lines, -8 removed lines

@@ -123,20 +123,22 @@ 
         $downloader = new FileDownloader();
 
         // let's get the files downloaded
-        foreach ($filesToDownload as $file){
+        foreach ($filesToDownload as $file) {
 
-            if (!is_object($file->url)){
+            if (!is_object($file->url)) {
                 $url = $file->url;
-            } else {
+            }
+            else {
                 $platform = strtolower(php_uname("s") . '/' . php_uname("m"));
-                if (isset($file->url->{$platform})){
+                if (isset($file->url->{$platform})) {
                     $url = $file->url->{$platform};
-                } else if (isset($file->url->generic)){
+                }
+                else if (isset($file->url->generic)) {
                     $url =  $file->url->generic;
                 }
             }
 
-            if (!isset($url)){
+            if (!isset($url)) {
                 throw new Exception("No supported downloads for ".$file->name);
             }
 
@@ -145,7 +147,8 @@ 
             $headers = array_change_key_case(get_headers($url, 1),CASE_LOWER);
             if ( !preg_match('/HTTP\/1\.(0|1) 200 OK/', $headers[0] ) ) {
                 $fileSize = $headers['content-length'][1];
-            } else {
+            }
+            else {
                 $fileSize = $headers['content-length'];
             }
 
@@ -158,7 +161,7 @@ 
 
             // Make sure that the relevant files are executable
             if (isset($file->makeExecutable)) {
-                foreach ($file->makeExecutable as $exec){
+                foreach ($file->makeExecutable as $exec) {
                     chmod("./vendor/bin/".$exec, 0755);
                 }
             }

src/php/DataSift/Storyplayer/Cli/ListHostsTable/Command.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $this->setLongDescription(
             "Use this command to get a list of all of the machines (physical or VM)"
             . " that are currently listed in Storyplayer's hoststable."
-            .PHP_EOL .PHP_EOL
+            .PHP_EOL . PHP_EOL
             ."This can help you to identify VMs that have been left running after "
             ."a test has completed."
             .PHP_EOL

src/php/DataSift/Storyplayer/Cli/ListProcesses/Switch.php

Spacing +2 added lines, -2 removed lines

@@ -67,10 +67,10 @@
         $this->setLongDesc(
             "Use this command to get a list of all of the processes that Storyplayer "
             ."has started in the background."
-            .PHP_EOL .PHP_EOL
+            .PHP_EOL . PHP_EOL
             ."This can help you to identify processes that have been left running after "
             ."a test has completed."
-            .PHP_EOL .PHP_EOL
+            .PHP_EOL . PHP_EOL
             ."You can use the '--kill-processes' switch to stop these processes."
         );
 

src/php/DataSift/Storyplayer/Cli/PlayStory/Command.php

Indentation +3 added lines, -3 removed lines

@@ -359,7 +359,7 @@ 
         // do we have any parameters at this point?
         if (empty($cliParams)) {
             $msg = "no stories listed on the command-line." . PHP_EOL . PHP_EOL
-                 . "see 'storyplayer help play-story' for required params" . PHP_EOL;
+                    . "see 'storyplayer help play-story' for required params" . PHP_EOL;
             $this->output->logCliError($msg);
             exit(1);
         }
@@ -438,7 +438,7 @@ 
         // did we find anything?
         if (!count($filenames)) {
             $msg = "no stories found in '{$folder}'" . PHP_EOL . PHP_EOL
-                 . "do your stories' filenames end in 'Story.php'?";
+                    . "do your stories' filenames end in 'Story.php'?";
             $this->output->logCliError($msg);
             exit(1);
         }
@@ -494,7 +494,7 @@ 
         // do we skip destroying the test environment?
         if ($this->st->getPersistTestEnvironment()) {
             echo PHP_EOL . "* Warning: NOT destroying test environment" . PHP_EOL
-                 .         "           --reuse-target flag is set" . PHP_EOL;
+                    .         "           --reuse-target flag is set" . PHP_EOL;
         }
 
         // cleanup

Spacing +2 added lines, -2 removed lines

@@ -317,7 +317,7 @@ 
         foreach ($engine->options->reports as $reportName => $reportFilename)
         {
             try {
-                $report = $injectables->reportLoader->loadReport($reportName, [ 'filename' => $reportFilename]);
+                $report = $injectables->reportLoader->loadReport($reportName, ['filename' => $reportFilename]);
             }
             catch (E4xx_NoSuchReport $e) {
                 $injectables->output->logCliError("no such report '{$reportName}'");
@@ -341,7 +341,7 @@ 
 
         // setup signal handling
         pcntl_signal(SIGTERM, array($this, 'sigtermHandler'));
-        pcntl_signal(SIGINT , array($this, 'sigtermHandler'));
+        pcntl_signal(SIGINT, array($this, 'sigtermHandler'));
     }
 
     /**

Braces +3 added lines, -6 removed lines

@@ -261,8 +261,7 @@ 
         // $this->playerList contains one or more things to play
         //
         // let's play each of them in order
-        foreach ($this->playerList as $player)
-        {
+        foreach ($this->playerList as $player) {
             // execute each player in turn
             //
             // they may also have their own list of nested players
@@ -314,8 +313,7 @@ 
 
         // setup the reports that have been requested
         $injectables->initReportLoaderSupport($injectables);
-        foreach ($engine->options->reports as $reportName => $reportFilename)
-        {
+        foreach ($engine->options->reports as $reportName => $reportFilename) {
             try {
                 $report = $injectables->reportLoader->loadReport($reportName, [ 'filename' => $reportFilename]);
             }
@@ -532,8 +530,7 @@ 
         echo "FINAL RESULTS\n";
         echo "\n";
 
-        foreach ($storyResults as $result)
-        {
+        foreach ($storyResults as $result) {
             echo Story_Player::$outcomeToText[$result->resultCode] . " :: " . $result->story->getName() . "\n";
         }
     }

src/php/DataSift/Storyplayer/Cli/RuntimeConfigManager.php

Braces +3 added lines, -6 removed lines

@@ -69,8 +69,7 @@ 
         static $configDir = null;
 
         // do we have a configDir remembered yet?
-        if (!$configDir)
-        {
+        if (!$configDir) {
             $configDir = getcwd() . '/.storyplayer';
         }
 
@@ -87,11 +86,9 @@ 
         $configDir = $this->getConfigDir();
 
         // does it exist?
-        if (!file_exists($configDir))
-        {
+        if (!file_exists($configDir)) {
             $success = mkdir($configDir, 0700, true);
-            if (!$success)
-            {
+            if (!$success) {
                 // cannot create it - bail out now
                 $output->logCliError("unable to create config directory '{$configDir}'");
                 exit(1);

src/php/DataSift/Storyplayer/Cli/Script/Command.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
 
         // setup signal handling
         pcntl_signal(SIGTERM, array($this, 'sigtermHandler'));
-        pcntl_signal(SIGINT , array($this, 'sigtermHandler'));
+        pcntl_signal(SIGINT, array($this, 'sigtermHandler'));
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -194,8 +194,7 @@
         // $this->scriptList contains one or more things to run
         //
         // let's play each of them in order
-        foreach ($this->scriptList as $player)
-        {
+        foreach ($this->scriptList as $player) {
             // play the story(ies)
             $player->play($st, $injectables);
         }

src/php/DataSift/Storyplayer/Cli/ShowTestEnvironment/Command.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $this->setLongDescription(
             "Use this command to see what Storyplayer will use as the default "
             ."environment to test against."
-            .PHP_EOL.PHP_EOL
+            .PHP_EOL . PHP_EOL
             ."This command mostly exists to assist tab-completion scripts for UNIX shells."
         );
     }

src/php/DataSift/Storyplayer/Cli/StaticConfigManager.php

Indentation +72 added lines, -72 removed lines

@@ -59,87 +59,87 @@
  */
 class StaticConfigManager extends ConfigManagerBase
 {
-	const USER_DOTFILE = 'storyplayer.json';
+    const USER_DOTFILE = 'storyplayer.json';
 
-	/**
-	 * load the default config file
-	 *
-	 * @param StaticConfig $config
-	 * @return void
-	 */
-	public function loadDefaultConfig($config, $defaultConfigFilename)
-	{
-		// load the default config file
-		$this->configHelper->loadConfigFile($config, $defaultConfigFilename);
-	}
+    /**
+     * load the default config file
+     *
+     * @param StaticConfig $config
+     * @return void
+     */
+    public function loadDefaultConfig($config, $defaultConfigFilename)
+    {
+        // load the default config file
+        $this->configHelper->loadConfigFile($config, $defaultConfigFilename);
+    }
 
-	/**
-	 * @param  StaticConfig $config
-	 * @return void
-	 */
-	public function loadUserConfig($config)
-	{
-		try {
-			// We start with an empty config
-			$this->configHelper->loadDotFileConfig($config, self::APP_NAME, self::USER_DOTFILE);
-		}
-		catch (E4xx_ConfigFileNotFound $e) {
-			// we don't care - user configs are optional
-		}
-		// all done
-	}
+    /**
+     * @param  StaticConfig $config
+     * @return void
+     */
+    public function loadUserConfig($config)
+    {
+        try {
+            // We start with an empty config
+            $this->configHelper->loadDotFileConfig($config, self::APP_NAME, self::USER_DOTFILE);
+        }
+        catch (E4xx_ConfigFileNotFound $e) {
+            // we don't care - user configs are optional
+        }
+        // all done
+    }
 
-	/**
-	 *
-	 * @return array<string>
-	 */
-	public function getListOfConfigFiles($dirs)
-	{
-		// do we have a credible search list?
-		if (!is_array($dirs)) {
-			// fraid not
-			return [];
-		}
+    /**
+     *
+     * @return array<string>
+     */
+    public function getListOfConfigFiles($dirs)
+    {
+        // do we have a credible search list?
+        if (!is_array($dirs)) {
+            // fraid not
+            return [];
+        }
 
-		$return = [];
-		foreach ($dirs as $dirToSearch)
-		{
-			// find JSON config files
-			$files = $this->configHelper->getListOfConfigFilesIn($dirToSearch, 'json');
-			foreach ($files as $filename) {
-				$return[basename($filename, '.json')] = $filename;
-			}
-		}
+        $return = [];
+        foreach ($dirs as $dirToSearch)
+        {
+            // find JSON config files
+            $files = $this->configHelper->getListOfConfigFilesIn($dirToSearch, 'json');
+            foreach ($files as $filename) {
+                $return[basename($filename, '.json')] = $filename;
+            }
+        }
 
-		// all done
-		return $return;
-	}
+        // all done
+        return $return;
+    }
 
-	public function loadConfigFilesFrom($dirs)
-	{
-		// our list of loaded config files
-		$return = [];
+    public function loadConfigFilesFrom($dirs)
+    {
+        // our list of loaded config files
+        $return = [];
 
-		// the files to load
-		$filenames = $this->getListOfConfigFiles($dirs);
+        // the files to load
+        $filenames = $this->getListOfConfigFiles($dirs);
 
-		// load the files
-		foreach ($filenames as $filename)
-		{
-			$config = new BaseObject();
-			$this->configHelper->loadConfigFile($config, $filename);
-			$return[basename($filename, '.json')] = $config;
-		}
+        // load the files
+        foreach ($filenames as $filename)
+        {
+            $config = new BaseObject();
+            $this->configHelper->loadConfigFile($config, $filename);
+            $return[basename($filename, '.json')] = $config;
+        }
 
-		// all done
-		return $return;
-	}
+        // all done
+        return $return;
+    }
 
-	public function loadConfigFile($filename)
-	{
-		$config = new BaseObject();
-		$this->configHelper->loadConfigFile($config, $filename);
+    public function loadConfigFile($filename)
+    {
+        $config = new BaseObject();
+        $this->configHelper->loadConfigFile($config, $filename);
 
-		return $config;
-	}
+        return $config;
+    }
 }

Braces +2 added lines, -4 removed lines

@@ -102,8 +102,7 @@ 
 		}
 
 		$return = [];
-		foreach ($dirs as $dirToSearch)
-		{
+		foreach ($dirs as $dirToSearch) {
 			// find JSON config files
 			$files = $this->configHelper->getListOfConfigFilesIn($dirToSearch, 'json');
 			foreach ($files as $filename) {
@@ -124,8 +123,7 @@ 
 		$filenames = $this->getListOfConfigFiles($dirs);
 
 		// load the files
-		foreach ($filenames as $filename)
-		{
+		foreach ($filenames as $filename) {
 			$config = new BaseObject();
 			$this->configHelper->loadConfigFile($config, $filename);
 			$return[basename($filename, '.json')] = $config;