Merge branch 'master' of https://github.com/yiisoft/yii2

637e1160 · Qiang Xue · 0766fbcc · 9880d1fa · 637e1160 · 637e1160
Commit 637e1160 authored May 05, 2013 by Qiang Xue
96 changed files
--- a/app/protected/config/assets.php
+++ b/app/protected/config/assets.php
--- a/app/protected/config/main.php
+++ b/app/protected/config/main.php
--- a/app/protected/controllers/SiteController.php
+++ b/app/protected/controllers/SiteController.php
--- a/app/protected/models/ContactForm.php
+++ b/app/protected/models/ContactForm.php
--- a/app/protected/models/LoginForm.php
+++ b/app/protected/models/LoginForm.php
--- a/app/protected/models/User.php
+++ b/app/protected/models/User.php
--- a/app/protected/views/layouts/main.php
+++ b/app/protected/views/layouts/main.php
--- a/app/protected/views/site/contact.php
+++ b/app/protected/views/site/contact.php
--- a/app/protected/views/site/login.php
+++ b/app/protected/views/site/login.php
--- a/framework/assets.php
+++ b/framework/assets.php
--- a/framework/base/ActionFilter.php
+++ b/framework/base/ActionFilter.php
--- a/framework/base/Exception.php
+++ b/framework/base/Exception.php
--- a/framework/base/View.php
+++ b/framework/base/View.php
--- a/framework/base/ViewEvent.php
+++ b/framework/base/ViewEvent.php
--- a/framework/base/Widget.php
+++ b/framework/base/Widget.php
--- a/framework/caching/Cache.php
+++ b/framework/caching/Cache.php
--- a/framework/caching/Dependency.php
+++ b/framework/caching/Dependency.php
--- a/framework/caching/MemCacheServer.php
+++ b/framework/caching/MemCacheServer.php
--- a/framework/caching/WinCache.php
+++ b/framework/caching/WinCache.php
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
--- a/framework/console/controllers/AppController.php
+++ b/framework/console/controllers/AppController.php
--- a/framework/console/controllers/AssetController.php
+++ b/framework/console/controllers/AssetController.php
--- a/framework/console/controllers/HelpController.php
+++ b/framework/console/controllers/HelpController.php
--- a/framework/console/webapp/config.php
+++ b/framework/console/webapp/config.php
--- a/framework/console/webapp/default/index.php
+++ b/framework/console/webapp/default/index.php
--- a/framework/console/webapp/default/protected/config/main.php
+++ b/framework/console/webapp/default/protected/config/main.php
--- a/framework/console/webapp/default/protected/controllers/SiteController.php
+++ b/framework/console/webapp/default/protected/controllers/SiteController.php
--- a/framework/console/webapp/default/protected/views/layouts/main.php
+++ b/framework/console/webapp/default/protected/views/layouts/main.php
--- a/framework/console/webapp/default/protected/views/site/index.php
+++ b/framework/console/webapp/default/protected/views/site/index.php
--- a/framework/db/Exception.php
+++ b/framework/db/Exception.php
--- a/framework/db/Expression.php
+++ b/framework/db/Expression.php
--- a/framework/db/Migration.php
+++ b/framework/db/Migration.php
--- a/framework/db/StaleObjectException.php
+++ b/framework/db/StaleObjectException.php
--- a/framework/helpers/ArrayHelper.php
+++ b/framework/helpers/ArrayHelper.php
--- a/framework/helpers/FileHelper.php
+++ b/framework/helpers/FileHelper.php
--- a/framework/helpers/JsExpression.php
+++ b/framework/helpers/JsExpression.php
--- a/framework/helpers/Json.php
+++ b/framework/helpers/Json.php
--- a/framework/helpers/SecurityHelper.php
+++ b/framework/helpers/SecurityHelper.php
--- a/framework/helpers/VarDumper.php
+++ b/framework/helpers/VarDumper.php
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
--- a/framework/helpers/base/FileHelper.php
+++ b/framework/helpers/base/FileHelper.php
--- a/framework/helpers/base/Json.php
+++ b/framework/helpers/base/Json.php
--- a/framework/helpers/base/VarDumper.php
+++ b/framework/helpers/base/VarDumper.php
--- a/framework/i18n/PhpMessageSource.php
+++ b/framework/i18n/PhpMessageSource.php
--- a/framework/i18n/data/plurals.php
+++ b/framework/i18n/data/plurals.php
--- a/framework/logging/EmailTarget.php
+++ b/framework/logging/EmailTarget.php
--- a/framework/logging/ProfileTarget.php
+++ b/framework/logging/ProfileTarget.php
--- a/framework/logging/WebTarget.php
+++ b/framework/logging/WebTarget.php
--- a/framework/renderers/SmartyViewRenderer.php
+++ b/framework/renderers/SmartyViewRenderer.php
--- a/framework/validators/InlineValidator.php
+++ b/framework/validators/InlineValidator.php
--- a/framework/validators/NumberValidator.php
+++ b/framework/validators/NumberValidator.php
--- a/framework/validators/UniqueValidator.php
+++ b/framework/validators/UniqueValidator.php
--- a/framework/views/error.php
+++ b/framework/views/error.php
--- a/framework/web/AccessControl.php
+++ b/framework/web/AccessControl.php
--- a/framework/web/AccessRule.php
+++ b/framework/web/AccessRule.php
--- a/framework/web/AssetBundle.php
+++ b/framework/web/AssetBundle.php
--- a/framework/web/AssetConverter.php
+++ b/framework/web/AssetConverter.php
--- a/framework/web/Controller.php
+++ b/framework/web/Controller.php
--- a/framework/web/HttpCache.php
+++ b/framework/web/HttpCache.php
--- a/framework/web/IAssetConverter.php
+++ b/framework/web/IAssetConverter.php
--- a/framework/web/Identity.php
+++ b/framework/web/Identity.php
--- a/framework/web/PageCache.php
+++ b/framework/web/PageCache.php
--- a/framework/web/Pagination.php
+++ b/framework/web/Pagination.php
--- a/framework/web/Sort.php
+++ b/framework/web/Sort.php
--- a/framework/web/UserEvent.php
+++ b/framework/web/UserEvent.php
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
--- a/framework/widgets/Block.php
+++ b/framework/widgets/Block.php
--- a/framework/widgets/FragmentCache.php
+++ b/framework/widgets/FragmentCache.php
--- a/tests/unit/MysqlTestCase.php
+++ b/tests/unit/MysqlTestCase.php
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
--- a/tests/unit/data/ar/ActiveRecord.php
+++ b/tests/unit/data/ar/ActiveRecord.php
--- a/tests/unit/data/ar/Customer.php
+++ b/tests/unit/data/ar/Customer.php
--- a/tests/unit/data/ar/Item.php
+++ b/tests/unit/data/ar/Item.php
--- a/tests/unit/data/ar/Order.php
+++ b/tests/unit/data/ar/Order.php
--- a/tests/unit/data/ar/OrderItem.php
+++ b/tests/unit/data/ar/OrderItem.php
--- a/tests/unit/data/base/Singer.php
+++ b/tests/unit/data/base/Singer.php
--- a/tests/unit/framework/base/ComponentTest.php
+++ b/tests/unit/framework/base/ComponentTest.php
--- a/tests/unit/framework/base/ObjectTest.php
+++ b/tests/unit/framework/base/ObjectTest.php
--- a/tests/unit/framework/caching/ApcCacheTest.php
+++ b/tests/unit/framework/caching/ApcCacheTest.php
--- a/tests/unit/framework/caching/DbCacheTest.php
+++ b/tests/unit/framework/caching/DbCacheTest.php
--- a/tests/unit/framework/caching/FileCacheTest.php
+++ b/tests/unit/framework/caching/FileCacheTest.php
--- a/tests/unit/framework/caching/MemCacheTest.php
+++ b/tests/unit/framework/caching/MemCacheTest.php
--- a/tests/unit/framework/caching/MemCachedTest.php
+++ b/tests/unit/framework/caching/MemCachedTest.php
--- a/tests/unit/framework/caching/WinCacheTest.php
+++ b/tests/unit/framework/caching/WinCacheTest.php
--- a/tests/unit/framework/caching/XCacheTest.php
+++ b/tests/unit/framework/caching/XCacheTest.php
--- a/tests/unit/framework/caching/ZendDataCacheTest.php
+++ b/tests/unit/framework/caching/ZendDataCacheTest.php
--- a/tests/unit/framework/db/ActiveRecordTest.php
+++ b/tests/unit/framework/db/ActiveRecordTest.php
--- a/tests/unit/framework/db/CommandTest.php
+++ b/tests/unit/framework/db/CommandTest.php
--- a/tests/unit/framework/db/QueryTest.php
+++ b/tests/unit/framework/db/QueryTest.php
--- a/tests/unit/framework/helpers/JsonTest.php
+++ b/tests/unit/framework/helpers/JsonTest.php
--- a/tests/unit/framework/helpers/StringHelperTest.php
+++ b/tests/unit/framework/helpers/StringHelperTest.php
--- a/tests/unit/framework/helpers/VarDumperTest.php
+++ b/tests/unit/framework/helpers/VarDumperTest.php
--- a/tests/unit/framework/validators/EmailValidatorTest.php
+++ b/tests/unit/framework/validators/EmailValidatorTest.php
--- a/tests/web/app/protected/config/main.php
+++ b/tests/web/app/protected/config/main.php
--- a/tests/web/app/protected/controllers/SiteController.php
+++ b/tests/web/app/protected/controllers/SiteController.php
--- a/tests/web/app/protected/views/site/index.php
+++ b/tests/web/app/protected/views/site/index.php