Skip to content
Snippets Groups Projects
Commit c8b2c112 authored by catch's avatar catch
Browse files

Issue #3270564 by quietone: Handle NULL for data blob in User source plugin

parent d9b8a31b
No related branches found
No related tags found
39 merge requests!7471uncessary 5 files are moved from media-library folder to misc folder,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!3291Issue #3336463: Rewrite rules for gzipped CSS and JavaScript aggregates never match,!3102Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use...,!2853#3274419 Makes BaseFieldOverride inherit the internal property from the base field.,!2661Issue #3295972 by Munavijayalakshmi, nitin_lama, arunkumark, cilefen,...,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1254Issue #3238915: Refactor (if feasible) uses of the jQuery ready function to use VanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!873Issue #2875228: Site install not using batch API service,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!712Issue #2909128: Autocomplete intermittent on Chrome Android,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/user/src/Plugin/migrate/source/d7/User.php
+ 1
− 1
View file @ c8b2c112
...@@ -76,7 +76,7 @@ public function prepareRow(Row $row) { ...@@ -76,7 +76,7 @@ public function prepareRow(Row $row) {
->fetchCol(); ->fetchCol();
$row->setSourceProperty('roles', $roles); $row->setSourceProperty('roles', $roles);
$row->setSourceProperty('data', unserialize($row->getSourceProperty('data'))); $row->setSourceProperty('data', unserialize($row->getSourceProperty('data') ?? ''));
// If this entity was translated using Entity Translation, we need to get // If this entity was translated using Entity Translation, we need to get
// its source language to get the field values in the right language. // its source language to get the field values in the right language.
......
core/modules/user/tests/src/Kernel/Plugin/migrate/source/d7/UserTest.php
+ 59
− 0
View file @ c8b2c112
...@@ -54,6 +54,18 @@ public function providerSource() { ...@@ -54,6 +54,18 @@ public function providerSource() {
'field_file_display' => 1, 'field_file_display' => 1,
'field_file_description' => 'None', 'field_file_description' => 'None',
], ],
[
'entity_type' => 'user',
'bundle' => 'user',
'deleted' => 0,
'entity_id' => 3,
'revision_id' => NULL,
'language' => 'und',
'delta' => 0,
'field_file_fid' => 42,
'field_file_display' => 1,
'field_file_description' => 'None',
],
]; ];
$tests[0]['source_data']['role'] = [ $tests[0]['source_data']['role'] = [
[ [
...@@ -81,12 +93,34 @@ public function providerSource() { ...@@ -81,12 +93,34 @@ public function providerSource() {
'init' => 'odo@local.host', 'init' => 'odo@local.host',
'data' => 'a:1:{s:7:"contact";i:1;}', 'data' => 'a:1:{s:7:"contact";i:1;}',
], ],
[
'uid' => '3',
'name' => 'foo',
'pass' => 'password',
'mail' => 'foo@local.host',
'theme' => '',
'signature' => '',
'signature_format' => 'filtered_html',
'created' => '1647752102',
'access' => '0',
'login' => '0',
'status' => '1',
'timezone' => 'America/Chicago',
'language' => '',
'picture' => '0',
'init' => 'foo@local.host',
'data' => NULL,
],
]; ];
$tests[0]['source_data']['users_roles'] = [ $tests[0]['source_data']['users_roles'] = [
[ [
'uid' => 2, 'uid' => 2,
'rid' => 2, 'rid' => 2,
], ],
[
'uid' => 3,
'rid' => 2,
],
]; ];
// The expected results. // The expected results.
...@@ -118,6 +152,31 @@ public function providerSource() { ...@@ -118,6 +152,31 @@ public function providerSource() {
], ],
], ],
], ],
[
'uid' => '3',
'name' => 'foo',
'pass' => 'password',
'mail' => 'foo@local.host',
'signature' => '',
'signature_format' => 'filtered_html',
'created' => '1647752102',
'access' => '0',
'login' => '0',
'status' => '1',
'timezone' => 'America/Chicago',
'language' => '',
'picture' => '0',
'init' => 'foo@local.host',
'roles' => [2],
'data' => FALSE,
'field_file' => [
[
'fid' => 42,
'display' => 1,
'description' => 'None',
],
],
],
]; ];
return $tests; return $tests;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment