From 51e71cbb328006c5a17b858d6e4a39825d2d876a Mon Sep 17 00:00:00 2001 From: dp Date: Tue, 17 Mar 2015 20:02:13 +0300 Subject: [PATCH] some fixes --- Source/Ice/Class/Generator.php | 4 +--- Source/Ice/Code/Generator/Action.php | 4 +--- Source/Ice/Code/Generator/Model.php | 4 +--- Source/Ice/Code/Generator/Validator.php | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Source/Ice/Class/Generator.php b/Source/Ice/Class/Generator.php index 1254d8f5..d3ed8425 100644 --- a/Source/Ice/Class/Generator.php +++ b/Source/Ice/Class/Generator.php @@ -45,9 +45,7 @@ public function generate($data) { $namespace = Object::getNamespace($this->_baseClass, $this->_class); - $module = Module::getInstance(Object::getModuleAlias($this->_class)); - - $path = $module->get(Module::SOURCE_DIR); + $path = Module::SOURCE_DIR; if ($namespace) { $path .= 'Model/'; diff --git a/Source/Ice/Code/Generator/Action.php b/Source/Ice/Code/Generator/Action.php index 4e00e078..5e0e1e4c 100644 --- a/Source/Ice/Code/Generator/Action.php +++ b/Source/Ice/Code/Generator/Action.php @@ -51,9 +51,7 @@ public function generate($class, $data, $force = false) // $class = Object::getClass(Action::getClass(), $data); $namespace = Object::getNamespace(Action::getClass(), $class); - $module = Module::getInstance(Object::getModuleAlias($this->_class)); - - $path = $module->get(Module::SOURCE_DIR); + $path = Module::SOURCE_DIR; if ($namespace) { $path .= 'Class/'; diff --git a/Source/Ice/Code/Generator/Model.php b/Source/Ice/Code/Generator/Model.php index 4127a450..a6757713 100644 --- a/Source/Ice/Code/Generator/Model.php +++ b/Source/Ice/Code/Generator/Model.php @@ -55,9 +55,7 @@ public function generate($class, $data, $force = false) $fieldNames = Arrays::column($data['columns'], 'fieldName'); - $module = Module::getInstance(Object::getModuleAlias($class)); - - $path = $module->get(Module::SOURCE_DIR); + $path = Module::SOURCE_DIR; if ($namespace) { $path .= 'Model/'; diff --git a/Source/Ice/Code/Generator/Validator.php b/Source/Ice/Code/Generator/Validator.php index eded8a72..8ace8988 100644 --- a/Source/Ice/Code/Generator/Validator.php +++ b/Source/Ice/Code/Generator/Validator.php @@ -53,9 +53,7 @@ public function generate($class, $data, $force = false) // $class = Object::getClass(Core_Validator::getClass(), $data); $namespace = Object::getNamespace(Core_Validator::getClass(), $class); - $module = Module::getInstance(Object::getModuleAlias($class)); - - $path = $module->get(Module::SOURCE_DIR); + $path = Module::SOURCE_DIR; if ($namespace) { $path .= 'Class/';