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

Issue #3275585 by dspachos, apaderno, joachim: Implementations of... 

Issue #3275585 by dspachos, apaderno, joachim: Implementations of getInstance() return the wrong type
parent 091a83df
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/lib/Drupal/Core/Field/FormatterPluginManager.php
+ 4
− 4
View file @ d9b8a31b
...@@ -90,8 +90,8 @@ public function createInstance($plugin_id, array $configuration = []) { ...@@ -90,8 +90,8 @@ public function createInstance($plugin_id, array $configuration = []) {
* - third_party_settings: (array) Settings provided by other extensions * - third_party_settings: (array) Settings provided by other extensions
* through hook_field_formatter_third_party_settings_form(). * through hook_field_formatter_third_party_settings_form().
* *
* @return \Drupal\Core\Field\FormatterInterface|null * @return \Drupal\Core\Field\FormatterInterface|false
* A formatter object or NULL when plugin is not found. * A formatter object or FALSE when plugin is not found.
*/ */
public function getInstance(array $options) { public function getInstance(array $options) {
$configuration = $options['configuration']; $configuration = $options['configuration'];
...@@ -114,7 +114,7 @@ public function getInstance(array $options) { ...@@ -114,7 +114,7 @@ public function getInstance(array $options) {
// Grab the default widget for the field type. // Grab the default widget for the field type.
$field_type_definition = $this->fieldTypeManager->getDefinition($field_type); $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
if (empty($field_type_definition['default_formatter'])) { if (empty($field_type_definition['default_formatter'])) {
return NULL; return FALSE;
} }
$plugin_id = $field_type_definition['default_formatter']; $plugin_id = $field_type_definition['default_formatter'];
} }
...@@ -123,7 +123,7 @@ public function getInstance(array $options) { ...@@ -123,7 +123,7 @@ public function getInstance(array $options) {
'field_definition' => $field_definition, 'field_definition' => $field_definition,
'view_mode' => $options['view_mode'], 'view_mode' => $options['view_mode'],
]; ];
return $this->createInstance($plugin_id, $configuration); return $this->createInstance($plugin_id, $configuration) ?? FALSE;
} }
/** /**
......
core/lib/Drupal/Core/Field/WidgetPluginManager.php
+ 4
− 4
View file @ d9b8a31b
...@@ -69,8 +69,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac ...@@ -69,8 +69,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
* - third_party_settings: (array) Settings provided by other extensions * - third_party_settings: (array) Settings provided by other extensions
* through hook_field_formatter_third_party_settings_form(). * through hook_field_formatter_third_party_settings_form().
* *
* @return \Drupal\Core\Field\WidgetInterface|null * @return \Drupal\Core\Field\WidgetInterface|false
* A Widget object or NULL when plugin is not found. * A Widget object or FALSE when plugin is not found.
*/ */
public function getInstance(array $options) { public function getInstance(array $options) {
// Fill in defaults for missing properties. // Fill in defaults for missing properties.
...@@ -99,7 +99,7 @@ public function getInstance(array $options) { ...@@ -99,7 +99,7 @@ public function getInstance(array $options) {
// Grab the default widget for the field type. // Grab the default widget for the field type.
$field_type_definition = $this->fieldTypeManager->getDefinition($field_type); $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
if (empty($field_type_definition['default_widget'])) { if (empty($field_type_definition['default_widget'])) {
return NULL; return FALSE;
} }
$plugin_id = $field_type_definition['default_widget']; $plugin_id = $field_type_definition['default_widget'];
} }
...@@ -107,7 +107,7 @@ public function getInstance(array $options) { ...@@ -107,7 +107,7 @@ public function getInstance(array $options) {
$configuration += [ $configuration += [
'field_definition' => $field_definition, 'field_definition' => $field_definition,
]; ];
return $this->createInstance($plugin_id, $configuration); return $this->createInstance($plugin_id, $configuration) ?? FALSE;
} }
/** /**
......
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