Merge branch '3.4' into 4.0

javiereguiluz · javiereguiluz · commit c0310654cf34 · 2018-07-03T10:46:12.000+02:00
* 3.4:
  More fixes about Twig classes namespaces
diff --git a/best_practices/templates.rst b/best_practices/templates.rst
@@ -74,7 +74,7 @@ to define one single method to transform Markdown content into HTML::
     }
 
 Next, create a new Twig extension and define a filter called ``md2html`` using
-the ``TwigFilter`` class. Inject the newly defined ``Markdown`` class in the
+the ``Twig\TwigFilter`` class. Inject the newly defined ``Markdown`` class in the
 constructor of the Twig extension::
 
     namespace App\Twig;

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ to define one single method to transform Markdown content into HTML::`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	Next, create a new Twig extension and define a filter called ``md2html`` using
`77`		-the ``TwigFilter`` class. Inject the newly defined ``Markdown`` class in the
	`77`	+the ``Twig\TwigFilter`` class. Inject the newly defined ``Markdown`` class in the
`78`	`78`	`constructor of the Twig extension::`
`79`	`79`
`80`	`80`	`namespace App\Twig;`