opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

12
web/core/modules/views/src/EventSubscriber/RouteSubscriber.php
View file

@ -49,7 +49,7 @@ class RouteSubscriber extends RouteSubscriberBase {
*
* @var array
*/
protected $viewRouteNames = array();
protected $viewRouteNames = [];
/**
* Constructs a \Drupal\views\EventSubscriber\RouteSubscriber instance.
@ -76,7 +76,7 @@ class RouteSubscriber extends RouteSubscriberBase {
*/
public static function getSubscribedEvents() {
$events = parent::getSubscribedEvents();
$events[RoutingEvents::FINISHED] = array('routeRebuildFinished');
$events[RoutingEvents::FINISHED] = ['routeRebuildFinished'];
// Ensure to run after the entity resolver subscriber
// @see \Drupal\Core\EventSubscriber\EntityRouteAlterSubscriber
$events[RoutingEvents::ALTER] = ['onAlterRoutes', -175];
@ -89,7 +89,7 @@ class RouteSubscriber extends RouteSubscriberBase {
*/
protected function getViewsDisplayIDsWithRoute() {
if (!isset($this->viewsDisplayPairs)) {
$this->viewsDisplayPairs = array();
$this->viewsDisplayPairs = [];
// @todo Convert this method to some service.
$views = $this->getApplicableViews();
@ -156,7 +156,11 @@ class RouteSubscriber extends RouteSubscriberBase {
}
/**
* {@inheritdoc}
* Stores the new route names after they have been rebuilt.
*
* Callback for the RoutingEvents::FINISHED event.
*
* @see \Drupal\views\EventSubscriber::getSubscribedEvents()
*/
public function routeRebuildFinished() {
$this->reset();

5
web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
View file

@ -144,6 +144,11 @@ class ViewsEntitySchemaSubscriber implements EntityTypeListenerInterface, EventS
$changes[] = static::REVISION_DATA_TABLE_REMOVAL;
}
// Stop here if no changes are needed.
if (empty($changes)) {
return;
}
/** @var \Drupal\views\Entity\View[] $all_views */
$all_views = $this->entityManager->getStorage('view')->loadMultiple(NULL);