Permalink
Browse files

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
  • Loading branch information...
wouterj committed Dec 16, 2014
2 parents a70c489 + 224c283 commit 18af18b79a755a14b477f1ff3ea3cb8a15547411
@@ -243,7 +243,7 @@ it's released:
└─ web/
The changes are pretty superficial, but for now, we recommend that you use
the Symfony2 directory structure.
the Symfony directory structure.
.. _`Composer`: https://getcomposer.org/
.. _`Get Started`: https://getcomposer.org/doc/00-intro.md
@@ -253,7 +253,7 @@ Learn More
----------
The `FOSUserBundle`_, developed by the Symfony community, adds support for a
database-backed user system in Symfony2. It also handles common tasks like
database-backed user system in Symfony. It also handles common tasks like
user registration and forgotten password functionality.
Enable the :doc:`Remember Me feature </cookbook/security/remember_me>` to
@@ -82,7 +82,7 @@ yourself by referencing common configuration bits.
Using the Symfony YAML Component
--------------------------------
The Symfony2 Yaml component is very simple and consists of two main classes:
The Symfony Yaml component is very simple and consists of two main classes:
one parses YAML strings (:class:`Symfony\\Component\\Yaml\\Parser`), and the
other dumps a PHP array to a YAML string
(:class:`Symfony\\Component\\Yaml\\Dumper`).
@@ -3,7 +3,7 @@
Symfony Documentation License
=============================
The Symfony2 documentation is licensed under a Creative Commons
The Symfony documentation is licensed under a Creative Commons
Attribution-Share Alike 3.0 Unported License (`CC BY-SA 3.0`_).
**You are free:**
@@ -67,7 +67,7 @@ class name.
.. note::
Symfony2 core Bundles do not prefix the Bundle class with ``Symfony``
Symfony core Bundles do not prefix the Bundle class with ``Symfony``
and always add a ``Bundle`` sub-namespace; for example:
:class:`Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle`.
@@ -160,8 +160,7 @@ instance, a ``HelloController`` controller is stored in
``Bundle/HelloBundle/Controller/HelloController.php`` and the fully qualified
class name is ``Bundle\HelloBundle\Controller\HelloController``.
All classes and files must follow the Symfony2 coding
:doc:`standards </contributing/code/standards>`.
All classes and files must follow the Symfony coding :doc:`standards </contributing/code/standards>`.
Some classes should be seen as facades and should be as short as possible, like
Commands, Helpers, Listeners, and Controllers.
@@ -175,7 +174,7 @@ Vendors
-------
A bundle must not embed third-party PHP libraries. It should rely on the
standard Symfony2 autoloading instead.
standard Symfony autoloading instead.
A bundle should not embed third-party libraries written in JavaScript, CSS, or
any other language.
@@ -248,13 +247,13 @@ following standardized instructions in your ``README.md`` file.
{
$bundles = array(
// ...
new <vendor>\<bundle-name>\<bundle-long-name>(),
);
// ...
}
// ...
}
```
@@ -291,10 +290,10 @@ Configuration
-------------
To provide more flexibility, a bundle can provide configurable settings by
using the Symfony2 built-in mechanisms.
using the Symfony built-in mechanisms.
For simple configuration settings, rely on the default ``parameters`` entry of
the Symfony2 configuration. Symfony2 parameters are simple key/value pairs; a
the Symfony configuration. Symfony parameters are simple key/value pairs; a
value being any valid PHP value. Each parameter name should start with the
bundle alias, though this is just a best-practice suggestion. The rest of the
parameter name will use a period (``.``) to separate different parts (e.g.
@@ -129,7 +129,7 @@ First things first, you have to create an extension class as explained in
Whenever a user includes the ``acme_social`` key (which is the DI alias) in a
configuration file, the configuration under it is added to an array of
configurations and passed to the ``load()`` method of your extension (Symfony2
configurations and passed to the ``load()`` method of your extension (Symfony
automatically converts XML and YAML to an array).
For the configuration example in the previous section, the array passed to your
@@ -18,7 +18,7 @@ For information on overriding templates, see
Routing
-------
Routing is never automatically imported in Symfony2. If you want to include
Routing is never automatically imported in Symfony. If you want to include
the routes from any bundle, then they must be manually imported from somewhere
in your application (e.g. ``app/config/routing.yml``).
@@ -4,7 +4,7 @@
How to Remove the AcmeDemoBundle
================================
The Symfony2 Standard Edition comes with a complete demo that lives inside a
The Symfony Standard Edition comes with a complete demo that lives inside a
bundle called AcmeDemoBundle. It is a great boilerplate to refer to while
starting a project, but you'll probably want to eventually remove it.
@@ -9,7 +9,7 @@ executed just before or just after your controller actions acting as filters
or hooks.
In symfony1, this was achieved with the preExecute and postExecute methods.
Most major frameworks have similar methods but there is no such thing in Symfony2.
Most major frameworks have similar methods but there is no such thing in Symfony.
The good news is that there is a much better way to interfere with the
Request -> Response process using the :doc:`EventDispatcher component </components/event_dispatcher/introduction>`.

0 comments on commit 18af18b

Please sign in to comment.