Use FileRepositoryInterface in \Drupal\file\Upload\FileUploadHandler::loadByUri

Change looks good and doesn't cause any issues so seems like a valid cleanup/update.

Added review to MR - we need to use dependency injection here.

Now that the service has a new parameter it will need a change record.

Also new parameter should default to NULL and throw a trigger_error

don't we need to deprecate it first?

So this is adding a parameter so would need something like

      @trigger_error('Calling ' . __CLASS__ . '::__construct() with the $migration argument is deprecated in drupal:10.1.0 and is removed in drupal:11.0.0. See https://www.drupal.org/node/3323212', E_USER_DEPRECATED);

With the URL being to the change record created here.

Then the test is maybe a Kernel test that shows you get that trigger_error when passing nothing in that last parameter spot.

Oh yes. I have read 'thrown error' instead of 'trigger_error' :)

I have created the deprecation notice. I have also created a new branch and MR as I can not change the target branch of MR !3316.

Spokje → closed merge request !3316

Looks good!

Made this change on commit, otherwise looks great.

diff --git a/core/modules/file/src/Upload/FileUploadHandler.php b/core/modules/file/src/Upload/FileUploadHandler.php
index a79e757c67..ac997bcefa 100644
--- a/core/modules/file/src/Upload/FileUploadHandler.php
+++ b/core/modules/file/src/Upload/FileUploadHandler.php
@@ -120,7 +120,7 @@ public function __construct(FileSystemInterface $fileSystem, EntityTypeManagerIn
     $this->currentUser = $currentUser;
     $this->requestStack = $requestStack;
     if ($fileRepository === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . ' without the $fileRepository argument is deprecated in drupal:10.1.5 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3346839', E_USER_DEPRECATED);
+      @trigger_error('Calling ' . __METHOD__ . ' without the $fileRepository argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3346839', E_USER_DEPRECATED);
       $fileRepository = \Drupal::service('file.repository');
     }
     $this->fileRepository = $fileRepository;

Committed 283d9be and pushed to 10.1.x. Thanks!

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

Published the CR