web/lib/Zend/Application/Resource/Db.php
changeset 1230 68c69c656a2c
parent 807 877f952ae2bd
--- a/web/lib/Zend/Application/Resource/Db.php	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Application/Resource/Db.php	Thu May 07 15:16:02 2015 +0200
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Application
  * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 25123 2012-11-14 18:27:44Z matthew $
+ * @version    $Id$
  */
 
 /**
@@ -32,7 +32,7 @@
  * @category   Zend
  * @package    Zend_Application
  * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract
@@ -88,7 +88,7 @@
     /**
      * Set the adapter params
      *
-     * @param  string $adapter
+     * @param array $params
      * @return Zend_Application_Resource_Db
      */
     public function setParams(array $params)
@@ -110,7 +110,7 @@
     /**
      * Set whether to use this as default table adapter
      *
-     * @param  boolean $defaultTableAdapter
+     * @param bool $isDefaultTableAdapter
      * @return Zend_Application_Resource_Db
      */
     public function setIsDefaultTableAdapter($isDefaultTableAdapter)
@@ -122,7 +122,7 @@
     /**
      * Is this adapter the default table adapter?
      *
-     * @return void
+     * @return bool
      */
     public function isDefaultTableAdapter()
     {
@@ -160,6 +160,8 @@
         if (null !== ($db = $this->getDbAdapter())) {
             return $db;
         }
+
+        return null;
     }
 
     /**