Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit ed6fbfb90a9a · 2019-03-20T13:36:58.000+01:00
* 3.4:
  use consistent placeholder comments in yaml, php and xml
diff --git a/create_framework/http_kernel_httpkernelinterface.rst b/create_framework/http_kernel_httpkernelinterface.rst
@@ -55,7 +55,7 @@ PHP; it implements ``HttpKernelInterface`` and wraps another
 
     // example.com/web/front.php
 
-    // ..
+    // ...
 
     $framework = new Simplex\Framework($dispatcher, $matcher, $controllerResolver, $argumentResolver);
     $framework = new HttpKernel\HttpCache\HttpCache(
diff --git a/routing.rst b/routing.rst
@@ -898,7 +898,7 @@ This happens when your controller method has an argument (e.g. ``$slug``)::
 
     public function show($slug)
     {
-        // ..
+        // ...
     }
 
 But your route path does *not* have a ``{slug}`` wildcard (e.g. it is ``/blog/show``).
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -230,7 +230,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
 
         // config/packages/security.php
 
-        // ..
+        // ...
         use App\Security\TokenAuthenticator;
 
         $container->loadFromExtension('security', [

Original file line number	Diff line number	Diff line change
@@ -898,7 +898,7 @@ This happens when your controller method has an argument (e.g. ``$slug``)::
`898`	`898`
`899`	`899`	`public function show($slug)`
`900`	`900`	`{`
`901`		`- // ..`
	`901`	`+ // ...`
`902`	`902`	`}`
`903`	`903`
`904`	`904`	But your route path does not have a ``{slug}`` wildcard (e.g. it is ``/blog/show``).