Merge branch 'feature/security-update' into develop

Author: rimi-itk

composer.lock

@@ -5,6 +5,7 @@
 use Drupal\Console\Core\Utils\NestedArray;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\FileUrlGeneratorInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\node\NodeInterface;
 use Drupal\os2loop_documents\Form\SettingsForm;
@@ -37,13 +38,21 @@ class EntityPrintController extends ControllerBase {
    */
   private $renderer;
 
+  /**
+   * The file url generator.
+   *
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface
+   */
+  private $fileUrlGenerator;
+
   /**
    * {@inheritdoc}
    */
-  public function __construct(Settings $settings, EntityTypeManagerInterface $entityTypeManager, RendererInterface $renderer) {
+  public function __construct(Settings $settings, EntityTypeManagerInterface $entityTypeManager, RendererInterface $renderer, FileUrlGeneratorInterface $fileUrlGenerator) {
     $this->config = $settings->getConfig(SettingsForm::SETTINGS_NAME)->get('pdf');
     $this->fileStorage = $entityTypeManager->getStorage('file');
     $this->renderer = $renderer;
+    $this->fileUrlGenerator = $fileUrlGenerator;
   }
 
   /**
@@ -53,7 +62,8 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get(Settings::class),
       $container->get('entity_type.manager'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('file_url_generator')
     );
   }
 
@@ -101,7 +111,7 @@ private function getFileUrl(array $configPath) {
     /** @var \Drupal\file\FileInterface|null $file */
     $file = $this->fileStorage->load($fileId);
 
-    return $file ? file_create_url($file->getFileUri()) : NULL;
+    return $file ? $this->fileUrlGenerator->generateAbsoluteString($file->getFileUri()) : NULL;
   }
 
 }

web/profiles/custom/os2loop/modules/os2loop_documents/src/Controller/EntityPrintController.php

@@ -6,3 +6,4 @@ services:
     arguments:
       - '@entity_type.manager'
       - '@file_system'
+      - '@file.repository'

web/profiles/custom/os2loop/modules/os2loop_media/modules/os2loop_media_fixtures/os2loop_media_fixtures.services.yml

@@ -6,6 +6,7 @@
 use Drupal\content_fixtures\Fixture\FixtureGroupInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\file\FileRepositoryInterface;
 use Drupal\media\Entity\Media;
 
 /**
@@ -29,17 +30,27 @@ class MediaFixture extends AbstractFixture implements FixtureGroupInterface {
    */
   protected $entityTypeManager;
 
+  /**
+   * The file repository.
+   *
+   * @var \Drupal\file\FileRepositoryInterface
+   */
+  protected $fileRepository;
+
   /**
    * MediaFixture constructor.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   Entity type manager.
    * @param \Drupal\Core\File\FileSystemInterface $fileSystem
    *   Filesystem.
+   * @param \Drupal\file\FileRepositoryInterface $fileRepository
+   *   File repository.
    */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, FileSystemInterface $fileSystem) {
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, FileSystemInterface $fileSystem, FileRepositoryInterface $fileRepository) {
     $this->entityTypeManager = $entityTypeManager;
     $this->fileSystem = $fileSystem;
+    $this->fileRepository = $fileRepository;
   }
 
   /**
@@ -89,8 +100,9 @@ private function loadFiles(): array {
       if (!is_dir(dirname($destination))) {
         $this->fileSystem->mkdir(dirname($destination), 0755, TRUE);
       }
-      $loadedFiles[] = file_save_data(
-        file_get_contents($file->uri), $destination,
+      $loadedFiles[] = $this->fileRepository->writeData(
+        file_get_contents($file->uri),
+        $destination,
         FileSystemInterface::EXISTS_REPLACE
       );
     }

web/profiles/custom/os2loop/modules/os2loop_media/modules/os2loop_media_fixtures/src/Fixture/MediaFixture.php

@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_media\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Extension\ExtensionPathResolver;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\image\Entity\ImageStyle;
@@ -30,12 +31,20 @@ class FileImageFormatter extends FileFormatterBase implements ContainerFactoryPl
    */
   private $entityTypeManager;
 
+  /**
+   * The extension path resolver.
+   *
+   * @var \Drupal\Core\Extension\ExtensionPathResolver
+   */
+  private $extensionPathResolver;
+
   /**
    * Constructor for a custom file formatter.
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityTypeManagerInterface $entityTypeManager) {
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityTypeManagerInterface $entityTypeManager, ExtensionPathResolver $extensionPathResolver) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->entityTypeManager = $entityTypeManager;
+    $this->extensionPathResolver = $extensionPathResolver;
   }
 
   /**
@@ -50,7 +59,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration['label'],
       $configuration['view_mode'],
       $configuration['third_party_settings'],
-      $container->get('entity_type.manager')
+      $container->get('entity_type.manager'),
+      $container->get('extension.path.resolver')
     );
   }
 
@@ -78,7 +88,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       }
       else {
         // If not an image use drupals fallback generic file icon.
-        $image_url = drupal_get_path('module', 'media') . '/images/icons/generic.png';
+        $image_url = $this->extensionPathResolver->getPath('module', 'media') . '/images/icons/generic.png';
         $image_uri = 'public://styles/media_library/public/media-icons/generic/generic.png';
         // Ensure file exists.
         $style = $this->entityTypeManager->getStorage('image_style')->load('media_library');

web/profiles/custom/os2loop/modules/os2loop_media/src/Plugin/Field/FieldFormatter/FileImageFormatter.php

@@ -89,7 +89,7 @@ public function getFilters(): array {
    */
   public function createVideo(array $text): ?string {
     // Set string depending on field type.
-    $string = isset($text['#plain_text']) ? $text['#plain_text'] : $text['#context']['value'];
+    $string = $text['#plain_text'] ?? $text['#context']['value'];
     if (!empty($this->findIframe($string))) {
       $string = $this->handleIframe($string);
     }

web/profiles/custom/os2loop/modules/os2loop_oembed/src/TwigExtension/TwigExtension.php

@@ -48,7 +48,7 @@ public function execute($node = NULL) {
    *   The next time the node should be revisioned.
    */
   private function getNextRevisionDate(): DrupalDateTime {
-    $extend = isset($this->configuration['time_span']) ? $this->configuration['time_span'] : 'now';
+    $extend = $this->configuration['time_span'] ?? 'now';
     return new DrupalDateTime($extend, date_default_timezone_get());
   }
 

web/profiles/custom/os2loop/modules/os2loop_revision_date/src/Plugin/Action/SetRevisionDate.php

@@ -50,7 +50,7 @@ public function preprocessField(array &$variables) {
           else {
             if (isset($comment_flag_counts['os2loop_upvote_upvote_button'])) {
               // If there is no upvoted comment, set it to current comment.
-              $upvoted_comment = isset($upvoted_comment) ? $upvoted_comment : $comment;
+              $upvoted_comment = $upvoted_comment ?? $comment;
 
               // Get number of upvotes for comment and upvoted comment.
               $upvoted_comment_upvotes = intval($this->flagCountManager->getEntityFlagCounts($upvoted_comment['#comment']));

web/profiles/custom/os2loop/modules/os2loop_upvote/src/Helper/FlagHelper.php

@@ -16,7 +16,7 @@ use Drupal\user\Entity\User;
  * Site logo for menu.
  */
 function os2loop_theme_preprocess(&$variables) {
-  $variables['logopath'] = file_url_transform_relative(file_create_url(theme_get_setting('logo.url')));
+  $variables['logopath'] = \Drupal::service('file_url_generator')->generateString(theme_get_setting('logo.url'));
   $variables['os2loop_container_class'] = theme_get_setting('container_class') ?: 'container-fluid';
 };
 
@@ -196,7 +196,7 @@ function os2loop_theme_form_system_theme_settings_alter(&$form, FormStateInterfa
       'file_validate_extensions' => ['css'],
       'file_validate_size' => [10000000],
     ],
-    '#default_value' => isset($uploaded_file) ? $uploaded_file : NULL,
+    '#default_value' => $uploaded_file ?? NULL,
     '#upload_location' => 'public://custom_color_scheme/',
   ];
 
@@ -231,7 +231,7 @@ function os2loop_theme_library_info_alter(&$libraries, $extension) {
     else {
       $file = File::load($custom_scheme[0]);
       $uri = $file->getFileUri();
-      $url = Url::fromUri(file_create_url($uri))->toString();
+      $url = Url::fromUri(\Drupal::service('file_url_generator')->generateAbsoluteString($uri))->toString();
       $stylesheet = $url;
     }