From 606874e9a883ae547df198498fce6fca7b735466 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 10 Aug 2015 19:50:41 +0200 Subject: Fix TProperyValue::ensureEnum and some unit tests class names --- framework/Data/ActiveRecord/TActiveRecord.php | 2 +- framework/Data/ActiveRecord/TActiveRecordConfig.php | 2 +- framework/Data/ActiveRecord/TActiveRecordManager.php | 2 +- framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php | 10 +++++----- framework/Data/SqlMap/DataMapper/TPropertyAccess.php | 2 ++ framework/Data/TDbConnection.php | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'framework/Data') diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php index 38f8ef29..d8337b7a 100644 --- a/framework/Data/ActiveRecord/TActiveRecord.php +++ b/framework/Data/ActiveRecord/TActiveRecord.php @@ -880,7 +880,7 @@ abstract class TActiveRecord extends \Prado\TComponent if($value === null) $this->_invalidFinderResult = null; else - $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult'); + $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult'); } /** diff --git a/framework/Data/ActiveRecord/TActiveRecordConfig.php b/framework/Data/ActiveRecord/TActiveRecordConfig.php index fc9b5f89..03fb2b5e 100644 --- a/framework/Data/ActiveRecord/TActiveRecordConfig.php +++ b/framework/Data/ActiveRecord/TActiveRecordConfig.php @@ -198,6 +198,6 @@ class TActiveRecordConfig extends TDataSourceConfig */ public function setInvalidFinderResult($value) { - $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult'); + $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult'); } } diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php index 11ffa047..0a27e873 100644 --- a/framework/Data/ActiveRecord/TActiveRecordManager.php +++ b/framework/Data/ActiveRecord/TActiveRecordManager.php @@ -158,6 +158,6 @@ class TActiveRecordManager extends \Prado\TComponent */ public function setInvalidFinderResult($value) { - $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult'); + $this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult'); } } diff --git a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php index 264997c0..b860659b 100644 --- a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php +++ b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php @@ -83,7 +83,7 @@ class TSqlMapCacheModel extends \Prado\TComponent if (isset(self::$_cacheTypes[$value])) $this->_implementation = $value; else - $this->_implementation = TPropertyValue::ensureEnum($value,'TSqlMapCacheTypes'); + $this->_implementation = TPropertyValue::ensureEnum($value,'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes'); } /** @@ -122,11 +122,11 @@ class TSqlMapCacheModel extends \Prado\TComponent $implementation = $this->_implementation; if (isset(self::$_cacheTypes[$implementation])) return self::$_cacheTypes[$implementation]; - switch(TPropertyValue::ensureEnum($implementation,'TSqlMapCacheTypes')) + switch(TPropertyValue::ensureEnum($implementation,'Prado\\Data\\SqlMap\\Configuration\\TSqlMapCacheTypes')) { - case TSqlMapCacheTypes::FIFO: return 'TSqlMapFifoCache'; - case TSqlMapCacheTypes::LRU : return 'TSqlMapLruCache'; - case TSqlMapCacheTypes::Basic : return 'TSqlMapApplicationCache'; + case TSqlMapCacheTypes::FIFO: return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapFifoCache'; + case TSqlMapCacheTypes::LRU : return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapLruCache'; + case TSqlMapCacheTypes::Basic : return '\\Prado\\Data\\SqlMap\\DataMapper\\TSqlMapApplicationCache'; } } diff --git a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php index 666f105b..0b57fcc3 100644 --- a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php +++ b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php @@ -11,6 +11,8 @@ namespace Prado\Data\SqlMap\DataMapper; +use Prado\Exceptions\TInvalidDataValueException; + /** * TPropertyAccess class provides dot notation stype property access and setting. * diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php index 4a46daa3..3dcef603 100644 --- a/framework/Data/TDbConnection.php +++ b/framework/Data/TDbConnection.php @@ -465,7 +465,7 @@ class TDbConnection extends \Prado\TComponent */ public function setColumnCase($value) { - switch(TPropertyValue::ensureEnum($value,'TDbColumnCaseMode')) + switch(TPropertyValue::ensureEnum($value,'Prado\\Data\\TDbColumnCaseMode')) { case TDbColumnCaseMode::Preserved: $value=PDO::CASE_NATURAL; @@ -501,7 +501,7 @@ class TDbConnection extends \Prado\TComponent */ public function setNullConversion($value) { - switch(TPropertyValue::ensureEnum($value,'TDbNullConversionMode')) + switch(TPropertyValue::ensureEnum($value,'Prado\\Data\\TDbNullConversionMode')) { case TDbNullConversionMode::Preserved: $value=PDO::NULL_NATURAL; -- cgit v1.2.3