@@ -331,6 +331,7 @@ |
||
| 331 | 331 | * Overloaded to ensure the code is always descent. |
| 332 | 332 | * |
| 333 | 333 | * @param string |
| 334 | + * @param string $val |
|
| 334 | 335 | */ |
| 335 | 336 | public function setCode($val){ |
| 336 | 337 | $this->setField("Code", Convert::raw2url($val)); |
@@ -588,6 +588,8 @@ discard block |
||
| 588 | 588 | |
| 589 | 589 | /** |
| 590 | 590 | * Utility for generating secure password hashes for this member. |
| 591 | + * @param string $string |
|
| 592 | + * @return string |
|
| 591 | 593 | */ |
| 592 | 594 | public function encryptWithUserSettings($string) { |
| 593 | 595 | if (!$string) return null; |
@@ -738,7 +740,7 @@ discard block |
||
| 738 | 740 | /** |
| 739 | 741 | * Returns the current logged in user |
| 740 | 742 | * |
| 741 | - * @return Member|null |
|
| 743 | + * @return DataObject|null |
|
| 742 | 744 | */ |
| 743 | 745 | public static function currentUser() { |
| 744 | 746 | $id = Member::currentUserID(); |
@@ -32,6 +32,7 @@ |
||
| 32 | 32 | /** |
| 33 | 33 | * Log a password change from the given member. |
| 34 | 34 | * Call MemberPassword::log($this) from within Member whenever the password is changed. |
| 35 | + * @param Member $member |
|
| 35 | 36 | */ |
| 36 | 37 | public static function log($member) { |
| 37 | 38 | $record = new MemberPassword(); |
@@ -28,6 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * Minimum password length |
| 31 | + * @param integer $minLength |
|
| 31 | 32 | */ |
| 32 | 33 | public function minLength($minLength) { |
| 33 | 34 | $this->minLength = $minLength; |
@@ -39,8 +40,8 @@ discard block |
||
| 39 | 40 | * |
| 40 | 41 | * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation")) |
| 41 | 42 | * |
| 42 | - * @param $minScore The minimum number of character tests that must pass |
|
| 43 | - * @param $testNames The names of the tests to perform |
|
| 43 | + * @param integer $minScore The minimum number of character tests that must pass |
|
| 44 | + * @param string[] $testNames The names of the tests to perform |
|
| 44 | 45 | */ |
| 45 | 46 | public function characterStrength($minScore, $testNames) { |
| 46 | 47 | $this->minScore = $minScore; |
@@ -50,6 +51,7 @@ discard block |
||
| 50 | 51 | |
| 51 | 52 | /** |
| 52 | 53 | * Check a number of previous passwords that the user has used, and don't let them change to that. |
| 54 | + * @param integer $count |
|
| 53 | 55 | */ |
| 54 | 56 | public function checkHistoricalPasswords($count) { |
| 55 | 57 | $this->historicalPasswordCount = $count; |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | * Recursively traverse the nested list of declared permissions and create |
| 653 | 653 | * a linear list. |
| 654 | 654 | * |
| 655 | - * @param aeeay $declared Nested structure of permissions. |
|
| 655 | + * @param boolean $declared Nested structure of permissions. |
|
| 656 | 656 | * @param $list List of permissions in the structure. The result will be |
| 657 | 657 | * written to this array. |
| 658 | 658 | */ |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | /** |
| 741 | 741 | * Get permissions |
| 742 | 742 | * |
| 743 | - * @return array Associative array of permissions in this permission |
|
| 743 | + * @return string Associative array of permissions in this permission |
|
| 744 | 744 | * group. The array indicies are the permission codes as |
| 745 | 745 | * used in {@link Permission::check()}. The value is |
| 746 | 746 | * suitable for using in an interface. |
@@ -66,6 +66,7 @@ |
||
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * @todo This should really be taken care of by TestRunner |
| 69 | + * @param string $msg |
|
| 69 | 70 | */ |
| 70 | 71 | protected function debugMessage($msg) { |
| 71 | 72 | if(class_exists('SapphireTest', false) && !SapphireTest::is_running_test()) { |
@@ -208,6 +208,8 @@ |
||
| 208 | 208 | * Simulate cached response file for testing error requests that are supposed to have cache files |
| 209 | 209 | * |
| 210 | 210 | * @todo Generate the cachepath without hardcoding the cache data |
| 211 | + * @param RestfulServiceTest_MockErrorService $connection |
|
| 212 | + * @param string $subUrl |
|
| 211 | 213 | */ |
| 212 | 214 | private function createFakeCachedResponse($connection, $subUrl) { |
| 213 | 215 | $fullUrl = $connection->getAbsoluteRequestURL($subUrl); |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Framework\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use SilverStripe\BehatExtension\Context\SilverStripeContext, |
|
| 6 | - SilverStripe\BehatExtension\Context\BasicContext, |
|
| 7 | - SilverStripe\BehatExtension\Context\LoginContext, |
|
| 8 | - SilverStripe\BehatExtension\Context\FixtureContext, |
|
| 9 | - SilverStripe\BehatExtension\Context\EmailContext, |
|
| 10 | - SilverStripe\Framework\Test\Behaviour\CmsFormsContext, |
|
| 11 | - SilverStripe\Framework\Test\Behaviour\CmsUiContext; |
|
| 5 | +use SilverStripe\BehatExtension\Context\SilverStripeContext; |
|
| 6 | +use SilverStripe\BehatExtension\Context\BasicContext; |
|
| 7 | +use SilverStripe\BehatExtension\Context\LoginContext; |
|
| 8 | +use SilverStripe\BehatExtension\Context\FixtureContext; |
|
| 9 | +use SilverStripe\BehatExtension\Context\EmailContext; |
|
| 10 | +use SilverStripe\Framework\Test\Behaviour\CmsFormsContext; |
|
| 11 | +use SilverStripe\Framework\Test\Behaviour\CmsUiContext; |
|
| 12 | 12 | |
| 13 | 13 | // PHPUnit |
| 14 | 14 | require_once 'PHPUnit/Autoload.php'; |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * This is a helper method for getting a new manifest |
| 13 | - * @param $name |
|
| 13 | + * @param string $name |
|
| 14 | 14 | * @return any |
| 15 | 15 | */ |
| 16 | 16 | protected function getConfigFixtureValue($name) { |
@@ -20,6 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * This is a helper method for displaying a relevant message about a parsing failure |
| 23 | + * @param string $path |
|
| 23 | 24 | */ |
| 24 | 25 | protected function getParsedAsMessage($path) { |
| 25 | 26 | return sprintf('Reference path "%s" failed to parse correctly', $path); |
@@ -41,7 +42,7 @@ discard block |
||
| 41 | 42 | |
| 42 | 43 | /** |
| 43 | 44 | * A helper method to return a mock of the manifest in order to test expectations and reduce dependency |
| 44 | - * @param $methods |
|
| 45 | + * @param string[] $methods |
|
| 45 | 46 | * @return SS_ConfigManifest |
| 46 | 47 | */ |
| 47 | 48 | protected function getManifestMock($methods) { |