Skip to content

Commit 18af18b

Browse files
committed
minor #4652 replace Symfony2 with Symfony (xabbuh)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #4652). Discussion ---------- replace Symfony2 with Symfony | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | Commits ------- 224c283 replace Symfony2 with Symfony
2 parents a70c489 + 224c283 commit 18af18b

File tree

9 files changed

+16
-17
lines changed

9 files changed

+16
-17
lines changed

best_practices/creating-the-project.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ it's released:
243243
└─ web/
244244
245245
The changes are pretty superficial, but for now, we recommend that you use
246-
the Symfony2 directory structure.
246+
the Symfony directory structure.
247247

248248
.. _`Composer`: https://getcomposer.org/
249249
.. _`Get Started`: https://getcomposer.org/doc/00-intro.md

best_practices/security.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Learn More
253253
----------
254254

255255
The `FOSUserBundle`_, developed by the Symfony community, adds support for a
256-
database-backed user system in Symfony2. It also handles common tasks like
256+
database-backed user system in Symfony. It also handles common tasks like
257257
user registration and forgotten password functionality.
258258

259259
Enable the :doc:`Remember Me feature </cookbook/security/remember_me>` to

components/yaml/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ yourself by referencing common configuration bits.
8282
Using the Symfony YAML Component
8383
--------------------------------
8484

85-
The Symfony2 Yaml component is very simple and consists of two main classes:
85+
The Symfony Yaml component is very simple and consists of two main classes:
8686
one parses YAML strings (:class:`Symfony\\Component\\Yaml\\Parser`), and the
8787
other dumps a PHP array to a YAML string
8888
(:class:`Symfony\\Component\\Yaml\\Dumper`).

contributing/documentation/license.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Symfony Documentation License
44
=============================
55

6-
The Symfony2 documentation is licensed under a Creative Commons
6+
The Symfony documentation is licensed under a Creative Commons
77
Attribution-Share Alike 3.0 Unported License (`CC BY-SA 3.0`_).
88

99
**You are free:**

cookbook/bundles/best_practices.rst

+8-9
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class name.
6767

6868
.. note::
6969

70-
Symfony2 core Bundles do not prefix the Bundle class with ``Symfony``
70+
Symfony core Bundles do not prefix the Bundle class with ``Symfony``
7171
and always add a ``Bundle`` sub-namespace; for example:
7272
:class:`Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle`.
7373

@@ -160,8 +160,7 @@ instance, a ``HelloController`` controller is stored in
160160
``Bundle/HelloBundle/Controller/HelloController.php`` and the fully qualified
161161
class name is ``Bundle\HelloBundle\Controller\HelloController``.
162162

163-
All classes and files must follow the Symfony2 coding
164-
:doc:`standards </contributing/code/standards>`.
163+
All classes and files must follow the Symfony coding :doc:`standards </contributing/code/standards>`.
165164

166165
Some classes should be seen as facades and should be as short as possible, like
167166
Commands, Helpers, Listeners, and Controllers.
@@ -175,7 +174,7 @@ Vendors
175174
-------
176175

177176
A bundle must not embed third-party PHP libraries. It should rely on the
178-
standard Symfony2 autoloading instead.
177+
standard Symfony autoloading instead.
179178

180179
A bundle should not embed third-party libraries written in JavaScript, CSS, or
181180
any other language.
@@ -248,13 +247,13 @@ following standardized instructions in your ``README.md`` file.
248247
{
249248
$bundles = array(
250249
// ...
251-
250+
252251
new <vendor>\<bundle-name>\<bundle-long-name>(),
253252
);
254-
253+
255254
// ...
256255
}
257-
256+
258257
// ...
259258
}
260259
```
@@ -291,10 +290,10 @@ Configuration
291290
-------------
292291

293292
To provide more flexibility, a bundle can provide configurable settings by
294-
using the Symfony2 built-in mechanisms.
293+
using the Symfony built-in mechanisms.
295294

296295
For simple configuration settings, rely on the default ``parameters`` entry of
297-
the Symfony2 configuration. Symfony2 parameters are simple key/value pairs; a
296+
the Symfony configuration. Symfony parameters are simple key/value pairs; a
298297
value being any valid PHP value. Each parameter name should start with the
299298
bundle alias, though this is just a best-practice suggestion. The rest of the
300299
parameter name will use a period (``.``) to separate different parts (e.g.

cookbook/bundles/configuration.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ First things first, you have to create an extension class as explained in
129129

130130
Whenever a user includes the ``acme_social`` key (which is the DI alias) in a
131131
configuration file, the configuration under it is added to an array of
132-
configurations and passed to the ``load()`` method of your extension (Symfony2
132+
configurations and passed to the ``load()`` method of your extension (Symfony
133133
automatically converts XML and YAML to an array).
134134

135135
For the configuration example in the previous section, the array passed to your

cookbook/bundles/override.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For information on overriding templates, see
1818
Routing
1919
-------
2020

21-
Routing is never automatically imported in Symfony2. If you want to include
21+
Routing is never automatically imported in Symfony. If you want to include
2222
the routes from any bundle, then they must be manually imported from somewhere
2323
in your application (e.g. ``app/config/routing.yml``).
2424

cookbook/bundles/remove.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
How to Remove the AcmeDemoBundle
55
================================
66

7-
The Symfony2 Standard Edition comes with a complete demo that lives inside a
7+
The Symfony Standard Edition comes with a complete demo that lives inside a
88
bundle called AcmeDemoBundle. It is a great boilerplate to refer to while
99
starting a project, but you'll probably want to eventually remove it.
1010

cookbook/event_dispatcher/before_after_filters.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ executed just before or just after your controller actions acting as filters
99
or hooks.
1010

1111
In symfony1, this was achieved with the preExecute and postExecute methods.
12-
Most major frameworks have similar methods but there is no such thing in Symfony2.
12+
Most major frameworks have similar methods but there is no such thing in Symfony.
1313
The good news is that there is a much better way to interfere with the
1414
Request -> Response process using the :doc:`EventDispatcher component </components/event_dispatcher/introduction>`.
1515

0 commit comments

Comments
 (0)