Skip to content

Commit

Permalink
Merge branch '4.2'
Browse files Browse the repository at this point in the history
* 4.2:
  Removed unneeded versionadded directives
  Fixed a typo
  • Loading branch information
javiereguiluz committed Apr 17, 2019
2 parents 530f710 + c1c755e commit 6c77530
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
13 changes: 0 additions & 13 deletions workflow.rst
Expand Up @@ -197,10 +197,6 @@ As configured, the following property is used by the marking store::
Setting the ``audit_trail.enabled`` option to ``true`` makes the application
generate detailed log messages for the workflow activity.

.. versionadded:: 3.3

The ``audit_trail`` option was introduced in Symfony 3.3.

With this workflow named ``blog_publishing``, you can get help to decide
what actions are allowed on a blog post::

Expand Down Expand Up @@ -406,10 +402,6 @@ This means that each event has access to the following information:
:method:`Symfony\\Component\\Workflow\\Event\\Event::getWorkflowName`
Returns a string with the name of the workflow that triggered the event.

.. versionadded:: 3.3

The ``getWorkflowName()`` method was introduced in Symfony 3.3.

For Guard Events, there is an extended class :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent`.
This class has two more methods:

Expand Down Expand Up @@ -475,11 +467,6 @@ of domain logic in your templates:
``workflow_has_marked_place()``
Returns ``true`` if the marking of the given object has the given state.

.. versionadded:: 3.3

The ``workflow_marked_places()`` and ``workflow_has_marked_place()``
functions were introduced in Symfony 3.3.

The following example shows these functions in action:

.. code-block:: html+twig
Expand Down
10 changes: 5 additions & 5 deletions workflow/introduction.rst
@@ -1,8 +1,8 @@
Workflows and State Machines
============================

Worflows
--------
Workflows
---------

A workflow is a model of a process in your application. It may be the process of
how a blog post goes from draft to review and publish. Another example is when a
Expand Down Expand Up @@ -51,9 +51,9 @@ your model. The most important differences between them are:
machines can't;
* Workflows usually don't have cyclic paths in the definition graph, but it's
common for state machines;
* In order to apply a transition, worflows require that the object is in all the
previous places of the transition, whereas state machines only require that
the object is at least in one of those places.
* In order to apply a transition, workflows require that the object is in all
the previous places of the transition, whereas state machines only require
that the object is at least in one of those places.

Example
~~~~~~~
Expand Down

0 comments on commit 6c77530

Please sign in to comment.