Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit514991f

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: [Workflow] Some minor text optimizations Moving the new `env()` syntax upwards, to be shown as the preferred way
2 parents3a1cac4 +7e086b2 commit514991f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

‎configuration.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,9 @@ This example shows how you could configure the database connection using an env
619619
$container->extension('doctrine', [
620620
'dbal' => [
621621
// by convention the env var names are always uppercase
622-
'url' => '%env(resolve:DATABASE_URL)%',
623-
// or
624622
'url' => env('DATABASE_URL')->resolve(),
623+
// or
624+
'url' => '%env(resolve:DATABASE_URL)%',
625625
],
626626
]);
627627
};

‎workflow.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Workflow
22
========
33

4-
Using the Workflow component inside a Symfony application requiresto know first
4+
Using the Workflow component inside a Symfony application requiresknowing first
55
some basic theory and concepts about workflows and state machines.
66
:doc:`Read this article</workflow/workflow-and-state-machine>` for a quick overview.
77

@@ -29,8 +29,8 @@ Creating a Workflow
2929
-------------------
3030

3131
A workflow is a process or a lifecycle that your objects go through. Each
32-
step or stage in the process is called a *place*. Youdoalso define *transitions*
33-
to that describesthe action to get from one place to another.
32+
step or stage in the process is called a *place*. You also define *transitions*,
33+
which describethe action needed to get from one place to another.
3434

3535
..image::/_images/components/workflow/states_transitions.png
3636

@@ -39,8 +39,8 @@ a ``Definition`` and a way to write the states to the objects (i.e. an
3939
instance of a:class:`Symfony\\Component\\Workflow\\MarkingStore\\MarkingStoreInterface`.)
4040

4141
Consider the following example for a blog post. A post can have these places:
42-
``draft``, ``reviewed``, ``rejected``, ``published``. Youcan define the workflow
43-
like this:
42+
``draft``, ``reviewed``, ``rejected``, ``published``. Youcould define the workflow as
43+
follows:
4444

4545
..configuration-block::
4646

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp