Commit e452728d authored by Arthur Lorenz's avatar Arthur Lorenz Committed by Lio Novelli
Browse files

Issue #3318757 by arthur_lorenz, useernamee, erikaagp: D10 Compatability

parent 574e30de

composer.json

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
    "drupal/custom_elements": "^2.0",

    "drupal/lupus_ce_renderer": "^2.1.0",

    "drupal/rest_menu_items": "^3.0.2",

    "drupal/trusted_redirect": "^1.9.0",

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

    "drupal/trusted_redirect": "^1.10.0"

  }

}

modules/lupus_decoupled_ce_api/lupus_decoupled_ce_api.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ description: 'Provides custom elements API at /ce-api' 
type: module

package: Lupus Decoupled Drupal



core_version_requirement: 8.x || ^9

core_version_requirement: ^9 || ^10

dependencies:

  - trusted_redirect:trusted_redirect

  - lupus_ce_renderer:lupus_ce_renderer

modules/lupus_decoupled_ce_api/lupus_decoupled_ce_api.module

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
 * Implements hook_trusted_redirect_hosts_alter().

 */

function lupus_decoupled_ce_api_trusted_redirect_hosts_alter(array &$trusted_hosts) {

  $a =1;



  $frontend_base_url = \Drupal::service('lupus_decoupled_ce_api.base_url_provider')

    ->getFrontendBaseUrl();

  $trusted_hosts[] = parse_url($frontend_base_url, PHP_URL_HOST);

modules/lupus_decoupled_ce_api/src/BackendApiRequest.php

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


namespace Drupal\lupus_decoupled_ce_api;



use Symfony\Component\HttpFoundation\Response;

use Symfony\Component\HttpKernel\HttpKernelInterface;

use Symfony\Component\HttpFoundation\Request;
@@ -43,7 +44,7 @@ class BackendApiRequest implements HttpKernelInterface { 
  /**

   * {@inheritdoc}

   */

  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {

  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {

    $uri = $request->server->get('REQUEST_URI');



    // If this request is against /ce-api then internally rewrite is as a request

modules/lupus_decoupled_layout_builder/lupus_decoupled_layout_builder.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ description: 'Provides the layout builder base setup.' 
type: module

package: Lupus Decoupled Drupal



core_version_requirement: 8.x || ^9

core_version_requirement: ^9 || ^10

dependencies:

  - drupal:layout_builder