@@ -105,11 +105,17 @@ |
||
| 105 | 105 | $activeConfig->roles = $rolesTable->$testEnvName; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | + /** |
|
| 109 | + * @param Injectables $injectables |
|
| 110 | + */ |
|
| 108 | 111 | public function mergeStoryplayerConfig($injectables, $spConf) |
| 109 | 112 | { |
| 110 | 113 | $this->mergeData('storyplayer', $spConf); |
| 111 | 114 | } |
| 112 | 115 | |
| 116 | + /** |
|
| 117 | + * @param Injectables $injectables |
|
| 118 | + */ |
|
| 113 | 119 | public function mergeSystemUnderTestConfig($injectables, SystemUnderTestConfig $sutConfig = null) |
| 114 | 120 | { |
| 115 | 121 | // do we have a system under test? |
@@ -177,7 +177,6 @@ |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | - * @param integer $level |
|
| 181 | 180 | * @param string $msg |
| 182 | 181 | * @return void |
| 183 | 182 | */ |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | * __construct |
| 60 | 60 | * |
| 61 | 61 | * @param StoryTeller $st The StoryTeller object |
| 62 | - * @param array $args Any arguments to be used in this Prose module |
|
| 62 | + * @param string[] $args Any arguments to be used in this Prose module |
|
| 63 | 63 | * |
| 64 | 64 | * @return parent::__construct |
| 65 | 65 | */ |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | * a separate config file for each test environment. The original |
| 135 | 135 | * runtime-v2.json file is then deleted from disk. |
| 136 | 136 | * |
| 137 | - * @param BaseObject $config |
|
| 137 | + * @param BaseObject $oldConfig |
|
| 138 | 138 | * @return void |
| 139 | 139 | */ |
| 140 | 140 | protected function splitUpConfig($oldConfig) |
@@ -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 | { |
@@ -429,6 +429,7 @@ discard block |
||
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | /** |
| 432 | + * @param Prose_Loader $proseLoader |
|
| 432 | 433 | * @return void |
| 433 | 434 | */ |
| 434 | 435 | public function setProseLoader($proseLoader) |
@@ -445,6 +446,9 @@ discard block |
||
| 445 | 446 | return $this->phaseLoader; |
| 446 | 447 | } |
| 447 | 448 | |
| 449 | + /** |
|
| 450 | + * @param Phase_Loader $phaseLoader |
|
| 451 | + */ |
|
| 448 | 452 | public function setPhaseLoader($phaseLoader) |
| 449 | 453 | { |
| 450 | 454 | $this->phaseLoader = $phaseLoader; |
@@ -469,6 +473,9 @@ discard block |
||
| 469 | 473 | $this->output = $output; |
| 470 | 474 | } |
| 471 | 475 | |
| 476 | + /** |
|
| 477 | + * @param \DataSift\Storyplayer\OutputLib\DataFormatter $dataFormatter |
|
| 478 | + */ |
|
| 472 | 479 | public function setDataFormatter($dataFormatter) |
| 473 | 480 | { |
| 474 | 481 | $this->dataFormatter = $dataFormatter; |
@@ -501,6 +508,7 @@ discard block |
||
| 501 | 508 | } |
| 502 | 509 | |
| 503 | 510 | /** |
| 511 | + * @param \DataSift\Storyplayer\ConfigLib\ActiveConfig $config |
|
| 504 | 512 | * @return void |
| 505 | 513 | */ |
| 506 | 514 | public function setConfig($config) |
@@ -509,7 +517,7 @@ discard block |
||
| 509 | 517 | } |
| 510 | 518 | |
| 511 | 519 | /** |
| 512 | - * @return object |
|
| 520 | + * @return \DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentRuntimeConfig |
|
| 513 | 521 | */ |
| 514 | 522 | public function getRuntimeConfig() |
| 515 | 523 | { |
@@ -517,6 +525,7 @@ discard block |
||
| 517 | 525 | } |
| 518 | 526 | |
| 519 | 527 | /** |
| 528 | + * @param \DataSift\Storyplayer\TestEnvironmentsLib\TestEnvironmentRuntimeConfig $runtimeConfig |
|
| 520 | 529 | * @return void |
| 521 | 530 | */ |
| 522 | 531 | public function setRuntimeConfig($runtimeConfig) |
@@ -764,7 +773,7 @@ discard block |
||
| 764 | 773 | * |
| 765 | 774 | * @param string $methodName |
| 766 | 775 | * @param array $methodArgs |
| 767 | - * @return mixed |
|
| 776 | + * @return \Prose\Prose |
|
| 768 | 777 | */ |
| 769 | 778 | public function __call($methodName, $methodArgs) |
| 770 | 779 | { |
@@ -700,6 +700,7 @@ |
||
| 700 | 700 | } |
| 701 | 701 | |
| 702 | 702 | /** |
| 703 | + * @param integer $version |
|
| 703 | 704 | * @return Story |
| 704 | 705 | */ |
| 705 | 706 | public function requiresStoryplayerVersion($version) |
@@ -128,6 +128,9 @@ discard block |
||
| 128 | 128 | ]; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | + /** |
|
| 132 | + * @param string $filename |
|
| 133 | + */ |
|
| 131 | 134 | public function addOutputToFile($filename) |
| 132 | 135 | { |
| 133 | 136 | // can we open the file? |
@@ -169,6 +172,9 @@ discard block |
||
| 169 | 172 | // |
| 170 | 173 | // ------------------------------------------------------------------ |
| 171 | 174 | |
| 175 | + /** |
|
| 176 | + * @param integer $mode |
|
| 177 | + */ |
|
| 172 | 178 | public function setColourMode($mode) |
| 173 | 179 | { |
| 174 | 180 | switch ($mode) |
@@ -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 | { |