Moved "framework" to "iii".

pixelandtonic · May 9, 2013 · 0d814fa · 0d814fa
1 parent 15e1a79
commit 0d814fa
Show file tree

Hide file tree

Showing 202 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@ nbproject
 Thumbs.db
 
 # composer vendor dir
-/framework/vendor
+/yii/vendor
diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
@@ -2,7 +2,7 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-$frameworkPath = __DIR__ . '/../../framework';
+$frameworkPath = __DIR__ . '/../../yii';
 
 require($frameworkPath . '/Yii.php');
 // Register Composer autoloader

diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
@@ -5,7 +5,7 @@
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-require_once(__DIR__ . '/../../framework/Yii.php');
+require_once(__DIR__ . '/../../yii/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);
 

diff --git a/tests/web/app/index.php b/tests/web/app/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require(__DIR__ . '/../../../framework/Yii.php');
+require(__DIR__ . '/../../../yii/Yii.php');
 
 $application = new yii\web\Application('test', __DIR__ . '/protected');
 $application->run();
diff --git a/framework/.htaccess → yii/.htaccess b/framework/.htaccess → yii/.htaccess
diff --git a/framework/Yii.php → yii/Yii.php b/framework/Yii.php → yii/Yii.php
diff --git a/framework/YiiBase.php → yii/YiiBase.php b/framework/YiiBase.php → yii/YiiBase.php
diff --git a/framework/assets.php → yii/assets.php b/framework/assets.php → yii/assets.php
diff --git a/framework/assets/jquery.min.js → yii/assets/jquery.min.js b/framework/assets/jquery.min.js → yii/assets/jquery.min.js
diff --git a/framework/assets/yii.activeForm.js → yii/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js → yii/assets/yii.activeForm.js
diff --git a/framework/assets/yii.captcha.js → yii/assets/yii.captcha.js b/framework/assets/yii.captcha.js → yii/assets/yii.captcha.js
diff --git a/framework/assets/yii.debug.js → yii/assets/yii.debug.js b/framework/assets/yii.debug.js → yii/assets/yii.debug.js
diff --git a/framework/assets/yii.js → yii/assets/yii.js b/framework/assets/yii.js → yii/assets/yii.js
diff --git a/framework/assets/yii.validation.js → yii/assets/yii.validation.js b/framework/assets/yii.validation.js → yii/assets/yii.validation.js
diff --git a/framework/base/Action.php → yii/base/Action.php b/framework/base/Action.php → yii/base/Action.php
diff --git a/framework/base/ActionEvent.php → yii/base/ActionEvent.php b/framework/base/ActionEvent.php → yii/base/ActionEvent.php
diff --git a/framework/base/ActionFilter.php → yii/base/ActionFilter.php b/framework/base/ActionFilter.php → yii/base/ActionFilter.php
diff --git a/framework/base/Application.php → yii/base/Application.php b/framework/base/Application.php → yii/base/Application.php
diff --git a/framework/base/Behavior.php → yii/base/Behavior.php b/framework/base/Behavior.php → yii/base/Behavior.php
diff --git a/framework/base/Component.php → yii/base/Component.php b/framework/base/Component.php → yii/base/Component.php
diff --git a/framework/base/Controller.php → yii/base/Controller.php b/framework/base/Controller.php → yii/base/Controller.php
diff --git a/framework/base/Dictionary.php → yii/base/Dictionary.php b/framework/base/Dictionary.php → yii/base/Dictionary.php
diff --git a/framework/base/DictionaryIterator.php → yii/base/DictionaryIterator.php b/framework/base/DictionaryIterator.php → yii/base/DictionaryIterator.php
diff --git a/framework/base/ErrorException.php → yii/base/ErrorException.php b/framework/base/ErrorException.php → yii/base/ErrorException.php
diff --git a/framework/base/ErrorHandler.php → yii/base/ErrorHandler.php b/framework/base/ErrorHandler.php → yii/base/ErrorHandler.php
diff --git a/framework/base/Event.php → yii/base/Event.php b/framework/base/Event.php → yii/base/Event.php
diff --git a/framework/base/Exception.php → yii/base/Exception.php b/framework/base/Exception.php → yii/base/Exception.php
diff --git a/framework/base/HttpException.php → yii/base/HttpException.php b/framework/base/HttpException.php → yii/base/HttpException.php
diff --git a/framework/base/InlineAction.php → yii/base/InlineAction.php b/framework/base/InlineAction.php → yii/base/InlineAction.php
diff --git a/framework/base/InvalidCallException.php → yii/base/InvalidCallException.php b/framework/base/InvalidCallException.php → yii/base/InvalidCallException.php
diff --git a/framework/base/InvalidConfigException.php → yii/base/InvalidConfigException.php b/framework/base/InvalidConfigException.php → yii/base/InvalidConfigException.php
diff --git a/framework/base/InvalidParamException.php → yii/base/InvalidParamException.php b/framework/base/InvalidParamException.php → yii/base/InvalidParamException.php
diff --git a/framework/base/InvalidRequestException.php → yii/base/InvalidRequestException.php b/framework/base/InvalidRequestException.php → yii/base/InvalidRequestException.php
diff --git a/framework/base/InvalidRouteException.php → yii/base/InvalidRouteException.php b/framework/base/InvalidRouteException.php → yii/base/InvalidRouteException.php
diff --git a/framework/base/Model.php → yii/base/Model.php b/framework/base/Model.php → yii/base/Model.php
diff --git a/framework/base/ModelEvent.php → yii/base/ModelEvent.php b/framework/base/ModelEvent.php → yii/base/ModelEvent.php
diff --git a/framework/base/Module.php → yii/base/Module.php b/framework/base/Module.php → yii/base/Module.php
diff --git a/framework/base/NotSupportedException.php → yii/base/NotSupportedException.php b/framework/base/NotSupportedException.php → yii/base/NotSupportedException.php
diff --git a/framework/base/Object.php → yii/base/Object.php b/framework/base/Object.php → yii/base/Object.php
diff --git a/framework/base/Request.php → yii/base/Request.php b/framework/base/Request.php → yii/base/Request.php
diff --git a/framework/base/Response.php → yii/base/Response.php b/framework/base/Response.php → yii/base/Response.php
diff --git a/framework/base/Theme.php → yii/base/Theme.php b/framework/base/Theme.php → yii/base/Theme.php
diff --git a/framework/base/UnknownClassException.php → yii/base/UnknownClassException.php b/framework/base/UnknownClassException.php → yii/base/UnknownClassException.php
diff --git a/framework/base/UnknownMethodException.php → yii/base/UnknownMethodException.php b/framework/base/UnknownMethodException.php → yii/base/UnknownMethodException.php
diff --git a/framework/base/UnknownPropertyException.php → yii/base/UnknownPropertyException.php b/framework/base/UnknownPropertyException.php → yii/base/UnknownPropertyException.php
diff --git a/framework/base/UserException.php → yii/base/UserException.php b/framework/base/UserException.php → yii/base/UserException.php
diff --git a/framework/base/Vector.php → yii/base/Vector.php b/framework/base/Vector.php → yii/base/Vector.php
diff --git a/framework/base/VectorIterator.php → yii/base/VectorIterator.php b/framework/base/VectorIterator.php → yii/base/VectorIterator.php
diff --git a/framework/base/View.php → yii/base/View.php b/framework/base/View.php → yii/base/View.php
diff --git a/framework/base/ViewEvent.php → yii/base/ViewEvent.php b/framework/base/ViewEvent.php → yii/base/ViewEvent.php
diff --git a/framework/base/ViewRenderer.php → yii/base/ViewRenderer.php b/framework/base/ViewRenderer.php → yii/base/ViewRenderer.php
diff --git a/framework/base/Widget.php → yii/base/Widget.php b/framework/base/Widget.php → yii/base/Widget.php
diff --git a/framework/caching/ApcCache.php → yii/caching/ApcCache.php b/framework/caching/ApcCache.php → yii/caching/ApcCache.php
diff --git a/framework/caching/Cache.php → yii/caching/Cache.php b/framework/caching/Cache.php → yii/caching/Cache.php
diff --git a/framework/caching/ChainedDependency.php → yii/caching/ChainedDependency.php b/framework/caching/ChainedDependency.php → yii/caching/ChainedDependency.php
diff --git a/framework/caching/DbCache.php → yii/caching/DbCache.php b/framework/caching/DbCache.php → yii/caching/DbCache.php
diff --git a/framework/caching/DbDependency.php → yii/caching/DbDependency.php b/framework/caching/DbDependency.php → yii/caching/DbDependency.php
diff --git a/framework/caching/Dependency.php → yii/caching/Dependency.php b/framework/caching/Dependency.php → yii/caching/Dependency.php
diff --git a/framework/caching/DummyCache.php → yii/caching/DummyCache.php b/framework/caching/DummyCache.php → yii/caching/DummyCache.php
diff --git a/framework/caching/ExpressionDependency.php → yii/caching/ExpressionDependency.php b/framework/caching/ExpressionDependency.php → yii/caching/ExpressionDependency.php
diff --git a/framework/caching/FileCache.php → yii/caching/FileCache.php b/framework/caching/FileCache.php → yii/caching/FileCache.php
diff --git a/framework/caching/FileDependency.php → yii/caching/FileDependency.php b/framework/caching/FileDependency.php → yii/caching/FileDependency.php
diff --git a/framework/caching/MemCache.php → yii/caching/MemCache.php b/framework/caching/MemCache.php → yii/caching/MemCache.php
diff --git a/framework/caching/MemCacheServer.php → yii/caching/MemCacheServer.php b/framework/caching/MemCacheServer.php → yii/caching/MemCacheServer.php
diff --git a/framework/caching/WinCache.php → yii/caching/WinCache.php b/framework/caching/WinCache.php → yii/caching/WinCache.php
diff --git a/framework/caching/XCache.php → yii/caching/XCache.php b/framework/caching/XCache.php → yii/caching/XCache.php
diff --git a/framework/caching/ZendDataCache.php → yii/caching/ZendDataCache.php b/framework/caching/ZendDataCache.php → yii/caching/ZendDataCache.php
diff --git a/framework/console/Application.php → yii/console/Application.php b/framework/console/Application.php → yii/console/Application.php
diff --git a/framework/console/Controller.php → yii/console/Controller.php b/framework/console/Controller.php → yii/console/Controller.php
diff --git a/framework/console/Exception.php → yii/console/Exception.php b/framework/console/Exception.php → yii/console/Exception.php
diff --git a/framework/console/Request.php → yii/console/Request.php b/framework/console/Request.php → yii/console/Request.php
diff --git a/...ork/console/controllers/AppController.php → yii/console/controllers/AppController.php b/...ork/console/controllers/AppController.php → yii/console/controllers/AppController.php
diff --git a/...k/console/controllers/AssetController.php → yii/console/controllers/AssetController.php b/...k/console/controllers/AssetController.php → yii/console/controllers/AssetController.php
diff --git a/...k/console/controllers/CacheController.php → yii/console/controllers/CacheController.php b/...k/console/controllers/CacheController.php → yii/console/controllers/CacheController.php
diff --git a/...rk/console/controllers/HelpController.php → yii/console/controllers/HelpController.php b/...rk/console/controllers/HelpController.php → yii/console/controllers/HelpController.php
diff --git a/...console/controllers/MessageController.php → ...console/controllers/MessageController.php b/...console/controllers/MessageController.php → ...console/controllers/MessageController.php
diff --git a/...console/controllers/MigrateController.php → ...console/controllers/MigrateController.php b/...console/controllers/MigrateController.php → ...console/controllers/MigrateController.php
diff --git a/framework/console/runtime/.gitignore → yii/console/runtime/.gitignore b/framework/console/runtime/.gitignore → yii/console/runtime/.gitignore
diff --git a/framework/db/ActiveQuery.php → yii/db/ActiveQuery.php b/framework/db/ActiveQuery.php → yii/db/ActiveQuery.php
diff --git a/framework/db/ActiveRecord.php → yii/db/ActiveRecord.php b/framework/db/ActiveRecord.php → yii/db/ActiveRecord.php
diff --git a/framework/db/ActiveRelation.php → yii/db/ActiveRelation.php b/framework/db/ActiveRelation.php → yii/db/ActiveRelation.php
diff --git a/framework/db/ColumnSchema.php → yii/db/ColumnSchema.php b/framework/db/ColumnSchema.php → yii/db/ColumnSchema.php
diff --git a/framework/db/Command.php → yii/db/Command.php b/framework/db/Command.php → yii/db/Command.php
diff --git a/framework/db/Connection.php → yii/db/Connection.php b/framework/db/Connection.php → yii/db/Connection.php
diff --git a/framework/db/DataReader.php → yii/db/DataReader.php b/framework/db/DataReader.php → yii/db/DataReader.php
diff --git a/framework/db/Exception.php → yii/db/Exception.php b/framework/db/Exception.php → yii/db/Exception.php
diff --git a/framework/db/Expression.php → yii/db/Expression.php b/framework/db/Expression.php → yii/db/Expression.php
diff --git a/framework/db/Migration.php → yii/db/Migration.php b/framework/db/Migration.php → yii/db/Migration.php
diff --git a/framework/db/Query.php → yii/db/Query.php b/framework/db/Query.php → yii/db/Query.php
diff --git a/framework/db/QueryBuilder.php → yii/db/QueryBuilder.php b/framework/db/QueryBuilder.php → yii/db/QueryBuilder.php
diff --git a/framework/db/Schema.php → yii/db/Schema.php b/framework/db/Schema.php → yii/db/Schema.php
diff --git a/framework/db/StaleObjectException.php → yii/db/StaleObjectException.php b/framework/db/StaleObjectException.php → yii/db/StaleObjectException.php
diff --git a/framework/db/TableSchema.php → yii/db/TableSchema.php b/framework/db/TableSchema.php → yii/db/TableSchema.php
diff --git a/framework/db/Transaction.php → yii/db/Transaction.php b/framework/db/Transaction.php → yii/db/Transaction.php
diff --git a/framework/db/mysql/QueryBuilder.php → yii/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php → yii/db/mysql/QueryBuilder.php
diff --git a/framework/db/mysql/Schema.php → yii/db/mysql/Schema.php b/framework/db/mysql/Schema.php → yii/db/mysql/Schema.php
diff --git a/framework/db/sqlite/QueryBuilder.php → yii/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php → yii/db/sqlite/QueryBuilder.php
diff --git a/framework/db/sqlite/Schema.php → yii/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php → yii/db/sqlite/Schema.php
diff --git a/framework/debug/Module.php → yii/debug/Module.php b/framework/debug/Module.php → yii/debug/Module.php
diff --git a/framework/debug/Toolbar.php → yii/debug/Toolbar.php b/framework/debug/Toolbar.php → yii/debug/Toolbar.php
diff --git a/...k/debug/controllers/DefaultController.php → yii/debug/controllers/DefaultController.php b/...k/debug/controllers/DefaultController.php → yii/debug/controllers/DefaultController.php
diff --git a/framework/helpers/ArrayHelper.php → yii/helpers/ArrayHelper.php b/framework/helpers/ArrayHelper.php → yii/helpers/ArrayHelper.php
diff --git a/framework/helpers/Console.php → yii/helpers/Console.php b/framework/helpers/Console.php → yii/helpers/Console.php
diff --git a/framework/helpers/FileHelper.php → yii/helpers/FileHelper.php b/framework/helpers/FileHelper.php → yii/helpers/FileHelper.php
diff --git a/framework/helpers/Html.php → yii/helpers/Html.php b/framework/helpers/Html.php → yii/helpers/Html.php
diff --git a/framework/helpers/Json.php → yii/helpers/Json.php b/framework/helpers/Json.php → yii/helpers/Json.php
diff --git a/framework/helpers/Markdown.php → yii/helpers/Markdown.php b/framework/helpers/Markdown.php → yii/helpers/Markdown.php
diff --git a/framework/helpers/Purifier.php → yii/helpers/Purifier.php b/framework/helpers/Purifier.php → yii/helpers/Purifier.php
diff --git a/framework/helpers/SecurityHelper.php → yii/helpers/SecurityHelper.php b/framework/helpers/SecurityHelper.php → yii/helpers/SecurityHelper.php
diff --git a/framework/helpers/StringHelper.php → yii/helpers/StringHelper.php b/framework/helpers/StringHelper.php → yii/helpers/StringHelper.php
diff --git a/framework/helpers/VarDumper.php → yii/helpers/VarDumper.php b/framework/helpers/VarDumper.php → yii/helpers/VarDumper.php
diff --git a/framework/helpers/base/ArrayHelper.php → yii/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php → yii/helpers/base/ArrayHelper.php
diff --git a/framework/helpers/base/Console.php → yii/helpers/base/Console.php b/framework/helpers/base/Console.php → yii/helpers/base/Console.php
diff --git a/framework/helpers/base/FileHelper.php → yii/helpers/base/FileHelper.php b/framework/helpers/base/FileHelper.php → yii/helpers/base/FileHelper.php
diff --git a/framework/helpers/base/Html.php → yii/helpers/base/Html.php b/framework/helpers/base/Html.php → yii/helpers/base/Html.php
diff --git a/framework/helpers/base/Json.php → yii/helpers/base/Json.php b/framework/helpers/base/Json.php → yii/helpers/base/Json.php
diff --git a/framework/helpers/base/Markdown.php → yii/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php → yii/helpers/base/Markdown.php
diff --git a/framework/helpers/base/Purifier.php → yii/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php → yii/helpers/base/Purifier.php
diff --git a/framework/helpers/base/SecurityHelper.php → yii/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php → yii/helpers/base/SecurityHelper.php
diff --git a/framework/helpers/base/StringHelper.php → yii/helpers/base/StringHelper.php b/framework/helpers/base/StringHelper.php → yii/helpers/base/StringHelper.php
diff --git a/framework/helpers/base/VarDumper.php → yii/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php → yii/helpers/base/VarDumper.php
diff --git a/framework/helpers/base/mimeTypes.php → yii/helpers/base/mimeTypes.php b/framework/helpers/base/mimeTypes.php → yii/helpers/base/mimeTypes.php
diff --git a/framework/i18n/I18N.php → yii/i18n/I18N.php b/framework/i18n/I18N.php → yii/i18n/I18N.php
diff --git a/framework/i18n/MessageSource.php → yii/i18n/MessageSource.php b/framework/i18n/MessageSource.php → yii/i18n/MessageSource.php
diff --git a/framework/i18n/MissingTranslationEvent.php → yii/i18n/MissingTranslationEvent.php b/framework/i18n/MissingTranslationEvent.php → yii/i18n/MissingTranslationEvent.php
diff --git a/framework/i18n/PhpMessageSource.php → yii/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php → yii/i18n/PhpMessageSource.php
diff --git a/framework/i18n/data/plurals.php → yii/i18n/data/plurals.php b/framework/i18n/data/plurals.php → yii/i18n/data/plurals.php
diff --git a/framework/i18n/data/plurals.xml → yii/i18n/data/plurals.xml b/framework/i18n/data/plurals.xml → yii/i18n/data/plurals.xml
diff --git a/framework/logging/DbTarget.php → yii/logging/DbTarget.php b/framework/logging/DbTarget.php → yii/logging/DbTarget.php
diff --git a/framework/logging/EmailTarget.php → yii/logging/EmailTarget.php b/framework/logging/EmailTarget.php → yii/logging/EmailTarget.php
diff --git a/framework/logging/FileTarget.php → yii/logging/FileTarget.php b/framework/logging/FileTarget.php → yii/logging/FileTarget.php
diff --git a/framework/logging/Logger.php → yii/logging/Logger.php b/framework/logging/Logger.php → yii/logging/Logger.php
diff --git a/framework/logging/ProfileTarget.php → yii/logging/ProfileTarget.php b/framework/logging/ProfileTarget.php → yii/logging/ProfileTarget.php
diff --git a/framework/logging/Router.php → yii/logging/Router.php b/framework/logging/Router.php → yii/logging/Router.php
diff --git a/framework/logging/Target.php → yii/logging/Target.php b/framework/logging/Target.php → yii/logging/Target.php
diff --git a/framework/logging/WebTarget.php → yii/logging/WebTarget.php b/framework/logging/WebTarget.php → yii/logging/WebTarget.php
diff --git a/framework/renderers/SmartyViewRenderer.php → yii/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php → yii/renderers/SmartyViewRenderer.php
diff --git a/framework/renderers/TwigViewRenderer.php → yii/renderers/TwigViewRenderer.php b/framework/renderers/TwigViewRenderer.php → yii/renderers/TwigViewRenderer.php
diff --git a/framework/test/TestCase.php → yii/test/TestCase.php b/framework/test/TestCase.php → yii/test/TestCase.php
diff --git a/framework/test/WebTestCase.php → yii/test/WebTestCase.php b/framework/test/WebTestCase.php → yii/test/WebTestCase.php
diff --git a/framework/validators/BooleanValidator.php → yii/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php → yii/validators/BooleanValidator.php
diff --git a/framework/validators/CaptchaValidator.php → yii/validators/CaptchaValidator.php b/framework/validators/CaptchaValidator.php → yii/validators/CaptchaValidator.php
diff --git a/framework/validators/CompareValidator.php → yii/validators/CompareValidator.php b/framework/validators/CompareValidator.php → yii/validators/CompareValidator.php
diff --git a/framework/validators/DateValidator.php → yii/validators/DateValidator.php b/framework/validators/DateValidator.php → yii/validators/DateValidator.php
diff --git a/...work/validators/DefaultValueValidator.php → yii/validators/DefaultValueValidator.php b/...work/validators/DefaultValueValidator.php → yii/validators/DefaultValueValidator.php
diff --git a/framework/validators/EmailValidator.php → yii/validators/EmailValidator.php b/framework/validators/EmailValidator.php → yii/validators/EmailValidator.php
diff --git a/framework/validators/ExistValidator.php → yii/validators/ExistValidator.php b/framework/validators/ExistValidator.php → yii/validators/ExistValidator.php
diff --git a/framework/validators/FileValidator.php → yii/validators/FileValidator.php b/framework/validators/FileValidator.php → yii/validators/FileValidator.php
diff --git a/framework/validators/FilterValidator.php → yii/validators/FilterValidator.php b/framework/validators/FilterValidator.php → yii/validators/FilterValidator.php
diff --git a/framework/validators/InlineValidator.php → yii/validators/InlineValidator.php b/framework/validators/InlineValidator.php → yii/validators/InlineValidator.php
diff --git a/framework/validators/NumberValidator.php → yii/validators/NumberValidator.php b/framework/validators/NumberValidator.php → yii/validators/NumberValidator.php
diff --git a/framework/validators/RangeValidator.php → yii/validators/RangeValidator.php b/framework/validators/RangeValidator.php → yii/validators/RangeValidator.php
diff --git a/...validators/RegularExpressionValidator.php → ...validators/RegularExpressionValidator.php b/...validators/RegularExpressionValidator.php → ...validators/RegularExpressionValidator.php
diff --git a/framework/validators/RequiredValidator.php → yii/validators/RequiredValidator.php b/framework/validators/RequiredValidator.php → yii/validators/RequiredValidator.php
diff --git a/framework/validators/StringValidator.php → yii/validators/StringValidator.php b/framework/validators/StringValidator.php → yii/validators/StringValidator.php
diff --git a/framework/validators/UniqueValidator.php → yii/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php → yii/validators/UniqueValidator.php
diff --git a/framework/validators/UrlValidator.php → yii/validators/UrlValidator.php b/framework/validators/UrlValidator.php → yii/validators/UrlValidator.php
diff --git a/framework/validators/Validator.php → yii/validators/Validator.php b/framework/validators/Validator.php → yii/validators/Validator.php
diff --git a/framework/views/error.php → yii/views/error.php b/framework/views/error.php → yii/views/error.php
diff --git a/framework/views/exception.php → yii/views/exception.php b/framework/views/exception.php → yii/views/exception.php
diff --git a/framework/views/migration.php → yii/views/migration.php b/framework/views/migration.php → yii/views/migration.php
diff --git a/framework/web/AccessControl.php → yii/web/AccessControl.php b/framework/web/AccessControl.php → yii/web/AccessControl.php
diff --git a/framework/web/AccessRule.php → yii/web/AccessRule.php b/framework/web/AccessRule.php → yii/web/AccessRule.php
diff --git a/framework/web/Application.php → yii/web/Application.php b/framework/web/Application.php → yii/web/Application.php
diff --git a/framework/web/AssetBundle.php → yii/web/AssetBundle.php b/framework/web/AssetBundle.php → yii/web/AssetBundle.php
diff --git a/framework/web/AssetConverter.php → yii/web/AssetConverter.php b/framework/web/AssetConverter.php → yii/web/AssetConverter.php
diff --git a/framework/web/AssetManager.php → yii/web/AssetManager.php b/framework/web/AssetManager.php → yii/web/AssetManager.php
diff --git a/framework/web/CacheSession.php → yii/web/CacheSession.php b/framework/web/CacheSession.php → yii/web/CacheSession.php
diff --git a/framework/web/CaptchaAction.php → yii/web/CaptchaAction.php b/framework/web/CaptchaAction.php → yii/web/CaptchaAction.php
diff --git a/framework/web/Controller.php → yii/web/Controller.php b/framework/web/Controller.php → yii/web/Controller.php
diff --git a/framework/web/Cookie.php → yii/web/Cookie.php b/framework/web/Cookie.php → yii/web/Cookie.php
diff --git a/framework/web/CookieCollection.php → yii/web/CookieCollection.php b/framework/web/CookieCollection.php → yii/web/CookieCollection.php
diff --git a/framework/web/DbSession.php → yii/web/DbSession.php b/framework/web/DbSession.php → yii/web/DbSession.php
diff --git a/framework/web/HttpCache.php → yii/web/HttpCache.php b/framework/web/HttpCache.php → yii/web/HttpCache.php
diff --git a/framework/web/IAssetConverter.php → yii/web/IAssetConverter.php b/framework/web/IAssetConverter.php → yii/web/IAssetConverter.php
diff --git a/framework/web/Identity.php → yii/web/Identity.php b/framework/web/Identity.php → yii/web/Identity.php
diff --git a/framework/web/JsExpression.php → yii/web/JsExpression.php b/framework/web/JsExpression.php → yii/web/JsExpression.php
diff --git a/framework/web/PageCache.php → yii/web/PageCache.php b/framework/web/PageCache.php → yii/web/PageCache.php
diff --git a/framework/web/Pagination.php → yii/web/Pagination.php b/framework/web/Pagination.php → yii/web/Pagination.php
diff --git a/framework/web/Request.php → yii/web/Request.php b/framework/web/Request.php → yii/web/Request.php
diff --git a/framework/web/Response.php → yii/web/Response.php b/framework/web/Response.php → yii/web/Response.php
diff --git a/framework/web/Session.php → yii/web/Session.php b/framework/web/Session.php → yii/web/Session.php
diff --git a/framework/web/SessionIterator.php → yii/web/SessionIterator.php b/framework/web/SessionIterator.php → yii/web/SessionIterator.php
diff --git a/framework/web/Sort.php → yii/web/Sort.php b/framework/web/Sort.php → yii/web/Sort.php
diff --git a/framework/web/SpicyRice.md → yii/web/SpicyRice.md b/framework/web/SpicyRice.md → yii/web/SpicyRice.md
diff --git a/framework/web/SpicyRice.ttf → yii/web/SpicyRice.ttf b/framework/web/SpicyRice.ttf → yii/web/SpicyRice.ttf
diff --git a/framework/web/UploadedFile.php → yii/web/UploadedFile.php b/framework/web/UploadedFile.php → yii/web/UploadedFile.php
diff --git a/framework/web/UrlManager.php → yii/web/UrlManager.php b/framework/web/UrlManager.php → yii/web/UrlManager.php
diff --git a/framework/web/UrlRule.php → yii/web/UrlRule.php b/framework/web/UrlRule.php → yii/web/UrlRule.php
diff --git a/framework/web/User.php → yii/web/User.php b/framework/web/User.php → yii/web/User.php
diff --git a/framework/web/UserEvent.php → yii/web/UserEvent.php b/framework/web/UserEvent.php → yii/web/UserEvent.php
diff --git a/framework/widgets/ActiveField.php → yii/widgets/ActiveField.php b/framework/widgets/ActiveField.php → yii/widgets/ActiveField.php
diff --git a/framework/widgets/ActiveForm.php → yii/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php → yii/widgets/ActiveForm.php
diff --git a/framework/widgets/Block.php → yii/widgets/Block.php b/framework/widgets/Block.php → yii/widgets/Block.php
diff --git a/framework/widgets/Breadcrumbs.php → yii/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php → yii/widgets/Breadcrumbs.php
diff --git a/framework/widgets/Captcha.php → yii/widgets/Captcha.php b/framework/widgets/Captcha.php → yii/widgets/Captcha.php
diff --git a/framework/widgets/ContentDecorator.php → yii/widgets/ContentDecorator.php b/framework/widgets/ContentDecorator.php → yii/widgets/ContentDecorator.php
diff --git a/framework/widgets/FragmentCache.php → yii/widgets/FragmentCache.php b/framework/widgets/FragmentCache.php → yii/widgets/FragmentCache.php
diff --git a/framework/widgets/Menu.php → yii/widgets/Menu.php b/framework/widgets/Menu.php → yii/widgets/Menu.php
diff --git a/framework/yiic → yii/yiic b/framework/yiic → yii/yiic
diff --git a/framework/yiic.bat → yii/yiic.bat b/framework/yiic.bat → yii/yiic.bat
diff --git a/framework/yiic.php → yii/yiic.php b/framework/yiic.php → yii/yiic.php