Minor fixes

Author: samdark

guide/en/caching/data.md

@@ -19,7 +19,7 @@ public function getTopProducts(\Yiisoft\Cache\CacheInterface $cache): array
 
     // Try retrieving $data from cache.
     $data = $cache->getOrSet($key, function (\Psr\SimpleCache\CacheInterface $cache) use ($count) {
-        // Can't find $data in cache, calculate it from scratch.
+        // Can't find $data in a cache, calculate it from scratch.
         return getTopProductsFromDatabase($count);
     }, 3600);
 
@@ -52,7 +52,7 @@ Yii provides the following handlers:
 - [File](https://github.com/yiisoft/cache-file) — uses standard files to store cached data. This is particularly suitable
   to cache large chunks of data, such as page content.
 - [Memcached](https://github.com/yiisoft/cache-memcached) — uses a PHP [memcached](https://secure.php.net/manual/en/book.memcached.php)
-  extension. You can consider this option as the fastest one when dealing with cache in distributed application 
+  extension. You can consider this option as the fastest one when dealing with cache in a distributed application  
   (e.g., with several servers, load balancers, etc.)
 - [Wincache](https://github.com/yiisoft/cache-wincache) — uses PHP [WinCache](https://iis.net/downloads/microsoft/wincache-extension)
   ([see also](https://secure.php.net/manual/en/book.wincache.php)) extension.
@@ -107,7 +107,7 @@ The `$ttl` parameter indicates for how many seconds the data item can remain val
 the data item, if it has passed the expiration time, the method will execute the function and set the resulting value
 into cache.
 
-You may set default TTL for the cache:
+You may set the default TTL for the cache:
 
 ```php
 $cache = new \Yiisoft\Cache\Cache($arrayCache, 60 * 60); // 1 hour
@@ -168,7 +168,7 @@ The `\Yiisoft\Cache\Cache` uses a built-in "Probably early expiration" algorithm
 This algorithm randomly fakes a cache miss for one user while others are still served the cached value.
 You can control its behavior with the fifth optional parameter of `getOrSet()`, which is a float value called `$beta`.
 By default, beta is `1.0`, which is usually enough.
-The higher the value the earlier cache will be re-created.
+The higher the value, the earlier cache will be re-created.
 
 ```php
 /**

guide/en/concept/di-container.md

@@ -28,7 +28,7 @@ final readonly class CachedWidget extends Cache
 }
 ```
 
-The issue here is that these two are becoming unnecessarily coupled or inter-dependent making them more fragile.
+The issue here is that these two are becoming unnecessarily coupled or inter-dependent, making them more fragile.
 
 Another way to handle this is composition:
 

guide/en/concept/immutability.md

@@ -106,7 +106,7 @@ $discounted = $price->withAmount(800);
 > If you define a simple DTO, you can use modern PHP `readonly` and leave properties `public`. The `readonly` keyword
 > would ensure that the properties cannot be modified after the object is created.
 
-## Using clone (and why it is cheap)
+## Using clone (and why it is inexpensive)
 
 PHP's clone performs a shallow copy of the object. For immutable value objects that contain only scalars 
 or other immutable objects, shallow cloning is enough and fast. In modern PHP, cloning small value objects is 

guide/en/databases/db-migrations.md

@@ -8,7 +8,7 @@ composer require yiisoft/db-migration
 
 ### Example usage
 
-First, configure DI container. Create `config/common/db.php` with the following content:
+First, configure a DI container. Create `config/common/db.php` with the following content:
 
 ```php
 <?php
@@ -67,7 +67,7 @@ use Yiisoft\Db\Migration\RevertibleMigrationInterface;
 use Yiisoft\Db\Migration\TransactionalMigrationInterface;
 
 /**
- * Handles the creation of table `my_first_table`.
+ * Handles the creation of a table `my_first_table`.
  */
 final class M240115143455CreateMyFirstTableTable implements RevertibleMigrationInterface, TransactionalMigrationInterface
 {
@@ -97,6 +97,6 @@ Migrations in Yii2 and the [yiisoft/db-migration](https://github.com/yiisoft/db-
 and the `migration` table is also not
 compatible.
 A probable solution is to use structure dumps and rename the old `migration` table. Upon the initial execution of
-migrations, a new `migration` table with new fields will be created. All subsequent changes in the database schema are
+migrations, a new `migration` table with new fields will be created. All further changes in the database schema are
 applied using the new `migration` component and recorded in the new migration table.
 

guide/en/intro/what-is-yii.md

@@ -51,7 +51,7 @@ Yii currently has three major versions available: 1.1, 2.0, and 3.0.
 
 ## Requirements and prerequisites
 
-Yii3 requires PHP 8.2 or above, but some packages also older PHP such as PHP 7.4.
+Yii3 requires PHP 8.2 or above, but some packages work with older PHP, such as PHP 7.4.
 
 Using Yii requires basic knowledge of object-oriented programming (OOP), as Yii is a pure OOP-based framework.
 Yii3 also makes use of the latest PHP features, such as type declarations and generators. Understanding these

guide/en/security/authentication.md

@@ -37,7 +37,7 @@ return [
 
     // User:
     IdentityRepositoryInterface::class => static function (ContainerInterface $container) {
-        // instead of Cycle-based repository, you can use any implementation
+        // instead of a Cycle-based repository, you can use any implementation
         return $container->get(\Cycle\ORM\ORMInterface::class)->getRepository(\App\Entity\User::class);
     },
 ];
@@ -49,7 +49,7 @@ The identity class must implement the `\Yiisoft\Auth\IdentityInterface` which ha
 
 * [[yii\web\IdentityInterface::getId()|getId()]]: it returns the ID of the user represented by this identity instance.
 
-In the following example, an identity class implemented as a pure PHP object.
+In the following example, an identity class is implemented as a pure PHP object.
 
 ```php
 <?php
@@ -131,8 +131,8 @@ final readonly class IdentityRepository implements IdentityRepositoryInterface
 
 ## Using `\Yiisoft\User\User` <span id="using-user"></span>
 
-You can use `\Yiisoft\User\User` service to obtain current user identity.
-As any service, it could be auto wired in either action handler constructor or method:
+You can use `\Yiisoft\User\User` service to get current user identity.
+As any service, it could be auto-wired in either action handler constructor or method:
 
 ```php
 use \Psr\Http\Message\ServerRequestInterface;
@@ -166,7 +166,7 @@ $user->login($identity);
 The `login()` method sets the identity to the User service.
 It stores identity into session so user authentication status is maintained.
 
-To logout a user, simply call
+To log out a user, call
 
 ```php
 /* @var $user \Yiisoft\User\User */

guide/en/security/authorization.md

@@ -64,7 +64,7 @@ You may assign a role to one or many users.
 To check if a user has a specified permission, you may check if the user has a role with that permission.
 
 Associated with each role or permission, there may be a *rule*.
-A rule represents a piece of code that access checker
+A rule represents a piece of code that an access checker
 will execute to decide if the corresponding role or permission applies to the current user.
 For example, the "update post" permission may have a rule that checks if the current user is the post creator.
 During access checking, if the user is NOT the post creator, there's no "update post" permission.
@@ -99,7 +99,7 @@ return [
 ];
 ```
 
-`\Yiisoft\Rbac\Manager\PhpManager` uses a PHP script files to store authorization data.
+`\Yiisoft\Rbac\Manager\PhpManager` uses PHP script files to store authorization data.
 The files are under `@rbac` alias.
 Make sure the directory and all the files in it are writable by the Web server process if you want to change permission
 hierarchy online.
@@ -168,7 +168,7 @@ final readonly class RbacCommand extends Command
         $updatePost = (new Permission('updatePost'))->withDescription('Update post');
         $auth->add($updatePost);
 
-        // add "author" role and give this role the "createPost" permission
+        // add the "author" role and give this role the "createPost" permission
         $author = new Role('author');
         $auth->add($author);
         $auth->addChild($author, $createPost);
@@ -230,7 +230,7 @@ class m170124_084304_init_rbac extends Migration
         $updatePost = (new Permission('updatePost'))->withDescription('Update post');
         $auth->add($updatePost);
 
-        // add "author" role and give this role the "createPost" permission
+        // add the "author" role and give this role the "createPost" permission
         $author = new Role('author');
         $auth->add($author);
         $auth->addChild($author, $createPost);
@@ -266,10 +266,10 @@ You could apply migration by using `./yii migrate`.
 
 TODO: update when signup implemented in demo / template.
 
-The author can create a post, admin can update post and do everything the author can.
+The author can create a post, admin can update the post and do everything the author can.
 
-If your application allows user signup, you need to assign roles to these new users once.
-For example, in order for all signed-up users to become authors in your advanced project template you need
+If your application allows user signup, you need to assign roles to these new users at once.
+For example, in order for all signed-up users to become authors in your advanced project template, you need
 to change `frontend\models\SignupForm::signup()` as follows:
 
 ```php
@@ -314,7 +314,7 @@ use Yiisoft\Rbac\Item;
 use \Yiisoft\Rbac\Rule;
 
 /**
- * Checks if authorID matches user passed via params.
+ * Checks if the authorID matches user passed via params.
  */
 final readonly class AuthorRule extends Rule
 {
@@ -360,7 +360,7 @@ Now you've got the following hierarchy:
 
 ### Access check <span id="access-check"></span>
 
-The check is done similar to how it was done in the first section of this guide:
+The check is done similarly to how it was done in the first section of this guide:
 
 ```php
 namespace App\Blog\Post;
@@ -396,7 +396,7 @@ final readonly class PostController
 }
 ```
 
-The difference is that now checking for user's own post is part of the RBAC.
+The difference is that now checking for a user's own post is part of the RBAC.
 
 If the current user is Jane with `ID=1` you are starting at `createPost` and trying to get to `Jane`:
 

guide/en/structure/middleware.md

@@ -21,9 +21,9 @@ as follows:
 
 ## Using middleware
 
-Any PSR-15 compatible middleware could be used with Yii and there are many.
-Say, you need to add basic authentication
-one of the application URLs. URL-dependent middleware is configured using router, so you need to change router factory. 
+Any [PSR-15](https://www.php-fig.org/psr/psr-15/) compatible middleware could be used with Yii, and there are many.
+Say, you need to add basic authentication to one of the application URLs. 
+URL-dependent middleware is configured using router, so you need to change the router factory. 
 
 Authentication middleware is implemented by `middlewares/http-authentication` package so execute
 `composer require middlewares/http-authentication` in the application root directory.
@@ -68,7 +68,7 @@ When configuring routing, you're binding `/basic-auth` URL to a chain of middlew
 authentication, and the action itself. A chain is a special middleware that executes all the middleware it's configured
 with.
 
-The action itself may be the following:
+The action itself could be the following:
 
 ```php
 public function auth(ServerRequestInterface $request): ResponseInterface
@@ -113,9 +113,9 @@ To create middleware, you need to implement a single `process` method of `Psr\Ht
 public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface;
 ```
 
-There are multiple ways to handle request and choosing one depends on what the middleware should achieve.
+There are multiple ways to handle a request, and choosing one depends on what the middleware should achieve.
 
-### Forming response directly
+### Forming a response directly
 
 To respond directly, one needs a response factory passed via constructor:
 
@@ -148,8 +148,8 @@ final readonly class RespondingMiddleware implements MiddlewareInterface
 
 ### Delegating handling to the next middleware
 
-If middleware either isn't intended form response / change request or can't do it this time, handling could be
-left to the next middleware in the stack:  
+If middleware either isn't intended to form a response or change the request or can't do anything this time,
+handling could be left to the next middleware in the stack:  
 
 ```php
 return $next->handle($request);
@@ -170,7 +170,7 @@ $answer = $request->getAttribute('answer');
 
 ### Capturing response to manipulate it
 
-You may want to capture response to manipulate it. It could be useful for adding CORS headers, gzipping content etc.
+You may want to capture the response to manipulate it. It could be useful for adding CORS headers, gzipping content, etc.
 
 ```php
 $response = $next->handle($request);

guide/en/tutorial/performance-tuning.md

@@ -11,7 +11,7 @@ A well-configured PHP environment is important. To get maximum performance:
 
 - Use the latest stable PHP version. Major releases of PHP may bring significant performance improvements.
 - Enable bytecode caching with [Opcache](https://secure.php.net/opcache). 
-  Bytecode caching avoids the time spent in parsing and including PHP scripts for every incoming request.
+  Bytecode caching avoids the time spent on parsing and including PHP scripts for every incoming request.
 - [Tune `realpath()` cache](https://github.com/samdark/realpath_cache_tuner).
 - Make sure [XDebug](https://xdebug.org/) isn't installed in the production environment.
 - Try [PHP 7 preloading](https://wiki.php.net/rfc/preload).
@@ -134,7 +134,7 @@ was used with the following run parameters:
 ab -n 1000 -c 10 -t 10
 ```
 
-Also, the debug mode was disabled. And an optimized autoloader of the [Composer](https://getcomposer.org) was used
+Also, the debug mode was disabled. And an optimized autoloader of the [Composer](https://getcomposer.org) was used, 
 and development dependencies weren't used:
 
 ```shell

guide/en/tutorial/using-with-event-loop.md

@@ -40,7 +40,7 @@ in the state of a service made by the previous request may affect the current re
 if data from one user is available to another user.
 
 There are two ways of dealing with it. First, you can avoid having state by making services stateless. PHP's `readonly`
-keyword may be handy for it. Second, you can reset services state at the end of the request processing. 
+keyword may be handy for it. Second, you can reset the services' state at the end of the request processing. 
 In this case, a state resetter will help you:
 
 ```php