Skip to content

Commit a9a1fc4

Browse files
committed
Simpler language, consistent Yii 2.0 usage
1 parent 1e24e0e commit a9a1fc4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/guide/databases/db-migrations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ final class M240115143455CreateMyFirstTableTable implements RevertibleMigrationI
9191

9292
For more information [see](https://github.com/yiisoft/db-migration/tree/master/docs/guide/en)
9393

94-
### Upgrading from Yii2
94+
### Upgrading from Yii 2.0
9595

96-
Migrations in Yii2 and the [yiisoft/db-migration](https://github.com/yiisoft/db-migration/) package are not compatible,
96+
Migrations in Yii 2.0 and the [yiisoft/db-migration](https://github.com/yiisoft/db-migration/) package are not compatible,
9797
and the `migration` table is also not
9898
compatible.
9999
A probable solution is to use structure dumps and rename the old `migration` table. Upon the initial execution of

src/guide/intro/upgrade-from-v2.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Upgrading from Version 2.0
22

3-
> If you haven't used Yii2, you can skip this section and get directly to "[getting started](../start/prerequisites.md)"
3+
> If you haven't used Yii 2.0, you can skip this section and get directly to "[getting started](../start/prerequisites.md)"
44
> section.
55
6-
While sharing some common ideas and values, Yii3 is conceptually different from Yii 2. There is no easy upgrade
7-
path, so first [check maintenance policy and end-of-life dates for Yii 2](https://www.yiiframework.com/release-cycle)
8-
and consider starting new projects on Yii3 while keeping existing ones on Yii 2.
6+
While sharing some common ideas and values, Yii3 is conceptually different from Yii 2.0. There is no easy upgrade
7+
path, so first [check maintenance policy and end-of-life dates for Yii 2.0](https://www.yiiframework.com/release-cycle)
8+
and consider starting new projects on Yii3 while keeping existing ones on Yii 2.0.
99

1010
## PHP requirements
1111

12-
Yii3 requires PHP 8.2 or above. As a result, there are language features used that weren't used in Yii 2:
12+
Yii3 requires PHP 8.2 or above. As a result, there are language features used that weren't used in Yii 2.0:
1313

1414
- [Type declarations](https://www.php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration)
1515
- [Return type declarations](https://www.php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration)
@@ -26,7 +26,7 @@ Yii3 requires PHP 8.2 or above. As a result, there are language features used th
2626

2727
## Preliminary refactoring
2828

29-
It's a good idea to refactor your Yii 2 project before porting it to Yii3. That would both make porting easier
29+
It's a good idea to refactor your Yii 2.0 project before porting it to Yii3. That would both make porting easier
3030
and benefit the project in question while it's not moved to Yii3 yet.
3131

3232
### Use DI instead of the service locator
@@ -67,7 +67,7 @@ that's all the business logic has to go to framework-independent classes.
6767

6868
### Move more into components
6969

70-
Yii3 services are conceptually similar to Yii 2 components, so it's a good idea to move reusable parts of your application
70+
Yii3 services are conceptually similar to Yii 2.0 components, so it's a good idea to move reusable parts of your application
7171
into components.
7272

7373
## Things to learn
@@ -85,16 +85,16 @@ It's a good idea to learn how to use it and use it for your own projects since i
8585

8686
Yii3 application templates are using [environment variables](https://en.wikipedia.org/wiki/Environment_variable)
8787
to configure parts of the application. The concept is [very handy for Dockerized applications](https://12factor.net/)
88-
but might be alien to users of Yii 1.1 and Yii 2.
88+
but might be alien to users of Yii 1.1 and Yii 2.0.
8989

9090
### Handlers
9191

92-
Unlike Yii2, Yii3 doesn't have controllers per se. Instead, it uses [handlers](../structure/handler.md) which
92+
Unlike Yii 2.0, Yii3 doesn't have controllers concept. Instead, it uses [handlers](../structure/handler.md) which
9393
are similar to controllers but different.
9494

9595
### Application structure
9696

97-
Suggested Yii3 application structure is different from Yii 2.
97+
Suggested Yii3 application structure is different from Yii 2.0.
9898
It's described in [application structure](../structure/overview.md).
9999

100-
Despite that, Yii3 is flexible, so it's still possible to use a structure similar to Yii 2 with Yii3.
100+
Despite that, Yii3 is flexible, so it's still possible to use a structure similar to Yii 2.0 with Yii3.

0 commit comments

Comments
 (0)