mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-04 21:28:02 +02:00
Code Issues Releases Wiki Activity

renamed DibiLazyStorage to DibiHashMap

Browse Source
This commit is contained in:
David Grudl
2011-01-25 18:00:29 +01:00
parent 1ada6fab97
commit 9c52b8ea9d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dibi/dibi.php
View File

@@ -66,7 +66,7 @@ class DibiPcreException extends Exception {
require_once dirname(__FILE__) . '/libs/interfaces.php'; require_once dirname(__FILE__) . '/libs/interfaces.php';
require_once dirname(__FILE__) . '/libs/DibiDateTime.php'; require_once dirname(__FILE__) . '/libs/DibiDateTime.php';
require_once dirname(__FILE__) . '/libs/DibiObject.php'; require_once dirname(__FILE__) . '/libs/DibiObject.php';
require_once dirname(__FILE__) . '/libs/DibiLazyStorage.php'; require_once dirname(__FILE__) . '/libs/DibiHashMap.php';
require_once dirname(__FILE__) . '/libs/DibiException.php'; require_once dirname(__FILE__) . '/libs/DibiException.php';
require_once dirname(__FILE__) . '/libs/DibiConnection.php'; require_once dirname(__FILE__) . '/libs/DibiConnection.php';
require_once dirname(__FILE__) . '/libs/DibiResult.php'; require_once dirname(__FILE__) . '/libs/DibiResult.php';
@@ -612,7 +612,7 @@ class dibi
/** /**
* Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes(). * Returns substitution hashmap - Monostate for DibiConnection::getSubstitutes().
* @return DibiLazyStorage * @return DibiHashMap
*/ */
public static function getSubstitutes() public static function getSubstitutes()
{ {

6
dibi/libs/DibiConnection.php
View File

@@ -42,7 +42,7 @@ class DibiConnection extends DibiObject
/** @var bool Is connected? */ /** @var bool Is connected? */
private $connected = FALSE; private $connected = FALSE;
/** @var DibiLazyStorage Substitutes for identifiers */ /** @var DibiHashMap Substitutes for identifiers */
private $substitutes; private $substitutes;
@@ -122,7 +122,7 @@ class DibiConnection extends DibiObject
$this->setProfiler(new $class($profilerCfg)); $this->setProfiler(new $class($profilerCfg));
} }
$this->substitutes = new DibiLazyStorage(create_function('$expr', 'return ":$expr:";')); $this->substitutes = new DibiHashMap(create_function('$expr', 'return ":$expr:";'));
if (!empty($config['substitutes'])) { if (!empty($config['substitutes'])) {
foreach ($config['substitutes'] as $key => $value) { foreach ($config['substitutes'] as $key => $value) {
$this->substitutes->$key = $value; $this->substitutes->$key = $value;
@@ -582,7 +582,7 @@ class DibiConnection extends DibiObject
/** /**
* Returns substitution hashmap. * Returns substitution hashmap.
* @return DibiLazyStorage * @return DibiHashMap
*/ */
public function getSubstitutes() public function getSubstitutes()
{ {

2
dibi/libs/DibiDatabaseInfo.php
View File

@@ -532,7 +532,7 @@ class DibiColumnInfo extends DibiObject
public function getType() public function getType()
{ {
if (self::$types === NULL) { if (self::$types === NULL) {
self::$types = new DibiLazyStorage(array(__CLASS__, 'detectType')); self::$types = new DibiHashMap(array(__CLASS__, 'detectType'));
} }
return self::$types->{$this->info['nativetype']}; return self::$types->{$this->info['nativetype']};
} }

4
dibi/libs/DibiFluent.php
View File

@@ -94,7 +94,7 @@ class DibiFluent extends DibiObject implements IDataSource
/** @var array */ /** @var array */
private $cursor; private $cursor;
/** @var DibiLazyStorage normalized clauses */ /** @var DibiHashMap normalized clauses */
private static $normalizer; private static $normalizer;
@@ -107,7 +107,7 @@ class DibiFluent extends DibiObject implements IDataSource
$this->connection = $connection; $this->connection = $connection;
if (self::$normalizer === NULL) { if (self::$normalizer === NULL) {
self::$normalizer = new DibiLazyStorage(array(__CLASS__, '_formatClause')); self::$normalizer = new DibiHashMap(array(__CLASS__, '_formatClause'));
} }
} }

4
dibi/libs/DibiLazyStorage.php → dibi/libs/DibiHashMap.php
View File

@@ -18,7 +18,7 @@
* @author David Grudl * @author David Grudl
* @internal * @internal
*/ */
abstract class DibiLazyStorageBase abstract class DibiHashMapBase
{ {
private $callback; private $callback;
@@ -50,7 +50,7 @@ abstract class DibiLazyStorageBase
final class DibiLazyStorage extends DibiLazyStorageBase final class DibiHashMap extends DibiHashMapBase
{ {
public function __set($nm, $val) public function __set($nm, $val)

4
dibi/libs/DibiTranslator.php
View File

@@ -49,7 +49,7 @@ final class DibiTranslator extends DibiObject
/** @var int */ /** @var int */
private $offset; private $offset;
/** @var DibiLazyStorage */ /** @var DibiHashMap */
private $identifiers; private $identifiers;
@@ -69,7 +69,7 @@ final class DibiTranslator extends DibiObject
*/ */
public function translate(array $args) public function translate(array $args)
{ {
$this->identifiers = new DibiLazyStorage(array($this, 'delimite')); $this->identifiers = new DibiHashMap(array($this, 'delimite'));
$this->driver = $this->connection->getDriver(); $this->driver = $this->connection->getDriver();
$args = array_values($args); $args = array_values($args);