Unverified Commit 031615d6 authored by Geoff Appleby's avatar Geoff Appleby
Browse files

Issue #3296908: Drupal 10 compatibility

parent 4daf6513

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
  "require": {

    "php": ">=7.2",

    "ext-json": "*",

    "drupal/core": "^9.3"

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

  }

}

csp.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Content Security Policy

type: module

description: Provide Content-Security-Policy headers

core_version_requirement: ^9

core_version_requirement: ^9.2 || ^10

configure: csp.settings

csp_extras/csp_extras.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Content Security Policy Extras

type: module

description: Optional extra features for Content Security Policy

core_version_requirement: ^9.3

core_version_requirement: ^9.3 || ^10



dependencies:

- csp:csp

csp_extras/csp_extras.module

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ function csp_extras_library_info_alter(&$libraries, $extension) { 


  // Add module ajax.js to core library.

  if ($extension == 'core' && isset($libraries['drupal.ajax'])) {

    $path = '/' . drupal_get_path('module', 'csp_extras') . '/js/ajax.js';

    $path = '/' . \Drupal::service('extension.list.module')->getPath('csp_extras') . '/js/ajax.js';

    $libraries['drupal.ajax']['js'][$path] = [

      'version' => '1.13',

    ];

csp_extras/src/Ajax/AjaxResponseAttachmentsProcessor.php

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn 
   *   An array of commands ready to be returned as JSON.

   */

  protected function buildAttachmentsCommands(AjaxResponse $response, Request $request) {

    $ajax_page_state = $request->request->get('ajax_page_state');

    $ajax_page_state = $request->request->all('ajax_page_state');



    // Aggregate CSS/JS if necessary, but only during normal site operation.

    $optimize_css = !defined('MAINTENANCE_MODE') && $this->config->get('css.preprocess');
@@ -147,7 +147,7 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn 
      ->setAlreadyLoadedLibraries(isset($ajax_page_state['libraries']) ? explode(',', $ajax_page_state['libraries']) : [])

      ->setSettings(isset($attachments['drupalSettings']) ? $attachments['drupalSettings'] : []);

    $css_assets = $this->assetResolver->getCssAssets($assets, $optimize_css);

    list($js_assets_header, $js_assets_footer) = $this->assetResolver->getJsAssets($assets, $optimize_js);

    [$js_assets_header, $js_assets_footer] = $this->assetResolver->getJsAssets($assets, $optimize_js);



    // First, AttachedAssets::setLibraries() ensures duplicate libraries are

    // removed: it converts it to a set of libraries if necessary. Second,