Skip to content

Y
yii2
Commit 88a3fcaa by Larry Ullman
Options

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

parents 03fc27c8 11e43263
Showing with 156 additions and 76 deletions
.travis.yml
......@@ -8,7 +8,7 @@ php:
- hhvm-nightly
env:
- CUBRID_VERSION=9.3.0/CUBRID-9.3.0.0206 CUBRID_PDO_VERSION=9.2.0.0001
- CUBRID_VERSION=9.3.0/CUBRID-9.3.0.0206 CUBRID_PDO_VERSION=9.3.0.0001
# run build against hhvm but allow them to fail
# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
......@@ -38,7 +38,7 @@ addons:
install:
- composer self-update && composer --version
- composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
- composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
- export PATH="$HOME/.composer/vendor/bin:$PATH"
# core framework:
- composer install --prefer-dist
......
README.md
......@@ -8,16 +8,6 @@ Yii 2 inherits the main spirit behind Yii for being simple, fast and highly exte
Yii 2 requires PHP 5.4 and embraces the best practices and protocols found in modern Web application development.
**Yii 2 is not ready for production use yet.** We may make significant changes without prior notices.
We expect to make the first stable release of Yii 2 in the middle of 2014.
If you mainly want to learn Yii with no real project development requirement, we highly recommend
you start with Yii 2 as it will be our main focus for the next few years.
If you have a real project with tight schedule, you should stick to [Yii 1.1](https://github.com/yiisoft/yii)
which is the latest stable release of Yii.
[![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2/v/stable.png)](https://packagist.org/packages/yiisoft/yii2)
[![Total Downloads](https://poser.pugx.org/yiisoft/yii2/downloads.png)](https://packagist.org/packages/yiisoft/yii2)
[![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
......@@ -55,14 +45,11 @@ The minimum requirement by Yii is that your Web server supports PHP 5.4.
DOCUMENTATION
-------------
A draft of the [Definitive Guide](docs/guide/README.md) is available.
API docs and a rendering of the definitive guide are currently
available under the following urls:
Yii 2.0 has a [Definitive Guide](http://www.yiiframework.com/doc-2.0/guide-index.html) and
a [Class Reference](http://www.yiiframework.com/doc-2.0/index.html) which cover every detail of Yii.
- http://www.yiiframework.com/doc-2.0/ API and Definitive Guide (updated daily)
- http://stuff.cebe.cc/yii2docs/ API and Definitive Guide (updated every 15 minutes)
- http://stuff.cebe.cc/yii2-guide.pdf The PDF version of the Guide
There is also a [PDF version](http://stuff.cebe.cc/yii2-guide.pdf) of the Definitive Guide
and a [Definitive Guide Mirror](http://stuff.cebe.cc/yii2docs/) which update every 15 minutes.
For 1.1 users, you may refer to [Upgrading from Yii 1.1](docs/guide/intro-upgrade-from-v1.md)
to have a general idea of what has changed in 2.0.
......
apps/advanced/README.md
......@@ -74,7 +74,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
You can then install the application using the following command:
~~~
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta2"
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta3"
php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced
~~~
......
apps/basic/README.md
......@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
You can then install this application template using the following command:
~~~
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta2"
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta3"
php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
~~~
......
docs/guide-zh-CN/start-installation.md
......@@ -20,7 +20,7 @@
Composer 安装后，切换到一个可通过 Web 访问的目录，执行如下命令即可安装 Yii ：
composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
composer create-project --prefer-dist yiisoft/yii2-app-basic basic
第一条命令安装 [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)，它是通过 Composer 管理 bower 和 npm 包所必须的，此命令全局应用，只需执行一次即可。
......
docs/guide/db-active-record.md
......@@ -35,7 +35,8 @@ Below is the list of databases that are currently supported by Yii Active Record
* SQLite 2 and 3: via [[yii\db\ActiveRecord]]
* Microsoft SQL Server 2010 or later: via [[yii\db\ActiveRecord]]
* Oracle: via [[yii\db\ActiveRecord]]
* CUBRID 9.1 or later: via [[yii\db\ActiveRecord]]
* CUBRID 9.3 or later: via [[yii\db\ActiveRecord]] (Note that due to a [bug](http://jira.cubrid.org/browse/APIS-658) in
the cubrid PDO extension, quoting of values will not work, so you need CUBRID 9.3 as the client as well as the server)
* Sphnix: via [[yii\sphinx\ActiveRecord]], requires `yii2-sphinx` extension
* ElasticSearch: via [[yii\elasticsearch\ActiveRecord]], requires `yii2-elasticsearch` extension
* Redis 2.6.12 or later: via [[yii\redis\ActiveRecord]], requires `yii2-redis` extension
......
docs/guide/db-dao.md
......@@ -12,7 +12,8 @@ By default, Yii supports the following DBMS:
- [MariaDB](https://mariadb.com/)
- [SQLite](http://sqlite.org/)
- [PostgreSQL](http://www.postgresql.org/)
- [CUBRID](http://www.cubrid.org/): version 9.1.0 or higher.
- [CUBRID](http://www.cubrid.org/): version 9.3 or higher. (Note that due to a [bug](http://jira.cubrid.org/browse/APIS-658) in
the cubrid PDO extension, quoting of values will not work, so you need CUBRID 9.3 as the client as well as the server)
- [Oracle](http://www.oracle.com/us/products/database/overview/index.html)
- [MSSQL](https://www.microsoft.com/en-us/sqlserver/default.aspx): version 2005 or higher.
......
docs/guide/security-authorization.md
......@@ -347,7 +347,7 @@ $rule = new \app\rbac\AuthorRule;
$auth->add($rule);
// add the "updateOwnPost" permission and associate the rule with it.
$updateOwnPost = $this->auth->createPermission('updateOwnPost');
$updateOwnPost = $auth->createPermission('updateOwnPost');
$updateOwnPost->description = 'Update own post';
$updateOwnPost->ruleName = $rule->name;
$auth->add($updateOwnPost);
......
docs/guide/start-installation.md
......@@ -26,7 +26,7 @@ by running `composer self-update`.
With Composer installed, you can install Yii by running the following commands under a Web-accessible folder:
composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
composer create-project --prefer-dist yiisoft/yii2-app-basic basic
The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)
......
docs/guide/tutorial-advanced-app.md
......@@ -17,7 +17,7 @@ If you do not have [Composer](http://getcomposer.org/), follow the instructions
With Composer installed, you can then install the application using the following commands:
composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
composer create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced yii-application
The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)
......
docs/guide/tutorial-start-from-scratch.md
......@@ -48,6 +48,6 @@ Use the Template
That's all that's required to create a new Yii application template. Now you can create projects using your template:
```
composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
composer create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project
```
extensions/apidoc/CHANGELOG.md
Yii Framework 2 apidoc extension Change Log
===========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Chg: Updated cebe/markdown to 1.0.0 which includes breaking changes in its internal API (cebe)
2.0.0-rc September 27, 2014
......
extensions/authclient/CHANGELOG.md
Yii Framework 2 authclient extension Change Log
===============================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Enh #5135: Added ability to operate nested and complex attributes via `yii\authclient\BaseClient::normalizeUserAttributeMap` (zinzinday, klimov-paul)
......
extensions/bootstrap/CHANGELOG.md
Yii Framework 2 bootstrap extension Change Log
==============================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Bug #5323: Nested dropdown does not work for `yii\bootstrap\DropDown` (aryraditya)
- Bug #5336: `yii\bootstrap\DropDown` should register bootstrap plugin asset (zelenin)
- Chg #5231: Collapse `items` property uses `label` element instead of array key for headers (nkovacs)
......
extensions/codeception/CHANGELOG.md
Yii Framework 2 Codeception extension Change Log
================================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/composer/CHANGELOG.md
Yii Framework 2 composer extension Change Log
=============================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/debug/CHANGELOG.md
Yii Framework 2 debug extension Change Log
==========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/elasticsearch/CHANGELOG.md
Yii Framework 2 elasticsearch extension Change Log
==================================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Enh #3381: Added ActiveRecord::arrayAttributes() to define attributes that should be treated as array when retrieved via `fields` (cebe)
......
extensions/faker/CHANGELOG.md
Yii Framework 2 faker extension Change Log
==============================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/gii/CHANGELOG.md
Yii Framework 2 gii extension Change Log
========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Bug #5408: Gii console command incorrectly reports errors when there is actually no error (qiangxue)
- Bug: Fixed table name regression caused by changed introduced in #4971 (samdark)
......
extensions/imagine/CHANGELOG.md
Yii Framework 2 imagine extension Change Log
================================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/jui/CHANGELOG.md
Yii Framework 2 jui extension Change Log
========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/mongodb/CHANGELOG.md
Yii Framework 2 mongodb extension Change Log
============================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Bug #5303: Fixed `yii\mongodb\Collection` unable to fetch default database name from DSN with parameters (klimov-paul)
- Bug #5411: Fixed `yii\mongodb\ActiveRecord` unable to fetch 'hasMany' referred by array of `\MongoId` (klimov-paul)
......
extensions/redis/CHANGELOG.md
Yii Framework 2 redis extension Change Log
==========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/smarty/CHANGELOG.md
Yii Framework 2 smarty extension Change Log
===========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/sphinx/CHANGELOG.md
Yii Framework 2 sphinx extension Change Log
===========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Enh #5211: `yii\sphinx\Query` now supports 'HAVING' (klimov-paul)
......
extensions/swiftmailer/CHANGELOG.md
Yii Framework 2 swiftmailer extension Change Log
================================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- no changes in this release.
2.0.0-rc September 27, 2014
---------------------------
......
extensions/twig/CHANGELOG.md
Yii Framework 2 twig extension Change Log
=========================================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Bug #5308: object function calls in templates were passing arguments in a wrong way (genichyar, samdark)
......
framework/BaseYii.php
......@@ -93,7 +93,7 @@ class BaseYii
*/
public static function getVersion()
{
return '2.0.0-dev';
return '2.0.1-dev';
}
/**
......
framework/CHANGELOG.md
Yii Framework 2 Change Log
==========================
2.0.0 under development
2.0.1 under development
-----------------------
- no changes in this release.
2.0.0 October 12, 2014
----------------------
- Bug #4881: Fixed `yii\console\controllers\AssetController` breaks CSS URLs on Windows (klimov-paul)
- Bug #5171: Fixed the bug that ActiveForm + Pjax submit event is only triggered once (qiangxue)
- Bug #5242: Fixed `yii\console\controllers\AssetController` breaks CSS URLs in case target file localed at `yii\web\AssetManager::basePath` root (klimov-paul)
......@@ -26,6 +32,7 @@ Yii Framework 2 Change Log
- Enh #5467: Added ability to pass HTML tag options to `asEmail()`, `asImage()` and `asUrl()` methods of `yii\i18n\Formatter` (alxkolm, samdark)
- Chg #2037: Dropped the support for using `yii\base\Module` as concrete module classes (qiangxue)
- Chg: Updated cebe/markdown to 1.0.0 which includes breaking changes in its internal API (cebe)
- Chg: If you are using CUBRID DBMS, make sure to use at least version 9.3.0 because quoting is broken in prior versions and Yii has no reliable way to work around this issue (cebe)
2.0.0-rc September 27, 2014
......
framework/README.md
......@@ -12,7 +12,7 @@ The preferred way to install the Yii framework is through [composer](http://getc
Either run
```
composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
composer global require "fxp/composer-asset-plugin:1.0.0-beta3"
composer require --prefer-dist "yiisoft/yii2 *"
```
......
framework/UPGRADE.md
......@@ -32,6 +32,11 @@ Upgrade from Yii 2.0 RC
you need to update your implementation. See <https://github.com/cebe/markdown/releases/tag/1.0.0-rc> for details.
If you just used the markdown helper class there is no need to change anything.
* If you are using CUBRID DBMS, make sure to use at least version 9.3.0 as the server and also as the PDO extension.
Quoting of values is broken in prior versions and Yii has no reliable way to work around this issue.
A workaround that may have worked before has been removed in this release because it was not reliable.
Upgrade from Yii 2.0 Beta
-------------------------
......@@ -39,7 +44,7 @@ Upgrade from Yii 2.0 Beta
the composer-asset-plugin, *before* you update your project:
```
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta2"
php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta3"
```
You also need to add the following code to your project's `composer.json` file:
......
framework/db/cubrid/QueryBuilder.php
......@@ -10,7 +10,7 @@ namespace yii\db\cubrid;
use yii\base\InvalidParamException;
/**
* QueryBuilder is the query builder for CUBRID databases (version 9.1.x and higher).
* QueryBuilder is the query builder for CUBRID databases (version 9.3.x and higher).
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
......
framework/db/cubrid/Schema.php
......@@ -13,7 +13,7 @@ use yii\db\ColumnSchema;
use yii\db\Transaction;
/**
* Schema is the class for retrieving metadata from a CUBRID database (version 9.1.x and higher).
* Schema is the class for retrieving metadata from a CUBRID database (version 9.3.x and higher).
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
......@@ -104,30 +104,6 @@ class Schema extends \yii\db\Schema
}
/**
* Quotes a string value for use in a query.
* Note that if the parameter is not a string, it will be returned without change.
* @param string $str string to be quoted
* @return string the properly quoted string
* @see http://www.php.net/manual/en/function.PDO-quote.php
*/
public function quoteValue($str)
{
if (!is_string($str)) {
return $str;
}
$pdo = $this->db->getSlavePdo();
// workaround for broken PDO::quote() implementation in CUBRID 9.1.0 http://jira.cubrid.org/browse/APIS-658
$version = $pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION);
if (version_compare($version, '8.4.4.0002', '<') || $version[0] == '9' && version_compare($version, '9.2.0.0002', '<=')) {
return "'" . addcslashes(str_replace("'", "''", $str), "\000\n\r\\\032") . "'";
} else {
return $pdo->quote($str);
}
}
/**
* Creates a query builder for the CUBRID database.
* @return QueryBuilder query builder instance
*/
......
framework/web/Session.php
......@@ -43,7 +43,8 @@ use yii\base\InvalidParamException;
* useful for displaying confirmation messages. To use flash messages, simply
* call methods such as [[setFlash()]], [[getFlash()]].
*
* @property array $allFlashes Flash messages (key => message). This property is read-only.
* @property array $allFlashes Flash messages (key => message or key => [message1, message2]). This property
* is read-only.
* @property array $cookieParams The session cookie parameters. This property is read-only.
* @property integer $count The number of session variables. This property is read-only.
* @property string $flash The key identifying the flash message. Note that flash messages and normal session
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment