Merge branch '6.0' into 6.1

* 6.0:
  Update best_practices.rst

Author: javiereguiluz

best_practices.rst

@@ -378,7 +378,8 @@ Use Voters to Implement Fine-grained Security Restrictions
 
 If your security logic is complex, you should create custom
 :doc:`security voters </security/voters>` instead of defining long expressions
-inside the ``@Security`` annotation.
+inside the ``#[Security]`` attribute (or in the ``@Security`` annotation if your
+PHP version doesn't support attributes yet).
 
 Web Assets
 ----------