Commit a70a3da8 authored by Julian Pustkuchen's avatar Julian Pustkuchen Committed by Joshua Sedler
Browse files

Issue #3326280: Updating to 1.2.0 fails with Argument Argument #1... 

Issue #3326280: Updating to 1.2.0 fails with Argument Argument #1 ($processorCookiePolicyUrl) must be of type string, null given
parent 43d986d3

cookies.install

+17 −14
Original line number Diff line number Diff line
@@ -109,28 +109,31 @@ function cookies_update_8007() { 
  // Create new functional cookies_service_group:

  $cookies_service_group_entity = \Drupal::entityTypeManager()->getStorage('cookies_service_group')->load('default');

  CookiesServiceGroup::create([

    'langcode' => $cookies_service_group_entity->get('langcode'),

    'langcode' => $cookies_service_group_entity->get('langcode') ?? 'en',

    'id' => 'functional',

    'label' => $cookies_service_group_entity->get('label'),

    'status' => $cookies_service_group_entity->get('status'),

    'dependencies' => $cookies_service_group_entity->get('dependencies'),

    'weight' => $cookies_service_group_entity->get('weight'),

    'title' => $cookies_service_group_entity->get('title'),

    'details' => $cookies_service_group_entity->get('details'),

    'label' => $cookies_service_group_entity->get('label') ?? '',

    'status' => $cookies_service_group_entity->get('status') ?? FALSE,

    'dependencies' => $cookies_service_group_entity->get('dependencies') ?? [],

    'weight' => $cookies_service_group_entity->get('weight') ?? 0,

    'title' => $cookies_service_group_entity->get('title') ?? '',

    'details' => $cookies_service_group_entity->get('details') ?? '',

  ])->save();



  // Create new functional cookies_service and set all values:

  $cookies_service_entity = \Drupal::entityTypeManager()->getStorage('cookies_service')->load('base');

  CookiesServiceEntity::create([

    'langcode' => $cookies_service_entity->get('langcode'),

    'langcode' => $cookies_service_entity->get('langcode') ?? 'en',

    'id' => 'functional',

    'label' => 'Required functional cookies',

    'status' => $cookies_service_entity->get('status'),

    'dependencies' => $cookies_service_entity->get('dependencies'),

    'status' => $cookies_service_entity->get('status') ?? FALSE,

    'dependencies' => $cookies_service_entity->get('dependencies') ?? [],

    'group' => 'functional',

    'info' => $cookies_service_entity->get('info'),

    'url' => $cookies_service_entity->get('url'),

    'consentRequired' => $cookies_service_entity->get('consentRequired'),

    'info' => $cookies_service_entity->get('info') ?? [

      'value' => 'Fallback',

      'format' => 'full_html',

    ],

    'url' => $cookies_service_entity->get('url') ?? '',

    'consentRequired' => $cookies_service_entity->get('consentRequired') ?? TRUE,

  ])->save();



  // Load all service entities which had "default" as group and set their group
@@ -169,7 +172,7 @@ function cookies_update_8008() { 
    }

    // Set the old url value otherwise:

    else {

      $cookies_service_entity->setProcessorCookiePolicyUrl($cookies_service_entity->get('url'));

      $cookies_service_entity->setProcessorCookiePolicyUrl($cookies_service_entity->get('url') ?? '');

    }

    $cookies_service_entity->setPurpose('');

    $cookies_service_entity->setProcessor('');

tests/src/FunctionalJavascript/CookiesFunctionalJsGeneralTest.php

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ class CookiesFunctionalJsGeneralTest extends CookiesFunctionalJsTestBase { 
      'placeholderAcceptText' => 'Only accept Functional cookies.',

    ])->save();

    $this->drupalPlaceBlock('cookies_ui_block');

    $this->drupalGet('/test#' . $cookiesConfig->get('open_settings_hash'));

    $this->drupalGet('<front>');

    $session->waitForElementVisible('css', 'button.cookiesjsr-btn.cookiesjsr-settings');

    $page->pressButton('Cookie settings');