Unverified Commit d68d8dfa authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3062757 by voleger, Berdir, andypost: Remove deprecated legacy include files from Drupal 9 

(cherry picked from commit 91f4c1ed)
parent 035a770e

core/lib/Drupal/Component/FileSecurity/FileSecurity.php

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public static function writeHtaccess($directory, $deny_public_access = TRUE, $fo 
   * @return string

   *   The desired contents of the .htaccess file.

   *

   * @see file_save_htaccess()

   * @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess()

   */

  public static function htaccessLines($deny_public_access = TRUE) {

    $lines = static::htaccessPreventExecution();

core/lib/Drupal/Core/Form/form.api.php

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ function callback_batch_finished($success, $results, $operations) { 
      '#theme' => 'item_list',

      '#items' => $results,

    ];

    $message .= drupal_render($list);

    $message .= \Drupal::service('renderer')->render($list);

    \Drupal::messenger()->addStatus($message);

  }

  else {

core/lib/Drupal/Core/Utility/token.api.php

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Re 
    // of a field (field_title).

    if (isset($context['tokens']['title'])) {

      $title = $node->field_title->view('default');

      $replacements[$context['tokens']['title']] = drupal_render($title);

      $replacements[$context['tokens']['title']] = \Drupal::service('renderer')->render($title);

    }

  }

}

core/modules/file/file.module

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ function file_load($fid, $reset = FALSE) { 
 * @return \Drupal\file\FileInterface|false

 *   File entity if the copy is successful, or FALSE in the event of an error.

 *

 * @see file_unmanaged_copy()

 * @see \Drupal\Core\File\FileSystemInterface::copy()

 * @see hook_file_copy()

 */

function file_copy(FileInterface $source, $destination = NULL, $replace = FileSystemInterface::EXISTS_RENAME) {
@@ -565,7 +565,7 @@ function file_validate_image_resolution(FileInterface $file, $maximum_dimensions 
 * @return \Drupal\file\FileInterface|false

 *   A file entity, or FALSE on error.

 *

 * @see file_unmanaged_save_data()

 * @see \Drupal\Core\File\FileSystemInterface::saveData()

 */

function file_save_data($data, $destination = NULL, $replace = FileSystemInterface::EXISTS_RENAME) {

  $user = \Drupal::currentUser();

core/modules/toolbar/src/Controller/ToolbarController.php

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public function checkSubTreeAccess($hash) { 
   * @return array

   *   The updated renderable array.

   *

   * @see drupal_render()

   * @see \Drupal\Core\Render\RendererInterface::render()

   */

  public static function preRenderAdministrationTray(array $element) {

    $menu_tree = \Drupal::service('toolbar.menu_tree');