diff --git a/core/modules/action/action.api.php b/core/modules/action/action.api.php
index ddfe3ca..3718093 100644
--- a/core/modules/action/action.api.php
+++ b/core/modules/action/action.api.php
@@ -13,7 +13,7 @@
 /**
  * Executes code after an action is deleted.
  *
- * @param mixed $aid
+ * @param $aid
  *   The action ID.
  */
 function hook_action_delete($aid) {
diff --git a/core/modules/action/src/Plugin/Action/EmailAction.php b/core/modules/action/src/Plugin/Action/EmailAction.php
index 5512306..797d8a4 100644
--- a/core/modules/action/src/Plugin/Action/EmailAction.php
+++ b/core/modules/action/src/Plugin/Action/EmailAction.php
@@ -54,14 +54,13 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
   protected $logger;
 
   /**
-   * The mail manager.
+   * The mail manager
    *
    * @var \Drupal\Core\Mail\MailManagerInterface
    */
   protected $mailManager;
 
-  /**
-   * The language manager.
+  /** The language manager.
    *
    * @var \Drupal\Core\Language\LanguageManagerInterface
    */
@@ -89,9 +88,9 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
    *   The entity manager.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
-   * @param \Drupal\Core\Mail\MailManagerInterface $mail_manager
+   * @param \Drupal\Core\Mail\MailManagerInterface
    *   The mail manager.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   * @param \Drupal\Core\Language\LanguageManagerInterface
    *   The language manager.
    * @param \Egulias\EmailValidator\EmailValidator $email_validator
    *   The email validator.
diff --git a/core/modules/file/src/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php
index 3e45c80..ef09a79 100644
--- a/core/modules/file/src/Controller/FileWidgetAjaxController.php
+++ b/core/modules/file/src/Controller/FileWidgetAjaxController.php
@@ -15,70 +15,34 @@
 class FileWidgetAjaxController {
 
   /**
-   * Determines the file progress implementation available and passes the $key
-   * on to the implementation wrapper.
+   * Returns the progress status for a file upload process.
    *
    * @param string $key
    *   The unique key for this upload process.
    *
-   * @see file_progress_implementation()
-   */
-  public function progress($key) {
-    if ($implementation = ucfirst(file_progress_implementation())) {
-      $this->{"progress$implementation"}($key);
-    }
-    else {
-      $this->sendResponse();
-    }
-  }
-
-  /**
-   * Retrieves the file upload progress status from uploadprogress.
-   *
-   * @param string $key
-   *   The unique key for this upload process.
-   */
-  protected function progressUploadprogress($key) {
-    $this->sendResponse(uploadprogress_get_info($key), 'bytes_uploaded', 'bytes_total');
-  }
-
-  /**
-   * Retrieves the file upload progress status from APC.
-   *
-   * @param string $key
-   *   The unique key for this upload process.
-   *
-   */
-  protected function progressApc($key) {
-    $this->sendResponse(apc_fetch('upload_' . $key));
-  }
-
-  /**
-   * Sends the file progress status information back to the browser.
-   *
-   * @param array $status
-   *   An array with upload status information retrieved from the file
-   *   progress implementation.
-   * @param string $current
-   *   The array key to use to get the current upload progress (in bytes)
-   *   from $status.
-   * @param string $total
-   *   The array key to use to get the total bytes to upload from $status.
-   *
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    *   A JsonResponse object.
    */
-  protected function sendResponse($status = [], $current = 'current', $total = 'total') {
+  public function progress($key) {
     $progress = array(
       'message' => t('Starting upload...'),
       'percentage' => -1,
     );
-    if (isset($status[$current]) && !empty($status[$total])) {
-      $progress['message'] = t('Uploading... (@current of @total)', array(
-          '@current' => format_size($status[$current]),
-          '@total' => format_size($status[$total])
-      ));
-      $progress['percentage'] = round(100 * $status[$current] / $status[$total]);
+
+    $implementation = file_progress_implementation();
+    if ($implementation == 'uploadprogress') {
+      $status = uploadprogress_get_info($key);
+      if (isset($status['bytes_uploaded']) && !empty($status['bytes_total'])) {
+        $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['bytes_uploaded']), '@total' => format_size($status['bytes_total'])));
+        $progress['percentage'] = round(100 * $status['bytes_uploaded'] / $status['bytes_total']);
+      }
+    }
+    elseif ($implementation == 'apc') {
+      $status = apcu_fetch('upload_' . $key);
+      if (isset($status['current']) && !empty($status['total'])) {
+        $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['current']), '@total' => format_size($status['total'])));
+        $progress['percentage'] = round(100 * $status['current'] / $status['total']);
+      }
     }
 
     return new JsonResponse($progress);