Просмотр исходного кода

ZF-7189
- Fixed docblock for assemble() of Zend_Db_Select to return null

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16814 44c647ce-9c0f-0410-b52a-842ac1e357ba

ralph 16 лет назад
Родитель
Сommit
995afbd403
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      library/Zend/Db/Select.php
  2. 1 1
      library/Zend/Db/Table/Select.php

+ 2 - 2
library/Zend/Db/Select.php

@@ -682,7 +682,7 @@ class Zend_Db_Select
     /**
      * Converts this object to an SQL SELECT string.
      *
-     * @return string This object as a SELECT string.
+     * @return string|null This object as a SELECT string. (or null if a string cannot be produced.)
      */
     public function assemble()
     {
@@ -995,7 +995,7 @@ class Zend_Db_Select
      * Render DISTINCT clause
      *
      * @param string   $sql SQL query
-     * @return string
+     * @return string|null
      */
     protected function _renderColumns($sql)
     {

+ 1 - 1
library/Zend/Db/Table/Select.php

@@ -185,7 +185,7 @@ class Zend_Db_Table_Select extends Zend_Db_Select
      * Performs a validation on the select query before passing back to the parent class.
      * Ensures that only columns from the primary Zend_Db_Table are returned in the result.
      *
-     * @return string This object as a SELECT string.
+     * @return string|null This object as a SELECT string (or null if a string cannot be produced)
      */
     public function assemble()
     {