From 4fdaab35606ee600bcc95e4fb81cec3928d9f7a5 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Mon, 4 Mar 2013 08:03:46 -0500 Subject: [PATCH] updated file header. --- docs/code_style.md | 4 +- framework/YiiBase.php | 4 +- framework/base/Action.php | 4 +- framework/base/ActionEvent.php | 4 +- framework/base/Application.php | 4 +- framework/base/Behavior.php | 4 +- framework/base/Component.php | 4 +- framework/base/Controller.php | 4 +- framework/base/Dictionary.php | 4 +- framework/base/DictionaryIterator.php | 4 +- framework/base/ErrorException.php | 4 +- framework/base/ErrorHandler.php | 4 +- framework/base/Event.php | 4 +- framework/base/Exception.php | 4 +- framework/base/HttpException.php | 4 +- framework/base/InlineAction.php | 4 +- framework/base/InvalidCallException.php | 4 +- framework/base/InvalidConfigException.php | 4 +- framework/base/InvalidParamException.php | 4 +- framework/base/InvalidRequestException.php | 4 +- framework/base/InvalidRouteException.php | 4 +- framework/base/Model.php | 4 +- framework/base/ModelEvent.php | 4 +- framework/base/Module.php | 4 +- framework/base/NotSupportedException.php | 4 +- framework/base/Object.php | 4 +- framework/base/Request.php | 4 +- framework/base/Response.php | 4 +- framework/base/Theme.php | 4 +- framework/base/UnknownMethodException.php | 4 +- framework/base/UnknownPropertyException.php | 4 +- framework/base/UserException.php | 4 +- framework/base/Vector.php | 4 +- framework/base/VectorIterator.php | 4 +- framework/base/View.php | 4 +- framework/base/ViewRenderer.php | 4 +- framework/base/Widget.php | 4 +- framework/caching/ApcCache.php | 4 +- framework/caching/Cache.php | 4 +- framework/caching/ChainedDependency.php | 4 +- framework/caching/DbCache.php | 4 +- framework/caching/DbDependency.php | 4 +- framework/caching/Dependency.php | 4 +- framework/caching/DummyCache.php | 4 +- framework/caching/ExpressionDependency.php | 4 +- framework/caching/FileCache.php | 4 +- framework/caching/FileDependency.php | 4 +- framework/caching/MemCache.php | 4 +- framework/caching/MemCacheServer.php | 4 +- framework/caching/WinCache.php | 4 +- framework/caching/XCache.php | 4 +- framework/caching/ZendDataCache.php | 4 +- framework/console/Application.php | 2 +- framework/console/Controller.php | 4 +- framework/console/Exception.php | 4 +- framework/console/Request.php | 4 +- framework/console/controllers/AppController.php | 4 +- framework/console/controllers/CacheController.php | 4 +- framework/console/controllers/HelpController.php | 4 +- .../console/controllers/MessageController.php | 4 +- .../console/controllers/MigrateController.php | 4 +- framework/db/ActiveQuery.php | 4 +- framework/db/ActiveRecord.php | 4 +- framework/db/ActiveRelation.php | 4 +- framework/db/ColumnSchema.php | 4 +- framework/db/Command.php | 4 +- framework/db/Connection.php | 4 +- framework/db/DataReader.php | 4 +- framework/db/Exception.php | 4 +- framework/db/Expression.php | 4 +- framework/db/Migration.php | 4 +- framework/db/Query.php | 4 +- framework/db/QueryBuilder.php | 4 +- framework/db/Schema.php | 4 +- framework/db/TableSchema.php | 2 - framework/db/Transaction.php | 4 +- framework/db/mysql/QueryBuilder.php | 4 +- framework/db/mysql/Schema.php | 4 +- framework/db/sqlite/QueryBuilder.php | 4 +- framework/db/sqlite/Schema.php | 4 +- framework/i18n/MessageSource.php | 4 +- framework/i18n/MissingTranslationEvent.php | 4 +- framework/i18n/PhpMessageSource.php | 4 +- framework/logging/DbTarget.php | 4 +- framework/logging/EmailTarget.php | 4 +- framework/logging/FileTarget.php | 4 +- framework/logging/Logger.php | 4 +- framework/logging/ProfileTarget.php | 2 - framework/logging/Router.php | 4 +- framework/logging/Target.php | 4 +- framework/logging/WebTarget.php | 2 - framework/test/TestCase.php | 2 +- framework/util/ArrayHelper.php | 4 +- framework/util/ConsoleColor.php | 4 +- framework/util/FileHelper.php | 2 +- framework/util/SecurityHelper.php | 4 +- framework/util/StringHelper.php | 4 +- framework/util/VarDumper.php | 2 - framework/util/mimeTypes.php | 2 +- framework/validators/BooleanValidator.php | 4 +- framework/validators/CaptchaValidator.php | 4 +- framework/validators/CompareValidator.php | 4 +- framework/validators/DateValidator.php | 4 +- framework/validators/DefaultValueValidator.php | 4 +- framework/validators/EmailValidator.php | 4 +- framework/validators/ExistValidator.php | 4 +- framework/validators/FileValidator.php | 4 +- framework/validators/FilterValidator.php | 4 +- framework/validators/InlineValidator.php | 4 +- framework/validators/NumberValidator.php | 4 +- framework/validators/RangeValidator.php | 4 +- .../validators/RegularExpressionValidator.php | 4 +- framework/validators/RequiredValidator.php | 4 +- framework/validators/StringValidator.php | 4 +- framework/validators/UniqueValidator.php | 4 +- framework/validators/UrlValidator.php | 4 +- framework/validators/Validator.php | 4 +- framework/web/Application.php | 4 +- framework/web/AssetManager.php | 2 - framework/web/CacheSession.php | 4 +- framework/web/Controller.php | 4 +- framework/web/Cookie.php | 4 +- framework/web/CookieCollection.php | 4 +- framework/web/DbSession.php | 4 +- framework/web/Pagination.php | 2 - framework/web/Request.php | 4 +- framework/web/Response.php | 4 +- framework/web/Session.php | 4 +- framework/web/SessionIterator.php | 4 +- framework/web/Sort.php | 2 - framework/web/Theme.php | 141 --------------------- framework/web/UrlManager.php | 4 +- framework/web/UrlRule.php | 4 +- framework/yii.php | 2 +- framework/yiic | 2 +- framework/yiic.php | 2 +- tests/unit/data/ar/ActiveRecord.php | 4 +- 137 files changed, 129 insertions(+), 528 deletions(-) delete mode 100644 framework/web/Theme.php diff --git a/docs/code_style.md b/docs/code_style.md index dfa475e..fcf643d 100644 --- a/docs/code_style.md +++ b/docs/code_style.md @@ -251,10 +251,8 @@ switch ($this->phpType) { ~~~ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php index 59dcb3f..aec198c 100644 --- a/framework/console/controllers/MigrateController.php +++ b/framework/console/controllers/MigrateController.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php index de56e14..43c3059 100644 --- a/framework/db/ActiveQuery.php +++ b/framework/db/ActiveQuery.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php index 9ec1fac..aaa9200 100644 --- a/framework/db/ActiveRecord.php +++ b/framework/db/ActiveRecord.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveRelation.php b/framework/db/ActiveRelation.php index 54c6c62..e1793bd 100644 --- a/framework/db/ActiveRelation.php +++ b/framework/db/ActiveRelation.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ColumnSchema.php b/framework/db/ColumnSchema.php index 44e6cb0..ffdafd4 100644 --- a/framework/db/ColumnSchema.php +++ b/framework/db/ColumnSchema.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/util/mimeTypes.php b/framework/util/mimeTypes.php index 87295f8..ffdba4b 100644 --- a/framework/util/mimeTypes.php +++ b/framework/util/mimeTypes.php @@ -6,7 +6,7 @@ * according to file extension names. * * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ * @since 2.0 */ diff --git a/framework/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php index acf79be..427fa44 100644 --- a/framework/validators/BooleanValidator.php +++ b/framework/validators/BooleanValidator.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/CacheSession.php b/framework/web/CacheSession.php index 23938f3..25524a0 100644 --- a/framework/web/CacheSession.php +++ b/framework/web/CacheSession.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/Request.php b/framework/web/Request.php index a4a1fb9..65a7f30 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/Theme.php b/framework/web/Theme.php deleted file mode 100644 index 22fe608..0000000 --- a/framework/web/Theme.php +++ /dev/null @@ -1,141 +0,0 @@ - - * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008-2011 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -/** - * CTheme represents an application theme. - * - * @property string $name Theme name. - * @property string $baseUrl The relative URL to the theme folder (without ending slash). - * @property string $basePath The file path to the theme folder. - * @property string $viewPath The path for controller views. Defaults to 'ThemeRoot/views'. - * @property string $systemViewPath The path for system views. Defaults to 'ThemeRoot/views/system'. - * @property string $skinPath The path for widget skins. Defaults to 'ThemeRoot/views/skins'. - * - * @author Qiang Xue - * @version $Id$ - * @package system.web - * @since 1.0 - */ -class CTheme extends CComponent -{ - private $_name; - private $_basePath; - private $_baseUrl; - - /** - * Constructor. - * @param string $name name of the theme - * @param string $basePath base theme path - * @param string $baseUrl base theme URL - */ - public function __construct($name,$basePath,$baseUrl) - { - $this->_name=$name; - $this->_baseUrl=$baseUrl; - $this->_basePath=$basePath; - } - - /** - * @return string theme name - */ - public function getName() - { - return $this->_name; - } - - /** - * @return string the relative URL to the theme folder (without ending slash) - */ - public function getBaseUrl() - { - return $this->_baseUrl; - } - - /** - * @return string the file path to the theme folder - */ - public function getBasePath() - { - return $this->_basePath; - } - - /** - * @return string the path for controller views. Defaults to 'ThemeRoot/views'. - */ - public function getViewPath() - { - return $this->_basePath.DIRECTORY_SEPARATOR.'views'; - } - - /** - * @return string the path for system views. Defaults to 'ThemeRoot/views/system'. - */ - public function getSystemViewPath() - { - return $this->getViewPath().DIRECTORY_SEPARATOR.'system'; - } - - /** - * @return string the path for widget skins. Defaults to 'ThemeRoot/views/skins'. - * @since 1.1 - */ - public function getSkinPath() - { - return $this->getViewPath().DIRECTORY_SEPARATOR.'skins'; - } - - /** - * Finds the view file for the specified controller's view. - * @param CController $controller the controller - * @param string $viewName the view name - * @return string the view file path. False if the file does not exist. - */ - public function getViewFile($controller,$viewName) - { - $moduleViewPath=$this->getViewPath(); - if(($module=$controller->getModule())!==null) - $moduleViewPath.='/'.$module->getId(); - return $controller->resolveViewFile($viewName,$this->getViewPath().'/'.$controller->getUniqueId(),$this->getViewPath(),$moduleViewPath); - } - - /** - * Finds the layout file for the specified controller's layout. - * @param CController $controller the controller - * @param string $layoutName the layout name - * @return string the layout file path. False if the file does not exist. - */ - public function getLayoutFile($controller,$layoutName) - { - $moduleViewPath=$basePath=$this->getViewPath(); - $module=$controller->getModule(); - if(empty($layoutName)) - { - while($module!==null) - { - if($module->layout===false) - return false; - if(!empty($module->layout)) - break; - $module=$module->getParentModule(); - } - if($module===null) - $layoutName=\Yii::$app->layout; - else - { - $layoutName=$module->layout; - $moduleViewPath.='/'.$module->getId(); - } - } - else if($module!==null) - $moduleViewPath.='/'.$module->getId(); - - return $controller->resolveViewFile($layoutName,$moduleViewPath.'/layouts',$basePath,$moduleViewPath); - } -} diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php index 8849d7e..e736cc6 100644 --- a/framework/web/UrlManager.php +++ b/framework/web/UrlManager.php @@ -1,9 +1,7 @@