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

src/Adapter/DbTable.php

@@ -428,7 +428,7 @@ protected function _authenticateQuerySelect(DbSelect $dbSelect)
         $dbSelect->prepareStatement($this->_zendDb, $statement);
         $resultSet = new ResultSet();
         try {
-            $resultSet->setDataSource($statement->execute(array($this->_credential, $this->_identity)));
+            $resultSet->initialize($statement->execute(array($this->_credential, $this->_identity)));
             $resultIdentities = $resultSet->toArray();
         } catch (\Exception $e) {
             throw new Exception\RuntimeException(

src/Adapter/Http.php

@@ -348,7 +348,7 @@ public function authenticate()
             $getHeader = 'Authorization';
         }
 
-        $headers = $this->_request->headers();
+        $headers = $this->_request->getHeaders();
         if (!$headers->has($getHeader)) {
             return $this->_challengeClient();
         }
@@ -412,7 +412,7 @@ protected function _challengeClient()
         $this->_response->setStatusCode($statusCode);
 
         // Send a challenge in each acceptable authentication scheme
-        $headers = $this->_response->headers();
+        $headers = $this->_response->getHeaders();
         if (in_array('basic', $this->_acceptSchemes)) {
             $headers->addHeaderLine($headerName, $this->_basicHeader());
         }
@@ -496,14 +496,19 @@ protected function _basicAuth($header)
             return $this->_challengeClient();
         }
 
-        $password = $this->_basicResolver->resolve($creds[0], $this->_realm);
-        if ($password && 
-            $this->_secureStringCompare($password, $creds[1])) {
+        $result = $this->_basicResolver->resolve($creds[0], $this->_realm, $creds[1]);
+
+        if ($result
+            && !is_array($result)
+            && $this->_secureStringCompare($result, $creds[1])
+        ) {
             $identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
-        } else {
-            return $this->_challengeClient();
+        } elseif (is_array($result)) {
+            return new Authentication\Result(Authentication\Result::SUCCESS, $result);
         }
+
+        return $this->_challengeClient();
     }
 
     /**
@@ -614,7 +619,7 @@ protected function _calcNonce()
         // would be surprising if the user just logged in.
         $timeout = ceil(time() / $this->_nonceTimeout) * $this->_nonceTimeout;
 
-        $nonce = hash('md5', $timeout . ':' . $this->_request->server()->get('HTTP_USER_AGENT') . ':' . __CLASS__);
+        $nonce = hash('md5', $timeout . ':' . $this->_request->getServer()->get('HTTP_USER_AGENT') . ':' . __CLASS__);
         return $nonce;
     }
 
@@ -688,7 +693,7 @@ protected function _parseDigestAuth($header)
         // Section 3.2.2.5 in RFC 2617 says the authenticating server must
         // verify that the URI field in the Authorization header is for the
         // same resource requested in the Request Line.
-        $rUri = $this->_request->uri();
+        $rUri = $this->_request->getUri();
         $cUri = UriFactory::factory($temp[1]);
 
         // Make sure the path portion of both URIs is the same
@@ -744,7 +749,7 @@ protected function _parseDigestAuth($header)
             if (!$ret || empty($temp[1])) {
 
                 // Big surprise: IE isn't RFC 2617-compliant.
-                $headers = $this->_request->headers();
+                $headers = $this->_request->getHeaders();
                 if (!$headers->has('User-Agent')) {
                     return false;
                 }

src/Adapter/Http/FileResolver.php

@@ -99,7 +99,7 @@ public function getFile()
      *         realm, false otherwise.
      * @throws Exception\ExceptionInterface
      */
-    public function resolve($username, $realm)
+    public function resolve($username, $realm, $password = null)
     {
         if (empty($username)) {
             throw new Exception\InvalidArgumentException('Username is required');

src/Adapter/Http/ResolverInterface.php

@@ -40,8 +40,9 @@ interface ResolverInterface
      *
      * @param  string $username Username
      * @param  string $realm    Authentication Realm
-     * @return string|false User's shared secret, if the user is found in the
-     *         realm, false otherwise.
+     * @param  string $password Password (optional)
+     * @return string|array|false User's shared secret as string if found in realm, or User's identity as array
+     *         if resolved, false otherwise.
      */
-    public function resolve($username, $realm);
+    public function resolve($username, $realm, $password = null);
 }

test/Adapter/Http/AuthTest.php

@@ -341,7 +341,7 @@ protected function _doAuth($clientHeader, $scheme)
         $request->setUri('http://localhost/');
         $request->setMethod('GET');
         $request->setServer(new Parameters(array('HTTP_USER_AGENT' => 'PHPUnit')));
-        $headers = $request->headers();
+        $headers = $request->getHeaders();
         $headers->addHeaderLine('Authorization', $clientHeader);
 
         // Select an Authentication scheme
@@ -370,7 +370,7 @@ protected function _doAuth($clientHeader, $scheme)
         $return = array(
             'result'  => $result,
             'status'  => $response->getStatusCode(),
-            'headers' => $response->headers(),
+            'headers' => $response->getHeaders(),
         );
         return $return;
     }

test/Adapter/Http/ProxyTest.php

@@ -361,7 +361,7 @@ public function _doAuth($clientHeader, $scheme)
         $return = array(
             'result'  => $result,
             'status'  => $response->getStatusCode(),
-            'headers' => $response->headers(),
+            'headers' => $response->getHeaders(),
         );
         return $return;
     }