Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 6f6b216d4c2f · 2018-10-15T16:27:44.000+02:00
* 2.8:
  Updated the command to run the Docker image
  [Doctrine Bridge] document priority for doctrine.event_listener tag
  Add details on how the ClockMock::register works
  Add Dockerfile
  Fix function name in expression
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,16 @@
+FROM  python:2-stretch as builder
+
+WORKDIR /www
+
+COPY ./_build/.requirements.txt _build/
+
+RUN pip install  pip==9.0.1 wheel==0.29.0 \
+    && pip install -r _build/.requirements.txt
+
+COPY . /www
+
+RUN make -C _build html
+
+FROM  nginx:latest
+
+COPY --from=builder /www/_build/html /usr/share/nginx/html
diff --git a/README.markdown b/README.markdown
@@ -19,3 +19,17 @@ Platform.sh
 -----------
 
 Pull requests are automatically built by [Platform.sh](https://platform.sh).
+
+Docker
+------
+
+You can build the doc locally with these commands:
+
+```bash
+# build the image...
+$ docker build . -t symfony-docs
+
+# ...and serve it locally on http//:127.0.0.1:8080
+# (if it's already in use, change the '8080' port by any other port)
+$ docker run --rm -p 8080:80 symfony-docs
+```
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -352,6 +352,48 @@ test::
 
 And that's all!
 
+.. caution::
+
+    Time-based function mocking follows the `PHP namespace resolutions rules`_
+    so "fully qualified function calls" (e.g ``\time()``) cannot be mocked.
+
+The ``@group time-sensitive`` annotation is equivalent to calling
+``ClockMock::register(MyTest::class)``. If you want to mock a function used in a
+different class, do it explicitly using ``ClockMock::register(MyClass::class)``::
+
+    // the class that uses the time() function to be mocked
+    namespace App;
+
+    class MyClass
+    {
+        public function getTimeInHours()
+        {
+            return time() / 3600;
+        }
+    }
+
+    // the test that mocks the external time() function explicitly
+    namespace App\Tests;
+
+    use App\MyClass;
+    use PHPUnit\Framework\TestCase;
+
+    /**
+     * @group time-sensitive
+     */
+    class MyTest extends TestCase
+    {
+        public function testGetTimeInHours()
+        {
+            ClockMock::register(MyClass::class);
+
+            $my = new MyClass();
+            $result = $my->getTimeInHours();
+
+            $this->assertEquals(time() / 3600, $result);
+        }
+    }
+
 .. tip::
 
     An added bonus of using the ``ClockMock`` class is that time passes
@@ -631,3 +673,4 @@ not find the SUT:
 .. _`Travis CI`: https://travis-ci.org/
 .. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
 .. _`@covers`: https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers
+.. _`PHP namespace resolutions rules`: https://php.net/manual/en/language.namespaces.rules.php
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -242,3 +242,56 @@ to the tag like so:
 
 .. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
 .. _`the Doctrine Documentation`: https://symfony.com/doc/current/bundles/DoctrineBundle/entity-listeners.html
+
+Priorities for Event Listeners
+------------------------------
+
+In case you have multiple listeners for the same event you can control the order
+in which they are invoked using the ``priority`` attribute on the tag.
+Listeners with a higher priority are invoked first.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        services:
+            my.listener.with_high_priority:
+                class: AppBundle\EventListener\MyHighPriorityListener
+                tags:
+                    - { name: doctrine.event_listener, event: postPersist, priority: 10 }
+
+            my.listener.with_low_priority:
+                class: AppBundle\EventListener\MyLowPriorityListener
+                tags:
+                    - { name: doctrine.event_listener, event: postPersist, priority: 1 }
+
+    .. code-block:: xml
+
+        <?xml version="1.0" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
+
+            <services>
+                <service id="my.listener.with_high_priority" class="AppBundle\EventListener\MyHighPriorityListener">
+                    <tag name="doctrine.event_listener" event="postPersist" priority="10" />
+                </service>
+                <service id="my.listener.with_low_priority" class="AppBundle\EventListener\MyLowPriorityListener">
+                    <tag name="doctrine.event_listener" event="postPersist" priority="1" />
+                </service>
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        use AppBundle\EventListener\MyHighPriorityListener;
+        use AppBundle\EventListener\MyLowPriorityListener;
+
+        $container
+            ->register('my.listener.with_high_priority', MyHighPriorityListener::class)
+            ->addTag('doctrine.event_listener', array('event' => 'postPersist', 'priority' => 10))
+        ;
+
+        $container
+            ->register('my.listener.with_low_priority', MyLowPriorityListener::class)
+            ->addTag('doctrine.event_listener', array('event' => 'postPersist', 'priority' => 1))
+        ;
diff --git a/security/expressions.rst b/security/expressions.rst
@@ -67,7 +67,7 @@ Additionally, you have access to a number of functions inside the expression:
 
 .. sidebar:: ``is_remember_me`` is different than checking ``IS_AUTHENTICATED_REMEMBERED``
 
-    The ``is_remember_me()`` and ``is_authenticated_fully()`` functions are *similar*
+    The ``is_remember_me()`` and ``is_fully_authenticated()`` functions are *similar*
     to using ``IS_AUTHENTICATED_REMEMBERED`` and ``IS_AUTHENTICATED_FULLY``
     with the ``isGranted()`` function - but they are **not** the same. The
     following shows the difference::
