Merge branch '2.7' into 2.8

Author: wouterj

components/class_loader/introduction.rst

@@ -19,7 +19,7 @@ load your classes:
   the `PSR-0`_ class naming standard;
 
 * :doc:`/components/class_loader/psr4_class_loader`: loads classes that follow
-  the `PSR-4` class naming standard;
+  the `PSR-4`_ class naming standard;
 
 * :doc:`/components/class_loader/map_class_loader`: loads classes using
   a static map from class name to file path.
@@ -45,5 +45,6 @@ You can install the component in 2 different ways:
 .. include:: /components/require_autoload.rst.inc
 
 .. _PSR-0: http://www.php-fig.org/psr/psr-0/
+.. _PSR-4: http://www.php-fig.org/psr/psr-4/
 .. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
 .. _Packagist: https://packagist.org/packages/symfony/class-loader

components/phpunit_bridge.rst

@@ -6,7 +6,7 @@ The PHPUnit Bridge
 ==================
 
     The PHPUnit Bridge provides utilities to report legacy tests and usage of
-    deprecated code and a helper for time-sensitive tests.
+    deprecated code.
 
 It comes with the following features:
 
@@ -18,8 +18,6 @@ It comes with the following features:
 
 * Displays the stack trace of a deprecation on-demand;
 
-* Provides a ``ClockMock`` helper class for time-sensitive tests.
-
 .. versionadded:: 2.7
     The PHPUnit Bridge was introduced in Symfony 2.7. It is however possible to
     install the bridge in any Symfony application (even 2.3).
@@ -122,125 +120,10 @@ 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
---------------------
-
-Use Case
-~~~~~~~~
-
-If you have this kind of time-related tests::
-
-    use Symfony\Component\Stopwatch\Stopwatch;
-
-    class MyTest extends \PHPUnit_Framework_TestCase
-    {
-        public function testSomething()
-        {
-            $stopwatch = new Stopwatch();
-
-            $stopwatch->start();
-            sleep(10);
-            $duration = $stopwatch->stop();
-
-            $this->assertEquals(10, $duration);
-        }
-    }
-
-You used the :doc:`Symfony Stopwatch Component </components/stopwatch>` to
-calculate the duration time of your process, here 10 seconds. However, depending
-on the load of the server your the processes running on your local machine, the
-``$duration`` could for example be `10.000023s` instead of `10s`.
-
-This kind of tests are called transient tests: they are failing randomly
-depending on spurious and external circumstances. They are often cause trouble
-when using public continuous integration services like `Travis CI`_.
-
-Clock Mocking
-~~~~~~~~~~~~~
-
-The :class:`Symfony\\Bridge\\PhpUnit\\ClockMock` class provided by this bridge
-allows you to mock the PHP's built-in time functions ``time()``,
-``microtime()``, ``sleep()`` and ``usleep()``.
-
-To use the ``ClockMock`` class in your test, you can:
-
-* (**Recommended**) Add the ``@group time-sensitive`` annotation to its class or
-  method;
-
-* Register it manually by calling ``ClockMock::register(__CLASS__)`` and
-  ``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
-test::
-
-    use Symfony\Component\Stopwatch\Stopwatch;
-
-    /**
-     * @group time-sensitive
-     */
-    class MyTest extends \PHPUnit_Framework_TestCase
-    {
-        public function testSomething()
-        {
-            $stopwatch = new Stopwatch();
-
-            $stopwatch->start();
-            sleep(10);
-            $duration = $stopwatch->stop();
-
-            $this->assertEquals(10, $duration);
-        }
-    }
-
-And that's all!
-
-.. tip::
-
-    An added bonus of using the ``ClockMock`` class is that time passes
-    instantly. Using PHP's ``sleep(10)`` will make your test wait for 10
-    actual seconds (more or less). In contrast, the ``ClockMock`` class
-    advances the internal clock the given number of seconds without actually
-    waiting that time, so your test will execute 10 seconds faster.
-
-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``.
-
-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
-:doc:`HttpKernel Component </components/http_kernel/introduction>`:
-
-.. code-block:: xml
-
-    <!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
-    <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-    >
-
-        <!-- ... -->
-
-        <listeners>
-            <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
-                <arguments>
-                    <array>
-                        <element><string>Symfony\Component\HttpFoundation</string></element>
-                    </array>
-                </arguments>
-            </listener>
-        </listeners>
-    </phpunit>
-
 .. _PHPUnit: https://phpunit.de
 .. _`PHPUnit event listener`: https://phpunit.de/manual/current/en/extending-phpunit.html#extending-phpunit.PHPUnit_Framework_TestListener
 .. _`PHP error handler`: http://php.net/manual/en/book.errorfunc.php
 .. _`environment variable`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.php-ini-constants-variables
 .. _Packagist: https://packagist.org/packages/symfony/phpunit-bridge
 .. _`@-silencing operator`: http://php.net/manual/en/language.operators.errorcontrol.php
 .. _`@-silenced`: http://php.net/manual/en/language.operators.errorcontrol.php
-.. _`Travis CI`: https://travis-ci.com/

components/serializer.rst

@@ -169,7 +169,7 @@ The serializer can also be used to update an existing object::
     EOF;
 
     $serializer->deserialize($data, 'Acme\Person', 'xml', array('object_to_populate' => $person));
-    // $obj2 = Acme\Person(name: 'foo', age: '99', sportsman: true)
+    // $obj2 = Acme\Person(name: 'foo', age: '69', sportsman: true)
 
 This is a common need when working with an ORM.
 

reference/configuration/framework.rst

@@ -86,7 +86,7 @@ Configuration
     * :ref:`enabled <reference-translator-enabled>`
     * `fallbacks`_
     * `logging`_
-* `property_accessor`_
+* `property_access`_
     * `magic_call`_
     * `throw_exception_on_invalid_index`_
 * `validation`_
@@ -1300,8 +1300,8 @@ for a given key. The logs are made to the ``translation`` channel and at the
 ``debug`` for level for keys where there is a translation in the fallback
 locale and the ``warning`` level if there is no translation to use at all.
 
-property_accessor
-~~~~~~~~~~~~~~~~~
+property_access
+~~~~~~~~~~~~~~~
 
 magic_call
 ..........