| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | |
| 99 | 99 | // what is the required argument? | 
| 100 | 100 | $requiredArgMsg = "the system-under-test to test; one of:" . PHP_EOL . PHP_EOL; | 
| 101 | -        foreach($sutList->getEntryNames() as $sutName) { | |
| 101 | +        foreach ($sutList->getEntryNames() as $sutName) { | |
| 102 | 102 | $requiredArgMsg .= "* $sutName" . PHP_EOL; | 
| 103 | 103 | } | 
| 104 | 104 |          if ($defaultSutName) { | 
| 105 | - $requiredArgMsg .= PHP_EOL. ' '; | |
| 105 | + $requiredArgMsg .= PHP_EOL . ' '; | |
| 106 | 106 | } | 
| 107 | 107 |          $this->setRequiredArg('<system-under-test>', $requiredArgMsg); | 
| 108 | 108 | $this->setArgValidator(new Feature_SystemUnderTestConfigValidator($sutList, $defaultSutName)); | 
| @@ -94,10 +94,10 @@ | ||
| 94 | 94 | |
| 95 | 95 | // what is the required argument? | 
| 96 | 96 | $requiredArgMsg = "the environment to test against; one of:" . PHP_EOL . PHP_EOL; | 
| 97 | -        foreach($envList->getEntryNames() as $envName) { | |
| 97 | +        foreach ($envList->getEntryNames() as $envName) { | |
| 98 | 98 | $requiredArgMsg .= "* $envName" . PHP_EOL; | 
| 99 | 99 | } | 
| 100 | - $requiredArgMsg .= PHP_EOL. ' '; | |
| 100 | + $requiredArgMsg .= PHP_EOL . ' '; | |
| 101 | 101 |          $this->setRequiredArg('<environment>', $requiredArgMsg); | 
| 102 | 102 | $this->setArgValidator(new Feature_TestEnvironmentConfigValidator($envList, $defaultEnvName)); | 
| 103 | 103 | $this->setArgHasDefaultValueOf($defaultEnvName); | 
| @@ -123,43 +123,43 @@ | ||
| 123 | 123 | $downloader = new FileDownloader(); | 
| 124 | 124 | |
| 125 | 125 | // let's get the files downloaded | 
| 126 | -        foreach ($filesToDownload as $file){ | |
| 126 | +        foreach ($filesToDownload as $file) { | |
| 127 | 127 | |
| 128 | -            if (!is_object($file->url)){ | |
| 128 | +            if (!is_object($file->url)) { | |
| 129 | 129 | $url = $file->url; | 
| 130 | 130 |              } else { | 
| 131 | 131 |                  $platform = strtolower(php_uname("s") . '/' . php_uname("m")); | 
| 132 | -                if (isset($file->url->{$platform})){ | |
| 132 | +                if (isset($file->url->{$platform})) { | |
| 133 | 133 |                      $url = $file->url->{$platform}; | 
| 134 | -                } else if (isset($file->url->generic)){ | |
| 135 | - $url = $file->url->generic; | |
| 134 | +                } else if (isset($file->url->generic)) { | |
| 135 | + $url = $file->url->generic; | |
| 136 | 136 | } | 
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | -            if (!isset($url)){ | |
| 140 | -                throw new Exception("No supported downloads for ".$file->name); | |
| 139 | +            if (!isset($url)) { | |
| 140 | +                throw new Exception("No supported downloads for " . $file->name); | |
| 141 | 141 | } | 
| 142 | 142 | |
| 143 | 143 | // How big is the file? | 
| 144 | 144 | // via http://www.php.net/manual/en/function.filesize.php#84130 | 
| 145 | - $headers = array_change_key_case(get_headers($url, 1),CASE_LOWER); | |
| 146 | -            if ( !preg_match('/HTTP\/1\.(0|1) 200 OK/', $headers[0] ) ) { | |
| 145 | + $headers = array_change_key_case(get_headers($url, 1), CASE_LOWER); | |
| 146 | +            if (!preg_match('/HTTP\/1\.(0|1) 200 OK/', $headers[0])) { | |
| 147 | 147 | $fileSize = $headers['content-length'][1]; | 
| 148 | 148 |              } else { | 
| 149 | 149 | $fileSize = $headers['content-length']; | 
| 150 | 150 | } | 
| 151 | 151 | |
| 152 | 152 | // Update the user on what's going on | 
| 153 | -            echo "Downloading: " . $url.' ('.round($fileSize/1024/1024, 3).'mb)'.PHP_EOL; | |
| 153 | +            echo "Downloading: " . $url . ' (' . round($fileSize / 1024 / 1024, 3) . 'mb)' . PHP_EOL; | |
| 154 | 154 | |
| 155 | 155 | // Download it | 
| 156 | 156 | $fileBase = basename($url); | 
| 157 | - $downloader->download($url, "./vendor/bin/".$fileBase); | |
| 157 | + $downloader->download($url, "./vendor/bin/" . $fileBase); | |
| 158 | 158 | |
| 159 | 159 | // Make sure that the relevant files are executable | 
| 160 | 160 |              if (isset($file->makeExecutable)) { | 
| 161 | -                foreach ($file->makeExecutable as $exec){ | |
| 162 | -                    chmod("./vendor/bin/".$exec, 0755); | |
| 161 | +                foreach ($file->makeExecutable as $exec) { | |
| 162 | +                    chmod("./vendor/bin/" . $exec, 0755); | |
| 163 | 163 | } | 
| 164 | 164 | } | 
| 165 | 165 | } | 
| @@ -67,7 +67,7 @@ | ||
| 67 | 67 | $this->setLongDescription( | 
| 68 | 68 | "Use this command to get a list of all of the machines (physical or VM)" | 
| 69 | 69 | . " that are currently listed in Storyplayer's hoststable." | 
| 70 | - .PHP_EOL .PHP_EOL | |
| 70 | + .PHP_EOL . PHP_EOL | |
| 71 | 71 | ."This can help you to identify VMs that have been left running after " | 
| 72 | 72 | ."a test has completed." | 
| 73 | 73 | .PHP_EOL | 
| @@ -67,10 +67,10 @@ | ||
| 67 | 67 | $this->setLongDesc( | 
| 68 | 68 | "Use this command to get a list of all of the processes that Storyplayer " | 
| 69 | 69 | ."has started in the background." | 
| 70 | - .PHP_EOL .PHP_EOL | |
| 70 | + .PHP_EOL . PHP_EOL | |
| 71 | 71 | ."This can help you to identify processes that have been left running after " | 
| 72 | 72 | ."a test has completed." | 
| 73 | - .PHP_EOL .PHP_EOL | |
| 73 | + .PHP_EOL . PHP_EOL | |
| 74 | 74 | ."You can use the '--kill-processes' switch to stop these processes." | 
| 75 | 75 | ); | 
| 76 | 76 | |
| @@ -317,7 +317,7 @@ discard block | ||
| 317 | 317 | foreach ($engine->options->reports as $reportName => $reportFilename) | 
| 318 | 318 |          { | 
| 319 | 319 |              try { | 
| 320 | - $report = $injectables->reportLoader->loadReport($reportName, [ 'filename' => $reportFilename]); | |
| 320 | + $report = $injectables->reportLoader->loadReport($reportName, ['filename' => $reportFilename]); | |
| 321 | 321 | } | 
| 322 | 322 |              catch (E4xx_NoSuchReport $e) { | 
| 323 | 323 |                  $injectables->output->logCliError("no such report '{$reportName}'"); | 
| @@ -341,7 +341,7 @@ discard block | ||
| 341 | 341 | |
| 342 | 342 | // setup signal handling | 
| 343 | 343 | pcntl_signal(SIGTERM, array($this, 'sigtermHandler')); | 
| 344 | - pcntl_signal(SIGINT , array($this, 'sigtermHandler')); | |
| 344 | + pcntl_signal(SIGINT, array($this, 'sigtermHandler')); | |
| 345 | 345 | } | 
| 346 | 346 | |
| 347 | 347 | /** | 
| @@ -231,7 +231,7 @@ | ||
| 231 | 231 | |
| 232 | 232 | // setup signal handling | 
| 233 | 233 | pcntl_signal(SIGTERM, array($this, 'sigtermHandler')); | 
| 234 | - pcntl_signal(SIGINT , array($this, 'sigtermHandler')); | |
| 234 | + pcntl_signal(SIGINT, array($this, 'sigtermHandler')); | |
| 235 | 235 | } | 
| 236 | 236 | |
| 237 | 237 | /** | 
| @@ -67,7 +67,7 @@ | ||
| 67 | 67 | $this->setLongDescription( | 
| 68 | 68 | "Use this command to see what Storyplayer will use as the default " | 
| 69 | 69 | ."environment to test against." | 
| 70 | - .PHP_EOL.PHP_EOL | |
| 70 | + .PHP_EOL . PHP_EOL | |
| 71 | 71 | ."This command mostly exists to assist tab-completion scripts for UNIX shells." | 
| 72 | 72 | ); | 
| 73 | 73 | } | 
| @@ -72,9 +72,9 @@ discard block | ||
| 72 | 72 | |
| 73 | 73 | // how we will talk with the command | 
| 74 | 74 | $pipesSpec = [ | 
| 75 | - [ 'file', 'php://stdin', 'r' ], | |
| 76 | - [ 'pipe', 'w' ], | |
| 77 | - [ 'pipe', 'w' ] | |
| 75 | + ['file', 'php://stdin', 'r'], | |
| 76 | + ['pipe', 'w'], | |
| 77 | + ['pipe', 'w'] | |
| 78 | 78 | ]; | 
| 79 | 79 | $pipes = []; | 
| 80 | 80 | |
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 | // timeout has happened | 
| 111 | 111 | // | 
| 112 | 112 | // this makes sure that we do not burn CPU for the sake of it | 
| 113 | - $readable = [ $pipes[1], $pipes[2] ]; | |
| 113 | + $readable = [$pipes[1], $pipes[2]]; | |
| 114 | 114 | $writeable = $except = []; | 
| 115 | 115 | stream_select($readable, $writeable, $except, 1); | 
| 116 | 116 | |