diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php index e4f17b5..f3cbb9d 100644 --- a/core/modules/views/src/Tests/ViewExecutableTest.php +++ b/core/modules/views/src/Tests/ViewExecutableTest.php @@ -351,7 +351,13 @@ protected function assertViewDestroy($view) { $reflection = new \ReflectionClass($view); $defaults = $reflection->getDefaultProperties(); // The storage and user should remain. - unset($defaults['storage'], $defaults['user'], $defaults['request'], $defaults['routeProvider']); + unset( + $defaults['storage'], + $defaults['user'], + $defaults['request'], + $defaults['routeProvider'], + $defaults['viewsData'] + ); foreach ($defaults as $property => $default) { $this->assertIdentical($this->getProtectedProperty($view, $property), $default); diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index d6c644d..0d95ba2 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -1966,7 +1966,13 @@ public function destroy() { $defaults = $reflection->getDefaultProperties(); // The external dependencies should not be reset. This is not generated by // the execution of a view. - unset($defaults['storage'], $defaults['user'], $defaults['request'], $defaults['routeProvider']); + unset( + $defaults['storage'], + $defaults['user'], + $defaults['request'], + $defaults['routeProvider'], + $defaults['viewsData'] + ); foreach ($defaults as $property => $default) { $this->{$property} = $default;