Skip to content

Commit 0b5a5c6

Browse files
committed
Minor reword
1 parent 1fb2c31 commit 0b5a5c6

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

setup/flex.rst

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ manual steps:
176176
.. code-block:: terminal
177177
178178
$ composer remove symfony/symfony
179-
179+
180180
Now add the ``symfony/symfony`` package to the ``conflict`` section of the project's
181181
``composer.json`` file as `shown in this example of the skeleton-project`_ so that
182182
it will not be installed again:
@@ -228,11 +228,11 @@ manual steps:
228228
:doc:`autowiring feature </service_container/3.3-di-changes>` you can remove
229229
most of the service configuration.
230230

231-
.. note::
231+
.. note::
232232

233-
Make sure your previous configuration files don't have ``imports`` declarations
234-
pointing to same resources already loaded by ``Kernel::configureContainer()``
235-
or ``Kernel::configureRoutes()`` methods.
233+
Make sure that your previous configuration files don't have ``imports``
234+
declarations pointing to resources already loaded by ``Kernel::configureContainer()``
235+
or ``Kernel::configureRoutes()`` methods.
236236

237237
#. Move the rest of the ``app/`` contents as follows (and after that, remove the
238238
``app/`` directory):
@@ -242,8 +242,10 @@ manual steps:
242242
* ``app/Resources/<BundleName>/views/`` -> ``templates/bundles/<BundleName>/``
243243
* rest of ``app/Resources/`` files -> ``src/Resources/``
244244

245-
#. Move the original PHP source code from ``src/AppBundle/*``, except bundle specific
246-
files (like ``AppBundle``, ``DependencyInjection\``), to ``src/``. Remove ``src/AppBundle/``.
245+
#. Move the original PHP source code from ``src/AppBundle/*``, except bundle
246+
specific files (like ``AppBundle.php`` and ``DependencyInjection/``), to
247+
``src/``. Remove ``src/AppBundle/``.
248+
247249
In addition to moving the files, update the ``autoload`` and ``autoload-dev``
248250
values of the ``composer.json`` file as `shown in this example`_ to use
249251
``App\`` and ``App\Tests\`` as the application namespaces (advanced IDEs can
@@ -268,12 +270,8 @@ manual steps:
268270
#. Update the ``bin/console`` script `copying Symfony's bin/console source`_
269271
and changing anything according to your original console script.
270272

271-
#. Remove ``bin/symfony_requirements`` script. If you need a replacement for the
272-
task performed by this script, use `Symfony Requirements Checker`_:
273-
274-
.. code-block:: terminal
275-
276-
$ composer require symfony/requirements-checker
273+
#. Remove the ``bin/symfony_requirements`` script and if you need a replacement
274+
for it, use the new `Symfony Requirements Checker`_.
277275

278276
.. _`Symfony Flex`: https://github.com/symfony/flex
279277
.. _`Symfony Installer`: https://github.com/symfony/symfony-installer

0 commit comments

Comments
 (0)