Commit efc0fd14 authored by Udit Rawat's avatar Udit Rawat Committed by Daniel Moberly
Browse files

Issue #3297258 by uditrawat: Automated Drupal 10 compatibility fixes

parent 83dcb188

composer.json

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
        "issues": "https://drupal.org/project/issues/fontawesome",

        "source": "https://git.drupalcode.org/project/fontawesome"

    },

    "require": {

        "drupal/core": "^9.4 || ^10"

    },

    "extra": {

        "drush": {

            "services": {

fontawesome.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,6 +2,5 @@ name: 'Font Awesome' 
type: module

description: 'The most popular icon set and toolkit on the web.'



core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.4 || ^10

configure: fontawesome.admin_settings

fontawesome.module

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ function fontawesome_theme_registry_alter(&$theme_registry) { 
   * By default, Drupal 8 does not include theme suggestions from inside the

   * module in which they were created, so we must add them manually here.

   */

  $path = drupal_get_path('module', 'fontawesome');

  $path = \Drupal::service('extension.list.module')->getPath('fontawesome');

  $fontawesome_templates = drupal_find_theme_templates($theme_registry, '.html.twig', $path);

  foreach ($fontawesome_templates as &$fontawesome_template) {

    $fontawesome_template['type'] = 'module';

fontawesome.services.yml

+1 −1
Original line number Diff line number Diff line 
services:

  fontawesome.font_awesome_manager:

    class: Drupal\fontawesome\FontAwesomeManager

    arguments: ['@cache.data', '@module_handler', '@theme_handler', '@file_system', '@http_client_factory']
 
    arguments: ['@cache.data', '@module_handler', '@theme_handler', '@file_system', '@extension.list.module']

modules/fontawesome_iconpicker_widget/fontawesome_iconpicker_widget.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ name: 'Font Awesome Iconpicker Widget' 
type: module

description: 'Provides an iconpicker widget for Font Awesome'



core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.4 || ^10

dependencies:

  - fontawesome:fontawesome