Merge branch 'feature/phpdoc-mismatch' of https://github.com/micheh/zf2…

… into hotfix/phpdoc
zendframework · Sep 10, 2012 · c9693ea · c9693ea
commit c9693ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Adapter/DbTable.php b/src/Adapter/DbTable.php
@@ -10,6 +10,7 @@
 
 namespace Zend\Authentication\Adapter;
 
+use stdClass;
 use Zend\Authentication\Result as AuthenticationResult;
 use Zend\Db\Adapter\Adapter as DbAdapter;
 use Zend\Db\ResultSet\ResultSet;
@@ -272,7 +273,7 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null)
             return false;
         }
 
-        $returnObject = new \stdClass();
+        $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
 

diff --git a/src/Adapter/Http/FileResolver.php b/src/Adapter/Http/FileResolver.php
@@ -45,7 +45,7 @@ public function __construct($path = '')
      *
      * @param  string $path
      * @return FileResolver Provides a fluent interface
-     * @throws Exception\ExceptionInterface
+     * @throws Exception\InvalidArgumentException if path is not readable
      */
     public function setFile($path)
     {

diff --git a/src/Adapter/Ldap.php b/src/Adapter/Ldap.php
@@ -10,6 +10,7 @@
 
 namespace Zend\Authentication\Adapter;
 
+use stdClass;
 use Zend\Authentication\Result as AuthenticationResult;
 use Zend\Ldap as ZendLdap;
 use Zend\Ldap\Exception\LdapException;
@@ -459,7 +460,7 @@ public function getAccountObject(array $returnAttribs = array(), array $omitAttr
             return false;
         }
 
-        $returnObject = new \stdClass();
+        $returnObject = new stdClass();
 
         $omitAttribs = array_map('strtolower', $omitAttribs);