Merge branch 'master' into acceptHandling

Conflicts: library/Zend/Http/Header/AbstractAccept.php library/Zend/Http/Header/AcceptEncoding.php library/Zend/Http/Header/AcceptLanguage.php tests/Zend/Http/Header/AcceptCharsetTest.php tests/Zend/Http/Header/AcceptEncodingTest.php tests/Zend/Http/Header/AcceptLanguageTest.php tests/Zend/Http/Header/AcceptTest.php
zendframework · Jul 14, 2012 · 1702218 · 1702218
18 parents 054fdbf + ba14e90 + dc7d636 + 06375a2 + 53fdaa9 + 80ccc9b + fa80520 + 4009aca + ad280cb + b0d3db4 + 9b28224 + 49a871c + 4145ab4 + ff8e603 + abd0527 + 9dc2f89 + 20317fc + da6fd5b
commit 1702218
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 40 deletions.
diff --git a/src/Adapter/Exception/InvalidArgumentException.php b/src/Adapter/Exception/InvalidArgumentException.php
@@ -16,4 +16,4 @@ class InvalidArgumentException
     extends Exception\InvalidArgumentException
     implements ExceptionInterface
 {
-} 
+}
diff --git a/src/Adapter/Exception/RuntimeException.php b/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
 {
 }
diff --git a/src/Adapter/Exception/UnexpectedValueException.php b/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
 {
 }
diff --git a/src/Adapter/Http.php b/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])

diff --git a/src/Adapter/Http/Exception/InvalidArgumentException.php b/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
 {
 }
diff --git a/src/Adapter/Http/Exception/RuntimeException.php b/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
 {
 }
diff --git a/src/Adapter/Http/FileResolver.php b/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.');
         }

diff --git a/src/Adapter/Ldap.php b/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();

diff --git a/src/AuthenticationService.php b/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)
     {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -15,7 +15,7 @@
  * @package    Zend_Authentication
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {
 }
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -15,7 +15,7 @@
  * @package    Zend_Authentication
  * @subpackage Exception
  */
-class UnexpectedValueException extends \UnexpectedValueException implements 
+class UnexpectedValueException extends \UnexpectedValueException implements
     ExceptionInterface
 {
 }
diff --git a/test/Adapter/Http/AuthTest.php b/test/Adapter/Http/AuthTest.php
@@ -10,11 +10,11 @@
 
 namespace ZendTest\Authentication\Adapter\Http;
 
-use Zend\Authentication\Adapter\Http,
-    Zend\Http\Headers,
-    Zend\Http\Request,
-    Zend\Http\Response,
-    Zend\Stdlib\Parameters;
+use Zend\Authentication\Adapter\Http;
+use Zend\Http\Headers;
+use Zend\Http\Request;
+use Zend\Http\Response;
+use Zend\Stdlib\Parameters;
 
 /**
  * @category   Zend

diff --git a/test/Adapter/Http/ObjectTest.php b/test/Adapter/Http/ObjectTest.php
@@ -10,12 +10,12 @@
 
 namespace ZendTest\Authentication\Adapter\Http;
 
-use Zend\Authentication\Adapter\Http,
-    Zend\Authentication\Adapter,
-    Zend\Authentication,
-    Zend\Http\Headers,
-    Zend\Http\Request,
-    Zend\Http\Response;
+use Zend\Authentication\Adapter\Http;
+use Zend\Authentication\Adapter;
+use Zend\Authentication;
+use Zend\Http\Headers;
+use Zend\Http\Request;
+use Zend\Http\Response;
 
 /**
  * @category   Zend

diff --git a/test/Adapter/Http/ProxyTest.php b/test/Adapter/Http/ProxyTest.php
@@ -10,11 +10,11 @@
 
 namespace ZendTest\Authentication\Adapter\Http;
 
-use Zend\Authentication\Adapter\Http,
-    Zend\Http\Headers,
-    Zend\Http\Request,
-    Zend\Http\Response,
-    Zend\Stdlib\Parameters;
+use Zend\Authentication\Adapter\Http;
+use Zend\Http\Headers;
+use Zend\Http\Request;
+use Zend\Http\Response;
+use Zend\Stdlib\Parameters;
 
 /**
  * @category   Zend

diff --git a/test/Adapter/Ldap/OfflineTest.php b/test/Adapter/Ldap/OfflineTest.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Authentication\Adapter\Ldap;
 
-use Zend\Authentication\Adapter,
-    Zend\Ldap;
+use Zend\Authentication\Adapter;
+use Zend\Ldap;
 
 /**
  * @category   Zend

diff --git a/test/Adapter/Ldap/OnlineTest.php b/test/Adapter/Ldap/OnlineTest.php
@@ -10,9 +10,9 @@
 
 namespace ZendTest\Authentication\Adapter\Ldap;
 
-use Zend\Authentication,
-    Zend\Authentication\Adapter,
-    Zend\Ldap;
+use Zend\Authentication;
+use Zend\Authentication\Adapter;
+use Zend\Ldap;
 
 /**
  * @category   Zend

diff --git a/test/AuthenticationServiceTest.php b/test/AuthenticationServiceTest.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Authentication;
 
-use Zend\Authentication\AuthenticationService,
-    Zend\Authentication as Auth;
+use Zend\Authentication\AuthenticationService;
+use Zend\Authentication as Auth;
 
 /**
  * @category   Zend

diff --git a/test/TestAsset/SuccessAdapter.php b/test/TestAsset/SuccessAdapter.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\Authentication\TestAsset;
 
-use Zend\Authentication\Adapter\AdapterInterface as AuthenticationAdapter,
-    Zend\Authentication\Result as AuthenticationResult;
+use Zend\Authentication\Adapter\AdapterInterface as AuthenticationAdapter;
+use Zend\Authentication\Result as AuthenticationResult;
 
 class SuccessAdapter implements AuthenticationAdapter
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ class InvalidArgumentException @@
         extends Exception\InvalidArgumentException
         implements ExceptionInterface
     {
-    }
+    }