diff --git a/composer.json b/composer.json index 6c82c553..fbeaa169 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "drupal/maxlength": "^2.1", "drupal/entity_hierarchy": "4.x", "drupal/elasticsearch_connector": "^7.0", - "drupal/search_api": "^1.11", + "drupal/search_api": "^1.36", "drupal/data_pipelines": "1.0.0-alpha22", "drupal/data_pipelines_elasticsearch": "^1.0@alpha", "drupal/key": "^1.17", @@ -406,7 +406,7 @@ "[UX] Add the ability to hide or disable the import CSV option - https://www.drupal.org/project/tablefield/issues/2337743": "https://www.drupal.org/files/issues/2020-11-11/tablefield-allowed_data_sources-2337743-16.patch" }, "drupal/search_api": { - "Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2020-02-08/search_api-index-specific-items-3016809-09.patch" + "Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2024-11-25/search_api-index-specific-items-3016809-10.patch" }, "drupal/key": { "KeyProviderInterface::getKeyValue() doesn't always return a string - https://www.drupal.org/project/key/issues/3356052#comment-15030602": "https://git.drupalcode.org/project/key/-/merge_requests/11/diffs.patch", diff --git a/modules/tide_ckeditor/modules/ckeditor_tablecol_resize/src/Plugin/Filter/FilterResizeTableColumns.php b/modules/tide_ckeditor/modules/ckeditor_tablecol_resize/src/Plugin/Filter/FilterResizeTableColumns.php index 8d1ef0ae..43b41cb2 100644 --- a/modules/tide_ckeditor/modules/ckeditor_tablecol_resize/src/Plugin/Filter/FilterResizeTableColumns.php +++ b/modules/tide_ckeditor/modules/ckeditor_tablecol_resize/src/Plugin/Filter/FilterResizeTableColumns.php @@ -4,9 +4,7 @@ use Drupal\ckeditor5\Plugin\CKEditor5PluginManagerInterface; use Drupal\Component\Utility\Html; -use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\Core\Routing\CurrentRouteMatch; use Drupal\filter\FilterProcessResult; use Drupal\filter\Plugin\FilterBase; use Psr\Container\ContainerInterface; @@ -24,6 +22,11 @@ */ class FilterResizeTableColumns extends FilterBase implements ContainerFactoryPluginInterface { + /** + * The CKEditor5 plugin manager. + * + * @var \Drupal\ckeditor5\Plugin\CKEditor5PluginManagerInterface + */ protected CKEditor5PluginManagerInterface $ckeditor5PluginManager; /** diff --git a/modules/tide_ckeditor/tide_ckeditor.install b/modules/tide_ckeditor/tide_ckeditor.install index 47bcde62..1a43afbd 100644 --- a/modules/tide_ckeditor/tide_ckeditor.install +++ b/modules/tide_ckeditor/tide_ckeditor.install @@ -47,16 +47,17 @@ function tide_ckeditor_update_10002() { if ($filter) { // Add , , and to allowed HTML. $additional_allowed_tags = ' '; - // Append the new tags to the allowed HTML, making sure not to add duplicates + // Append the new tags to the allowed HTML, + // making sure not to add duplicates. $replaced = $allowed_html . ' ' . $additional_allowed_tags; $replaced = trim($replaced, ','); - // Set the updated allowed HTML tags in the filter + // Set the updated allowed HTML tags in the filter. $filter->set('filters.filter_html.settings.allowed_html', $replaced); $filter->set('filters.filter_resize_tablecolumns', [ 'id' => 'filter_resize_tablecolumns', 'provider' => 'ckeditor_tablecol_resize', - 'status' => true, + 'status' => TRUE, 'weight' => 99, 'settings' => [], ]); diff --git a/modules/tide_landing_page/src/Plugin/jsonapi/FieldEnhancer/BasicTextEnhancer.php b/modules/tide_landing_page/src/Plugin/jsonapi/FieldEnhancer/BasicTextEnhancer.php index b3cf7b5b..bd165bf6 100644 --- a/modules/tide_landing_page/src/Plugin/jsonapi/FieldEnhancer/BasicTextEnhancer.php +++ b/modules/tide_landing_page/src/Plugin/jsonapi/FieldEnhancer/BasicTextEnhancer.php @@ -83,6 +83,9 @@ public function replaceUnicodeWhitespace(array $data) { return $data; } + /** + * Helper function to add table styles to processed field. + */ public function addTableStylesToProcessed(&$data) { // Check if 'value' and 'processed' keys exist in $data. if (isset($data['value']) && isset($data['processed'])) { @@ -91,7 +94,7 @@ public function addTableStylesToProcessed(&$data) { $processedDom = new \DOMDocument(); // Suppress warnings for malformed HTML in $value and $processed. - libxml_use_internal_errors(true); + libxml_use_internal_errors(TRUE); $valueDom->loadHTML($data['value']); $processedDom->loadHTML($data['processed']); libxml_clear_errors(); @@ -117,14 +120,14 @@ public function addTableStylesToProcessed(&$data) { $processedCol = $processedCols->item($j); if ($valueCol->hasAttribute('style')) { - // Parse the style attribute. + // Parse the style attribute. $styleValue = $valueCol->getAttribute('style'); $styles = explode(';', $styleValue); foreach ($styles as $style) { $style = trim($style); if (!empty($style)) { - list($property, $value) = explode(':', $style, 2); + [$property, $value] = explode(':', $style, 2); $property = trim($property); $value = trim($value); @@ -149,4 +152,5 @@ public function addTableStylesToProcessed(&$data) { } return $data; } + }