Skip to content

Commit 140e54e

Browse files
committed
Merge branch '2.4' into 2.5
2 parents 6629db8 + 3393cba commit 140e54e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

components/using_components.rst

+19-19
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,42 @@ the ``vendor/autoload.php`` file that was generated by Composer. This file
4848
takes care of autoloading all of the libraries so that you can use them
4949
immediately::
5050

51-
// File: src/script.php
51+
// File: src/script.php
5252

53-
// update this to the path to the "vendor/" directory, relative to this file
54-
require_once '../vendor/autoload.php';
53+
// update this to the path to the "vendor/" directory, relative to this file
54+
require_once '../vendor/autoload.php';
5555

56-
use Symfony\Component\Finder\Finder;
56+
use Symfony\Component\Finder\Finder;
5757

58-
$finder = new Finder();
59-
$finder->in('../data/');
58+
$finder = new Finder();
59+
$finder->in('../data/');
6060

61-
// ...
61+
// ...
6262

6363
.. tip::
6464

6565
If you want to use all of the Symfony2 Components, then instead of adding
6666
them one by one:
6767

68-
.. code-block:: json
68+
.. code-block:: json
6969
70-
{
71-
"require": {
72-
"symfony/finder": "2.3.*",
73-
"symfony/dom-crawler": "2.3.*",
74-
"symfony/css-selector": "2.3.*"
75-
}
70+
{
71+
"require": {
72+
"symfony/finder": "2.3.*",
73+
"symfony/dom-crawler": "2.3.*",
74+
"symfony/css-selector": "2.3.*"
7675
}
76+
}
7777
7878
you can use:
7979

80-
.. code-block:: json
80+
.. code-block:: json
8181
82-
{
83-
"require": {
84-
"symfony/symfony": "2.3.*"
85-
}
82+
{
83+
"require": {
84+
"symfony/symfony": "2.3.*"
8685
}
86+
}
8787
8888
This will include the Bundle and Bridge libraries, which you may not
8989
actually need.

0 commit comments

Comments
 (0)