Merge branch 'master' into rfc/escaper

zendframework · Jun 23, 2012 · abd0527 · abd0527
commit abd0527
Show file tree

Hide file tree

Showing 37 changed files with 781 additions and 705 deletions.
diff --git a/src/Adapter.php → src/Adapter/AdapterInterface.php b/src/Adapter.php → src/Adapter/AdapterInterface.php
@@ -19,10 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
-namespace Zend\Authentication;
+namespace Zend\Authentication\Adapter;
 
 /**
  * @category   Zend
@@ -31,13 +28,13 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Adapter
+interface AdapterInterface
 {
     /**
      * Performs an authentication attempt
      *
-     * @return Zend\Authentication\Result
-     * @throws Zend\Authentication\Adapter\Exception If authentication cannot be performed
+     * @return \Zend\Authentication\Result
+     * @throws \Zend\Authentication\Adapter\Exception\ExceptionInterface If authentication cannot be performed
      */
     public function authenticate();
 }