Fixing CS problems

cakephp · Jun 3, 2014 · 775fe66 · 775fe66
1 parent f0039fd
commit 775fe66
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/Controller/Component/Auth/BaseAuthenticate.php b/src/Controller/Component/Auth/BaseAuthenticate.php
@@ -135,7 +135,7 @@ protected function _findUser($username, $password = null) {
  * Return password hasher object
  *
  * @return AbstractPasswordHasher Password hasher instance
- * @throws RuntimeException If password hasher class not found or
+ * @throws \RuntimeException If password hasher class not found or
  *   it does not extend AbstractPasswordHasher
  */
 	public function passwordHasher() {

diff --git a/src/Controller/Component/Auth/FallbackPasswordHasher.php b/src/Controller/Component/Auth/FallbackPasswordHasher.php
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.0
+ * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Controller\Component\Auth;
@@ -43,6 +43,9 @@ class FallbackPasswordHasher extends AbstractPasswordHasher {
 /**
  * Constructor
  *
+ * @param array $config configuration options for this object. Requires the
+ * `hashers` key to be present in the array with a list of other hashers to be
+ * used
  */
 	public function __construct(array $config = array()) {
 		parent::__construct($config);

diff --git a/src/Controller/Component/Auth/PasswordHasherFactory.php b/src/Controller/Component/Auth/PasswordHasherFactory.php
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.0
+ * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Controller\Component\Auth;
@@ -28,7 +28,7 @@ class PasswordHasherFactory {
  * @param string|array $passwordHasher name of the password hasher or an array with
  * at least the key `className` set to the name of the class to use
  * @return AbstractPasswordHasher Password hasher instance
- * @throws RuntimeException If password hasher class not found or
+ * @throws \RuntimeException If password hasher class not found or
  *   it does not extend AbstractPasswordHasher
  */
 	public static function build($passwordHasher) {
@@ -44,7 +44,7 @@ public static function build($passwordHasher) {
 		list($plugin, $class) = pluginSplit($class, true);
 		$className = App::className($class, 'Controller/Component/Auth', 'PasswordHasher');
 		if (!class_exists($className)) {
-			throw new Error\Exception(sprintf('Password hasher class "%s" was not found.', $class));
+			throw new \RuntimeException(sprintf('Password hasher class "%s" was not found.', $class));
 		}
 
 		$hasher = new $className($config);

diff --git a/tests/TestCase/Controller/Component/Auth/FallbackPasswordHasherTest.php b/tests/TestCase/Controller/Component/Auth/FallbackPasswordHasherTest.php
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.0
+ * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Test\TestCase\Controller\Component\Auth;
@@ -25,7 +25,6 @@
  */
 class FallbackPasswordHasherTest extends TestCase {
 
-
 /**
  * Tests that only the first hasher is user for hashing a password
  *

diff --git a/tests/TestCase/Controller/Component/Auth/WeakPasswordHasherTest.php b/tests/TestCase/Controller/Component/Auth/WeakPasswordHasherTest.php
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.0
+ * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Test\TestCase\Controller\Component\Auth;