Verified Commit c381152e authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2987089 by askibinski, andypost, alexpott: Remove views.module's direct... 

Issue #2987089 by askibinski, andypost, alexpott: Remove views.module's direct use of the _serviceId property

(cherry picked from commit c7dc516f)
parent 87e7b0e6

core/modules/views/src/ViewExecutable.php

+2 −4
Original line number Diff line number Diff line
@@ -2492,8 +2492,6 @@ public function __sleep() { 
    // state during unserialization.

    $this->serializationData = [

      'storage' => $this->storage->id(),

      'views_data' => $this->viewsData->_serviceId,

      'route_provider' => $this->routeProvider->_serviceId,

      'current_display' => $this->current_display,

      'args' => $this->args,

      'current_page' => $this->current_page,
@@ -2520,8 +2518,8 @@ public function __wakeup() { 


      // Attach all necessary services.

      $this->user = \Drupal::currentUser();

      $this->viewsData = \Drupal::service($this->serializationData['views_data']);

      $this->routeProvider = \Drupal::service($this->serializationData['route_provider']);

      $this->viewsData = \Drupal::service('views.views_data');

      $this->routeProvider = \Drupal::service('router.route_provider');



      // Restore the state of this executable.

      if ($request = \Drupal::request()) {