Skip to content

Commit 5971fc9

Browse files
committed
Merge branch 'master' into feature/BAP-21264_es8
2 parents 7559732 + fadd92e commit 5971fc9

29 files changed

+493
-538
lines changed

backend/api/actions.rst

Lines changed: 165 additions & 166 deletions
Large diffs are not rendered by default.

backend/api/batch-api.rst

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Batch API
55

66
The Batch API provides a way to create or update a list of entities of the same type via one API request.
77

8-
For detailed information how this API works see :ref:`update_list <update-list-action>`,
8+
For detailed information how this API works, see the :ref:`update_list <update-list-action>`,
99
:ref:`batch_update <batch-update-action>` and :ref:`batch_update_item <batch-update-item-action>` actions.
1010

1111
.. _web-api--batch-api--enable:
@@ -15,7 +15,7 @@ Enable Batch API for Entity
1515

1616
By default, Batch API is disabled for all API resources. To enable it for an API resource,
1717
the :ref:`update_list <update-list-action>` action should be enabled for this resource.
18-
This can be done via ``actions`` section for an entity in `Resources/config/oro/api.yml`.
18+
You can do this via ``actions`` section for an entity in `Resources/config/oro/api.yml`.
1919

2020
Example:
2121

@@ -32,7 +32,7 @@ Example:
3232
Batch API Configuration
3333
-----------------------
3434

35-
All configuration options related to Batch API are grouped in ``batch_api`` section of ApiBundle configuration:
35+
All configuration options related to Batch API are grouped in the ``batch_api`` section of ApiBundle configuration:
3636

3737
.. code-block:: yaml
3838
@@ -56,9 +56,8 @@ All configuration options related to Batch API are grouped in ``batch_api`` sect
5656
Parameters ``chunk_size_per_entity`` and ``included_data_chunk_size_per_entity`` can be used to tuning of
5757
an API engine to have maximum performance.
5858

59-
To get maximum performance in requests with included entities, the value of the ``included_data_chunk_size_per_entity``
60-
parameter can be changed to the medium number of related entities that will be set to one primary entity when processing
61-
the request.
59+
To get maximum performance in requests with included entities, you can change the value of the ``included_data_chunk_size_per_entity``
60+
parameter to the medium number of related entities that will be set to one primary entity when processing the request.
6261

6362
.. _web-api--batch-api--async-operation-config:
6463

@@ -89,8 +88,7 @@ The default configuration of this cron job is illustrated below:
8988
Storage Configuration
9089
---------------------
9190

92-
The |KnpGaufretteBundle| is used to configure storages for source data files of Batch API requests and
93-
all files that are created when processing asynchronous batch operations (e.g. chunk files, error files, etc.).
91+
The |KnpGaufretteBundle| is used to configure storages for source data files of Batch API requests and all files created when processing asynchronous batch operations (e.g., chunk files, error files, etc.).
9492

9593
Here is the default configuration of these storages:
9694

@@ -117,8 +115,7 @@ Here is the default configuration of these storages:
117115
adapter: api
118116
alias: api_filesystem
119117
120-
To change the adapter configuration the `Resources/config/oro/app.yml` in any bundle or `config/config.yml`
121-
of your application can be used.
118+
To change the adapter configuration, use `Resources/config/oro/app.yml` in any application bundle or `config/config.yml`.
122119
The following example shows how to reconfigure this adapter to use a local filesystem:
123120

124121
.. code-block:: yaml
@@ -129,8 +126,8 @@ The following example shows how to reconfigure this adapter to use a local files
129126
local:
130127
directory: '%kernel.project_dir%/var/api_files'
131128
132-
More examples can be found in |KnpGaufretteBundle documentation|.
129+
You can find more examples in |KnpGaufretteBundle documentation|.
133130

134131

135132
.. include:: /include/include-links-dev.rst
136-
:start-after: begin
133+
:start-after: begin

backend/api/commands.rst

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ CLI Commands
1010
oro:api:cache:clear
1111
-------------------
1212

13-
This command command clears the API cache.
13+
This command clears the API cache.
1414

15-
Usually you need to run this command when you add a new entity to `Resources/config/oro/api.yml` or you add a new processor that changes a list of available via the API.
15+
Usually, you need to run this command when you add a new entity to `Resources/config/oro/api.yml` or a new processor that changes a list of available via the API.
1616

1717
.. code-block:: none
1818
@@ -29,7 +29,7 @@ The ``--no-warmup`` option can be used to skip warming up the cache after cleani
2929
oro:api:doc:cache:clear
3030
-----------------------
3131

32-
This clears or warms up API documentation cache.
32+
This clears or warms up the API documentation cache.
3333

3434
If this command is launched without parameters, it warm ups all API documentation caches:
3535

@@ -43,7 +43,7 @@ To clear the cache without then warming it up, use the ``--no-warmup`` option:
4343
4444
php bin/console oro:api:doc:cache:clear --no-warmup
4545
46-
To work only with the specified |API documentation views| use ``--view`` option:
46+
To work only with the specified |API documentation views| use the ``--view`` option:
4747

4848
.. code-block:: none
4949
@@ -127,8 +127,8 @@ or
127127
128128
php bin/console oro:api:debug --no-docs <action> <group>
129129
130-
The --attribute option can be used to show the processors that will be executed only when the context has a given attribute with the specified value.
131-
The attribute name and value should be separated by a colon, e.g. --attribute=collection:true for a scalar value, or --attribute=extra:[definition,filters] for an array value:
130+
You can use the ``--attribute`` option to show the processors that will be executed only when the context has a given attribute with the specified value.
131+
Separate the attribute name and value by a colon, e.g., ``--attribute=collection:true`` for a scalar value, or ``--attribute=extra:[definition,filters]`` for an array value:
132132

133133
.. code-block:: none
134134
@@ -140,7 +140,7 @@ or
140140
141141
php bin/console oro:api:debug --attribute=extra:[definition,filters] <action>
142142
143-
The --processors and --processors-without-description options can be used to display all processors and all processors without descriptions respectively:
143+
Use the ``--processors` and ``--processors-without-description`` options to display all processors and all processors without descriptions, respectively:
144144

145145
.. code-block:: none
146146
@@ -152,7 +152,7 @@ or
152152
153153
php bin/console oro:api:debug --processors-without-description
154154
155-
The --request-type option can limit the scope to the specified request type(s). Omitting this option is equivalent to --request-type=rest --request-type=json_api. Available types: rest, json_api, batch, or use any to include all request types:
155+
The ``--request-type`` option can limit the scope to the specified request type(s). Omitting this option is equivalent to ``--request-type=rest --request-type=json_api``. The available types are ``rest``, ``json_api``, ``batch``, or use ``any`` to include all request types:
156156

157157
.. code-block:: none
158158
@@ -173,7 +173,7 @@ The --request-type option can limit the scope to the specified request type(s).
173173
oro:api:config:dump
174174
-------------------
175175

176-
This command shows configuration for a particular entity.
176+
This command shows the configuration for a particular entity.
177177

178178
Execute this command with an entity class or entity alias specified as an argument:
179179

@@ -193,25 +193,25 @@ To display the configuration used for a particular action, use the ``--action op
193193
194194
php bin/console oro:api:config:dump users --action=update
195195
196-
To display the configuration for a particular request type you can use the ``request-type`` option:
196+
To display the configuration for a particular request type, use the ``request-type`` option:
197197

198198
.. code-block:: none
199199
200200
php bin/console oro:api:config:dump users --request-type=rest --request-type=json_api
201201
202-
By default no extra configuration data are added into output, but they can be added with the ``--extra`` option. The value for ``extra`` option can be: actions, definition, filters, sorters, descriptions or the full name of a class implements |ConfigExtraInterface|, e.g.
202+
No extra configuration data are added to the output by default, but you can add them with the ``--extra`` option. The value for the ``extra`` option can be: actions, definition, filters, sorters, descriptions, or the full name of a class implements |ConfigExtraInterface|, e.g.
203203

204204
.. code-block:: none
205205
206206
php bin/console oro:api:config:dump users --extra=filters --extra=sorters
207207
208-
To display the human-readable representation of an entity and its fields:
208+
To display the human-readable representation of an entity and its fields, use:
209209

210210
.. code-block:: none
211211
212212
php bin/console oro:api:config:dump users --extra=descriptions
213213
214-
If a new extra section was added, pass the FQCN of a ConfigExtra:
214+
If you added a new extra section, pass the FQCN of a ConfigExtra:
215215

216216
.. code-block:: none
217217
@@ -267,7 +267,7 @@ This command shows the structure of `Resources/config/oro/api.yml`.
267267
268268
php bin/console oro:api:config:dump-reference
269269
270-
The --max-nesting-level option can be used to limit the depth of nesting target entities:
270+
You can use the ``--max-nesting-level`` option to limit the depth of nesting target entities:
271271

272272
.. code-block:: none
273273
@@ -290,6 +290,5 @@ To show the number of obsolete asynchronous operations without the deletion of t
290290
291291
php bin/console oro:cron:api:async_operations:cleanup --dry-run
292292
293-
294293
.. include:: /include/include-links-dev.rst
295-
:start-after: begin
294+
:start-after: begin

backend/api/configuration-extensions.rst

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
Configuration Extensions
44
========================
55

6-
Configuration extensions help add:
7-
8-
- new options to existing configuration sections
9-
- new configuration sections
6+
Configuration extensions help add new options to existing configuration sections and new configuration sections.
107

118
.. _web-api--configuration-extensions-create:
129

1310
Creating a Configuration Extension
1411
----------------------------------
1512

16-
17-
Each configuration extension must implement |ConfigExtensionInterface| (you can also use |AbstractConfigExtension| as a superclass). To register new configuration extension, add it to `Resources/config/oro/app.yml` in your bundle or use `config/config.yml` of your application. Here is an example:
13+
Each configuration extension must implement |ConfigExtensionInterface| (you can also use |AbstractConfigExtension| as a superclass). To register a new configuration extension, add it to `Resources/config/oro/app.yml` in your bundle or use `config/config.yml` of your application. Here is an example:
1814

1915
.. code-block:: php
2016
@@ -38,15 +34,14 @@ Each configuration extension must implement |ConfigExtensionInterface| (you can
3834
config_extensions:
3935
- acme.api.my_config_extension
4036
41-
4237
.. _web-api--configuration-extensions-add-options:
4338

4439
Add Options to an Existing Configuration Section
4540
------------------------------------------------
4641

47-
To add options to an existing configuration section, implement the ``getConfigureCallbacks`` method of |ConfigExtensionInterface|. If you need to add logic before the normalization of during the validation of the configuration, implement the ``getPreProcessCallbacks`` and ``getPostProcessCallbacks`` methods.
42+
To add options to an existing configuration section, implement the ``getConfigureCallbacks`` method of |ConfigExtensionInterface|. If you need to add logic before the normalization during the configuration validation, implement the ``getPreProcessCallbacks`` and ``getPostProcessCallbacks`` methods.
4843

49-
The following table describes existing sections for which new options can be added.
44+
The following table describes existing sections to which you can add new options.
5045

5146
+-----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
5247
| Section Name | When to use |
@@ -134,9 +129,9 @@ Add New Configuration Section
134129

135130
To add new configuration section, create a class implements |ConfigurationSectionInterface| and return instance of it in the ``getEntityConfigurationSections`` method of your configuration extension.
136131

137-
By default the configuration is returned as an array, but if you want to provide a class represents the configuration of your section, you can implement a configuration loader. The loader is a class that implements |ConfigLoaderInterface|. An instance of the loader should be returned by the ``getEntityConfigurationLoaders`` method of your configuration extension.
132+
By default, the configuration is returned as an array, but if you want to provide a class that represents the configuration of your section, you can implement a configuration loader. The loader is a class that implements |ConfigLoaderInterface|. An instance of the loader should be returned by the ``getEntityConfigurationLoaders`` method of your configuration extension.
138133

139-
An example of simple configuration section:
134+
An example of a simple configuration section:
140135

141136
.. code-block:: php
142137
@@ -156,7 +151,7 @@ An example of simple configuration section:
156151
}
157152
}
158153
159-
An example of a configuration section that can be extended by other bundles:
154+
An example of a configuration section that other bundles can extend:
160155

161156
.. code-block:: php
162157
@@ -261,4 +256,4 @@ To check that your configuration section is added correctly, run ``php bin/conso
261256
my_option: ~
262257
263258
.. include:: /include/include-links-dev.rst
264-
:start-after: begin
259+
:start-after: begin

0 commit comments

Comments
 (0)