Browse Source

Merge pull request #8151 from nkovacs/following

Grammar fix: followings -> following [skip ci]
tags/2.0.4
Alexander Makarov 10 years ago
parent
commit
0645622d49
  1. 2
      docs/guide-zh-CN/structure-extensions.md
  2. 2
      docs/guide/caching-data.md
  3. 2
      docs/guide/concept-di-container.md
  4. 2
      docs/guide/db-query-builder.md
  5. 2
      docs/guide/runtime-handling-errors.md
  6. 2
      docs/guide/security-authorization.md
  7. 2
      docs/guide/structure-controllers.md
  8. 2
      framework/base/Behavior.php
  9. 2
      framework/base/Component.php
  10. 2
      framework/base/Module.php
  11. 2
      framework/db/ActiveQueryInterface.php
  12. 2
      framework/db/ActiveQueryTrait.php
  13. 2
      framework/db/QueryInterface.php
  14. 2
      framework/db/Schema.php
  15. 2
      framework/di/Container.php
  16. 2
      framework/di/ServiceLocator.php
  17. 2
      framework/rbac/DbManager.php
  18. 2
      framework/validators/ExistValidator.php
  19. 2
      framework/validators/UniqueValidator.php

2
docs/guide-zh-CN/structure-extensions.md

@ -363,7 +363,7 @@ If it is the first time you release an extension, you should register it on a Co
on the VCS repository of your extension and notify the Composer repository about the new release. People will
then be able to find the new release, and install or update the extension through the Composer repository.
In the releases of your extension, besides code files you should also consider including the followings to
In the releases of your extension, besides code files you should also consider including the following to
help other people learn about and use your extension:
* A readme file in the package root directory: it describes what your extension does and how to install and use it.

2
docs/guide/caching-data.md

@ -135,7 +135,7 @@ which may reduce the overhead involved in retrieving cached data. The APIs [[yii
and [[yii\caching\Cache::madd()|madd()]] are provided to exploit this feature. In case the underlying cache storage
does not support this feature, it will be simulated.
Because [[yii\caching\Cache]] implements `ArrayAccess`, a cache component can be used like an array. The followings
Because [[yii\caching\Cache]] implements `ArrayAccess`, a cache component can be used like an array. The following
are some examples:
```php

2
docs/guide/concept-di-container.md

@ -344,7 +344,7 @@ When to Register Dependencies <span id="when-to-register-dependencies"></span>
-----------------------------
Because dependencies are needed when new objects are being created, their registration should be done
as early as possible. The followings are the recommended practices:
as early as possible. The following are the recommended practices:
* If you are the developer of an application, you can register dependencies in your
application's [entry script](structure-entry-scripts.md) or in a script that is included by the entry script.

2
docs/guide/db-query-builder.md

@ -225,7 +225,7 @@ Operator format allows you to specify arbitrary conditions in a programmatic way
```
where the operands can each be specified in string format, hash format or operator format recursively, while
the operator can be one of the followings:
the operator can be one of the following:
- `and`: the operands should be concatenated together using `AND`. For example,
`['and', 'id=1', 'id=2']` will generate `id=1 AND id=2`. If an operand is an array,

2
docs/guide/runtime-handling-errors.md

@ -2,7 +2,7 @@ Handling Errors
===============
Yii includes a built-in [[yii\web\ErrorHandler|error handler]] which makes error handling a much more pleasant
experience than before. In particular, the Yii error handler does the followings to improve error handling:
experience than before. In particular, the Yii error handler does the following to improve error handling:
* All non-fatal PHP errors (e.g. warnings, notices) are converted into catchable exceptions.
* Exceptions and fatal PHP errors are displayed with detailed call stack information and source code lines

2
docs/guide/security-authorization.md

@ -60,7 +60,7 @@ When ACF performs authorization check, it will examine the rules one by one from
a match. The `allow` value of the matching rule will then be used to judge if the user is authorized. If none
of the rules matches, it means the user is NOT authorized and ACF will stop further action execution.
By default, ACF does only of the followings when it determines a user is not authorized to access the current action:
By default, ACF does only the following when it determines a user is not authorized to access the current action:
* If the user is a guest, it will call [[yii\web\User::loginRequired()]], which may redirect the browser to the login page.
* If the user is already authenticated, it will throw a [[yii\web\ForbiddenHttpException]].

2
docs/guide/structure-controllers.md

@ -131,7 +131,7 @@ Controller class names can be derived from controller IDs according to the follo
* Append the suffix `Controller`.
* And prepend the [[yii\base\Application::controllerNamespace|controller namespace]].
The followings are some examples, assuming the [[yii\base\Application::controllerNamespace|controller namespace]]
The following are some examples, assuming the [[yii\base\Application::controllerNamespace|controller namespace]]
takes the default value `app\controllers`:
* `article` derives `app\controllers\ArticleController`;

2
framework/base/Behavior.php

@ -36,7 +36,7 @@ class Behavior extends Object
* attached to the owner; and they will be detached from the events when
* the behavior is detached from the component.
*
* The callbacks can be any of the followings:
* The callbacks can be any of the following:
*
* - method in this behavior: `'handleClick'`, equivalent to `[$this, 'handleClick']`
* - object method: `[$object, 'handleClick']`

2
framework/base/Component.php

@ -447,7 +447,7 @@ class Component extends Object
/**
* Attaches an event handler to an event.
*
* The event handler must be a valid PHP callback. The followings are
* The event handler must be a valid PHP callback. The following are
* some examples:
*
* ~~~

2
framework/base/Module.php

@ -364,7 +364,7 @@ class Module extends ServiceLocator
* Adds a sub-module to this module.
* @param string $id module ID
* @param Module|array|null $module the sub-module to be added to this module. This can
* be one of the followings:
* be one of the following:
*
* - a [[Module]] object
* - a configuration array: when [[getModule()]] is called initially, the array

2
framework/db/ActiveQueryInterface.php

@ -59,7 +59,7 @@ interface ActiveQueryInterface extends QueryInterface
* For example, `orders.address` means the `address` relation defined
* in the model class corresponding to the `orders` relation.
*
* The followings are some usage examples:
* The following are some usage examples:
*
* ~~~
* // find customers together with their orders and country

2
framework/db/ActiveQueryTrait.php

@ -53,7 +53,7 @@ trait ActiveQueryTrait
* For example, `orders.address` means the `address` relation defined
* in the model class corresponding to the `orders` relation.
*
* The followings are some usage examples:
* The following are some usage examples:
*
* ~~~
* // find customers together with their orders and country

2
framework/db/QueryInterface.php

@ -91,7 +91,7 @@ interface QueryInterface
* - `['status' => null]` generates `status IS NULL`.
*
* A condition in operator format generates the SQL expression according to the specified operator, which
* can be one of the followings:
* can be one of the following:
*
* - **and**: the operands should be concatenated together using `AND`. For example,
* `['and', 'id=1', 'id=2']` will generate `id=1 AND id=2`. If an operand is an array,

2
framework/db/Schema.php

@ -36,7 +36,7 @@ use yii\caching\TagDependency;
abstract class Schema extends Object
{
/**
* The followings are the supported abstract column data types.
* The following are the supported abstract column data types.
*/
const TYPE_PK = 'pk';
const TYPE_BIGPK = 'bigpk';

2
framework/di/Container.php

@ -230,7 +230,7 @@ class Container extends Component
* You may use [[has()]] to check if a class definition already exists.
*
* @param string $class class name, interface name or alias name
* @param mixed $definition the definition associated with `$class`. It can be one of the followings:
* @param mixed $definition the definition associated with `$class`. It can be one of the following:
*
* - a PHP callable: The callable will be executed when [[get()]] is invoked. The signature of the callable
* should be `function ($container, $params, $config)`, where `$params` stands for the list of constructor

2
framework/di/ServiceLocator.php

@ -170,7 +170,7 @@ class ServiceLocator extends Component
*
* @param string $id component ID (e.g. `db`).
* @param mixed $definition the component definition to be registered with this locator.
* It can be one of the followings:
* It can be one of the following:
*
* - a class name
* - a configuration array: the array contains name-value pairs that will be used to

2
framework/rbac/DbManager.php

@ -60,7 +60,7 @@ class DbManager extends BaseManager
*/
public $ruleTable = '{{%auth_rule}}';
/**
* @var Cache|array|string the cache used to improve RBAC performance. This can be one of the followings:
* @var Cache|array|string the cache used to improve RBAC performance. This can be one of the following:
*
* - an application component ID (e.g. `cache`)
* - a configuration array

2
framework/validators/ExistValidator.php

@ -19,7 +19,7 @@ use yii\base\InvalidConfigException;
* This validator is often used to verify that a foreign key contains a value
* that can be found in the foreign table.
*
* The followings are examples of validation rules using this validator:
* The following are examples of validation rules using this validator:
*
* ```php
* // a1 needs to exist

2
framework/validators/UniqueValidator.php

@ -16,7 +16,7 @@ use yii\db\ActiveRecordInterface;
* UniqueValidator checks if the value being validated is unique in the table column specified by
* the ActiveRecord class [[targetClass]] and the attribute [[targetAttribute]].
*
* The followings are examples of validation rules using this validator:
* The following are examples of validation rules using this validator:
*
* ```php
* // a1 needs to be unique

Loading…
Cancel
Save