Merge branch '7.0' into 7.1

* 7.0:
  Fix phpcs issue

src/Kunstmaan/MediaBundle/Controller/ChooserController.php

@@ -139,7 +139,7 @@ public function chooserShowFolderAction(Request $request, $folderId, array $cust
             'folder' => $folder,
             'adminlist' => $adminList,
             'subform' => $subForm->createView(),
-            ...$customViewVars
+            ...$customViewVars,
         ];
 
         $forms = [];