diff --git a/dibi/dibi.php b/dibi/dibi.php index 84a59ef1..ea6f0e25 100644 --- a/dibi/dibi.php +++ b/dibi/dibi.php @@ -111,6 +111,13 @@ class dibi VERSION = '0.9', REVISION = '$WCREV$ released on $WCDATE$'; + /** + * Configuration options + */ + const + RESULT_WITH_TABLES = 'resultWithTables', + RESULT_OBJECTS = 'resultObjects', + RESULT_CLASS = 'resultClass'; /** * Connection registry storage for DibiConnection objects. diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php index c9afb673..8fcfe91b 100644 --- a/dibi/libs/DibiConnection.php +++ b/dibi/libs/DibiConnection.php @@ -100,25 +100,25 @@ class DibiConnection extends DibiObject } if (isset($config['result:withtables'])) { - $config['resultWithTables'] = $config['result:withtables']; + $config[dibi::RESULT_WITH_TABLES] = $config['result:withtables']; unset($config['result:withtables']); } if (isset($config['result:objects'])) { - $config['resultObjects'] = $config['result:objects']; + $config[dibi::RESULT_OBJECTS] = $config['result:objects']; unset($config['result:objects']); } - if (isset($config['resultObjects'])) { // normalize - $val = $config['resultObjects']; - $config['resultObjects'] = is_string($val) && !is_numeric($val) ? $val : (bool) $val; + if (isset($config[dibi::RESULT_OBJECTS])) { // normalize + $val = $config[dibi::RESULT_OBJECTS]; + $config[dibi::RESULT_OBJECTS] = is_string($val) && !is_numeric($val) ? $val : (bool) $val; } - if (isset($config['resultClass'])) { - if (strcasecmp($config['resultClass'], 'DibiResult') && !is_subclass_of($config['resultClass'], 'DibiResult')) { + if (isset($config[dibi::RESULT_CLASS])) { + if (strcasecmp($config[dibi::RESULT_CLASS], 'DibiResult') && !is_subclass_of($config[dibi::RESULT_CLASS], 'DibiResult')) { throw new InvalidArgumentException("Class '$config[resultClass]' is not DibiResult descendant."); } - $this->resultClass = $config['resultClass']; + $this->resultClass = $config[dibi::RESULT_CLASS]; } $config['name'] = $name; diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php index 50f4ac0f..1814feb6 100644 --- a/dibi/libs/DibiResult.php +++ b/dibi/libs/DibiResult.php @@ -89,12 +89,12 @@ class DibiResult extends DibiObject implements IDataSource { $this->driver = $driver; - if (!empty($config['resultWithTables'])) { + if (!empty($config[dibi::RESULT_WITH_TABLES])) { $this->setWithTables(TRUE); } - if (isset($config['resultObjects'])) { - $this->setObjects($config['resultObjects']); + if (isset($config[dibi::RESULT_OBJECTS])) { + $this->setObjects($config[dibi::RESULT_OBJECTS]); } } diff --git a/dibi/libs/DibiTable.php b/dibi/libs/DibiTable.php index 90c0bee9..1a72685a 100644 --- a/dibi/libs/DibiTable.php +++ b/dibi/libs/DibiTable.php @@ -297,7 +297,7 @@ abstract class DibiTable extends DibiObject $row = $this->blankRow; $row[$this->primary] = NULL; - if ($class = $this->connection->getConfig('resultObjects')) { + if ($class = $this->connection->getConfig(dibi::RESULT_OBJECTS)) { if ($class === TRUE) { $row = (object) $row; } else {