Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1'

  • Loading branch information...
commit 8ab585474ffa2fab0f77fc82157dbe50d674b6e3 2 parents 6b75721 + 700f72d
@weaverryan weaverryan authored
View
4 components/config/definition.rst
@@ -431,8 +431,8 @@ an array with with ``fixXmlConfig``.
You can further control the normalization process if you need to. For example,
you may want to allow a string to be set and used as a particular key or several
-keys to be set explicitly. So that, if everything apart from id is optional in this
-config:
+keys to be set explicitly. So that, if everything apart from ``name`` is optional
+in this config:
.. code-block:: yaml
View
14 contributing/code/patches.rst
@@ -78,7 +78,7 @@ Get the Symfony2 source code:
$ git clone git@github.com:USERNAME/symfony.git
-* Add the upstream repository as ``remote``:
+* Add the upstream repository as a remote:
.. code-block:: bash
@@ -292,7 +292,6 @@ An example submission could now look as follows:
Bug fix: no
Feature addition: yes
Backwards compatibility break: no
- Symfony2 tests pass: yes
Fixes the following tickets: #12, #43
Todo: -
License of the code: MIT
@@ -350,17 +349,6 @@ When you save, git will start rebasing, and if successful, will ask you to
edit the commit message, which by default is a listing of the commit messages
of all the commits. When you finish, execute the push command.
-.. tip::
-
- To automatically get your feature branch tested, you can add your fork to
- `travis-ci.org`_. Just login using your github.com account and then simply
- flip a single switch to enable automated testing. In your pull request,
- instead of specifying "*Symfony2 tests pass: [yes|no]*", you can link to
- the `travis-ci.org status icon`_. For more details, see the
- `travis-ci.org Getting Started Guide`_. This could easily be done by clicking
- on the wrench icon on the build page of Travis. First select your feature
- branch and then copy the markdown to your PR description.
-
.. _ProGit: http://git-scm.com/book
.. _GitHub: https://github.com/signup/free
.. _`Github's Documentation`: https://help.github.com/articles/ignoring-files
View
3  contributing/code/standards.rst
@@ -40,7 +40,7 @@ example containing most features described below:
private $fooBar;
/**
- * @param string $dummyy Some argument description
+ * @param string $dummy Some argument description
*/
public function __construct($dummy)
{
@@ -49,6 +49,7 @@ example containing most features described below:
/**
* @param string $dummy Some argument description
+ * @param array $options
*
* @return string|null Transformed input
*/
View
3  cookbook/form/data_transformers.rst
@@ -184,6 +184,9 @@ In the above example, the transformer was used as a "model" transformer.
In fact, there are two different type of transformers and three different
types of underlying data.
+.. image:: /images/cookbook/form/DataTransformersTypes.png
+ :align: center
+
In any form, the 3 different types of data are:
1) **Model data** - This is the data in the format used in your application
View
BIN  images/cookbook/form/DataTransformersTypes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 reference/dic_tags.rst
@@ -90,7 +90,7 @@ For simplicity, you'll often extend an
the interface directly::
// src/Acme/MainBundle/Form/Type/MyFormTypeExtension.php
- namespace Acme\MainBundle\Form\Type\MyFormTypeExtension;
+ namespace Acme\MainBundle\Form\Type;
use Symfony\Component\Form\AbstractTypeExtension;
@@ -810,4 +810,4 @@ For an example, see the ``EntityInitializer`` class inside the Doctrine Bridge.
.. _`Twig official extension repository`: https://github.com/fabpot/Twig-extensions
.. _`KernelEvents`: https://github.com/symfony/symfony/blob/2.1/src/Symfony/Component/HttpKernel/KernelEvents.php
.. _`SwiftMailer's Plugin Documentation`: http://swiftmailer.org/docs/plugins.html
-.. _`Twig Loader`: http://twig.sensiolabs.org/doc/api.html#loaders
+.. _`Twig Loader`: http://twig.sensiolabs.org/doc/api.html#loaders
Please sign in to comment.
Something went wrong with that request. Please try again.