Merge "Address errors and warnings in CodeSniffer in api/"

diff --cc includes/api/ApiDelete.php
index fe5a196,b9b07d1..c09cad3
--- 1/includes/api/ApiDelete.php
--- 2/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@@ -127,15 -133,17 +133,17 @@@ class ApiDelete extends ApiBase 
        }
  
        /**
 -       * @param $page WikiPage|Page object to work on
 -       * @param $user User doing the action
 -       * @param $token
 -       * @param $oldimage
 -       * @param $reason
 -       * @param $suppress bool
 +       * @param Page $page Object to work on
 +       * @param User $user User doing the action
 +       * @param string $token Delete token (same as edit token)
 +       * @param string $oldimage Archive name
 +       * @param string $reason Reason for the deletion. Autogenerated if null.
 +       * @param bool $suppress Whether to mark all deleted versions as restricted
         * @return Status|array
         */
-       public static function deleteFile( Page $page, User $user, $token, $oldimage, &$reason = null, $suppress = false ) {
+       public static function deleteFile( Page $page, User $user, $token, $oldimage,
+               &$reason = null, $suppress = false
+       ) {
                $title = $page->getTitle();
                $errors = self::getPermissionsError( $title, $user, $token );
                if ( count( $errors ) ) {

diff --cc includes/api/ApiMain.php
Simple merge

diff --cc includes/api/ApiQueryImageInfo.php
Simple merge