diff --git a/README.md b/README.md index 3bc2d67172..35a50f5fc1 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ without prior notices. **Yii 2.0 is not ready for production use yet.** [![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) -[![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2) +[![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2) [![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master) @@ -24,7 +24,7 @@ DIRECTORY STRUCTURE benchmark/ app demonstrating the minimal overhead introduced by the framework build/ internally used build tools docs/ documentation - extensions/ extensions + extensions/ extensions framework/ framework files yii/ framework source files tests/ tests of the core framework code diff --git a/apps/advanced/frontend/widgets/Alert.php b/apps/advanced/frontend/widgets/Alert.php index e070e1bd47..390f359575 100644 --- a/apps/advanced/frontend/widgets/Alert.php +++ b/apps/advanced/frontend/widgets/Alert.php @@ -27,13 +27,13 @@ class Alert extends \yii\bootstrap\Widget * - $value is the bootstrap alert type (i.e. danger, success, info, warning) */ public $alertTypes = [ - 'error' => 'danger', - 'danger' => 'danger', - 'success' => 'success', - 'info' => 'info', + 'error' => 'danger', + 'danger' => 'danger', + 'success' => 'success', + 'info' => 'info', 'warning' => 'warning' ]; - + /** * @var array the options for rendering the close button tag. */ @@ -49,7 +49,7 @@ class Alert extends \yii\bootstrap\Widget foreach ($flashes as $type => $message) { /* initialize css class for each alert box */ - $this->options['class'] = 'alert-' . $this->alertTypes[$type] . $appendCss; + $this->options['class'] = 'alert-' . $this->alertTypes[$type] . $appendCss; /* assign unique id to each alert box */ $this->options['id'] = $this->getId() . '-' . $type; diff --git a/apps/basic/commands/HelloController.php b/apps/basic/commands/HelloController.php index 29394cd97c..db36c5a8a5 100644 --- a/apps/basic/commands/HelloController.php +++ b/apps/basic/commands/HelloController.php @@ -13,7 +13,7 @@ use yii\console\Controller; * This command echoes what the first argument that you have entered. * * This command is provided as an example for you to learn how to create console commands. - * + * * @author Qiang Xue * @since 2.0 */ diff --git a/apps/basic/tests/_helpers/CodeHelper.php b/apps/basic/tests/_helpers/CodeHelper.php index 972c8f3f1a..eea532c3b7 100644 --- a/apps/basic/tests/_helpers/CodeHelper.php +++ b/apps/basic/tests/_helpers/CodeHelper.php @@ -1,7 +1,7 @@ dontSeeElement('.error'); @@ -834,7 +834,7 @@ class WebGuy extends \Codeception\AbstractGuy * Checks if element does not exist (or is visible) on a page, matching it by CSS or XPath * * Example: - * + * * ``` php * dontSeeElement('.error'); @@ -854,7 +854,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -873,7 +873,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -892,7 +892,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -911,16 +911,16 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. * ---------------------------------------------- * * Fills a text field or textarea with value. - * + * * Example: - * + * * ``` php * fillField("//input[@type='text']", "Hello World!"); @@ -941,7 +941,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -981,7 +981,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1011,7 +1011,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1040,7 +1040,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1099,7 +1099,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1152,7 +1152,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1209,7 +1209,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1266,7 +1266,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1321,7 +1321,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1376,7 +1376,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1419,7 +1419,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1462,7 +1462,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1485,7 +1485,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1507,7 +1507,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1529,7 +1529,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1560,7 +1560,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1591,7 +1591,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1648,7 +1648,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1705,7 +1705,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1774,7 +1774,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1841,7 +1841,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1874,7 +1874,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1907,7 +1907,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1962,7 +1962,7 @@ class WebGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. diff --git a/apps/basic/tests/functional/TestGuy.php b/apps/basic/tests/functional/TestGuy.php index 553a44f44b..9da8947344 100644 --- a/apps/basic/tests/functional/TestGuy.php +++ b/apps/basic/tests/functional/TestGuy.php @@ -27,7 +27,7 @@ use Codeception\Module\Yii2; class TestGuy extends \Codeception\AbstractGuy { - + /** * This method is generated. * Documentation taken from corresponding module. @@ -49,7 +49,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -79,7 +79,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -106,7 +106,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -133,7 +133,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -161,7 +161,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -220,7 +220,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -281,7 +281,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -336,7 +336,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -355,7 +355,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -412,7 +412,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -439,13 +439,13 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. * ---------------------------------------------- * - * Authenticates user for HTTP_AUTH + * Authenticates user for HTTP_AUTH * * @param $username * @param $password @@ -461,7 +461,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -494,7 +494,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -540,7 +540,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -605,7 +605,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -670,7 +670,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -733,7 +733,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -794,7 +794,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -853,7 +853,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -906,7 +906,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -963,7 +963,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1020,7 +1020,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1075,7 +1075,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1130,7 +1130,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1161,7 +1161,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1224,7 +1224,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1285,7 +1285,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1354,7 +1354,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1421,7 +1421,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1477,16 +1477,16 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. * ---------------------------------------------- * * Fills a text field or textarea with value. - * + * * Example: - * + * * ``` php * fillField("//input[@type='text']", "Hello World!"); @@ -1507,7 +1507,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1547,7 +1547,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1577,7 +1577,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1606,7 +1606,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1637,7 +1637,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1662,7 +1662,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1698,7 +1698,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1731,7 +1731,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1764,7 +1764,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1817,7 +1817,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1826,7 +1826,7 @@ class TestGuy extends \Codeception\AbstractGuy * Checks if element does not exist (or is visible) on a page, matching it by CSS or XPath * * Example: - * + * * ``` php * dontSeeElement('.error'); @@ -1854,7 +1854,7 @@ class TestGuy extends \Codeception\AbstractGuy * Checks if element does not exist (or is visible) on a page, matching it by CSS or XPath * * Example: - * + * * ``` php * dontSeeElement('.error'); @@ -1874,7 +1874,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1931,7 +1931,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -1988,7 +1988,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -2025,7 +2025,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -2068,7 +2068,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. @@ -2123,7 +2123,7 @@ class TestGuy extends \Codeception\AbstractGuy return new Maybe(); } - + /** * This method is generated. * Documentation taken from corresponding module. diff --git a/apps/basic/tests/unit/CodeGuy.php b/apps/basic/tests/unit/CodeGuy.php index 613c7549f9..70165a69b0 100644 --- a/apps/basic/tests/unit/CodeGuy.php +++ b/apps/basic/tests/unit/CodeGuy.php @@ -25,6 +25,6 @@ use Codeception\Module\CodeHelper; class CodeGuy extends \Codeception\AbstractGuy { - + } diff --git a/docs/guide/active-record.md b/docs/guide/active-record.md index 90826b0098..aa4775144a 100644 --- a/docs/guide/active-record.md +++ b/docs/guide/active-record.md @@ -3,7 +3,7 @@ Active Record Active Record implements the [Active Record design pattern](http://en.wikipedia.org/wiki/Active_record). The premise behind Active Record is that an individual [[ActiveRecord]] object is associated with a specific row in a database table. The object's attributes are mapped to the columns of the corresponding table. Referencing an Active Record attribute is equivalent to accessing -the corresponding table column for that record. +the corresponding table column for that record. As an example, say that the `Customer` ActiveRecord class is associated with the `tbl_customer` table. This would mean that the class's `name` attribute is automatically mapped to the `name` column in `tbl_customer`. diff --git a/docs/guide/authentication.md b/docs/guide/authentication.md index 0b81f14335..e73b11d2f2 100644 --- a/docs/guide/authentication.md +++ b/docs/guide/authentication.md @@ -3,7 +3,7 @@ Authentication Authentication is the act of verifying who a user is, and is the basis of the login process. Typically, authentication uses an identifier--a username or email address--and password, submitted through a form. The application then compares this information against that previously stored. -In Yii all this is done semi-automatically, leaving the developer to merely implement [[\yii\web\IdentityInterface]]. Typically, implementation is accomplished using the `User` model. You can find a full featured example in the +In Yii all this is done semi-automatically, leaving the developer to merely implement [[\yii\web\IdentityInterface]]. Typically, implementation is accomplished using the `User` model. You can find a full featured example in the [advanced application template](installation.md). Below only the interface methods are listed: ```php diff --git a/docs/guide/composer.md b/docs/guide/composer.md index 89eac350e0..8abef5a5f8 100644 --- a/docs/guide/composer.md +++ b/docs/guide/composer.md @@ -9,7 +9,7 @@ Installing Composer In order to install Composer, check the official guide for your operating system: -* [Linux](http://getcomposer.org/doc/00-intro.md#installation-nix) +* [Linux](http://getcomposer.org/doc/00-intro.md#installation-nix) * [Windows](http://getcomposer.org/doc/00-intro.md#installation-windows) All of the details can be found in the guide, but you'll either download Composer directly from [http://getcomposer.org/](http://getcomposer.org/), or run the following command: diff --git a/docs/guide/images/structure.vsd b/docs/guide/images/structure.vsd index e683556d08..c3b795f92b 100644 Binary files a/docs/guide/images/structure.vsd and b/docs/guide/images/structure.vsd differ diff --git a/docs/guide/installation.md b/docs/guide/installation.md index 15751634dc..6a994582f3 100644 --- a/docs/guide/installation.md +++ b/docs/guide/installation.md @@ -19,7 +19,7 @@ curl -s http://getcomposer.org/installer | php For problems or more information, see the official Composer guide: -* [Linux](http://getcomposer.org/doc/00-intro.md#installation-nix) +* [Linux](http://getcomposer.org/doc/00-intro.md#installation-nix) * [Windows](http://getcomposer.org/doc/00-intro.md#installation-windows) With Composer installed, you can create a new Yii site using one of Yii's ready-to-use application templates. diff --git a/docs/guide/model.md b/docs/guide/model.md index abf2b480d5..a02e1ad866 100644 --- a/docs/guide/model.md +++ b/docs/guide/model.md @@ -59,7 +59,7 @@ Attribute Labels ---------------- Attribute labels are mainly used for display purpose. For example, given an attribute `firstName`, we can declare -a label `First Name` that is more user-friendly when displayed to end users in places such as form labels and +a label `First Name` that is more user-friendly when displayed to end users in places such as form labels and error messages. Given an attribute name, you can obtain its label by calling [[\yii\base\Model::getAttributeLabel()]]. To declare attribute labels, override the [[\yii\base\Model::attributeLabels()]] method. The overridden method returns a mapping of attribute names to attribute labels, as shown in the example below. If an attribute is not found @@ -86,7 +86,7 @@ Scenarios --------- A model may be used in different *scenarios*. For example, a `User` model may be used to collect user login inputs, -but it may also be used for user registration purposes. In the one scenario, every piece of data is required; in the other, only the username and password would be. +but it may also be used for user registration purposes. In the one scenario, every piece of data is required; in the other, only the username and password would be. To easily implement the business logic for different scenarios, each model has a property named `scenario` that stores the name of the scenario that the model is currently being used in. As will be explained in the next diff --git a/docs/guide/mvc.md b/docs/guide/mvc.md index 22f86a1fcb..8579064038 100644 --- a/docs/guide/mvc.md +++ b/docs/guide/mvc.md @@ -3,7 +3,7 @@ MVC Overview Yii implements the model-view-controller (MVC) design pattern, which is widely adopted in web and other application programming. MVC aims to separate business logic from -user interface considerations, allowing developers to more easily change individual components of an application without affecting, or even touching, another. +user interface considerations, allowing developers to more easily change individual components of an application without affecting, or even touching, another. In MVC, the *model* represents the information (the data) and the business rules to which the data must adhere. The *view* contains elements diff --git a/docs/guide/security.md b/docs/guide/security.md index f54a13383b..d74a661f45 100644 --- a/docs/guide/security.md +++ b/docs/guide/security.md @@ -1,7 +1,7 @@ Security ======== -Good security is vital to the health and success of many websites. Unfortunately, many developers may cut corners when it comes to security due to a lack of understanding or too large of an implementation hurdle. To make your Yii-based site as secure as possible, the Yii framework has baked in several excellent, and easy to use, security features. +Good security is vital to the health and success of many websites. Unfortunately, many developers may cut corners when it comes to security due to a lack of understanding or too large of an implementation hurdle. To make your Yii-based site as secure as possible, the Yii framework has baked in several excellent, and easy to use, security features. Hashing and verifying passwords ------------------------------- diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md index 37a7511521..c02a48dcdb 100644 --- a/docs/guide/upgrade-from-v1.md +++ b/docs/guide/upgrade-from-v1.md @@ -135,7 +135,7 @@ Path alias is also closely related with class namespaces. It is recommended that alias be defined for each root namespace so that you can use Yii the class autoloader without any further configuration. For example, because `@yii` refers to the Yii installation directory, a class like `yii\web\Request` can be autoloaded by Yii. If you use a third party library -such as Zend Framework, you may define a path alias `@Zend` which refers to its installation +such as Zend Framework, you may define a path alias `@Zend` which refers to its installation directory and Yii will be able to autoload any class in this library. More on path aliases can be found in the [Basic concepts section](basics.md). diff --git a/docs/internals/exception_hierarchy.vsd b/docs/internals/exception_hierarchy.vsd index d044ea9315..ce40607495 100644 Binary files a/docs/internals/exception_hierarchy.vsd and b/docs/internals/exception_hierarchy.vsd differ diff --git a/framework/yii/assets/jquery.maskedinput.js b/framework/yii/assets/jquery.maskedinput.js index 49a5a72549..902b5d3ac0 100644 --- a/framework/yii/assets/jquery.maskedinput.js +++ b/framework/yii/assets/jquery.maskedinput.js @@ -9,7 +9,7 @@ var el = document.createElement('input'), name = 'onpaste'; el.setAttribute(name, ''); - return (typeof el[name] === 'function')?'paste':'input'; + return (typeof el[name] === 'function')?'paste':'input'; } var pasteEventName = getPasteEvent() + ".mask", @@ -322,9 +322,9 @@ $.fn.extend({ .bind("keydown.mask", keydownEvent) .bind("keypress.mask", keypressEvent) .bind(pasteEventName, function() { - setTimeout(function() { + setTimeout(function() { var pos=checkVal(true); - input.caret(pos); + input.caret(pos); if (settings.completed && pos == input.val().length) settings.completed.call(input); }, 0); diff --git a/framework/yii/db/pgsql/Schema.php b/framework/yii/db/pgsql/Schema.php index dbf72377d9..8cc0a39f96 100644 --- a/framework/yii/db/pgsql/Schema.php +++ b/framework/yii/db/pgsql/Schema.php @@ -196,13 +196,13 @@ EOD; //http://www.postgresql.org/message-id/26677.1086673982@sss.pgh.pa.us $sql = <<db->quoteValue($table->name); $schemaName = $this->db->quoteValue($table->schemaName); $sql = <<getMethod() === 'OPTIONS'; } - + /** * Returns whether this is a HEAD request. * @return boolean whether this is a HEAD request. @@ -183,7 +183,7 @@ class Request extends \yii\base\Request { return $this->getMethod() === 'HEAD'; } - + /** * Returns whether this is a POST request. * @return boolean whether this is a POST request. diff --git a/framework/yii/web/Response.php b/framework/yii/web/Response.php index 3ebd358a2a..bb7784811e 100644 --- a/framework/yii/web/Response.php +++ b/framework/yii/web/Response.php @@ -513,8 +513,8 @@ class Response extends \yii\base\Response * specified by that header using web server internals including all optimizations like caching-headers. * * As this header directive is non-standard different directives exists for different web servers applications: - * - * - Apache: [X-Sendfile](http://tn123.org/mod_xsendfile) + * + * - Apache: [X-Sendfile](http://tn123.org/mod_xsendfile) * - Lighttpd v1.4: [X-LIGHTTPD-send-file](http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file) * - Lighttpd v1.5: [X-Sendfile](http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file) * - Nginx: [X-Accel-Redirect](http://wiki.nginx.org/XSendfile) @@ -524,23 +524,23 @@ class Response extends \yii\base\Response * a proper xHeader should be sent. * * **Note** - * - * This option allows to download files that are not under web folders, and even files that are otherwise protected + * + * This option allows to download files that are not under web folders, and even files that are otherwise protected * (deny from all) like `.htaccess`. * * **Side effects** - * + * * If this option is disabled by the web server, when this method is called a download configuration dialog * will open but the downloaded file will have 0 bytes. * * **Known issues** - * + * * There is a Bug with Internet Explorer 6, 7 and 8 when X-SENDFILE is used over an SSL connection, it will show - * an error message like this: "Internet Explorer was not able to open this Internet site. The requested site + * an error message like this: "Internet Explorer was not able to open this Internet site. The requested site * is either unavailable or cannot be found.". You can work around this problem by removing the `Pragma`-header. * * **Example** - * + * * ~~~ * Yii::$app->request->xSendFile('/home/user/Pictures/picture1.jpg'); * ~~~ diff --git a/tests/unit/data/i18n/test.mo b/tests/unit/data/i18n/test.mo index d5f94f14a3..2b25a7c338 100644 Binary files a/tests/unit/data/i18n/test.mo and b/tests/unit/data/i18n/test.mo differ diff --git a/tests/unit/framework/ar/ActiveRecordTestTrait.php b/tests/unit/framework/ar/ActiveRecordTestTrait.php index 56020968f5..9cd65b9e9d 100644 --- a/tests/unit/framework/ar/ActiveRecordTestTrait.php +++ b/tests/unit/framework/ar/ActiveRecordTestTrait.php @@ -1,7 +1,7 @@ */ diff --git a/tests/unit/framework/base/ExceptionTest.php b/tests/unit/framework/base/ExceptionTest.php index 5a623b144c..635b55cd47 100644 --- a/tests/unit/framework/base/ExceptionTest.php +++ b/tests/unit/framework/base/ExceptionTest.php @@ -8,7 +8,7 @@ use yii\base\InvalidCallException; class ExceptionTest extends TestCase { - public function testToArrayWithPrevious() + public function testToArrayWithPrevious() { $e = new InvalidCallException('bar', 0 ,new InvalidCallException('foo')); $array = $e->toArray(); diff --git a/tests/unit/framework/data/ActiveDataProviderTest.php b/tests/unit/framework/data/ActiveDataProviderTest.php index 4e4ca7780f..a58deabd28 100644 --- a/tests/unit/framework/data/ActiveDataProviderTest.php +++ b/tests/unit/framework/data/ActiveDataProviderTest.php @@ -160,7 +160,7 @@ class ActiveDataProviderTest extends DatabaseTestCase $this->assertEquals(2, count($provider->getModels())); } - public function testPaginationBeforeModels() + public function testPaginationBeforeModels() { $query = new Query; $provider = new ActiveDataProvider([ diff --git a/tests/unit/framework/web/AssetBundleTest.php b/tests/unit/framework/web/AssetBundleTest.php index 24c36d6a0a..d989a13362 100644 --- a/tests/unit/framework/web/AssetBundleTest.php +++ b/tests/unit/framework/web/AssetBundleTest.php @@ -1,7 +1,7 @@ */ diff --git a/tests/unit/framework/web/XmlResponseFormatterTest.php b/tests/unit/framework/web/XmlResponseFormatterTest.php index 800de66708..bf1aa294d7 100644 --- a/tests/unit/framework/web/XmlResponseFormatterTest.php +++ b/tests/unit/framework/web/XmlResponseFormatterTest.php @@ -48,7 +48,7 @@ class XmlResponseFormatterTest extends \yiiunit\TestCase } /** - * @param mixed $data the data to be formatted + * @param mixed $data the data to be formatted * @param string $xml the expected XML body * @dataProvider formatScalarDataProvider */