Skip to content
Snippets Groups Projects
Commit 8726363e authored by xamgore's avatar xamgore
Browse files

PHPDoc adjustment

parent 4c306aa0
No related merge requests found
<?php defined('SYSPATH') or die('No direct script access.');
/**
* Class Twig
*
* @property $HTML HTML
* @property $Date Date
* @property $URL URL
* @property $UTF8 UTF8
* @property $Text Text
* @property $Rus RusLang
* @property $Arr Arr
* @property $Inflector Inflector
* @property $System array[]
*/
class Twig extends Kohana_Twig
{
public static function factory($file = NULL, array $data = NULL) {
......
......@@ -18,7 +18,7 @@ class Kohana_Config_Database_Reader implements Kohana_Config_Reader
/**
* Constructs the database reader object
*
* @param array Configuration for the reader
* @param $config array Configuration for the reader
*/
public function __construct(array $config = NULL)
{
......
......@@ -76,7 +76,7 @@ class Kohana_Database_Query {
* Enables the query to be cached for a specified amount of time.
*
* @param integer $lifetime number of seconds to cache, 0 deletes it from the cache
* @param boolean whether or not to execute the query during a cache hit
* @param boolean $force whether or not to execute the query during a cache hit
* @return $this
* @uses Kohana::$cache_life
*/
......@@ -111,8 +111,8 @@ class Kohana_Database_Query {
/**
* Returns results as objects
*
* @param string $class classname or TRUE for stdClass
* @param array $params
* @param string|boolean $class classname or TRUE for stdClass
* @param array $params object constructor arguments
* @return $this
*/
public function as_object($class = TRUE, array $params = NULL)
......@@ -206,8 +206,8 @@ class Kohana_Database_Query {
* Execute the current query on the given database.
*
* @param mixed $db Database instance or name of instance
* @param string result object classname, TRUE for stdClass or FALSE for array
* @param array result object constructor arguments
* @param string $as_object result object classname, TRUE for stdClass or FALSE for array
* @param array $object_params result object constructor arguments
* @return Database_RESULT Database_Result for SELECT queries
* @return mixed the insert id for INSERT queries
* @return integer number of affected rows for all other queries
......
......@@ -38,7 +38,6 @@ abstract class Kohana_Model_Database extends Model {
* $model = new Foo_Model($db);
*
* @param mixed $db Database instance object or string
* @return void
*/
public function __construct($db = NULL)
{
......
......@@ -30,17 +30,18 @@ class Kohana_View {
return new View($file, $data);
}
/**
* Captures the output that is generated when a view is included.
* The view data will be extracted to make local variables. This method
* is static to prevent object scope resolution.
*
* $output = View::capture($file, $data);
*
* @param string $kohana_view_filename filename
* @param array $kohana_view_data variables
* @return string
*/
/**
* Captures the output that is generated when a view is included.
* The view data will be extracted to make local variables. This method
* is static to prevent object scope resolution.
*
* $output = View::capture($file, $data);
*
* @param string $kohana_view_filename filename
* @param array $kohana_view_data variables
* @return string
* @throws Exception
*/
protected static function capture($kohana_view_filename, array $kohana_view_data)
{
// Import the view variables to local namespace
......@@ -127,7 +128,6 @@ class Kohana_View {
*
* @param string $file view filename
* @param array $data array of values
* @return void
* @uses View::set_filename
*/
public function __construct($file = NULL, array $data = NULL)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment