Merge branch '4.2'

* 4.2:
  Change wrong class name
  Fix app.css comment syntax
  typo in sample of code
  Update doctrine.rst
  inject to the method instead of using the container
  [Bridge/PhpUnit] Add documentation about mocking date() in ClockMock
  Update contribution docs to reflect migration to SymfonyCloud

Author: javiereguiluz

README.markdown

@@ -15,10 +15,10 @@ We love contributors! For more information on how you can contribute to the
 Symfony documentation, please read
 [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
 
-Platform.sh
------------
+SymfonyCloud
+------------
 
-Pull requests are automatically built by [Platform.sh](https://platform.sh).
+Pull requests are automatically built by [SymfonyCloud](https://symfony.com/cloud).
 
 Docker
 ------

_images/contributing/docs-pull-request-platformsh.png

@@ -330,7 +330,10 @@ 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()``.
+``microtime()``, ``sleep()`` and ``usleep()``. Additionally the function
+``date()`` is mocked so it uses the mocked time if no timestamp is specified.
+Other functions with an optional timestamp parameter that defaults to ``time()``
+will still use the system time instead of the mocked time.
 
 To use the ``ClockMock`` class in your test, add the ``@group time-sensitive``
 annotation to its class or methods. This annotation only works when executing

_images/contributing/docs-pull-request-symfonycloud.png

@@ -229,22 +229,22 @@ this hard work, it's **time to celebrate again!**
 Review your changes
 -------------------
 
-Every GitHub Pull Request is automatically built and deployed by `Platform.sh`_
-on a single environment that you can access on your browser to review your
-changes.
+Every GitHub Pull Request is automatically built and deployed by
+`SymfonyCloud`_ on a single environment that you can access on your browser to
+review your changes.
 
-.. image:: /_images/contributing/docs-pull-request-platformsh.png
+.. image:: /_images/contributing/docs-pull-request-symfonycloud.png
    :align: center
-   :alt:   Platform.sh Pull Request Deployment
+   :alt:   SymfonyCloud Pull Request Deployment
 
-To access the `Platform.sh`_ environment URL, go to your Pull Request page on
-GitHub, click on the **Show all checks** link and finally, click on the ``Details``
-link displayed for Platform.sh service.
+To access the `SymfonyCloud`_ environment URL, go to your Pull Request page on
+GitHub, click on the **Show all checks** link and finally, click on the
+``Details`` link displayed for SymfonyCloud service.
 
 .. note::
 
     Only Pull Requests to maintained branches are automatically built by
-    Platform.sh. Check the `roadmap`_ for maintained branches.
+    SymfonyCloud. Check the `roadmap`_ for maintained branches.
 
 Build the Documentation Locally
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -326,7 +326,7 @@ definitely don't want you to waste your time!
 .. _`SymfonyConnect`: https://connect.symfony.com/
 .. _`Symfony Documentation Badge`: https://connect.symfony.com/badge/36/symfony-documentation-contributor
 .. _`sync your fork`: https://help.github.com/articles/syncing-a-fork
-.. _`Platform.sh`: https://platform.sh
+.. _`SymfonyCloud`: https://symfony.com/cloud
 .. _`roadmap`: https://symfony.com/roadmap
 .. _`pip`: https://pip.pypa.io/en/stable/
 .. _`pip installation`: https://pip.pypa.io/en/stable/installing/

components/phpunit_bridge.rst

@@ -675,7 +675,7 @@ In addition to the query builder, you can also query with `Doctrine Query Langua
             FROM App\Entity\Product p
             WHERE p.price > :price
             ORDER BY p.price ASC'
-        )->setParameter('price', 1000);
+        )->setParameter('price', $price);
 
         // returns an array of Product objects
         return $query->execute();
@@ -696,7 +696,7 @@ Or directly with SQL if you need to::
             ORDER BY p.price ASC
             ';
         $stmt = $conn->prepare($sql);
-        $stmt->execute(['price' => 1000]);
+        $stmt->execute(['price' => $price]);
 
         // returns an array of arrays (i.e. a raw data set)
         return $stmt->fetchAll();

contributing/documentation/overview.rst

@@ -94,7 +94,7 @@ And the new ``assets/css/app.css`` file:
 
 .. code-block:: css
 
-    // assets/css/app.css
+    /* assets/css/app.css */
     body {
         background-color: lightgray;
     }

doctrine.rst

@@ -96,7 +96,7 @@ can do most of the work for you:
                 {{ encore_entry_link_tags('app') }}
 
                 <!-- Renders a link tag (if your module requires any CSS)
-                     <link rel="stylesheet" src="/build/app.css"> -->
+                     <link rel="stylesheet" href="/build/app.css"> -->
             {% endblock %}
         </head>
         <body>

frontend/encore/installation-no-flex.rst

@@ -62,8 +62,7 @@ If you're using the :ref:`default services.yaml configuration <service-container
 This means you can use them immediately without *any* configuration.
 
 However, to understand autowiring better, the following examples explicitly configure
-both services. Also, to keep things simple, configure ``TwitterClient`` to be a
-:ref:`public <container-public>` service:
+both services:
 
 .. configuration-block::
 
@@ -80,8 +79,6 @@ both services. Also, to keep things simple, configure ``TwitterClient`` to be a
             App\Service\TwitterClient:
                 # redundant thanks to _defaults, but value is overridable on each service
                 autowire: true
-                # not required, will help in our example
-                public: true
 
             App\Util\Rot13Transformer:
                 autowire: true
@@ -98,7 +95,7 @@ both services. Also, to keep things simple, configure ``TwitterClient`` to be a
                 <defaults autowire="true" autoconfigure="true" public="false" />
                 <!-- ... -->
 
-                <service id="App\Service\TwitterClient" autowire="true" public="true" />
+                <service id="App\Service\TwitterClient" autowire="true" />
 
                 <service id="App\Util\Rot13Transformer" autowire="true" />
             </services>
@@ -114,8 +111,7 @@ both services. Also, to keep things simple, configure ``TwitterClient`` to be a
 
         // the autowire method is new in Symfony 3.3
         // in earlier versions, use register() and then call setAutowired(true)
-        $container->autowire(TwitterClient::class)
-            ->setPublic(true);
+        $container->autowire(TwitterClient::class);
 
         $container->autowire(Rot13Transformer::class)
             ->setPublic(false);
@@ -133,11 +129,10 @@ Now, you can use the ``TwitterClient`` service immediately in a controller::
         /**
          * @Route("/tweet", methods={"POST"})
          */
-        public function tweet()
+        public function tweet(TwitterClient $twitterClient)
         {
             // fetch $user, $key, $status from the POST'ed data
 
-            $twitterClient = $this->container->get(TwitterClient::class);
             $twitterClient->tweet($user, $key, $status);
 
             // ...

frontend/encore/simple-example.rst

@@ -273,7 +273,7 @@ container for any services with the ``app.mail_transport`` tag::
             $taggedServices = $container->findTaggedServiceIds('app.mail_transport');
 
             foreach ($taggedServices as $id => $tags) {
-                // add the transport service to the ChainTransport service
+                // add the transport service to the TransportChain service
                 $definition->addMethodCall('addTransport', array(new Reference($id)));
             }
         }