Merge remote-tracking branch 'upstream/master'

composer.json

@@ -39,8 +39,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {

src/Adapter/AbstractAdapter.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Authentication\Adapter;
+
+abstract class AbstractAdapter implements ValidatableAdapterInterface
+{
+
+    /**
+     * @var mixed
+     */
+    protected $credential;
+
+    /**
+     * @var mixed
+     */
+    protected $identity;
+
+    /**
+     * Returns the credential of the account being authenticated, or
+     * NULL if none is set.
+     *
+     * @return mixed
+     */
+    public function getCredential()
+    {
+        return $this->credential;
+    }
+
+    /**
+     * Sets the credential for binding
+     *
+     * @param  mixed           $credential
+     * @return AbstractAdapter
+     */
+    public function setCredential($credential)
+    {
+        $this->credential = $credential;
+
+        return $this;
+    }
+
+    /**
+     * Returns the identity of the account being authenticated, or
+     * NULL if none is set.
+     *
+     * @return mixed
+     */
+    public function getIdentity()
+    {
+        return $this->identity;
+    }
+
+    /**
+     * Sets the identity for binding
+     *
+     * @param  mixed          $identity
+     * @return AbstractAdapter
+     */
+    public function setIdentity($identity)
+    {
+        $this->identity = $identity;
+
+        return $this;
+    }
+}

src/Adapter/AdapterInterface.php

@@ -3,18 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Authentication
  */
 
 namespace Zend\Authentication\Adapter;
 
-/**
- * @category   Zend
- * @package    Zend_Authentication
- * @subpackage Adapter
- */
 interface AdapterInterface
 {
     /**