Part of #2047951: [META] Remove calls to deprecated global $user and $GLOBALS['user']

core/modules/file/file.module:

function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) {
  global $user;
function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAME) {
  global $user;
function file_file_download($uri, $field_type = 'file') {
  global $user;
function file_save_upload($form_field_name, $validators = array(), $destination = FALSE, $delta = NULL, $replace = FILE_EXISTS_RENAME) {
  global $user;

core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php:

function testFileValidateSize() {
    global $user;
CommentFileSizeAuthor
#10 drupal8.file-system.2061895-10.patch2.13 KBsergeypavlenko
#7 drupal-2061895-7.patch2.25 KBsergeypavlenko
#5 2061895-5.patch2.31 KBsergeypavlenko
#3 drupal-2061895-3.patch4.09 KBsergeypavlenko
#2 remove-calls-to-deprecated-global-user-in-file-module-2061895-2.patch4.09 KBsergeypavlenko
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
Title: Remove references to global user variable in file module » Remove calls to deprecated global $user in file module
sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
Assigned: sergeypavlenko » Unassigned
Status: Active » Needs review
FileSize
remove-calls-to-deprecated-global-user-in-file-module-2061895-2.patch4.09 KB

Fix. Needs review.

sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
FileSize
drupal-2061895-3.patch4.09 KB

Removed \ with some functions.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost commented
Status: Needs review » Needs work 
@@ -390,7 +390,7 @@ function file_validate_extensions(File $file, $extensions) {
-  global $user;
+  $account = Drupal::request()->attributes->get('_account');

@@ -398,7 +398,7 @@ function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) {
-  if ($user_limit && (Drupal::entityManager()->getStorageController('file')->spaceUsed($user->id()) + $file->getSize()) > $user_limit) {
+  if ($user_limit && (Drupal::entityManager()->getStorageController('file')->spaceUsed($account->id()) + $file->getSize()) > $user_limit) {

@@ -508,7 +508,7 @@ function file_validate_image_resolution(File $file, $maximum_dimensions = 0, $mi
-  global $user;
+  $account = Drupal::request()->attributes->get('_account');

@@ -523,7 +523,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
-      'uid' => $user->id(),
+      'uid' => $account->id(),

@@ -607,7 +607,7 @@ function file_theme() {
-  global $user;
+  $account = Drupal::request()->attributes->get('_account');

@@ -633,7 +633,7 @@ function file_file_download($uri, $field_type = 'file') {
-  if (empty($references) && ($file->isPermanent() || $file->getOwner()->id() != $user->id())) {
+  if (empty($references) && ($file->isPermanent() || $file->getOwner()->id() != $account->id())) {

@@ -765,7 +765,7 @@ function file_cron() {
-  global $user;
+  $account = Drupal::request()->attributes->get('_account');

@@ -824,7 +824,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
-      'uid' => $user->id(),
+      'uid' => $account->id(),

Please do not change the variable name. Leave $user as it was

@@ -129,7 +129,7 @@ function testFileValidateNameLength() {
-    global $user;
+    $user = \Drupal::request()->attributes->get('_account');

This should be $this->container->get('request')->....

sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
Status: Needs work » Needs review
FileSize
2061895-5.patch2.31 KB

Fix. Thank you!

Status: Needs review » Needs work

The last submitted patch, 2061895-5.patch, failed testing.

sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
Status: Needs work » Needs review
FileSize
drupal-2061895-7.patch2.25 KB

Fix.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost commented
Status: Needs review » Reviewed & tested by the community

Nice

catch’s picture

catch
he/him
Primary language English
CreditAttribution: catch commented
Status: Reviewed & tested by the community » Postponed

Sorry postponing this on #2062151: Create a current user service to ensure that current account is always available.

sergeypavlenko’s picture

sergeypavlenko CreditAttribution: sergeypavlenko commented
Status: Postponed » Needs review
FileSize
drupal8.file-system.2061895-10.patch2.13 KB

Issue #2062151: Create a current user service to ensure that current account is always available. Fix.

Crell’s picture

Crell CreditAttribution: Crell commented
Status: Needs review » Reviewed & tested by the community

#10 looks correct to me, pending bot approval.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott commented
Status: Reviewed & tested by the community » Fixed

Committed aafee28 and pushed to 8.x. Thanks!

Automatically closed -- issue fixed for 2 weeks with no activity.

Anonymous’s picture

(not verified) CreditAttribution: commented
Issue summary: View changes

Edit desc.