Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit cba024568624 · 2018-12-11T08:49:21.000+01:00
* 3.4:
  Change wrong class name
  Fix app.css comment syntax
  typo in sample of code
  inject to the method instead of using the container
  Update contribution docs to reflect migration to SymfonyCloud
diff --git a/README.markdown b/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
 ------
diff --git a/_images/contributing/docs-pull-request-platformsh.png b/_images/contributing/docs-pull-request-platformsh.png
diff --git a/_images/contributing/docs-pull-request-symfonycloud.png b/_images/contributing/docs-pull-request-symfonycloud.png
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -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/
diff --git a/frontend/encore/installation-no-flex.rst b/frontend/encore/installation-no-flex.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;
     }
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.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>
diff --git a/service_container/autowiring.rst b/service_container/autowiring.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);
 
             // ...
diff --git a/service_container/tags.rst b/service_container/tags.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)));
             }
         }

Original file line number	Diff line number	Diff line change
@@ -94,7 +94,7 @@ And the new ``assets/css/app.css`` file:
`94`	`94`
`95`	`95`	`.. code-block:: css`
`96`	`96`
`97`		`- // assets/css/app.css`
	`97`	`+ /* assets/css/app.css */`
`98`	`98`	`body {`
`99`	`99`	`background-color: lightgray;`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
@@ -273,7 +273,7 @@ container for any services with the ``app.mail_transport`` tag::
`273`	`273`	`$taggedServices = $container->findTaggedServiceIds('app.mail_transport');`
`274`	`274`
`275`	`275`	`foreach ($taggedServices as $id => $tags) {`
`276`		`- // add the transport service to the ChainTransport service`
	`276`	`+ // add the transport service to the TransportChain service`
`277`	`277`	`$definition->addMethodCall('addTransport', array(new Reference($id)));`
`278`	`278`	`}`
`279`	`279`	`}`