@@ -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? |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | /** |
| 221 | 221 | * how should we provision this environment? |
| 222 | 222 | * |
| 223 | - * @return array<ProvisioningAdapters> |
|
| 223 | + * @return ProvisioningAdapter[] |
|
| 224 | 224 | */ |
| 225 | 225 | public function getProvisioningAdapters() |
| 226 | 226 | { |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | /** |
| 266 | 266 | * what hosts exist in this group? |
| 267 | 267 | * |
| 268 | - * @return array<TestEnvironment_HostDefinition> |
|
| 268 | + * @return TestEnvironmentHost[] |
|
| 269 | 269 | */ |
| 270 | 270 | public function getHosts() |
| 271 | 271 | { |
@@ -74,6 +74,9 @@ |
||
| 74 | 74 | */ |
| 75 | 75 | protected $storySettings; |
| 76 | 76 | |
| 77 | + /** |
|
| 78 | + * @param string $hostId |
|
| 79 | + */ |
|
| 77 | 80 | public function __construct(TestEnvironment_GroupDefinition $parentGroup, $hostId) |
| 78 | 81 | { |
| 79 | 82 | $this->setParentGroup($parentGroup); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * this function avoids reset()ing the array, so it will not mess with |
| 54 | 54 | * any iteration that you may currently be part-way through |
| 55 | 55 | * |
| 56 | - * @param array $arrayToSearch |
|
| 56 | + * @param Storyplayer\TestEnvironments\ProvisioningAdapter[] $arrayToSearch |
|
| 57 | 57 | * the array to get the first element of |
| 58 | 58 | * @return mixed |
| 59 | 59 | * the first element of $array, or NULL if the array is empty |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | /** |
| 96 | 96 | * Create a new test environment object |
| 97 | 97 | * |
| 98 | - * @return TestEnvironment |
|
| 98 | + * @return TestEnvironment_Definition |
|
| 99 | 99 | * the test environment object to use in the script |
| 100 | 100 | */ |
| 101 | 101 | function newTestEnvironment() |
@@ -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 | */ |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | * the group that we belong to |
| 70 | 70 | * @param string $hostId |
| 71 | 71 | * the alias for this host |
| 72 | - * @return object |
|
| 72 | + * @return Vagrant_VirtualboxHostDefinition |
|
| 73 | 73 | * a host definition to populate |
| 74 | 74 | */ |
| 75 | 75 | public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId) |
@@ -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 | { |