Problem/Motivation

Follow-up to #1472946-67: Remove usages of deprecated function drupal_realpath() throughout core functions
Deprecated usage was replaced but not all classes using to inject dependency

Proposed resolution

Inject file_system service into every place where it's possible

Remaining tasks

- replace usage of \Drupal::service('file_system') with properly injected service

CommentFileSizeAuthor
#10 interdiff-2923511-9.txt3.7 KBandypost
#10 2923511-10.patch13.67 KBandypost
#9 interdiff-6-9.txt1.99 KBpiggito
#9 use-proper-di-for-filesystem-service-2923511-9.patch12.67 KBpiggito
#6 interdiff-2923511-2-6.txt1.04 KBilya.no
#6 use-proper-di-for-filesystem-service-2923511-6.patch14.66 KBilya.no
#2 use-proper-di-for-filesystem-service-2923511-2.patch14.24 KBilya.no
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

andypost created an issue. See original summary.

ilya.no’s picture

ilya.no CreditAttribution: ilya.no as a volunteer and at Skilld for Skilld commented
FileSize
use-proper-di-for-filesystem-service-2923511-2.patch14.24 KB

Attaching initial patch. I've updated one access handler and several forms. Not sure about tests.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Active » Needs review
andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Needs review » Needs work

2 places should be changed

  1. +++ b/core/modules/file/src/FileAccessControlHandler.php
@@ -13,7 +17,37 @@
-class FileAccessControlHandler extends EntityAccessControlHandler {
+class FileAccessControlHandler extends EntityAccessControlHandler implements EntityHandlerInterface {

    this looks not needed 

  2. +++ b/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -67,14 +75,17 @@ class ThemeSettingsForm extends ConfigFormBase {
-  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, ThemeManagerInterface $theme_manager) {
+  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, ThemeManagerInterface $theme_manager, FileSystemInterface $file_system) {

    But I see not usage changed in in this hunk

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented

4.1 is wrong - please ignore

+++ b/core/modules/file/src/FileAccessControlHandler.php
@@ -13,7 +17,37 @@
+   * Constructs the file access control handler instance

missed dot at the end

ilya.no’s picture

ilya.no CreditAttribution: ilya.no as a volunteer and at Skilld for Skilld commented
Status: Needs work » Needs review
FileSize
use-proper-di-for-filesystem-service-2923511-6.patch14.66 KB
interdiff-2923511-2-6.txt1.04 KB

Thanks for the review! Attaching new patch and interdiff.

The last submitted patch, 2: use-proper-di-for-filesystem-service-2923511-2.patch, failed testing. View results

Status: Needs review » Needs work

The last submitted patch, 6: use-proper-di-for-filesystem-service-2923511-6.patch, failed testing. View results

piggito’s picture

piggito CreditAttribution: piggito as a volunteer and at Skilld commented
Status: Needs work » Needs review
FileSize
use-proper-di-for-filesystem-service-2923511-9.patch12.67 KB
interdiff-6-9.txt1.99 KB

I'm reverting the changes in ./core/modules/simpletest/src/Form/SimpletestResultsForm.php cause it is a static function so we can't use $this->fileSystem when the function isn't called from inside an object.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
FileSize
2923511-10.patch13.67 KB
interdiff-2923511-9.txt3.7 KB

A bit more clean-up in ordering of `use`, the rest looks rtbc

Status: Needs review » Needs work

The last submitted patch, 10: 2923511-10.patch, failed testing. View results

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Needs work » Needs review

Version: 8.5.x-dev » 8.6.x-dev

Drupal 8.5.0-alpha1 will be released the week of January 17, 2018, which means new developments and disruptive changes should now be targeted against the 8.6.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.6.x-dev » 8.7.x-dev

Drupal 8.6.0-alpha1 will be released the week of July 16, 2018, which means new developments and disruptive changes should now be targeted against the 8.7.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

joachim’s picture

joachim CreditAttribution: joachim as a volunteer commented
Status: Needs review » Needs work 
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -282,6 +282,7 @@ public static function addResultForm(array &$form, array $results) {
+    $file_system = \Drupal::service('file_system');

Shouldn't this form inject the service with the create()/construct() pattern too?

Version: 8.7.x-dev » 8.8.x-dev

Drupal 8.7.0-alpha1 will be released the week of March 11, 2019, which means new developments and disruptive changes should now be targeted against the 8.8.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.8.x-dev » 8.9.x-dev

Drupal 8.8.0-alpha1 will be released the week of October 14th, 2019, which means new developments and disruptive changes should now be targeted against the 8.9.x-dev branch. (Any changes to 8.9.x will also be committed to 9.0.x in preparation for Drupal 9’s release, but some changes like significant feature additions will be deferred to 9.1.x.). For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

Version: 8.9.x-dev » 9.1.x-dev

Drupal 8.9.0-beta1 was released on March 20, 2020. 8.9.x is the final, long-term support (LTS) minor release of Drupal 8, which means new developments and disruptive changes should now be targeted against the 9.1.x-dev branch. For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

Version: 9.1.x-dev » 9.2.x-dev

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 10.1.x-dev » 11.x-dev

Drupal core is moving towards using a “main” branch. As an interim step, a new 11.x branch has been opened, as Drupal.org infrastructure cannot currently fully support a branch named main. New developments and disruptive changes should now be targeted for the 11.x branch, which currently accepts only minor-version allowed changes. For more information, see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.