@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * Copied logic from Core.php, because it needs to be executed prior to {@link SilverStripeAwareInitializer}. |
| 59 | 59 | * |
| 60 | 60 | * @param String Absolute start path to search upwards from |
| 61 | - * @return Boolean Absolute path to environment file |
|
| 61 | + * @return string|null Absolute path to environment file |
|
| 62 | 62 | */ |
| 63 | 63 | protected function findEnvironmentConfigFile($path) { |
| 64 | 64 | $envPath = null; |
@@ -85,6 +85,7 @@ discard block |
||
| 85 | 85 | * |
| 86 | 86 | * @param String Absolute start path to search upwards from |
| 87 | 87 | * @param Array Map of paths to host names |
| 88 | + * @param string $path |
|
| 88 | 89 | * @return String URL |
| 89 | 90 | */ |
| 90 | 91 | protected function findBaseUrlFromMapping($path, $mapping) { |
@@ -750,7 +750,7 @@ discard block |
||
| 750 | 750 | * - fieldset[data-name] table |
| 751 | 751 | * - table caption |
| 752 | 752 | * |
| 753 | - * @return Behat\Mink\Element\NodeElement |
|
| 753 | + * @return \Behat\Mink\Element\NodeElement|null |
|
| 754 | 754 | */ |
| 755 | 755 | protected function getTable($selector) { |
| 756 | 756 | $selector = $this->getSession()->getSelectorsHandler()->xpathLiteral($selector); |
@@ -971,6 +971,7 @@ discard block |
||
| 971 | 971 | |
| 972 | 972 | /** |
| 973 | 973 | * We have to catch exceptions and log somehow else otherwise behat falls over |
| 974 | + * @param \WebDriver\Exception $e |
|
| 974 | 975 | */ |
| 975 | 976 | protected function logException($e){ |
| 976 | 977 | file_put_contents('php://stderr', 'Exception caught: '.$e); |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | /** |
| 29 | 29 | * Sets bundle namespace to use for guessing. |
| 30 | 30 | * |
| 31 | - * @param string $namespace |
|
| 31 | + * @param string $namespaceBase |
|
| 32 | 32 | */ |
| 33 | 33 | public function setNamespaceBase($namespaceBase) |
| 34 | 34 | { |
@@ -121,6 +121,8 @@ |
||
| 121 | 121 | |
| 122 | 122 | /** |
| 123 | 123 | * @When /^I log in with "(?<username>[^"]*)" and "(?<password>[^"]*)"$/ |
| 124 | + * @param string $email |
|
| 125 | + * @param string $password |
|
| 124 | 126 | */ |
| 125 | 127 | public function stepILogInWith($email, $password) |
| 126 | 128 | { |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | /** |
| 22 | 22 | * Sets SilverStripe instance. |
| 23 | 23 | * |
| 24 | - * @param String $database_name Temp database name |
|
| 24 | + * @param String $databaseName Temp database name |
|
| 25 | + * @return void |
|
| 25 | 26 | */ |
| 26 | 27 | public function setDatabase($databaseName); |
| 27 | 28 | |
| 28 | 29 | /** |
| 29 | 30 | * Marks steps as AJAX steps for special treatment |
| 30 | 31 | * |
| 31 | - * @param array $ajax_steps Array of step name parts to match |
|
| 32 | + * @param array $ajaxSteps Array of step name parts to match |
|
| 33 | + * @return void |
|
| 32 | 34 | */ |
| 33 | 35 | public function setAjaxSteps($ajaxSteps); |
| 34 | 36 | } |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | * When using the "data-title" attribute, ensure not to include double quotes. |
| 135 | 135 | * |
| 136 | 136 | * @param String $region Region name or CSS selector |
| 137 | - * @return MinkElement|null |
|
| 137 | + * @return \Behat\Mink\Element\NodeElement |
|
| 138 | 138 | */ |
| 139 | 139 | public function getRegionObj($region) { |
| 140 | 140 | // Try to find regions directly by CSS selector. |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | - * @return array |
|
| 67 | + * @return Compiler\CoreInitializationPass[] |
|
| 68 | 68 | */ |
| 69 | 69 | public function getCompilerPasses() |
| 70 | 70 | { |
@@ -555,6 +555,10 @@ |
||
| 555 | 555 | return $data; |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | + /** |
|
| 559 | + * @param string $class |
|
| 560 | + * @param string $identifier |
|
| 561 | + */ |
|
| 558 | 562 | protected function prepareAsset($class, $identifier, $data = null) { |
| 559 | 563 | if(!$data) $data = array(); |
| 560 | 564 | $relativeTargetPath = (isset($data['Filename'])) ? $data['Filename'] : $identifier; |