From 003ee5ecc31fa6670219244e9f6ac4c4f299930c Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sun, 15 Jul 2012 21:58:38 +0300 Subject: [PATCH] code formatting --- ipf/orm/import/schema.php | 6 +- ipf/project.php | 191 +++++++++++++++++++------------------- 2 files changed, 99 insertions(+), 98 deletions(-) diff --git a/ipf/orm/import/schema.php b/ipf/orm/import/schema.php index 10cdd65..dbb6c21 100644 --- a/ipf/orm/import/schema.php +++ b/ipf/orm/import/schema.php @@ -537,9 +537,9 @@ class IPF_ORM_Import_Schema $validation = array_flip($validation); foreach ($element as $key => $value) { if ( ! isset($validation[$value])) { - throw new IPF_ORM_Exception(sprintf('Invalid schema element named "' . $value . '" - at path "' . $path . '"')); + throw new IPF_ORM_Exception(sprintf('Invalid schema element named "' . $value . + '" at path "' . $path . '"')); } } } -} \ No newline at end of file +} diff --git a/ipf/project.php b/ipf/project.php index 15c221c..836fdee 100644 --- a/ipf/project.php +++ b/ipf/project.php @@ -1,135 +1,135 @@ apps[$appname] = null; + private function __construct(){ + $applist = IPF::get('applications'); + foreach( $applist as &$appname){ + if (!IPF_Utils::isValidName($appname)) + throw new IPF_Exception_Panic("Application name \"$name\" is incorrect"); + $this->apps[$appname] = null; } - } - - private function __clone(){ - } - - private function appClassName($name){ - return $name.'_App'; - } - - public function appList(){ - foreach($this->apps as $appName=>&$app){ - if ($app==null){ - $app = $this->getApp($appName); - } - } - return $this->apps; - } - - // Lazy Application Loader - public function getApp($name){ - if (!array_key_exists($name,$this->apps)) - throw new IPF_Exception_Panic("Application \"$name\" not found"); + } + + private function __clone(){ + } + + private function appClassName($name){ + return $name.'_App'; + } + + public function appList(){ + foreach($this->apps as $appName=>&$app){ + if ($app==null){ + $app = $this->getApp($appName); + } + } + return $this->apps; + } + + // Lazy Application Loader + public function getApp($name){ + if (!array_key_exists($name,$this->apps)) + throw new IPF_Exception_Panic("Application \"$name\" not found"); if ($this->apps[$name]==null){ $className = $this->appClassName($name); $this->apps[$name] = new $className(); } return $this->apps[$name]; - } + } - public function checkApps(){ - foreach( $this->apps as $appname=>&$app) - $this->getApp($appname); - } + public function checkApps(){ + foreach( $this->apps as $appname=>&$app) + $this->getApp($appname); + } - public function generateModels(){ + public function generateModels(){ IPF_ORM::generateModelsFromYaml( IPF::get('project_path').DIRECTORY_SEPARATOR.'models.yml', IPF::get('project_path').DIRECTORY_SEPARATOR.'models' ); - } - - public function generateContribModels(){ - foreach( $this->apps as $appname=>&$app){ - if (substr($appname,0,4)=='IPF_') - $this->getApp($appname)->generateModels(); - } - } - + } + + public function generateContribModels(){ + foreach( $this->apps as $appname=>&$app){ + if (substr($appname,0,4)=='IPF_') + $this->getApp($appname)->generateModels(); + } + } + public function createTablesFromModels(){ - foreach( $this->apps as $appname=>&$app){ - if (substr($appname,0,4)=='IPF_') - $this->getApp($appname)->createTablesFromModels(); - } + foreach( $this->apps as $appname=>&$app){ + if (substr($appname,0,4)=='IPF_') + $this->getApp($appname)->createTablesFromModels(); + } return IPF_ORM::createTablesFromModels(IPF::get('project_path').DIRECTORY_SEPARATOR.'models'); - } + } public function createPermissionsFromModels() { $pathes = array(); - foreach( $this->apps as $appname=>&$app) - { - if (substr($appname,0,4)=='IPF_') - $pathes[] = $this->getApp($appname)->getPath().'models'; - } - - $pathes[] = IPF::get('project_path').DIRECTORY_SEPARATOR.'models'; - + foreach( $this->apps as $appname=>&$app) + { + if (substr($appname,0,4)=='IPF_') + $pathes[] = $this->getApp($appname)->getPath().'models'; + } + + $pathes[] = IPF::get('project_path').DIRECTORY_SEPARATOR.'models'; + return IPF_Auth_App::createPermissionsFromModels($pathes); } - public function generateSql(){ - $sql = ''; - foreach( $this->apps as $appname=>&$app){ - if (substr($appname,0,4)=='IPF_') - $sql .= $this->getApp($appname)->generateSql()."\n"; - } - $sql .= IPF_ORM::generateSqlFromModels(IPF::get('project_path').DIRECTORY_SEPARATOR.'models')."\n"; - return $sql; - } + public function generateSql(){ + $sql = ''; + foreach( $this->apps as $appname=>&$app){ + if (substr($appname,0,4)=='IPF_') + $sql .= $this->getApp($appname)->generateSql()."\n"; + } + $sql .= IPF_ORM::generateSqlFromModels(IPF::get('project_path').DIRECTORY_SEPARATOR.'models')."\n"; + return $sql; + } public function loadModels(){ - foreach( $this->apps as $appname=>&$app){ - if (substr($appname,0,4)=='IPF_') - $this->getApp($appname)->loadModels(); - } - IPF_ORM::loadModels(IPF::get('project_path').DIRECTORY_SEPARATOR.'models'); - } - - private function cli(){ - $cli = new IPF_Cli(); - $cli->run(); - } - - public function run(){ - $dsn = IPF::get('dsn'); - if ($dsn=='') - throw new IPF_Exception_Panic('Specify dsn in config file'); + foreach( $this->apps as $appname=>&$app){ + if (substr($appname,0,4)=='IPF_') + $this->getApp($appname)->loadModels(); + } + IPF_ORM::loadModels(IPF::get('project_path').DIRECTORY_SEPARATOR.'models'); + } + + private function cli(){ + $cli = new IPF_Cli(); + $cli->run(); + } + + public function run(){ + $dsn = IPF::get('dsn'); + if ($dsn=='') + throw new IPF_Exception_Panic('Specify dsn in config file'); $conn = IPF_ORM_Manager::connection($dsn); - if (IPF::get('debug')){ + if (IPF::get('debug')){ $this->sqlProfiler = new IPF_ORM_Connection_Profiler(); IPF_ORM_Manager::getInstance()->getCurrentConnection()->setListener($this->sqlProfiler); } - if (php_sapi_name()=='cli'){ + if (php_sapi_name() == 'cli'){ $this->cli(); return true; } - if (php_sapi_name()=='cli-server'){ + if (php_sapi_name() == 'cli-server') { $path = $_SERVER['DOCUMENT_ROOT'] . $_SERVER["REQUEST_URI"]; if (is_file($path)) return false; @@ -139,5 +139,6 @@ final class IPF_Project{ $this->router = new IPF_Router(); $this->router->dispatch(IPF_HTTP_URL::getAction()); return true; - } + } } + -- 2.49.0