From a070475bc3cdc505f7adeac154172229003ab9cd Mon Sep 17 00:00:00 2001 From: avl Date: Wed, 3 Sep 2008 19:58:31 +0300 Subject: [PATCH] const BASE_CLASSES_DIRECTORY --- ipf/orm.php | 4 ++-- ipf/orm/import/builder.php | 4 ++-- ipf/orm/import/schema.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ipf/orm.php b/ipf/orm.php index f728ac5..3b24720 100644 --- a/ipf/orm.php +++ b/ipf/orm.php @@ -246,9 +246,9 @@ final class IPF_ORM { try{ $it = new DirectoryIterator($directory.DIRECTORY_SEPARATOR.'_generated'); }catch(RuntimeException $e){ - return $loadedModels; + return $loadedModels; } - foreach ($it as $file) { + foreach ($it as $file) { $e = explode('.', $file->getFileName()); if (end($e) === 'php') { $className = $e[0]; diff --git a/ipf/orm/import/builder.php b/ipf/orm/import/builder.php index 2b996af..542594e 100644 --- a/ipf/orm/import/builder.php +++ b/ipf/orm/import/builder.php @@ -10,7 +10,7 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder protected $_generateBaseClasses = true; protected $_generateTableClasses = false; protected $_baseClassPrefix = 'Base'; - protected $_baseClassesDirectory = '_generated'; + protected $_baseClassesDirectory = IPF_ORM::BASE_CLASSES_DIRECTORY; protected $_baseClassName = 'IPF_ORM_Record'; protected $_generateAccessors = false; protected static $_tpl; @@ -79,7 +79,7 @@ class IPF_ORM_Import_Builder extends IPF_ORM_Builder return $this->_baseClassPrefix; } - public function setBaseClassesDirectory($baseClassesDirectory) + public function setbaseClassesDirectory($baseClassesDirectory) { $this->_baseClassesDirectory = $baseClassesDirectory; } diff --git a/ipf/orm/import/schema.php b/ipf/orm/import/schema.php index e44ac1c..10cdd65 100644 --- a/ipf/orm/import/schema.php +++ b/ipf/orm/import/schema.php @@ -12,7 +12,7 @@ class IPF_ORM_Import_Schema 'generateTableClasses' => false, 'generateAccessors' => false, 'baseClassesPrefix' => 'Base', - 'baseClassesDirectory' => '_generated', + 'baseClassesDirectory' => IPF_ORM::BASE_CLASSES_DIRECTORY, 'baseClassName' => 'IPF_ORM_Record'); protected $_validation = array('root' => array('abstract', -- 2.49.0