core/includes/common.inc | 69 ---------------------- core/lib/Drupal/Core/Render/Element/Table.php | 2 +- core/lib/Drupal/Core/Render/RendererInterface.php | 4 +- core/modules/editor/src/Plugin/EditorManager.php | 2 +- .../editor/src/Plugin/EditorPluginInterface.php | 4 +- .../quickedit/src/EditorSelectorInterface.php | 2 +- .../src/Plugin/InPlaceEditorInterface.php | 2 +- core/modules/views/src/ViewExecutable.php | 2 +- 8 files changed, 9 insertions(+), 78 deletions(-) diff --git a/core/includes/common.inc b/core/includes/common.inc index 38a2a3d..3b8d64c 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -454,75 +454,6 @@ function drupal_js_defaults($data = NULL) { } /** - * Processes non-asset attachments in a render() structure. - * - * Libraries, JavaScript settings, feeds, HTML tags and HTML links - * are attached to elements using the #attached property. The #attached property - * is an associative array, where the keys are the attachment types and the - * values are the attached data. For example: - * - * @code - * $build['#attached'] = [ - * 'library' => ['core/jquery'] - * ]; - * $build['#attached']['http_header'] = [ - * ['Content-Type', 'application/rss+xml; charset=utf-8'], - * ]; - * @endcode - * - * The available keys are: - * - 'library' (asset libraries) - * - 'drupalSettings' (JavaScript settings) - * - 'feed' (RSS feeds) - * - 'html_head' (tags in HTML ) - * - 'html_head_link' ( tags in HTML ) - * - 'http_header' (HTTP headers) - * - * This function processes all non-asset attachments, to apply them to the - * current response (that means all keys except 'library' and 'drupalSettings'). - * - * @param array $elements - * The structured array describing the data being rendered. - * - * @see drupal_render() - * @see hook_html_head_alter() - * @see \Drupal\Core\Asset\AssetResolver - * @see \Drupal\Core\EventSubscriber\FinishResponseSubscriber - * @see \Symfony\Component\HttpKernel\KernelEvents::RESPONSE - * - * @throws LogicException - * When attaching something of a non-existing attachment type. - * - * @deprecated Will be removed before Drupal 8.0.0. Specify attached elements in - * the render array from a controller, using ['#attached']. They will be - * rendered into the response towards the end of the render process. For - * example: - * @code - * $build['#attached'] = [ - * 'library' => ['core/jquery'] - * ]; - * $build['#attached']['http_header'] = [ - * ['Content-Type', 'application/rss+xml; charset=utf-8'], - * ]; - * return $build; - * @endcode - * For manipulating attached renderable items in non-controller applications, - * there are three options: - * - Use hook_page_attachments() and/or hook_page_attachments_alter() to - * change attachments. - * - Set up an event subscriber for the - * Symfony\Component\HttpKernel\KernelEvents::RESPONSE event. See - * Drupal\Core\EventSubscriber\FinishResponseSubscriber for an example. - * - Specify $variables['#attached'] in theme preprocess functions. - * To render attachments without a controller, use the - * 'bare_html_page_renderer' service. - */ -function drupal_process_attached(array $elements) { - $build['#attached'] = $elements['#attached']; - \Drupal::service('renderer')->render($build); -} - -/** * Adds JavaScript to change the state of an element based on another element. * * A "state" means a certain property on a DOM element, such as "visible" or diff --git a/core/lib/Drupal/Core/Render/Element/Table.php b/core/lib/Drupal/Core/Render/Element/Table.php index 4cd571e..63e15ed 100644 --- a/core/lib/Drupal/Core/Render/Element/Table.php +++ b/core/lib/Drupal/Core/Render/Element/Table.php @@ -332,7 +332,7 @@ public static function validateTable(&$element, FormStateInterface $form_state, * @return array * * @see template_preprocess_table() - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() * @see drupal_attach_tabledrag() */ public static function preRenderTable($element) { diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php index 9bb4cdb..e1f3e21 100644 --- a/core/lib/Drupal/Core/Render/RendererInterface.php +++ b/core/lib/Drupal/Core/Render/RendererInterface.php @@ -209,7 +209,7 @@ public function renderPlain(&$elements); * drupal_process_states(). * - If this element has #attached defined then any required libraries, * JavaScript, CSS, or other custom data are added to the current page by - * drupal_process_attached(). + * \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments(). * - If this element has an array of #theme_wrappers defined and * #render_children is not set, #children is then re-rendered by passing * the element in its current state to ThemeManagerInterface::render() @@ -316,7 +316,7 @@ public function renderPlain(&$elements); * @see \Drupal\Core\Render\ElementInfoManagerInterface::getInfo() * @see \Drupal\Core\Theme\ThemeManagerInterface::render() * @see drupal_process_states() - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() * @see ::renderRoot() */ public function render(&$elements, $is_root_call = FALSE); diff --git a/core/modules/editor/src/Plugin/EditorManager.php b/core/modules/editor/src/Plugin/EditorManager.php index 6fc04d0..98aaa61 100644 --- a/core/modules/editor/src/Plugin/EditorManager.php +++ b/core/modules/editor/src/Plugin/EditorManager.php @@ -61,7 +61,7 @@ public function listOptions() { * @return array * An array of attachments, for use with #attached. * - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() */ public function getAttachments(array $format_ids) { $attachments = array('library' => array()); diff --git a/core/modules/editor/src/Plugin/EditorPluginInterface.php b/core/modules/editor/src/Plugin/EditorPluginInterface.php index f5177f5..5a38468 100644 --- a/core/modules/editor/src/Plugin/EditorPluginInterface.php +++ b/core/modules/editor/src/Plugin/EditorPluginInterface.php @@ -95,7 +95,7 @@ public function settingsFormSubmit(array $form, FormStateInterface $form_state); * An array of settings that will be added to the page for use by this text * editor's JavaScript integration. * - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() * @see EditorManager::getAttachments() */ public function getJSSettings(Editor $editor); @@ -114,7 +114,7 @@ public function getJSSettings(Editor $editor); * An array of libraries that will be added to the page for use by this text * editor. * - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() * @see EditorManager::getAttachments() */ public function getLibraries(Editor $editor); diff --git a/core/modules/quickedit/src/EditorSelectorInterface.php b/core/modules/quickedit/src/EditorSelectorInterface.php index 5071dcd..88911ce 100644 --- a/core/modules/quickedit/src/EditorSelectorInterface.php +++ b/core/modules/quickedit/src/EditorSelectorInterface.php @@ -36,7 +36,7 @@ public function getEditor($formatter_type, FieldItemListInterface $items); * @return array * An array of attachments, for use with #attached. * - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() */ public function getEditorAttachments(array $editor_ids); diff --git a/core/modules/quickedit/src/Plugin/InPlaceEditorInterface.php b/core/modules/quickedit/src/Plugin/InPlaceEditorInterface.php index 4bb718b..1139e6d 100644 --- a/core/modules/quickedit/src/Plugin/InPlaceEditorInterface.php +++ b/core/modules/quickedit/src/Plugin/InPlaceEditorInterface.php @@ -52,7 +52,7 @@ public function getMetadata(FieldItemListInterface $items); * @return array * An array of attachments, for use with #attached. * - * @see drupal_process_attached() + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() */ public function getAttachments(); diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index 3638c9c..5ce7c41 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -399,7 +399,7 @@ class ViewExecutable implements \Serializable { * * @var array * - * @see drupal_process_attached + * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments() */ public $element = [ '#attached' => [