Merge branch 'master' of git://github.com/zendframework/zf2 into feature/console

Author: Thinkscape

src/Adapter/Exception/InvalidArgumentException.php

@@ -16,4 +16,4 @@ class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
 {
-} 
+}

src/Adapter/Exception/RuntimeException.php

@@ -17,7 +17,7 @@
  * @package    Zend_Authentication
  * @subpackage Adapter
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {
 }

src/Adapter/Exception/UnexpectedValueException.php

@@ -17,7 +17,7 @@
  * @package    Zend_Authentication
  * @subpackage Adapter
  */
-class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+class UnexpectedValueException extends Exception\UnexpectedValueException implements
     ExceptionInterface
 {
 }

src/Adapter/Http.php

@@ -484,7 +484,7 @@ protected function _basicAuth($header)
         }
 
         $result = $this->_basicResolver->resolve($creds[0], $this->_realm, $creds[1]);
-        
+
         if ($result
             && !is_array($result)
             && $this->_secureStringCompare($result, $creds[1])

src/Adapter/Http/Exception/InvalidArgumentException.php

@@ -17,7 +17,7 @@
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {
 }

src/Adapter/Http/Exception/RuntimeException.php

@@ -17,7 +17,7 @@
  * @package    Zend_Authentication
  * @subpackage Adapter_Http
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {
 }

src/Adapter/Http/FileResolver.php

@@ -90,13 +90,13 @@ public function resolve($username, $realm, $password = null)
     {
         if (empty($username)) {
             throw new Exception\InvalidArgumentException('Username is required');
-        } else if (!ctype_print($username) || strpos($username, ':') !== false) {
+        } elseif (!ctype_print($username) || strpos($username, ':') !== false) {
             throw new Exception\InvalidArgumentException('Username must consist only of printable characters, '
                                                               . 'excluding the colon');
         }
         if (empty($realm)) {
             throw new Exception\InvalidArgumentException('Realm is required');
-        } else if (!ctype_print($realm) || strpos($realm, ':') !== false) {
+        } elseif (!ctype_print($realm) || strpos($realm, ':') !== false) {
             throw new Exception\InvalidArgumentException('Realm must consist only of printable characters, '
                                                               . 'excluding the colon.');
         }

src/Adapter/Ldap.php

@@ -333,11 +333,11 @@ public function authenticate()
                      * server options.
                      */
                     continue;
-                } else if ($err == LdapException::LDAP_NO_SUCH_OBJECT) {
+                } elseif ($err == LdapException::LDAP_NO_SUCH_OBJECT) {
                     $code = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
                     $messages[0] = "Account not found: $username";
                     $failedAuthorities[$dname] = $zle->getMessage();
-                } else if ($err == LdapException::LDAP_INVALID_CREDENTIALS) {
+                } elseif ($err == LdapException::LDAP_INVALID_CREDENTIALS) {
                     $code = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
                     $messages[0] = 'Invalid credentials';
                     $failedAuthorities[$dname] = $zle->getMessage();

src/AuthenticationService.php

@@ -32,9 +32,9 @@ class AuthenticationService
 
     /**
      * Constructor
-     * 
-     * @param  Storage\StorageInterface $storage 
-     * @param  Adapter\AdapterInterface $adapter 
+     *
+     * @param  Storage\StorageInterface $storage
+     * @param  Adapter\AdapterInterface $adapter
      */
     public function __construct(Storage\StorageInterface $storage = null, Adapter\AdapterInterface $adapter = null)
     {

src/Exception/InvalidArgumentException.php

@@ -15,7 +15,7 @@
  * @package    Zend_Authentication
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {
 }