Commit 8b96bc19 authored by Fabien Gutknecht's avatar Fabien Gutknecht
Browse files

Issue #3297790 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent 9b899fcd

orejime.info.yml

+2 −2
Changes for orejime.info.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
name: 'Orejime'

type: module

description: 'Drupal 8 integration of Orejime'

core_version_requirement: ^8 || ^9

description: 'Drupal integration of Orejime'

core_version_requirement: ^9 || ^10

package: 'orejime'

configure: orejime_service.settings

dependencies:

src/Form/OrejimeSettingsForm.php

+15 −3
Changes for src/Form/OrejimeSettingsForm.php: 15 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Drupal\Component\Plugin\Factory\FactoryInterface; 
use Drupal\Core\Asset\CssOptimizer;

use Drupal\Core\Config\ConfigFactoryInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Extension\ModuleExtensionList;

use Drupal\Core\File\FileSystemInterface;

use Drupal\Core\Form\ConfigFormBase;

use Drupal\Core\Form\FormStateInterface;
@@ -79,6 +80,13 @@ class OrejimeSettingsForm extends ConfigFormBase { 
   */

  protected $entityTypeManager;



  /**

   * The module extension list.

   *

   * @var \Drupal\Core\Extension\ModuleExtensionList

   */

  protected $moduleExtensionList;



  /**

   * Creates a new OrejimeSettingsForm.

   *
@@ -96,10 +104,12 @@ class OrejimeSettingsForm extends ConfigFormBase { 
   *   The State service.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager

   *   The entity type manager.

   * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module

   *   The module extension list.

   *

   * @throws \Drupal\Component\Plugin\Exception\PluginException

   */

  public function __construct(ConfigFactoryInterface $config_factory, FactoryInterface $plugin_factory, ModuleHandlerInterface $module_handler, FileSystemInterface $file_system, TimeInterface $time, StateInterface $state, EntityTypeManagerInterface $entityTypeManager) {

  public function __construct(ConfigFactoryInterface $config_factory, FactoryInterface $plugin_factory, ModuleHandlerInterface $module_handler, FileSystemInterface $file_system, TimeInterface $time, StateInterface $state, EntityTypeManagerInterface $entityTypeManager, ModuleExtensionList $extension_list_module) {

    parent::__construct($config_factory);

    $this->condition = $plugin_factory->createInstance('request_path');

    $this->moduleHandler = $module_handler;
@@ -107,6 +117,7 @@ class OrejimeSettingsForm extends ConfigFormBase { 
    $this->time = $time;

    $this->state = $state;

    $this->entityTypeManager = $entityTypeManager;

    $this->moduleExtensionList = $extension_list_module;

  }



  /**
@@ -120,7 +131,8 @@ class OrejimeSettingsForm extends ConfigFormBase { 
      $container->get('file_system'),

      $container->get('datetime.time'),

      $container->get('state'),

      $container->get('entity_type.manager')

      $container->get('entity_type.manager'),

      $container->get('extension.list.module')

    );

  }
@@ -645,7 +657,7 @@ class OrejimeSettingsForm extends ConfigFormBase { 
      $target = 'public://orejime';

      $this->fileSystem->prepareDirectory($target, FileSystemInterface::CREATE_DIRECTORY);

      $target = $target . '/';

      $source = drupal_get_path('module', 'orejime') . '/css/orejime_drupal.css';

      $source = $this->moduleExtensionList->getPath('orejime') . '/css/orejime_drupal.css';



      // Transform default file to the new file.

      if (file_exists($source)) {

src/Services/JsCollectionRendererOrejime.php

+1 −1
Changes for src/Services/JsCollectionRendererOrejime.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class JsCollectionRendererOrejime extends JsCollectionRenderer { 
        case 'file':

          $query_string = $js_asset['version'] == -1 ? $default_query_string : 'v=' . $js_asset['version'];

          $query_string_separator = (strpos($js_asset['data'], '?') !== FALSE) ? '&' : '?';

          $element['#attributes']['src'] = file_url_transform_relative(file_create_url($js_asset['data']));

          $element['#attributes']['src'] = \Drupal::service('file_url_generator')->generateString($js_asset['data']);

          // Only add the cache-busting query string if this isn't an aggregate

          // file.

          if (!isset($js_asset['preprocessed'])) {