Commit f4311179 authored by catch's avatar catch
Browse files

Issue #3263391 by longwave: Remove deprecated code from book.module

parent 5508fb6c

core/includes/bootstrap.inc

+0 −8
Original line number Diff line number Diff line
@@ -475,14 +475,6 @@ function drupal_static_reset($name = NULL) { 
    case 'taxonomy_vocabulary_get_names':

      @trigger_error("Calling drupal_static_reset() with 'taxonomy_vocabulary_get_names' as argument is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. There is no replacement for this usage. See https://www.drupal.org/node/3039041", E_USER_DEPRECATED);

      break;



    case 'Drupal\book\BookManager::bookSubtreeData':

    case 'Drupal\book\BookManager::bookTreeAllData':

    case 'Drupal\book\BookManager::doBookTreeBuild':

      @trigger_error("Calling drupal_static_reset() with '{$name}' as argument is deprecated in drupal:9.3.0 and is removed in drupal:10.0.0. Use \Drupal::service('book.memory_cache')->deleteAll() instead. See https://www.drupal.org/node/3039439", E_USER_DEPRECATED);

      \Drupal::service('book.memory_cache')->deleteAll();

      break;



  }

  drupal_static($name, NULL, TRUE);

}

core/modules/book/src/BookBreadcrumbBuilder.php

+3 −11
Original line number Diff line number Diff line
@@ -55,22 +55,14 @@ class BookBreadcrumbBuilder implements BreadcrumbBuilderInterface { 
   *   The entity type manager service.

   * @param \Drupal\Core\Session\AccountInterface $account

   *   The current user account.

   * @param \Drupal\Core\Entity\EntityRepositoryInterface|null $entity_repository

   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository

   *   The entity repository service.

   * @param \Drupal\Core\Language\LanguageManagerInterface|null $language_manager

   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager

   *   The language manager service.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, AccountInterface $account, EntityRepositoryInterface $entity_repository = NULL, LanguageManagerInterface $language_manager = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, AccountInterface $account, EntityRepositoryInterface $entity_repository, LanguageManagerInterface $language_manager) {

    $this->nodeStorage = $entity_type_manager->getStorage('node');

    $this->account = $account;

    if (!$entity_repository) {

      @trigger_error('The entity.repository service must be passed to ' . __NAMESPACE__ . '\BookBreadcrumbBuilder::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $entity_repository = \Drupal::service('entity.repository');

    }

    if (!$language_manager) {

      @trigger_error('The language_manager service must be passed to ' . __NAMESPACE__ . '\BookBreadcrumbBuilder::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $language_manager = \Drupal::service('language_manager');

    }

    $this->entityRepository = $entity_repository;

    $this->languageManager = $language_manager;

  }

core/modules/book/src/BookExport.php

+2 −6
Original line number Diff line number Diff line
@@ -48,17 +48,13 @@ class BookExport { 
   *   The entity type manager.

   * @param \Drupal\book\BookManagerInterface $book_manager

   *   The book manager.

   * @param \Drupal\Core\Entity\EntityRepositoryInterface|null $entity_repository

   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository

   *   The entity repository service.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, BookManagerInterface $book_manager, EntityRepositoryInterface $entity_repository = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, BookManagerInterface $book_manager, EntityRepositoryInterface $entity_repository) {

    $this->nodeStorage = $entity_type_manager->getStorage('node');

    $this->viewBuilder = $entity_type_manager->getViewBuilder('node');

    $this->bookManager = $book_manager;

    if (!$entity_repository) {

      @trigger_error('The entity.repository service must be passed to ' . __NAMESPACE__ . '\BookExport::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $entity_repository = \Drupal::service('entity.repository');

    }

    $this->entityRepository = $entity_repository;

  }

core/modules/book/src/BookManager.php

+3 −19
Original line number Diff line number Diff line
@@ -113,40 +113,24 @@ class BookManager implements BookManagerInterface { 
   *   The book outline storage.

   * @param \Drupal\Core\Render\RendererInterface $renderer

   *   The renderer.

   * @param \Drupal\Core\Language\LanguageManagerInterface|null $language_manager

   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager

   *   The language manager.

   * @param \Drupal\Core\Entity\EntityRepositoryInterface|null $entity_repository

   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository

   *   The entity repository service.

   * @param \Drupal\Core\Cache\CacheBackendInterface $backend_chained_cache

   *   The book chained backend cache service.

   * @param \Drupal\Core\Cache\CacheBackendInterface $memory_cache

   *   The book memory cache service.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $translation, ConfigFactoryInterface $config_factory, BookOutlineStorageInterface $book_outline_storage, RendererInterface $renderer, LanguageManagerInterface $language_manager = NULL, EntityRepositoryInterface $entity_repository = NULL, CacheBackendInterface $backend_chained_cache = NULL, CacheBackendInterface $memory_cache = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $translation, ConfigFactoryInterface $config_factory, BookOutlineStorageInterface $book_outline_storage, RendererInterface $renderer, LanguageManagerInterface $language_manager, EntityRepositoryInterface $entity_repository, CacheBackendInterface $backend_chained_cache, CacheBackendInterface $memory_cache) {

    $this->entityTypeManager = $entity_type_manager;

    $this->stringTranslation = $translation;

    $this->configFactory = $config_factory;

    $this->bookOutlineStorage = $book_outline_storage;

    $this->renderer = $renderer;

    if (!$language_manager) {

      @trigger_error('The language_manager service must be passed to ' . __NAMESPACE__ . '\BookManager::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $language_manager = \Drupal::service('language_manager');

    }

    $this->languageManager = $language_manager;

    if (!$entity_repository) {

      @trigger_error('The entity.repository service must be passed to ' . __NAMESPACE__ . '\BookManager::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $entity_repository = \Drupal::service('entity.repository');

    }

    $this->entityRepository = $entity_repository;

    if (!$backend_chained_cache) {

      @trigger_error('Calling BookManager::__construct() without the $backend_chained_cache argument is deprecated in drupal:9.3.0 and the $backend_chained_cache argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3039439', E_USER_DEPRECATED);

      $backend_chained_cache = \Drupal::service('book.backend_chained_cache');

    }

    $this->backendChainedCache = $backend_chained_cache;

    if (!$memory_cache) {

      @trigger_error('Calling BookManager::__construct() without the $memory_cache argument is deprecated in drupal:9.3.0 and the $memory_cache argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3039439', E_USER_DEPRECATED);

      $memory_cache = \Drupal::service('book.memory_cache');

    }

    $this->memoryCache = $memory_cache;

  }

core/modules/book/src/Cache/BookNavigationCacheContext.php

+1 −12
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\book\Cache;



use Drupal\Core\DependencyInjection\DeprecatedServicePropertyTrait;

use Drupal\Core\Cache\CacheableMetadata;

use Drupal\Core\Cache\Context\CacheContextInterface;

use Drupal\Core\Routing\RouteMatchInterface;
@@ -25,7 +24,6 @@ 
class BookNavigationCacheContext implements CacheContextInterface, ContainerAwareInterface {



  use ContainerAwareTrait;

  use DeprecatedServicePropertyTrait;



  /**

   * The current route match.
@@ -34,22 +32,13 @@ class BookNavigationCacheContext implements CacheContextInterface, ContainerAwar 
   */

  protected $routeMatch;



  /**

   * {@inheritdoc}

   */

  protected $deprecatedProperties = ['request_stack' => 'request_stack'];



  /**

   * Constructs a new BookNavigationCacheContext service.

   *

   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match

   *   The current route match.

   */

  public function __construct($route_match) {

    if (!$route_match instanceof RouteMatchInterface) {

      @trigger_error('Passing the request_stack service to ' . __METHOD__ . '() is deprecated in drupal:9.2.0 and will be removed before drupal:10.0.0. The parameter should be an instance of \Drupal\Core\Routing\RouteMatchInterface instead.', E_USER_DEPRECATED);

      $route_match = \Drupal::routeMatch();

    }

  public function __construct(RouteMatchInterface $route_match) {

    $this->routeMatch = $route_match;

  }