Commit 0b479d17 authored by Sven Berg Ryen's avatar Sven Berg Ryen Committed by Sven Berg Ryen
Browse files

Issue #3274473 by svenryen: Drupal 10 compatibility

parent ca6aa281

eu_cookie_compliance.api.php

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


/**

 * @addtogroup hooks

 * @{

 *

 * Hooks that extend the EU Cookie Compliance module.

 */

eu_cookie_compliance.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: 'EU Cookie Compliance' 
type: module

description: 'This module aims at making the website compliant with the new EU cookie regulation'

package: User interface

core_version_requirement: ^8.9 || ^9

core_version_requirement: ^8.9 || ^9 || ^10

configure: eu_cookie_compliance.settings

dependencies:

  - drupal:filter

eu_cookie_compliance.install

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ function eu_cookie_compliance_schema() { 
 * Implements hook_install().

 */

function eu_cookie_compliance_install() {

  module_load_include('module', 'eu_cookie_compliance', 'eu_cookie_compliance');

  \Drupal::moduleHandler()->loadInclude('eu_cookie_compliance','module', 'eu_cookie_compliance');



  $roles = Role::loadMultiple();

  $permission = 'display eu cookie compliance popup';
@@ -307,7 +307,7 @@ function eu_cookie_compliance_update_8107() { 
 * Change module weight to load after other modules, ensure all JSs are handled.

 */

function eu_cookie_compliance_update_8108() {

  module_load_include('module', 'eu_cookie_compliance', 'eu_cookie_compliance');

  \Drupal::moduleHandler()->loadInclude('eu_cookie_compliance', 'module', 'eu_cookie_compliance');

  eu_cookie_compliance_module_set_weight();

}

eu_cookie_compliance.module

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ function eu_cookie_compliance_build_data() { 
  $was_debugging = FALSE;



  /**

   * @var Twig_Environment $twig_service

   * @var Drupal\Core\Template\TwigEnvironment $twig_service

   */

  $twig_service = Drupal::service('twig');

src/Controller/CheckIfEuCountryJsController.php

+2 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ use Symfony\Component\HttpFoundation\JsonResponse; 
class CheckIfEuCountryJsController extends ControllerBase {



  /**

   * The MIME type guesser.

   * The Module handler.

   *

   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface

   * @var \Drupal\Core\Extension\ModuleHandler

   */

  protected $moduleHandler;