@@ -356,8 +356,7 @@ |
||
356 | 356 | { |
357 | 357 | $list = $hardCodedDefaults->getConfigs(); |
358 | 358 | |
359 | - foreach ($list as $name => $config) |
|
360 | - { |
|
359 | + foreach ($list as $name => $config) { |
|
361 | 360 | $this->addEntry($name, $config); |
362 | 361 | } |
363 | 362 | } |
@@ -90,6 +90,9 @@ discard block |
||
90 | 90 | |
91 | 91 | /** |
92 | 92 | * constructor |
93 | + * @param string $configType |
|
94 | + * @param string[] $searchFolders |
|
95 | + * @param ConfigFinder[] $configFinders |
|
93 | 96 | */ |
94 | 97 | public function __construct($configType, $searchFolders, $configFinders) |
95 | 98 | { |
@@ -186,6 +189,7 @@ discard block |
||
186 | 189 | /** |
187 | 190 | * load a SPv2.0-style JSON configs |
188 | 191 | * |
192 | + * @param string $filename |
|
189 | 193 | * @return object |
190 | 194 | */ |
191 | 195 | protected function loadJsonConfig($filename) |
@@ -204,7 +208,8 @@ discard block |
||
204 | 208 | * @todo we need (at some point) to move the check for a return value |
205 | 209 | * out to somewhere else |
206 | 210 | * |
207 | - * @return object |
|
211 | + * @param string $filename |
|
212 | + * @return TestEnvironment_Definition |
|
208 | 213 | */ |
209 | 214 | protected function loadPhpConfig($filename) |
210 | 215 | { |
@@ -360,7 +365,7 @@ discard block |
||
360 | 365 | /** |
361 | 366 | * returns our list of all known configs |
362 | 367 | * |
363 | - * @return array |
|
368 | + * @return SystemUnderTestConfig[] |
|
364 | 369 | */ |
365 | 370 | public function getEntries() |
366 | 371 | { |
@@ -370,7 +375,7 @@ discard block |
||
370 | 375 | /** |
371 | 376 | * returns the names of all of the entries in our list |
372 | 377 | * |
373 | - * @return array<string> |
|
378 | + * @return integer[] |
|
374 | 379 | */ |
375 | 380 | public function getEntryNames() |
376 | 381 | { |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | */ |
56 | 56 | class HardCodedList |
57 | 57 | { |
58 | - /** |
|
59 | - * our list of configs |
|
60 | - * @var array<object> |
|
61 | - */ |
|
58 | + /** |
|
59 | + * our list of configs |
|
60 | + * @var array<object> |
|
61 | + */ |
|
62 | 62 | private $configs = []; |
63 | 63 | |
64 | 64 | /** |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function __construct($configType) |
78 | 78 | { |
79 | - $this->setConfigType($configType); |
|
79 | + $this->setConfigType($configType); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function getConfigType() |
88 | 88 | { |
89 | - return $this->configType; |
|
89 | + return $this->configType; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function setConfigType($configType) |
101 | 101 | { |
102 | - if (!class_exists($configType)) { |
|
103 | - throw new E4xx_NoSuchConfigClass($configType); |
|
104 | - } |
|
102 | + if (!class_exists($configType)) { |
|
103 | + throw new E4xx_NoSuchConfigClass($configType); |
|
104 | + } |
|
105 | 105 | |
106 | - $this->configType = $configType; |
|
106 | + $this->configType = $configType; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -118,15 +118,15 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function newConfig($name) |
120 | 120 | { |
121 | - // create our return object |
|
122 | - $classname = $this->configType; |
|
123 | - $obj = new $classname(); |
|
124 | - $obj->setName($name); |
|
121 | + // create our return object |
|
122 | + $classname = $this->configType; |
|
123 | + $obj = new $classname(); |
|
124 | + $obj->setName($name); |
|
125 | 125 | |
126 | - // add this to the list |
|
127 | - $this->addConfig($obj); |
|
126 | + // add this to the list |
|
127 | + $this->addConfig($obj); |
|
128 | 128 | |
129 | - return $obj; |
|
129 | + return $obj; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
@@ -137,13 +137,13 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function addConfig($config) |
139 | 139 | { |
140 | - // make sure the config is compatible first |
|
141 | - if (! $config instanceof $this->configType) { |
|
142 | - throw new E4xx_IncompatibleConfigClass($this->configType, get_class($config)); |
|
143 | - } |
|
140 | + // make sure the config is compatible first |
|
141 | + if (! $config instanceof $this->configType) { |
|
142 | + throw new E4xx_IncompatibleConfigClass($this->configType, get_class($config)); |
|
143 | + } |
|
144 | 144 | |
145 | - // if we get here, then we're good to go |
|
146 | - $name = $config->getName(); |
|
145 | + // if we get here, then we're good to go |
|
146 | + $name = $config->getName(); |
|
147 | 147 | $this->configs[$name] = $config; |
148 | 148 | |
149 | 149 | // keep the list sorted |
@@ -138,7 +138,7 @@ |
||
138 | 138 | public function addConfig($config) |
139 | 139 | { |
140 | 140 | // make sure the config is compatible first |
141 | - if (! $config instanceof $this->configType) { |
|
141 | + if (!$config instanceof $this->configType) { |
|
142 | 142 | throw new E4xx_IncompatibleConfigClass($this->configType, get_class($config)); |
143 | 143 | } |
144 | 144 |
@@ -82,7 +82,7 @@ |
||
82 | 82 | throw new E4xx_StoryplayerDefaultsSectionMustBeAnArray($this->getFilename()); |
83 | 83 | } |
84 | 84 | |
85 | - foreach($config->defaults as $defaultValue) { |
|
85 | + foreach ($config->defaults as $defaultValue) { |
|
86 | 86 | if (!is_string($defaultValue)) { |
87 | 87 | throw new E4xx_StoryplayerDefaultsMustBeStrings($this->getFilename()); |
88 | 88 | } |
@@ -422,8 +422,8 @@ |
||
422 | 422 | if ($trace !== null) { |
423 | 423 | $this->write(PHP_EOL . "-----" . PHP_EOL, $this->writer->commentStyle); |
424 | 424 | $this->write("This is the stack trace for this failure:" |
425 | - . PHP_EOL . PHP_EOL |
|
426 | - . CodeFormatter::indentBySpaces($trace, 4) . PHP_EOL . PHP_EOL); |
|
425 | + . PHP_EOL . PHP_EOL |
|
426 | + . CodeFormatter::indentBySpaces($trace, 4) . PHP_EOL . PHP_EOL); |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | // all done |
@@ -112,11 +112,9 @@ discard block |
||
112 | 112 | |
113 | 113 | // this is our opportunity to tell the user how our story(ies) |
114 | 114 | // went in detail |
115 | - foreach ($this->results as $result) |
|
116 | - { |
|
115 | + foreach ($this->results as $result) { |
|
117 | 116 | // so what happened? |
118 | - switch ($result->resultCode) |
|
119 | - { |
|
117 | + switch ($result->resultCode) { |
|
120 | 118 | case PhaseGroup_Result::OKAY: |
121 | 119 | // this is a good result |
122 | 120 | $succeededGroups[] = $result; |
@@ -303,8 +301,7 @@ discard block |
||
303 | 301 | |
304 | 302 | // does the phase have an exception? |
305 | 303 | $e = $phaseResult->getException(); |
306 | - if ($e) |
|
307 | - { |
|
304 | + if ($e) { |
|
308 | 305 | $stackTrace = $e->getTrace(); |
309 | 306 | $trace = $e->getTraceAsString(); |
310 | 307 | } |
@@ -92,7 +92,8 @@ |
||
92 | 92 | /** |
93 | 93 | * called when Storyplayer exits |
94 | 94 | * |
95 | - * @return void |
|
95 | + * @param boolean $summary |
|
96 | + * @return integer |
|
96 | 97 | */ |
97 | 98 | public function writeFinalReport($duration, $summary) |
98 | 99 | { |
@@ -270,8 +270,8 @@ |
||
270 | 270 | public function logCliErrorWithException($msg, $e) |
271 | 271 | { |
272 | 272 | $this->write("*** error: $msg" . PHP_EOL . PHP_EOL |
273 | - . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
274 | - . $e->getTraceAsString() . PHP_EOL); |
|
273 | + . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
274 | + . $e->getTraceAsString() . PHP_EOL); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | class DevModeConsole extends Console |
62 | 62 | { |
63 | - protected $resultStrings = array(); |
|
63 | + protected $resultStrings = array(); |
|
64 | 64 | |
65 | 65 | public function __construct() |
66 | 66 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | //$this->write('-------------------------------------------------------------' . PHP_EOL, $this->writer->commentStyle); |
125 | 125 | $this->write('----' . PHP_EOL, $this->writer->commentStyle); |
126 | 126 | $this->write("Result: "); |
127 | - if ($result->getPhaseGroupSucceeded()){ |
|
127 | + if ($result->getPhaseGroupSucceeded()) { |
|
128 | 128 | $this->write($resultString, $this->writer->successStyle); |
129 | 129 | } |
130 | 130 | else if ($result->getPhaseGroupFailed()) { |
@@ -124,7 +124,7 @@ |
||
124 | 124 | //$this->write('-------------------------------------------------------------' . PHP_EOL, $this->writer->commentStyle); |
125 | 125 | $this->write('----' . PHP_EOL, $this->writer->commentStyle); |
126 | 126 | $this->write("Result: "); |
127 | - if ($result->getPhaseGroupSucceeded()){ |
|
127 | + if ($result->getPhaseGroupSucceeded()) { |
|
128 | 128 | $this->write($resultString, $this->writer->successStyle); |
129 | 129 | } |
130 | 130 | else if ($result->getPhaseGroupFailed()) { |
@@ -209,8 +209,8 @@ |
||
209 | 209 | public function logCliErrorWithException($msg, $e) |
210 | 210 | { |
211 | 211 | echo "*** error: $msg" . PHP_EOL . PHP_EOL |
212 | - . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
213 | - . $e->getTraceAsString(); |
|
212 | + . "This was caused by an unexpected exception " . get_class($e) . PHP_EOL . PHP_EOL |
|
213 | + . $e->getTraceAsString(); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | /** |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}: attempt to create two or more groups with the same group ID {$groupId}"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}: attempt to create two or more groups with the same group ID {$groupId}"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId, $hostId) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, hostIds must all be strings, at least one " . gettype($hostId) . " found instead"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, hostIds must all be strings, at least one " . gettype($hostId) . " found instead"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -62,7 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | public function __construct($testEnvironmentName, $groupId, $hostId, $role) |
64 | 64 | { |
65 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array of strings; contains at least one " . gettype($role) . " instead"; |
|
65 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: roles must be an array of strings; contains at least one " . gettype($role) . " instead"; |
|
66 | 66 | parent::__construct(400, $msg, $msg); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |