Changeset 1237
- Timestamp:
- 11/04/06 23:29:49 (2 years ago)
- Location:
- trunk/src
- Files:
-
- 13 modified
-
core/AgaviContext.class.php (modified) (6 diffs)
-
database/AgaviAdodbDatabase.class.php (modified) (1 diff)
-
database/AgaviCreoleDatabase.class.php (modified) (3 diffs)
-
database/AgaviDatabase.class.php (modified) (4 diffs)
-
database/AgaviDatabaseManager.class.php (modified) (3 diffs)
-
database/AgaviMysqlDatabase.class.php (modified) (1 diff)
-
database/AgaviPdoDatabase.class.php (modified) (2 diffs)
-
database/AgaviPostgresqlDatabase.class.php (modified) (2 diffs)
-
database/AgaviPropelDatabase.class.php (modified) (10 diffs)
-
exception/AgaviAutoloadException.class.php (modified) (1 diff)
-
exception/AgaviException.class.php (modified) (1 diff)
-
exception/AgaviFileException.class.php (modified) (1 diff)
-
exception/AgaviInitializationException.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/core/AgaviContext.class.php
r1063 r1237 123 123 protected function __construct() 124 124 { 125 // Singleton, use Context::getInstance($controller) to get the instance125 // Singleton, setting up the class happens in initialize() 126 126 } 127 127 … … 164 164 * @param name A database name. 165 165 * 166 * @return mixed A n AgaviDatabase instance.167 * 168 * @throws <b>AgaviDatabaseException</b> If the requested database name does169 * not exist.166 * @return mixed A database connection. 167 * 168 * @throws <b>AgaviDatabaseException</b> If the requested database name 169 * does not exist. 170 170 * 171 171 * @author Sean Kerr <skerr@mojavi.org> … … 195 195 * Retrieve the AgaviContext instance. 196 196 * 197 * @param string name corresponding to a section of the config 198 * 199 * @return AgaviContext instance of the requested name 197 * If you don't supply a profile name this will try to return the context 198 * specified in the <kbd>core.default_context</kbd> setting. 199 * 200 * @param string A name corresponding to a section of the config 201 * 202 * @return AgaviContext An context instance initialized with the 203 * settings of the requested context name 200 204 * 201 205 * @author Dominik del Bondio <ddb@bitxtender.com> … … 228 232 * Retrieve the LoggerManager 229 233 * 230 * @return AgaviLoggerManager The current LoggerManager implementation instance 234 * @return AgaviLoggerManager The current LoggerManager implementation 235 * instance. 231 236 * 232 237 * @author David Zuelke <dz@bitxtender.com> … … 241 246 * (re)Initialize the AgaviContext instance. 242 247 * 243 * @param string name corresponding to a section of the config248 * @param string A name corresponding to a section of the config 244 249 * 245 250 * @author Dominik del Bondio <ddb@bitxtender.com> … … 492 497 * Retrieve the ValidatorManager 493 498 * 494 * @return AgaviValidatorManager The current ValidatorManager implementation495 * i nstance.499 * @return AgaviValidatorManager The current ValidatorManager 500 * implementation instance. 496 501 * 497 502 * @author David Zuelke <dz@bitxtender.com> -
trunk/src/database/AgaviAdodbDatabase.class.php
r1063 r1237 145 145 * Load a DSN connection string from an existing array. 146 146 * 147 * @param array An array with the connection array at the 'dsn' index. 148 * @param string The connection parameter read method. 149 * 147 150 * @return array An associative array of connection parameters. 148 151 * -
trunk/src/database/AgaviCreoleDatabase.class.php
r1063 r1237 39 39 * # <b>compat_assoc_lower</b> - [Off] - Always lowercase the indexes of assoc 40 40 * arrays 41 * # <b>compat_rtrim_string</b> - [Off] - Trim whitepace from end of string column42 * types41 * # <b>compat_rtrim_string</b> - [Off] - Trim whitepace from end of string 42 * column types 43 43 * # <b>password</b> - [none] - The database password. 44 44 * # <b>persistent</b> - [No] - Indicates that the connection should … … 158 158 * Load a DSN connection string from an existing array. 159 159 * 160 * @param array An array containing the connection information. 161 * 160 162 * @return array An associative array of connection parameters. 161 163 * … … 192 194 * Execute the shutdown procedure. 193 195 * 194 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 196 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 195 197 * down this database. 196 198 * -
trunk/src/database/AgaviDatabase.class.php
r1171 r1237 36 36 37 37 /** 38 * @var mixed A database connection 38 * @var mixed A database connection. 39 39 */ 40 40 protected $connection = null; … … 78 78 * @return mixed A database connection. 79 79 * 80 * @throws <b>AgaviDatabaseException</b> If a connection could not be retrieved. 80 * @throws <b>AgaviDatabaseException</b> If a connection could not be 81 * retrieved. 81 82 * 82 83 * @author Sean Kerr <skerr@mojavi.org> … … 115 116 * Initialize this Database. 116 117 * 118 * @param AgaviDatabaseManager The database manager of this instance. 117 119 * @param array An associative array of initialization parameters. 118 120 * … … 133 135 * Execute the shutdown procedure. 134 136 * 135 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 137 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 136 138 * down this database. 137 139 * -
trunk/src/database/AgaviDatabaseManager.class.php
r1063 r1237 16 16 17 17 /** 18 * AgaviDatabaseManager allows you to setup your database connectivity before the19 * request is handled. This eliminates the need for a filter to manage database20 * connections.18 * AgaviDatabaseManager allows you to setup your database connectivity before 19 * the request is handled. This eliminates the need for a filter to manage 20 * database connections. 21 21 * 22 22 * @package agavi … … 81 81 * Initialize this DatabaseManager. 82 82 * 83 * @param AgaviContext An AgaviContext instance. 84 * @param array An array of initialization parameters. 85 * 83 86 * @throws <b>AgaviInitializationException</b> If an error occurs while 84 87 * initializing this … … 100 103 * Execute the shutdown procedure. 101 104 * 102 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 105 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 103 106 * down this DatabaseManager. 104 107 * -
trunk/src/database/AgaviMysqlDatabase.class.php
r1063 r1237 135 135 * Load connection parameters from an existing array. 136 136 * 137 * @param array An array containing the connection information. 138 * 137 139 * @return array An associative array of connection parameters. 138 140 * -
trunk/src/database/AgaviPdoDatabase.class.php
r1063 r1237 15 15 16 16 /** 17 * AgaviPdoDatabase provides connectivity for the PDO database abstraction layer. 17 * AgaviPdoDatabase provides connectivity for the PDO database abstraction 18 * layer. 18 19 * 19 20 * @package agavi … … 32 33 * Connect to the database. 33 34 * 34 * @throws <b>AgaviDatabaseException</b> If a connection could not be created 35 * @throws <b>AgaviDatabaseException</b> If a connection could not be 36 * created. 35 37 * 36 38 * @author Daniel Swarbrick (daniel@pressure.net.nz) -
trunk/src/database/AgaviPostgresqlDatabase.class.php
r1063 r1237 16 16 17 17 /** 18 * AgaviPostgresqlDatabase provides connectivity for the PostgreSQL brand database. 18 * AgaviPostgresqlDatabase provides connectivity for the PostgreSQL brand 19 * database. 19 20 * 20 21 * <b>Optional parameters:</b> … … 121 122 * Load connection parameters from an existing array. 122 123 * 124 * @param array An array containing the connection information. 125 * 123 126 * @return string A connection string. 124 127 * -
trunk/src/database/AgaviPropelDatabase.class.php
r1189 r1237 75 75 /** 76 76 * Stores whether a Propel configuration file path has been explicitly set 77 * as default for use with Propel::init() in database. ini77 * as default for use with Propel::init() in database.xml 78 78 * 79 79 * @var bool A flag indicating whether a default config path was set. … … 85 85 /** 86 86 * Returns the path to the config file that is passed to Propel::init() when 87 * PropelAutoload.php is used in autoload. ini87 * PropelAutoload.php is used in autoload.xml 88 88 * 89 89 * @return mixed The path if one has been set, otherwise null … … 99 99 /** 100 100 * Sets the path to the config file that is passed to Propel::init() when 101 * PropelAutoload.php is used in autoload. ini101 * PropelAutoload.php is used in autoload.xml 102 102 * 103 103 * @param string The path to the configuration file … … 117 117 /** 118 118 * Returns whether a Propel configuration file path has been explicitly set 119 * as default for use with Propel::init() in database. ini119 * as default for use with Propel::init() in database.xml 120 120 * 121 121 * @return bool true, if a Propel configuration file path has explicitely 122 * been set as default in database.ini, otherwise false122 * been set as default in database.ini, otherwise false 123 123 * 124 124 * @author David Zuelke <dz@bitxtender.com> … … 132 132 /** 133 133 * Sets a flag indicating a Propel configuration file path has been 134 * explicitly set as default for use with Propel::init() in database. ini134 * explicitly set as default for use with Propel::init() in database.xml 135 135 * 136 136 * @author David Zuelke <dz@bitxtender.com> … … 144 144 /** 145 145 * Connect to the database. 146 * This method is used only if param.use_autoloadis false146 * This method is used only if the <kbd>use_autoload</kbd> parameter is false 147 147 * 148 148 * … … 204 204 * @return mixed A database connection. 205 205 * 206 * @throws <b>AgaviDatabaseException</b> If a connection could not be retrieved. 206 * @throws <b>AgaviDatabaseException</b> If a connection could not be 207 * retrieved. 207 208 * 208 209 * @author Sean Kerr <skerr@mojavi.org> … … 241 242 * Load Propel config 242 243 * 244 * @param AgaviDatabaseManager The database manager of this instance. 243 245 * @param array An associative array of initialization parameters. 244 246 * … … 302 304 /** 303 305 * Get the path to the Propel config file for this connection which has been 304 * specified in databases. ini.306 * specified in databases.xml. 305 307 * 306 308 * @return string The path to the Propel configuration file … … 317 319 * Execute the shutdown procedure. 318 320 * 319 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 321 * @throws <b>AgaviDatabaseException</b> If an error occurs while shutting 320 322 * down this database. 321 323 * -
trunk/src/exception/AgaviAutoloadException.class.php
r549 r1237 16 16 17 17 /** 18 * AgaviAutoloadException is thrown when a class that has been required cannot be19 * loaded.18 * AgaviAutoloadException is thrown when a class that has been required cannot 19 * be loaded. 20 20 * 21 21 * @package agavi -
trunk/src/exception/AgaviException.class.php
r1063 r1237 35 35 * Print the stack trace for this exception. 36 36 * 37 * @param string The format you wish to use for printing. Options 38 * include: 39 * - html 40 * - plain 37 * @param Exception The original exception. 38 * @param AgaviContext The context instance. 39 * @param AgaviResponse The response instance. 41 40 * 42 41 * @author Sean Kerr <skerr@mojavi.org> -
trunk/src/exception/AgaviFileException.class.php
r549 r1237 16 16 17 17 /** 18 * AgaviFileException is thrown when an error occurs while moving an uploaded file. 18 * AgaviFileException is thrown when an error occurs while moving an uploaded 19 * file. 19 20 * 20 21 * @package agavi -
trunk/src/exception/AgaviInitializationException.class.php
r549 r1237 16 16 17 17 /** 18 * AgaviInitializationException is thrown when an initialization procedure fails. 18 * AgaviInitializationException is thrown when an initialization procedure 19 * fails. 19 20 * 20 21 * @package agavi

