Merge branch '5.4' into 6.0

* 5.4:
  [FrameworkBundle] Update the default config of Doctrine cache

Author: OskarStark

reference/configuration/framework.rst

@@ -2785,10 +2785,12 @@ annotations
 cache
 .....
 
-**type**: ``string`` **default**: ``'file'``
+**type**: ``string`` **default**: ``'php_array'``
 
 This option can be one of the following values:
 
+php_array
+    Use a PHP array to cache annotations in memory
 file
     Use the filesystem to cache annotations
 none