sminnee / silverstripe-framework

security/PasswordEncryptor.php

Doc Comments +6 added lines, -2 removed lines

@@ -85,6 +85,10 @@ 
 	 * but is necessary for retain compatibility with password hashed
 	 * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and
 	 * {@link PasswordEncryptor_Blowfish}
+	 * @param string $hash
+	 * @param string $password
+	 * @param string $salt
+	 * @param Member $member
 	 */
 	public function check($hash, $password, $salt = null, $member = null) {
 		return $hash === $this->encrypt($password, $salt, $member);
@@ -127,8 +131,7 @@ 
 	/**
 	 * Gets the cost that is set for the blowfish algorithm
 	 *
-	 * @param int $cost
-	 * @return null
+	 * @return integer
 	 */
 	public static function get_cost() {
 		return self::$cost;
@@ -240,6 +243,7 @@ 
 
 	/**
 	 * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
+	 * @param string $password
 	 */
 	public function salt($password, $member = null) {
 		$generator = new RandomGenerator();

security/PasswordValidator.php

Doc Comments +4 added lines, -2 removed lines

@@ -28,6 +28,7 @@ 
 
 	/**
 	 * Minimum password length
+	 * @param integer $minLength
 	 */
 	public function minLength($minLength) {
 		$this->minLength = $minLength;
@@ -39,8 +40,8 @@ 
 	 *
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
 	 *
-	 * @param $minScore The minimum number of character tests that must pass
-	 * @param $testNames The names of the tests to perform
+	 * @param integer $minScore The minimum number of character tests that must pass
+	 * @param string[] $testNames The names of the tests to perform
 	 */
 	public function characterStrength($minScore, $testNames) {
 		$this->minScore = $minScore;
@@ -50,6 +51,7 @@ 
 
 	/**
 	 * Check a number of previous passwords that the user has used, and don't let them change to that.
+	 * @param integer $count
 	 */
 	public function checkHistoricalPasswords($count) {
 		$this->historicalPasswordCount = $count;

security/Permission.php

Doc Comments +2 added lines, -2 removed lines

@@ -652,7 +652,7 @@ 
 	 * Recursively traverse the nested list of declared permissions and create
 	 * a linear list.
 	 *
-	 * @param aeeay $declared Nested structure of permissions.
+	 * @param boolean $declared Nested structure of permissions.
 	 * @param $list List of permissions in the structure. The result will be
 	 *              written to this array.
 	 */
@@ -740,7 +740,7 @@ 
 	/**
 	 * Get permissions
 	 *
-	 * @return array Associative array of permissions in this permission
+	 * @return string Associative array of permissions in this permission
 	 *               group. The array indicies are the permission codes as
 	 *               used in {@link Permission::check()}. The value is
 	 *               suitable for using in an interface.

security/PermissionCheckboxSetField.php

Doc Comments +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 
 	/**
 	 * @param array $properties
-	 * @return HTMLText
+	 * @return DBField
 	 */
 	public function Field($properties = array()) {
 		Requirements::css(FRAMEWORK_DIR . '/css/CheckboxSetField.css');

security/Security.php

Doc Comments +5 added lines, -6 removed lines

@@ -465,7 +465,7 @@ 
 	 * Combine the given forms into a formset with a tabbed interface
 	 *
 	 * @param array $forms List of LoginForm instances
-	 * @return string
+	 * @return DBField
 	 */
 	protected function generateLoginFormSet($forms) {
 		$viewData = new ArrayData(array(
@@ -645,7 +645,6 @@ 
 	 * - t: plaintext token
 	 *
 	 * @param Member $member Member object associated with this link.
-	 * @param string $autoLoginHash The auto login token.
 	 */
 	public static function getPasswordResetLink($member, $autologinToken) {
 		$autologinToken = urldecode($autologinToken);
@@ -736,7 +735,7 @@ 
 	/**
 	 * Factory method for the lost password form
 	 *
-	 * @return Form Returns the lost password form
+	 * @return Security Returns the lost password form
 	 */
 	public function ChangePasswordForm() {
 		return Object::create('ChangePasswordForm', $this, 'ChangePasswordForm');
@@ -746,7 +745,7 @@ 
 	 * Gets the template for an include used for security.
 	 * For use in any subclass.
 	 *
-	 * @return string|array Returns the template(s) for rendering
+	 * @return string[] Returns the template(s) for rendering
 	 */
 	public function getIncludeTemplate($name) {
 		return array('Security_' . $name);
@@ -920,7 +919,7 @@ 
 	 * @deprecated 4.0 Use the "Security.password_encryption_algorithm" config setting instead
 	 * @param string $algorithm One of the available password encryption
 	 *  algorithms determined by {@link Security::get_encryption_algorithms()}
-	 * @return bool Returns TRUE if the passed algorithm was valid, otherwise FALSE.
+	 * @return boolean|null Returns TRUE if the passed algorithm was valid, otherwise FALSE.
 	 */
 	public static function set_password_encryption_algorithm($algorithm) {
 		Deprecation::notice('4.0', 'Use the "Security.password_encryption_algorithm" config setting instead');
@@ -1075,7 +1074,7 @@ 
 	/**
 	 * Set to true to ignore access to disallowed actions, rather than returning permission failure
 	 * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
-	 * @param $flag True or false
+	 * @param boolean $flag True or false
 	 */
 	public static function set_ignore_disallowed_actions($flag) {
 		self::$ignore_disallowed_actions = $flag;

tasks/EncryptAllPasswordsTask.php

Doc Comments +1 added lines

@@ -66,6 +66,7 @@
 
 	/**
 	 * @todo This should really be taken care of by TestRunner
+	 * @param string $msg
 	 */
 	protected function debugMessage($msg) {
 		if(class_exists('SapphireTest', false) && !SapphireTest::is_running_test()) {

tests/api/RestfulServiceTest.php

Doc Comments +2 added lines

@@ -208,6 +208,8 @@
 	 * Simulate cached response file for testing error requests that are supposed to have cache files
 	 *
 	 * @todo Generate the cachepath without hardcoding the cache data
+	 * @param RestfulServiceTest_MockErrorService $connection
+	 * @param string $subUrl
 	 */
 	private function createFakeCachedResponse($connection, $subUrl) {
 		$fullUrl = $connection->getAbsoluteRequestURL($subUrl);

tests/behat/features/bootstrap/FeatureContext.php

Unused Use Statements +7 added lines, -7 removed lines

@@ -2,13 +2,13 @@
 
 namespace SilverStripe\Framework\Test\Behaviour;
 
-use SilverStripe\BehatExtension\Context\SilverStripeContext,
-	SilverStripe\BehatExtension\Context\BasicContext,
-	SilverStripe\BehatExtension\Context\LoginContext,
-	SilverStripe\BehatExtension\Context\FixtureContext,
-	SilverStripe\BehatExtension\Context\EmailContext,
-	SilverStripe\Framework\Test\Behaviour\CmsFormsContext,
-	SilverStripe\Framework\Test\Behaviour\CmsUiContext;
+use SilverStripe\BehatExtension\Context\SilverStripeContext;
+use SilverStripe\BehatExtension\Context\BasicContext;
+use SilverStripe\BehatExtension\Context\LoginContext;
+use SilverStripe\BehatExtension\Context\FixtureContext;
+use SilverStripe\BehatExtension\Context\EmailContext;
+use SilverStripe\Framework\Test\Behaviour\CmsFormsContext;
+use SilverStripe\Framework\Test\Behaviour\CmsUiContext;
 
 // PHPUnit
 require_once 'PHPUnit/Autoload.php';

tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php

Unused Use Statements +3 added lines, -9 removed lines

@@ -2,15 +2,9 @@
 
 namespace SilverStripe\Framework\Test\Behaviour;
 
-use Behat\Behat\Context\ClosuredContextInterface,
-	Behat\Behat\Context\TranslatedContextInterface,
-	Behat\Behat\Context\BehatContext,
-	Behat\Behat\Context\Step,
-	Behat\Behat\Exception\PendingException,
-	Behat\Mink\Exception\ElementNotFoundException,
-	Behat\Gherkin\Node\PyStringNode,
-	Behat\Gherkin\Node\TableNode,
-	Behat\Mink\Element\NodeElement;
+use Behat\Behat\Context\BehatContext;
+use Behat\Behat\Context\Step;
+use Behat\Mink\Element\NodeElement;
 
 
 // PHPUnit