Merge remote-tracking branch 'upstream/master'

Author: javiereguiluz

book/controller.rst

@@ -260,7 +260,7 @@ to ``$name``. Just make sure they the name of the placeholder is the
 same as the name of the argument variable.
 
 Take the following more-interesting example, where the controller has two
-arguments::
+arguments:
 
 .. configuration-block::
 
@@ -681,7 +681,7 @@ read any flash messages from the session:
 
     .. code-block:: html+twig
 
-        {% for flash_message in app.session.flashbag.get('notice') %}
+        {% for flash_message in app.session.flashBag.get('notice') %}
             <div class="flash-notice">
                 {{ flash_message }}
             </div>
@@ -714,7 +714,7 @@ The Request and Response Object
 -------------------------------
 
 As mentioned :ref:`earlier <book-controller-request-argument>`, the framework will
-pass the ``Request`` object to any controller argument taht is type-hinted with
+pass the ``Request`` object to any controller argument that is type-hinted with
 the ``Request`` class::
 
     use Symfony\Component\HttpFoundation\Request;

book/doctrine.rst

@@ -150,8 +150,8 @@ can automatically generate an empty ``test_project`` database for you:
 
             # app/config/config.yml
             doctrine:
-                charset: utf8mb4
                 dbal:
+                    charset: utf8mb4
                     default_table_options:
                         charset: utf8mb4
                         collate: utf8mb4_unicode_ci

book/forms.rst

@@ -662,7 +662,7 @@ the documentation for each type.
     :ref:`disable HTML5 validation <book-forms-html5-validation-disable>`
     or set the ``required`` option on your field to ``false``::
     
-        ->add('dueDate', 'date', array(
+        ->add('dueDate', DateType::class, array(
             'widget' => 'single_text',
             'required' => false
         ))

book/http_cache.rst

@@ -917,7 +917,7 @@ Here is how you can configure the Symfony reverse proxy to support the
             if ($this->getStore()->purge($request->getUri())) {
                 $response->setStatusCode(200, 'Purged');
             } else {
-                $response->setStatusCode(200, 'Not found');
+                $response->setStatusCode(404, 'Not found');
             }
 
             return $response;

changelog.rst

@@ -13,6 +13,82 @@ documentation.
     Do you also want to participate in the Symfony Documentation? Take a look
     at the ":doc:`/contributing/documentation/overview`" article.
 
+March, 2016
+-----------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#6274 <https://github.com/symfony/symfony-docs/pull/6274>`_ Update Doctrine UTF8 docs (mcfedr)
+* `#6314 <https://github.com/symfony/symfony-docs/pull/6314>`_ New normalizers (mcfedr)
+* `#4971 <https://github.com/symfony/symfony-docs/pull/4971>`_ [DomCrawler] Document images crawler (valeriangalliat)
+* `#6296 <https://github.com/symfony/symfony-docs/pull/6296>`_ [Console] Add columns width setter documentation (akeeman)
+* `#6282 <https://github.com/symfony/symfony-docs/pull/6282>`_ [Form] fix ``choice_label`` values (HeahDude)
+* `#5894 <https://github.com/symfony/symfony-docs/pull/5894>`_ [WIP] Added an article to explain how to upgrade third-party bundles to Symfony 3 (javiereguiluz)
+* `#6273 <https://github.com/symfony/symfony-docs/pull/6273>`_ [PHPUnit bridge] Add documentation for the component (theofidry)
+* `#6316 <https://github.com/symfony/symfony-docs/pull/6316>`_ [Validator] Added docs about the format option (dosten)
+* `#6291 <https://github.com/symfony/symfony-docs/pull/6291>`_ fortrabbit deployment guide + index listing (ostark)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#6377 <https://github.com/symfony/symfony-docs/pull/6377>`_ Update "bootstrap.php.cache" to "autoload.php" (guilliamxavier)
+* `#6368 <https://github.com/symfony/symfony-docs/pull/6368>`_ [cookbook] Made list of form types more consistent (AAstakhov)
+* `#6366 <https://github.com/symfony/symfony-docs/pull/6366>`_ Removed server:stop code block for 2.3 (theyoux)
+* `#6347 <https://github.com/symfony/symfony-docs/pull/6347>`_ Add a note about enabling DebugBundle to use VarDumper inside Symfony (martijn80, javiereguiluz)
+* `#6320 <https://github.com/symfony/symfony-docs/pull/6320>`_ Fixed typo in path (timhovius)
+* `#6334 <https://github.com/symfony/symfony-docs/pull/6334>`_ Fixed yaml configuration of app.exception_controller (AAstakhov)
+* `#6322 <https://github.com/symfony/symfony-docs/pull/6322>`_ [DependencyInjection] fix autowiring docs (eXtreme)
+* `#6315 <https://github.com/symfony/symfony-docs/pull/6315>`_ Remove third parameter from createFormBuilder call (Hocdoc)
+* `#6324 <https://github.com/symfony/symfony-docs/pull/6324>`_ Fixed UserCheckerInterface importing (VIs-a-vis)
+* `#6326 <https://github.com/symfony/symfony-docs/pull/6326>`_ Missing svn:ignore (f-plante)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#6404 <https://github.com/symfony/symfony-docs/pull/6404>`_ fixed a typo (RickieL)
+* `#6409 <https://github.com/symfony/symfony-docs/pull/6409>`_ Update 'date' to DateType::class in form.rst (iltar)
+* `#6411 <https://github.com/symfony/symfony-docs/pull/6411>`_ Fixed a typo in configuration-block (VarunAgw)
+* `#6414 <https://github.com/symfony/symfony-docs/pull/6414>`_ stick to Sphinx 1.3.x for the moment (xabbuh)
+* `#6399 <https://github.com/symfony/symfony-docs/pull/6399>`_ Fixed wrong code examples for Isbn constraint (AAstakhov)
+* `#6397 <https://github.com/symfony/symfony-docs/pull/6397>`_ Fix typo in SwitchUserListener file name (luxifer)
+* `#6390 <https://github.com/symfony/symfony-docs/pull/6390>`_ Reworded the example about $deep param (Oliboy50, javiereguiluz)
+* `#6381 <https://github.com/symfony/symfony-docs/pull/6381>`_ [Form] [Cookbook] Correctly setup unit tests with dependencies (corphi)
+* `#6382 <https://github.com/symfony/symfony-docs/pull/6382>`_ unused use instructions (bshevchenko)
+* `#6365 <https://github.com/symfony/symfony-docs/pull/6365>`_ Removed the PR table example (this is now included by GitHub template) (javiereguiluz)
+* `#6363 <https://github.com/symfony/symfony-docs/pull/6363>`_ Removed info about reducing visibility for private (AAstakhov)
+* `#6362 <https://github.com/symfony/symfony-docs/pull/6362>`_ [book] Updated link to Translatable Extension (AAstakhov)
+* `#6336 <https://github.com/symfony/symfony-docs/pull/6336>`_ Added minor clarification (ThomasLandauer)
+* `#6303 <https://github.com/symfony/symfony-docs/pull/6303>`_ Tweaked the Symfony Releases page (javiereguiluz)
+* `#6360 <https://github.com/symfony/symfony-docs/pull/6360>`_ Editing the Doctrine section to improve accuracy and readability (natechicago)
+* `#6352 <https://github.com/symfony/symfony-docs/pull/6352>`_ [book] controller ch review, part 3 (Talita Kocjan Zager)
+* `#6351 <https://github.com/symfony/symfony-docs/pull/6351>`_ [book] controller ch review, part 2 (Talita Kocjan Zager)
+* `#6349 <https://github.com/symfony/symfony-docs/pull/6349>`_ [book] controller ch review, part 1 (Talita Kocjan Zager)
+* `#6369 <https://github.com/symfony/symfony-docs/pull/6369>`_ Minor corrections (sfdumi)
+* `#6370 <https://github.com/symfony/symfony-docs/pull/6370>`_ Fixed typo (tabbi89)
+* `#6371 <https://github.com/symfony/symfony-docs/pull/6371>`_ Fix escaping of backtick inside double back-quotes (guilliamxavier)
+* `#6364 <https://github.com/symfony/symfony-docs/pull/6364>`_ [reference] [constraints] added missing colon character for Image constraint documentation in YAML format. (hhamon)
+* `#6345 <https://github.com/symfony/symfony-docs/pull/6345>`_ Remove link-local IPv6 address (snoek09)
+* `#6219 <https://github.com/symfony/symfony-docs/pull/6219>`_ Point that route parameters are also Request attributes (sfdumi)
+* `#6348 <https://github.com/symfony/symfony-docs/pull/6348>`_ [best practices] mostly typos (Talita Kocjan Zager)
+* `#6350 <https://github.com/symfony/symfony-docs/pull/6350>`_ Fix reference to app folder (kainjow)
+* `#6275 <https://github.com/symfony/symfony-docs/pull/6275>`_ [quick tour] mostly typos (Talita Kocjan Zager)
+* `#6305 <https://github.com/symfony/symfony-docs/pull/6305>`_ Mention IvoryCKEditorBundle in the Symfony Forms doc (javiereguiluz)
+* `#6331 <https://github.com/symfony/symfony-docs/pull/6331>`_ Rename DunglasApiBundle to ApiPlatform (sroze)
+* `#6328 <https://github.com/symfony/symfony-docs/pull/6328>`_ Update extension.rst - added caution box for people trying to remove the default file with services definitions (Pavel Jurecka)
+* `#6343 <https://github.com/symfony/symfony-docs/pull/6343>`_ Replace XLIFF number ids by strings (Triiistan)
+* `#6344 <https://github.com/symfony/symfony-docs/pull/6344>`_ Altered single / multiple inheritance sentence (outspaced)
+* `#6330 <https://github.com/symfony/symfony-docs/pull/6330>`_ [Form] reorder EntityType options (HeahDude)
+* `#6337 <https://github.com/symfony/symfony-docs/pull/6337>`_ Fix configuration.rst typo (gong023)
+* `#6295 <https://github.com/symfony/symfony-docs/pull/6295>`_ Update tools.rst (andrewtch)
+* `#6323 <https://github.com/symfony/symfony-docs/pull/6323>`_ [DependencyInjection] Add Autowiring keyword (theofidry)
+* `#6325 <https://github.com/symfony/symfony-docs/pull/6325>`_ Minor error (ThomasLandauer)
+* `#6311 <https://github.com/symfony/symfony-docs/pull/6311>`_ Improved TwigExtension to show default values and optional arguments (javiereguiluz)
+* `#6286 <https://github.com/symfony/symfony-docs/pull/6286>`_ [HttpFoundation] Fix typo for ParameterBag getters - 3.0 (rendler-denis)
+* `#6267 <https://github.com/symfony/symfony-docs/pull/6267>`_ [Form] fix 'data_class' option in EntityType (HeahDude)
+* `#6281 <https://github.com/symfony/symfony-docs/pull/6281>`_ Change isValid to isSubmitted. (mustafaaloko)
+
+
 February, 2016
 --------------
 

components/form/introduction.rst

@@ -315,9 +315,8 @@ Your integration with the Validation component will look something like this::
     use Symfony\Component\Validator\Validation;
 
     $vendorDir = realpath(__DIR__.'/../vendor');
-    $vendorFormDir = $vendorDir.'/symfony/form/Symfony/Component/Form';
-    $vendorValidatorDir =
-        $vendorDir.'/symfony/validator/Symfony/Component/Validator';
+    $vendorFormDir = $vendorDir.'/symfony/form';
+    $vendorValidatorDir = $vendorDir.'/symfony/validator';
 
     // create the validator - details will vary
     $validator = Validation::createValidator();

components/phpunit_bridge.rst

@@ -114,13 +114,13 @@ message contains the ``"foobar"`` string.
 Making Tests Fail
 -----------------
 
-By default, any non-legacy-tagged or any non-`@-silenced`_ deprecation notices will
-make tests fail. Alternatively, setting ``SYMFONY_DEPRECATIONS_HELPER`` to an
-arbitrary value (ex: ``320``) will make the tests fails only if a higher number
-of deprecation notices is reached (``0`` is the default value). You can also set
-the value ``"weak"`` which will make the bridge ignore any deprecation notices.
-This is useful to projects that must use deprecated interfaces for backward
-compatibility reasons.
+By default, any non-legacy-tagged or any non-`@-silenced`_ deprecation notices
+will make tests fail. Alternatively, setting ``SYMFONY_DEPRECATIONS_HELPER`` to
+an arbitrary value (ex: ``320``) will make the tests fails only if a higher
+number of deprecation notices is reached (``0`` is the default value). You can
+also set the value ``"weak"`` which will make the bridge ignore any deprecation
+notices. This is useful to projects that must use deprecated interfaces for
+backward compatibility reasons.
 
 Time-sensitive Tests
 --------------------
@@ -171,7 +171,7 @@ To use the ``ClockMock`` class in your test, you can:
   ``ClockMock::withClockMock(true)`` before the test and
   ``ClockMock::withClockMock(false)`` after the test.
 
-As a result, the following is guarenteed to work and is no longer a transient
+As a result, the following is guaranteed to work and is no longer a transient
 test::
 
     use Symfony\Component\Stopwatch\Stopwatch;
@@ -203,17 +203,97 @@ And that's all!
     advances the internal clock the given number of seconds without actually
     waiting that time, so your test will execute 10 seconds faster.
 
+DNS-sensitive Tests
+-------------------
+
+.. versionadded:: 3.1
+    The mocks for DNS related functions were introduced in Symfony 3.1.
+
+Tests that make network connections, for example to check the validity of a DNS
+record, can be slow to execute and unreliable due to the conditions of the
+network. For that reason, this component also provides mocks for these PHP
+functions:
+
+* :phpfunction:`checkdnsrr()`
+* :phpfunction:`dns_check_record()`
+* :phpfunction:`getmxrr()`
+* :phpfunction:`dns_get_mx()`
+* :phpfunction:`gethostbyaddr()`
+* :phpfunction:`gethostbyname()`
+* :phpfunction:`gethostbynamel()`
+* :phpfunction:`dns_get_record()`
+
+Use Case
+~~~~~~~~
+
+Consider the following example that uses the ``checkMX`` option of the ``Email``
+constraint to test the validity of the email domain::
+
+    use Symfony\Component\Validator\Constraints\Email;
+
+    class MyTest extends \PHPUnit_Framework_TestCase
+    {
+        public function testEmail()
+        {
+            $validator = ...
+            $constraint = new Email(array('checkMX' => true));
+
+            $result = $validator->validate('foo@example.com', $constraint);
+
+            // ...
+    }
+
+In order to avoid making a real network connection, add the ``@dns-sensitive``
+annotation to the class and use the ``DnsMock::withMockedHosts()`` to configure
+the data you expect to get for the given hosts::
+
+    use Symfony\Component\Validator\Constraints\Email;
+
+    /**
+     * @group dns-sensitive
+     */
+    class MyTest extends \PHPUnit_Framework_TestCase
+    {
+        public function testEmails()
+        {
+            DnsMock::withMockedHosts(array('example.com' => array(array('type' => 'MX'))));
+
+            $validator = ...
+            $constraint = new Email(array('checkMX' => true));
+
+            $result = $validator->validate('foo@example.com', $constraint);
+
+            // ...
+    }
+
+The ``withMockedHosts()`` method can return any number of hosts with different
+configuration, so you can simulate diverse network conditions::
+
+    DnsMock::withMockedHosts(array(
+        'example.com' => array(
+            array(
+                'type' => 'A',
+                'ip' => '1.2.3.4',
+            ),
+            array(
+                'type' => 'AAAA',
+                'ipv6' => '::12',
+            ),
+        ),
+    ));
+
 Troubleshooting
-~~~~~~~~~~~~~~~
+---------------
 
-The ``@group time-sensitive`` works "by convention" and assumes that the
-namespace of the tested class can be obtained just by removing the ``\Tests\``
-part from the test namespace. I.e. that if the your test case fully-qualified
-class name (FQCN) is ``App\Tests\Watch\DummyWatchTest``, it assumes the tested
-class FQCN is ``App\Watch\DummyWatch``.
+The ``@group time-sensitive`` and ``@group dns-sensitive`` annotations work
+"by convention" and assume that the namespace of the tested class can be
+obtained just by removing the ``\Tests\`` part from the test namespace. For
+example, if your test case fully-qualified class name (FQCN) is
+``App\Tests\Watch\DummyWatchTest``, it assumes the tested class FQCN is
+``App\Watch\DummyWatch``.
 
-If this convention doesn't work for your application, you can also configure
-the mocked namespaces in the ``phpunit.xml`` file, as done for example in the
+If this convention doesn't work for your application, configure the mocked
+namespaces in the ``phpunit.xml`` file, as done for example in the
 :doc:`HttpKernel Component </components/http_kernel/introduction>`:
 
 .. code-block:: xml

components/serializer.rst

@@ -296,7 +296,7 @@ You are now able to serialize only attributes in the groups you want::
     $serializer = new Serializer(array($normalizer));
 
     $data = $serializer->normalize($obj, null, array('groups' => array('group1')));
-    // $data = ['foo' => 'foo'];
+    // $data = array('foo' => 'foo');
 
     $obj2 = $serializer->denormalize(
         array('foo' => 'foo', 'bar' => 'bar'),

contributing/code/core_team.rst

@@ -51,8 +51,9 @@ Active Core Members
   * **Romain Neutron** (`romainneutron`_) can merge into the
     Process_ component;
 
-  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Debug_
-    component, the VarDumper_ component and the DebugBundle_;
+  * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
+    Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
+    the DebugBundle_;
 
   * **Christophe Coevoet** (`stof`_) can merge into the BrowserKit_,
     Config_, Console_, DependencyInjection_, DomCrawler_, EventDispatcher_,