diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php index b97bb64..b4e535f 100644 --- a/core/modules/node/src/Plugin/views/row/Rss.php +++ b/core/modules/node/src/Plugin/views/row/Rss.php @@ -10,6 +10,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\views\Plugin\views\row\RssPluginBase; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\node\NodeStorageInterface; @@ -60,9 +61,11 @@ class Rss extends RssPluginBase { * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_manager); + public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, ViewExecutableFactory $executable_factory) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_manager, $executable_factory); $this->nodeStorage = $entity_manager->getStorage('node'); } diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php index 6d1514f..34b4ab0 100644 --- a/core/modules/views/src/Entity/View.php +++ b/core/modules/views/src/Entity/View.php @@ -229,7 +229,7 @@ public function &getDisplay($display_id) { * {@inheritdoc} */ public function duplicateDisplayAsType($old_display_id, $new_display_type) { - $executable = Views::executableFactory()->get($this); + $executable = $this->getExecutable(); $display = $executable->newDisplay($new_display_type); $new_display_id = $display->display['id']; $displays = $this->get('display'); @@ -266,7 +266,7 @@ public function calculateDependencies() { // Ensure that the view is dependant on the module that implements the view. $this->addDependency('module', $this->module); - $executable = Views::executableFactory()->get($this); + $executable = $this->getExecutable(); $executable->initDisplay(); $executable->initStyle(); @@ -308,7 +308,7 @@ public function preSave(EntityStorageInterface $storage) { * a view at save time rather than at runtime. */ protected function addCacheMetadata() { - $executable = Views::executableFactory()->get($this); + $executable = $this->getExecutable(); $current_display = $executable->current_display; $displays = $this->get('display'); diff --git a/core/modules/views/src/EventSubscriber/RouteSubscriber.php b/core/modules/views/src/EventSubscriber/RouteSubscriber.php index cdc1fd5..7185614 100644 --- a/core/modules/views/src/EventSubscriber/RouteSubscriber.php +++ b/core/modules/views/src/EventSubscriber/RouteSubscriber.php @@ -15,6 +15,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Views; use Symfony\Component\Routing\RouteCollection; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; use Symfony\Component\HttpKernel\KernelEvents; @@ -52,6 +53,13 @@ class RouteSubscriber extends RouteSubscriberBase { protected $state; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Stores an array of route names keyed by view_id.display_id. * * @var array @@ -65,10 +73,13 @@ class RouteSubscriber extends RouteSubscriberBase { * The entity manager. * @param \Drupal\Core\State\StateInterface $state * The state key value store. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(EntityManagerInterface $entity_manager, StateInterface $state) { + public function __construct(EntityManagerInterface $entity_manager, StateInterface $state , ViewExecutableFactory $executable_factory) { $this->viewStorage = $entity_manager->getStorage('view'); $this->state = $state; + $this->executableFactory = $executable_factory; } /** @@ -121,8 +132,7 @@ public function routes() { foreach ($this->getViewsDisplayIDsWithRoute() as $pair) { list($view_id, $display_id) = explode('.', $pair); $view = $this->viewStorage->load($view_id); - // @todo This should have an executable factory injected. - if (($view = Views::executableFactory()->get($view)) && $view instanceof ViewExecutable) { + if (($view = $this->executableFactory->get($view)) && $view instanceof ViewExecutable) { if ($view->setDisplay($display_id) && $display = $view->displayHandlers->get($display_id)) { if ($display instanceof DisplayRouterInterface) { $this->viewRouteNames += (array) $display->collectRoutes($collection); @@ -143,8 +153,7 @@ protected function alterRoutes(RouteCollection $collection) { foreach ($this->getViewsDisplayIDsWithRoute() as $pair) { list($view_id, $display_id) = explode('.', $pair); $view = $this->viewStorage->load($view_id); - // @todo This should have an executable factory injected. - if (($view = Views::executableFactory()->get($view)) && $view instanceof ViewExecutable) { + if (($view = $this->executableFactory->get($view)) && $view instanceof ViewExecutable) { if ($view->setDisplay($display_id) && $display = $view->displayHandlers->get($display_id)) { if ($display instanceof DisplayRouterInterface) { // If the display returns TRUE a route item was found, so it does not diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php index d5f489c..02502fd 100644 --- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php +++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php @@ -9,8 +9,8 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; -use Drupal\views\Views; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\views\ViewExecutableFactory; /** * Provides block plugin definitions for all Views block displays. @@ -41,12 +41,20 @@ class ViewsBlock implements ContainerDeriverInterface { protected $viewStorage; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * {@inheritdoc} */ public static function create(ContainerInterface $container, $base_plugin_id) { return new static( $base_plugin_id, - $container->get('entity.manager')->getStorage('view') + $container->get('entity.manager')->getStorage('view'), + $container->get('views.executable') ); } @@ -57,10 +65,13 @@ public static function create(ContainerInterface $container, $base_plugin_id) { * The base plugin ID. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage * The entity storage to load views. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct($base_plugin_id, EntityStorageInterface $view_storage) { + public function __construct($base_plugin_id, EntityStorageInterface $view_storage, ViewExecutableFactory $executable_factory) { $this->basePluginId = $base_plugin_id; $this->viewStorage = $view_storage; + $this->executableFactory = $executable_factory; } /** @@ -84,7 +95,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { if (!$view->status()) { continue; } - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->initDisplay(); foreach ($executable->displayHandlers as $display) { // Add a block plugin definition for each block display. diff --git a/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php index 1b9079b..4b0a7d1 100644 --- a/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php +++ b/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php @@ -9,7 +9,7 @@ use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\views\Views; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -41,16 +41,26 @@ class ViewsExposedFilterBlock implements ContainerDeriverInterface { protected $basePluginId; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Constructs a ViewsExposedFilterBlock object. * * @param string $base_plugin_id * The base plugin ID. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage * The entity storage to load views. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct($base_plugin_id, EntityStorageInterface $view_storage) { + public function __construct($base_plugin_id, EntityStorageInterface $view_storage, ViewExecutableFactory $executable_factory) { $this->basePluginId = $base_plugin_id; $this->viewStorage = $view_storage; + $this->executableFactory = $executable_factory; } /** @@ -59,7 +69,9 @@ public function __construct($base_plugin_id, EntityStorageInterface $view_storag public static function create(ContainerInterface $container, $base_plugin_id) { return new static( $base_plugin_id, - $container->get('entity.manager')->getStorage('view') + $container->get('entity.manager')->getStorage('view'), + $container->get('views.executable') + ); } @@ -84,7 +96,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { if (!$view->status()) { continue; } - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->initDisplay(); foreach ($executable->displayHandlers as $display) { if (isset($display) && $display->getOption('exposed_block')) { diff --git a/core/modules/views/src/Plugin/ViewsHandlerManager.php b/core/modules/views/src/Plugin/ViewsHandlerManager.php index 5244147..deae4a6 100644 --- a/core/modules/views/src/Plugin/ViewsHandlerManager.php +++ b/core/modules/views/src/Plugin/ViewsHandlerManager.php @@ -11,6 +11,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\DefaultPluginManager; +use Drupal\views\ViewExecutableFactory; use Drupal\views\ViewsData; use Symfony\Component\DependencyInjection\Container; use Drupal\views\Plugin\views\HandlerBase; @@ -37,6 +38,13 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin protected $handlerType; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Constructs a ViewsHandlerManager object. * * @param string $handler_type @@ -50,8 +58,10 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin * Cache backend instance to use. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler to invoke the alter hook with. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct($handler_type, \Traversable $namespaces, ViewsData $views_data, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) { + public function __construct($handler_type, \Traversable $namespaces, ViewsData $views_data, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, ViewExecutableFactory $executable_factory) { $plugin_definition_annotation_name = 'Drupal\views\Annotation\Views' . Container::camelize($handler_type); $plugin_interface = 'Drupal\views\Plugin\views\ViewsHandlerInterface'; if ($handler_type == 'join') { @@ -67,6 +77,7 @@ public function __construct($handler_type, \Traversable $namespaces, ViewsData $ $this->defaults = array( 'plugin_type' => $handler_type, ); + $this->executableFactory = $executable_factory; } /** @@ -127,6 +138,7 @@ public function createInstance($plugin_id, array $configuration = array()) { if ($instance instanceof HandlerBase) { $instance->setModuleHandler($this->moduleHandler); $instance->setViewsData($this->viewsData); + $instance->setExecutableFactory($this->executableFactory); } return $instance; } diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php index 4bff164..79ae997 100644 --- a/core/modules/views/src/Plugin/views/HandlerBase.php +++ b/core/modules/views/src/Plugin/views/HandlerBase.php @@ -18,6 +18,7 @@ use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ViewExecutable; use Drupal\Core\Database\Database; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; use Drupal\views\ViewsData; @@ -93,6 +94,13 @@ protected $moduleHandler; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * The views data service. * * @var \Drupal\views\ViewsData @@ -335,6 +343,29 @@ public function setModuleHandler(ModuleHandlerInterface $module_handler) { } /** + * Gets the executable factory. + * + * @return \Drupal\views\ViewExecutableFactory + */ + protected function getExecutableFactory() { + if (!$this->executableFactory) { + $this->executableFactory = Views::executableFactory(); + } + + return $this->executableFactory; + } + + /** + * Sets the executable factory. + * + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. + */ + public function setExecutableFactory(ViewExecutableFactory $executable_factory) { + $this->executableFactory = $executable_factory; + } + + /** * Provides the handler some groupby. */ public function usesGroupBy() { @@ -773,7 +804,7 @@ public function displayExposedForm($form, FormStateInterface $form_state) { $display_id = $form_state->get('display_id'); $type = $form_state->get('type'); $id = $form_state->get('id'); - Views::executableFactory()->get($view)->setHandler($display_id, $type, $id, $item); + $this->getExecutableFactory()->get($view)->setHandler($display_id, $type, $id, $item); $view->addFormToStack($form_state->get('form_key'), $display_id, $type, $id, TRUE, TRUE); @@ -802,7 +833,7 @@ public function submitTemporaryForm($form, FormStateInterface $form_state) { $override = NULL; $view = $form_state->get('view'); - $executable = Views::executableFactory()->get($view); + $executable = $this->getExecutableFactory()->get($view); if ($executable->display_handler->useGroupBy() && !empty($item['group_type'])) { if (empty($executable->query)) { $executable->initQuery(); @@ -827,7 +858,7 @@ public function submitTemporaryForm($form, FormStateInterface $form_state) { $handler->unpackOptions($handler->options, $options, NULL, FALSE); // Store the item back on the view. - $executable = Views::executableFactory()->get($view); + $executable = $this->getExecutableFactory()->get($view); $executable->temporary_options[$type][$form_state->get('id')] = $handler->options; // @todo Decide if \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm() is diff --git a/core/modules/views/src/Plugin/views/area/View.php b/core/modules/views/src/Plugin/views/area/View.php index d7ce2fc..2ec9b6a 100644 --- a/core/modules/views/src/Plugin/views/area/View.php +++ b/core/modules/views/src/Plugin/views/area/View.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -35,6 +36,13 @@ class View extends AreaPluginBase { */ protected $viewStorage; + /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + /** * Constructs a View object. * @@ -46,24 +54,28 @@ class View extends AreaPluginBase { * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage * The view storage. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $view_storage) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $view_storage, ViewExecutableFactory $executable_factory) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->viewStorage = $view_storage; + $this->executableFactory = $executable_factory; } - /** - * {@inheritdoc} - */ - public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { - return new static( - $configuration, - $plugin_id, - $plugin_definition, - $container->get('entity.manager')->getStorage('view') - ); - } + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('entity.manager')->getStorage('view'), + $container->get('views.executable') + ); + } /** * {@inheritdoc} @@ -109,8 +121,7 @@ public function render($empty = FALSE) { if (!empty($this->options['view_to_insert'])) { list($view_name, $display_id) = explode(':', $this->options['view_to_insert']); - $view = $this->viewStorage->load($view_name); - $view = Views::executableFactory()->get($view); + $view = $this->executableFactory->get($this->viewStorage->load($view_name)); if (empty($view) || !$view->access($display_id)) { return array(); diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index 890eb70..6e43a7e 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -17,7 +17,6 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ViewExecutable; -use Drupal\views\Views; /** * @defgroup views_filter_handlers Views filter handler plugins @@ -84,6 +83,8 @@ */ var $always_required = FALSE; + + /** * Overrides \Drupal\views\Plugin\views\HandlerBase::init(). * @@ -446,7 +447,7 @@ public function buildGroupForm($form, FormStateInterface $form_state) { $display_id = $form_state->get('display_id'); $type = $form_state->get('type'); $id = $form_state->get('id'); - Views::executableFactory()->get($view)->setHandler($display_id, $type, $id, $item); + $this->getExecutableFactory()->get($view)->setHandler($display_id, $type, $id, $item); $view->addFormToStack($form_state->get('form_key'), $display_id, $type, $id, TRUE, TRUE); @@ -1111,7 +1112,7 @@ public function addGroupForm($form, FormStateInterface $form_state) { $display_id = $form_state->get('display_id'); $type = $form_state->get('type'); $id = $form_state->get('id'); - Views::executableFactory()->get($view)->setHandler($display_id, $type, $id, $item); + $this->getExecutableFactory()->get($view)->setHandler($display_id, $type, $id, $item); $view->cacheSet(); $form_state->set('rerender', TRUE); diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php index 1a6b1f3..5c4441a 100644 --- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php +++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php @@ -9,7 +9,9 @@ use Drupal\Core\Database\Query\AlterableInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Relationship handler that allows a groupwise maximum of the linked in table. @@ -64,6 +66,42 @@ class GroupwiseMax extends RelationshipPluginBase { /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** + * Constructs an GroupwiseMax object. + * + * @param array $configuration + * A configuration array containing information about the plugin instance. + * @param string $plugin_id + * The plugin_id for the plugin instance. + * @param mixed $plugin_definition + * The plugin implementation definition. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, ViewExecutableFactory $executable_factory) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + $this->executableFactory = $executable_factory; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('views.executable') + ); + } + + /** * {@inheritdoc} */ protected function defineOptions() { @@ -158,7 +196,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { protected function getTemporaryView() { $view = entity_create('view', array('base_table' => $this->definition['base'])); $view->addDisplay('default'); - return Views::executableFactory()->get($view); + return $this->executableFactory->get($view); } /** diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php index e95e5fa..732707d 100644 --- a/core/modules/views/src/Plugin/views/row/EntityRow.php +++ b/core/modules/views/src/Plugin/views/row/EntityRow.php @@ -14,6 +14,7 @@ use Drupal\views\Entity\Render\EntityTranslationRenderTrait; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ViewExecutable; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -76,9 +77,11 @@ class EntityRow extends RowPluginBase { * The entity manager. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager) { - parent::__construct($configuration, $plugin_id, $plugin_definition); + public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, ViewExecutableFactory $executable_factory) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $executable_factory); $this->entityManager = $entity_manager; $this->languageManager = $language_manager; @@ -100,7 +103,14 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { - return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'), $container->get('language_manager')); + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('entity.manager'), + $container->get('language_manager'), + $container->get('views.executable') + ); } /** diff --git a/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/core/modules/views/src/Plugin/views/row/RowPluginBase.php index 32fc4b3..b13a96b 100644 --- a/core/modules/views/src/Plugin/views/row/RowPluginBase.php +++ b/core/modules/views/src/Plugin/views/row/RowPluginBase.php @@ -10,7 +10,9 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\Plugin\views\PluginBase; use Drupal\views\ViewExecutable; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * @defgroup views_row_plugins Views row plugins @@ -56,6 +58,42 @@ protected $usesFields = FALSE; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** + * Constructs a PluginBase object. + * + * @param array $configuration + * A configuration array containing information about the plugin instance. + * @param string $plugin_id + * The plugin_id for the plugin instance. + * @param mixed $plugin_definition + * The plugin implementation definition. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, ViewExecutableFactory $executable_factory) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + $this->executableFactory = $executable_factory; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('views.executable') + ); + } + + /** * Returns the usesFields property. * * @return bool @@ -82,7 +120,7 @@ protected function defineOptions() { public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); if (isset($this->base_table)) { - $executable = Views::executableFactory()->get($form_state->get('view')); + $executable = $this->executableFactory->get($form_state->get('view')); // A whole bunch of code to figure out what relationships are valid for // this item. diff --git a/core/modules/views/src/Plugin/views/row/RssPluginBase.php b/core/modules/views/src/Plugin/views/row/RssPluginBase.php index ed1e5b9..11bbe05 100644 --- a/core/modules/views/src/Plugin/views/row/RssPluginBase.php +++ b/core/modules/views/src/Plugin/views/row/RssPluginBase.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -35,8 +36,8 @@ * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager) { - parent::__construct($configuration, $plugin_id, $plugin_definition); + public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, ViewExecutableFactory $executable_factory) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $executable_factory); $this->entityManager = $entity_manager; } @@ -49,7 +50,8 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('entity.manager') + $container->get('entity.manager'), + $container->get('views.executable') ); } diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php index 629bcec..0606c64 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -11,11 +11,13 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\UrlGeneratorTrait; use Drupal\views\Entity\View; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; use Drupal\views_ui\ViewUI; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\PluginBase; use Drupal\views\Plugin\views\wizard\WizardInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * @defgroup views_wizard_plugins Views wizard plugins @@ -115,12 +117,29 @@ ); /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Constructs a WizardPluginBase object. + * + * @param array $configuration + * A configuration array containing information about the plugin instance. + * @param string $plugin_id + * The plugin_id for the plugin instance. + * @param mixed $plugin_definition + * The plugin implementation definition. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, ViewExecutableFactory $executable_factory) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->base_table = $this->definition['base_table']; + $this->executableFactory = $executable_factory; $entity_types = \Drupal::entityManager()->getDefinitions(); foreach ($entity_types as $entity_type_id => $entity_type) { @@ -132,6 +151,18 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition } /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('views.executable') + ); + } + + /** * Gets the createdColumn property. * * @return string @@ -730,7 +761,7 @@ protected function alterDisplayOptions(&$display_options, $form, FormStateInterf protected function addDisplays(View $view, $display_options, $form, FormStateInterface $form_state) { // Initialize and store the view executable to get the display plugin // instances. - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); // Display: Master $default_display = $executable->newDisplay('default', 'Master', 'default'); @@ -1237,7 +1268,7 @@ protected function setValidatedView(array $form, FormStateInterface $form_state, */ public function validateView(array $form, FormStateInterface $form_state) { $view = $this->instantiateView($form, $form_state); - $errors = Views::executableFactory()->get($view)->validate(); + $errors = $this->executableFactory->get($view)->validate(); if (empty($errors)) { $this->setValidatedView($form, $form_state, $view); diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php index 45dd319..4ef5091 100644 --- a/core/modules/views/src/Tests/DefaultViewsTest.php +++ b/core/modules/views/src/Tests/DefaultViewsTest.php @@ -117,7 +117,7 @@ public function testDefaultViews() { $views = $controller->loadMultiple(); foreach ($views as $name => $view_storage) { - $view = Views::executableFactory()->get($view_storage); + $view = $view_storage->getExecutable(); $view->initDisplay(); foreach ($view->storage->get('display') as $display_id => $display) { $view->setDisplay($display_id); diff --git a/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php index 0b9fbf9..c4c6497 100644 --- a/core/modules/views/src/Tests/Handler/HandlerAllTest.php +++ b/core/modules/views/src/Tests/Handler/HandlerAllTest.php @@ -9,7 +9,6 @@ use Drupal\comment\Tests\CommentTestTrait; use Drupal\views\ViewExecutable; -use Drupal\views\Views; use Drupal\views\Plugin\views\HandlerBase; use Drupal\views\Plugin\views\filter\InOperator; @@ -61,7 +60,7 @@ public function testHandlers() { } $view = entity_create('view', array('base_table' => $base_table)); - $view = Views::executableFactory()->get($view); + $view = $view->getExecutable(); // @todo The groupwise relationship is currently broken. $exclude[] = 'taxonomy_term_field_data:tid_representative'; diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php index 93ec6b1..e237a19 100644 --- a/core/modules/views/src/Tests/ModuleTest.php +++ b/core/modules/views/src/Tests/ModuleTest.php @@ -195,7 +195,7 @@ public function testLoadFunctions() { // Test $exclude_view parameter. $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name'); $this->assertFalse(array_key_exists('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name'); - $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', Views::executableFactory()->get($archive))), 'View excluded from options based on object'); + $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object'); // Test the $opt_group parameter. $expected_opt_groups = array(); diff --git a/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php b/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php index dff61e8..e9052b4 100644 --- a/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php +++ b/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php @@ -7,8 +7,6 @@ namespace Drupal\views\Tests\Plugin; -use Drupal\views\Views; - /** * Tests the ability to disable and enable view displays. * @@ -56,7 +54,7 @@ public function testDisabledDisplays() { // Load the test view and initialize its displays. $view = $this->container->get('entity.manager')->getStorage('view')->load('test_disabled_display'); - Views::executableFactory()->get($view)->setDisplay(); + $view->getExecutable()->setDisplay(); // Enabled page display should return content. $this->drupalGet('test-disabled-display'); @@ -69,9 +67,9 @@ public function testDisabledDisplays() { // Enable each disabled display and save the view. foreach ($display_ids as $display_id) { - Views::executableFactory()->get($view)->displayHandlers->get($display_id)->setOption('enabled', TRUE); + $view->getExecutable()->displayHandlers->get($display_id)->setOption('enabled', TRUE); $view->save(); - $enabled = Views::executableFactory()->get($view)->displayHandlers->get($display_id)->isEnabled(); + $enabled = $view->getExecutable()->displayHandlers->get($display_id)->isEnabled(); $this->assertTrue($enabled, 'Display ' . $display_id . ' is now enabled'); } @@ -84,9 +82,9 @@ public function testDisabledDisplays() { // Disable each disabled display and save the view. foreach ($display_ids as $display_id) { - Views::executableFactory()->get($view)->displayHandlers->get($display_id)->setOption('enabled', FALSE); + $view->getExecutable()->displayHandlers->get($display_id)->setOption('enabled', FALSE); $view->save(); - $enabled = Views::executableFactory()->get($view)->displayHandlers->get($display_id)->isEnabled(); + $enabled = $view->getExecutable()->displayHandlers->get($display_id)->isEnabled(); $this->assertFalse($enabled, 'Display ' . $display_id . ' is now disabled'); } diff --git a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php index 6aef36f..512541e 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php @@ -65,7 +65,7 @@ public function testFeedOutput() { $this->assertEqual($result[0], 'test_display_feed', 'The display title is used for the feed title.'); // Add a block display and attach the feed. - Views::executableFactory()->get($view)->newDisplay('block', NULL, 'test'); + $view->getExecutable()->newDisplay('block', NULL, 'test'); $display = &$view->getDisplay('feed_1'); $display['display_options']['displays']['test'] = 'test'; $view->save(); diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php index c7ac707..81bb1c2 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php @@ -225,7 +225,7 @@ public function testReadMore() { $this->assertTrue(empty($result), 'The more link is not shown when view has more records.'); // Test the default value of use_more_always. - $view = Views::executableFactory()->get(entity_create('view')); + $view = entity_create('view')->getExecutable(); $this->assertTrue($view->getDisplay()->getOption('use_more_always'), 'Always display the more link by default.'); } diff --git a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php index 60486c6..183e395 100644 --- a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php +++ b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php @@ -209,7 +209,7 @@ public function testBuildRenderableWithCacheContexts() { $view = View::load('test_view'); $display =& $view->getDisplay('default'); $display['cache_metadata']['contexts'] = ['beatles']; - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $build = $executable->buildRenderable(); $this->assertEqual(['beatles'], $build['#cache']['contexts']); diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php index 6d04131..3771c0d 100644 --- a/core/modules/views/src/Tests/ViewExecutableTest.php +++ b/core/modules/views/src/Tests/ViewExecutableTest.php @@ -256,7 +256,7 @@ public function testDisplays() { // Test the newDisplay() method. $view = $this->container->get('entity.manager')->getStorage('view')->create(array('id' => 'test_executable_displays')); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $executable->newDisplay('page'); $executable->newDisplay('page'); @@ -442,7 +442,7 @@ public function testValidate() { */ public function testValidateNestedLoops() { $view = View::create(['id' => 'test_validate_nested_loops']); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $executable->newDisplay('display_test'); $executable->newDisplay('display_test'); diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php index b4f2c8c..f30c1dd 100644 --- a/core/modules/views/src/Tests/ViewStorageTest.php +++ b/core/modules/views/src/Tests/ViewStorageTest.php @@ -168,7 +168,7 @@ protected function displayTests() { // Ensure the right display_plugin is created/instantiated. $this->assertEqual($display[$new_id]['display_plugin'], 'page', 'New page display "test" uses the right display plugin.'); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $executable->initDisplay(); $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.'); @@ -267,7 +267,7 @@ protected function displayMethodTests() { // Tests item related methods(). $view = $this->controller->create(array('base_table' => 'views_test_data')); $view->addDisplay('default'); - $view = Views::executableFactory()->get($view); + $view = $view->getExecutable(); $display_id = 'default'; $expected_items = array(); diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index 03c1555..fe65fe3 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -1900,8 +1900,7 @@ public function getUser() { * data, ID, and UUID. */ public function createDuplicate() { - $view = $this->storage->createDuplicate(); - return Views::executableFactory()->get($view); + return $this->storage->createDuplicate()->getExecutable(); } /** diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php index 841ecdf..747f2f8 100644 --- a/core/modules/views/src/Views.php +++ b/core/modules/views/src/Views.php @@ -227,7 +227,7 @@ public static function getApplicableViews($type) { $result = array(); foreach (\Drupal::entityManager()->getStorage('view')->loadMultiple($entity_ids) as $view) { // Check each display to see if it meets the criteria and is enabled. - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $executable->initDisplay(); foreach ($executable->displayHandlers as $id => $handler) { if (!empty($handler->definition[$type]) && $handler->isEnabled()) { diff --git a/core/modules/views/views.services.yml b/core/modules/views/views.services.yml index 1a01543..6ef31b5 100644 --- a/core/modules/views/views.services.yml +++ b/core/modules/views/views.services.yml @@ -4,10 +4,10 @@ services: arguments: [access, '@container.namespaces', '@cache.discovery', '@module_handler'] plugin.manager.views.area: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [area, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [area, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.argument: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [argument, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [argument, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.argument_default: class: Drupal\views\Plugin\ViewsPluginManager arguments: [argument_default, '@container.namespaces', '@cache.discovery', '@module_handler'] @@ -28,13 +28,13 @@ services: arguments: [exposed_form, '@container.namespaces', '@cache.discovery', '@module_handler'] plugin.manager.views.field: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [field, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [field, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.filter: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [filter, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [filter, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.join: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [join, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [join, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.pager: class: Drupal\views\Plugin\ViewsPluginManager arguments: [pager, '@container.namespaces', '@cache.discovery', '@module_handler'] @@ -43,13 +43,13 @@ services: arguments: [query, '@container.namespaces', '@cache.discovery', '@module_handler'] plugin.manager.views.relationship: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [relationship, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [relationship, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.row: class: Drupal\views\Plugin\ViewsPluginManager arguments: [row, '@container.namespaces', '@cache.discovery', '@module_handler'] plugin.manager.views.sort: class: Drupal\views\Plugin\ViewsHandlerManager - arguments: [sort, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler'] + arguments: [sort, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler', '@views.executable'] plugin.manager.views.style: class: Drupal\views\Plugin\ViewsPluginManager arguments: [style, '@container.namespaces', '@cache.discovery', '@module_handler'] @@ -70,7 +70,7 @@ services: arguments: ['@module_handler'] views.route_subscriber: class: Drupal\views\EventSubscriber\RouteSubscriber - arguments: ['@entity.manager', '@state'] + arguments: ['@entity.manager', '@state', '@views.executable'] tags: - { name: 'event_subscriber' } views.exposed_form_cache: diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc index c3980f4..64b9077 100644 --- a/core/modules/views_ui/admin.inc +++ b/core/modules/views_ui/admin.inc @@ -216,7 +216,7 @@ function views_ui_nojs_submit($form, FormStateInterface $form_state) { function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_state, $section) { $view = $form_state->get('view'); $display_id = $form_state->get('display_id'); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $displays = $executable->displayHandlers; $current_display = $executable->display_handler; diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php index 2cfa6ad..77ddb1f 100644 --- a/core/modules/views_ui/src/Controller/ViewsUIController.php +++ b/core/modules/views_ui/src/Controller/ViewsUIController.php @@ -12,6 +12,7 @@ use Drupal\Core\Url; use Drupal\views\ViewExecutable; use Drupal\views\ViewEntityInterface; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; use Drupal\views_ui\ViewUI; use Drupal\views\ViewsData; @@ -34,13 +35,23 @@ class ViewsUIController extends ControllerBase { protected $viewsData; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Constructs a new \Drupal\views_ui\Controller\ViewsUIController object. * * @param \Drupal\views\ViewsData views_data * The Views data cache object. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(ViewsData $views_data) { + public function __construct(ViewsData $views_data, ViewExecutableFactory $executable_factory) { $this->viewsData = $views_data; + $this->executableFactory = $executable_factory; } /** @@ -48,7 +59,8 @@ public function __construct(ViewsData $views_data) { */ public static function create(ContainerInterface $container) { return new static( - $container->get('views.views_data') + $container->get('views.views_data'), + $container->get('views.executable') ); } @@ -66,7 +78,7 @@ public function reportFields() { $fields = array(); $handler_types = ViewExecutable::getHandlerTypes(); foreach ($views as $view) { - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->initDisplay(); foreach ($executable->displayHandlers as $display_id => $display) { if ($executable->setDisplay($display_id)) { diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php index 266fc92..da54d50 100644 --- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php +++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php @@ -61,7 +61,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ), ); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; diff --git a/core/modules/views_ui/src/Form/Ajax/Analyze.php b/core/modules/views_ui/src/Form/Ajax/Analyze.php index 0dc68d8..95e126a 100644 --- a/core/modules/views_ui/src/Form/Ajax/Analyze.php +++ b/core/modules/views_ui/src/Form/Ajax/Analyze.php @@ -41,7 +41,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['#section'] = 'analyze'; $analyzer = Views::analyzer(); - $messages = $analyzer->getMessages(Views::executableFactory()->get($view)); + $messages = $analyzer->getMessages($view->getExecutable()); $form['analysis'] = array( '#prefix' => '
', diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php index 35ce35d..e290789 100644 --- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php +++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php @@ -67,7 +67,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $ '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE), ), ); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $save_ui_cache = FALSE; if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); @@ -228,7 +228,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { } $override = NULL; - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if ($executable->display_handler->useGroupBy() && !empty($item['group_type'])) { if (empty($executable->query)) { $executable->initQuery(); @@ -274,7 +274,7 @@ public function remove(&$form, FormStateInterface $form_state) { $id = $form_state->get('id'); // Store the item back on the view list($was_defaulted, $is_defaulted) = $view->getOverrideValues($form, $form_state); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); // If the display selection was changed toggle the override value. if ($was_defaulted != $is_defaulted) { $display = &$executable->displayHandlers->get($display_id); diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php index 87d9368..a3917f0 100644 --- a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php +++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php @@ -10,7 +10,6 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewEntityInterface; use Drupal\views\ViewExecutable; -use Drupal\views\Views; /** * Provides a form for configuring extra information for a Views UI item. @@ -64,7 +63,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE), ), ); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; @@ -117,7 +116,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { } // Store the item back on the view - Views::executableFactory()->get($view)->setHandler($form_state->get('display_id'), $form_state->get('type'), $form_state->get('id'), $item); + $view->getExecutable()->setHandler($form_state->get('display_id'), $form_state->get('type'), $form_state->get('id'), $item); // Write to cache $view->cacheSet(); diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php index 1ef7416..9ffcc48 100644 --- a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php +++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php @@ -64,7 +64,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE), ), ); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; @@ -103,7 +103,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $type = $form_state->get('type'); $handler = Views::handlerManager($type)->getHandler($item); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $handler->init($executable, $executable->display_handler, $item); $handler->submitGroupByForm($form, $form_state); diff --git a/core/modules/views_ui/src/Form/Ajax/Display.php b/core/modules/views_ui/src/Form/Ajax/Display.php index 79628d8..78cd8f8 100644 --- a/core/modules/views_ui/src/Form/Ajax/Display.php +++ b/core/modules/views_ui/src/Form/Ajax/Display.php @@ -9,7 +9,6 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewEntityInterface; -use Drupal\views\Views; /** * Provides a form for editing the Views display. @@ -64,7 +63,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $view = $form_state->get('view'); $display_id = $form_state->get('display_id'); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; @@ -99,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { public function validateForm(array &$form, FormStateInterface $form_state) { $view = $form_state->get('view'); $display_id = $form_state->get('display_id'); - Views::executableFactory()->get($view)->displayHandlers->get($display_id)->validateOptionsForm($form['options'], $form_state); + $view->getExecutable()->displayHandlers->get($display_id)->validateOptionsForm($form['options'], $form_state); if ($form_state->getErrors()) { $form_state->set('rerender', TRUE); @@ -112,7 +111,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) { $view = $form_state->get('view'); $display_id = $form_state->get('display_id'); - Views::executableFactory()->get($view)->displayHandlers->get($display_id)->submitOptionsForm($form['options'], $form_state); + $view->getExecutable()->displayHandlers->get($display_id)->submitOptionsForm($form['options'], $form_state); $view->cacheSet(); } diff --git a/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/core/modules/views_ui/src/Form/Ajax/Rearrange.php index 209dcd5..2f0fbcb 100644 --- a/core/modules/views_ui/src/Form/Ajax/Rearrange.php +++ b/core/modules/views_ui/src/Form/Ajax/Rearrange.php @@ -12,7 +12,6 @@ use Drupal\Core\Url; use Drupal\views\ViewEntityInterface; use Drupal\views\ViewExecutable; -use Drupal\views\Views; /** * Provides a rearrange form for Views handlers. @@ -57,7 +56,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $type = $form_state->get('type'); $types = ViewExecutable::getHandlerTypes(); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; @@ -155,7 +154,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $type = $form_state->get('type'); $types = ViewExecutable::getHandlerTypes(); - $display = &Views::executableFactory()->get($view)->displayHandlers->get($display_id); + $display = &$view->getExecutable()->displayHandlers->get($display_id); $old_fields = $display->getOption($types[$type]['plural']); $new_fields = $order = array(); diff --git a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php index 249ed84..1b8e18d 100644 --- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php +++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php @@ -11,7 +11,6 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views_ui\ViewUI; use Drupal\views\ViewExecutable; -use Drupal\views\Views; /** * Provides a rearrange form for Views filters. @@ -41,7 +40,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $type = 'filter'; $types = ViewExecutable::getHandlerTypes(); - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); if (!$executable->setDisplay($display_id)) { $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id))); return $form; @@ -220,7 +219,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) { $types = ViewExecutable::getHandlerTypes(); $view = $form_state->get('view'); - $display = &Views::executableFactory()->get($view)->displayHandlers->get($form_state->get('display_id')); + $display = &$view->getExecutable()->displayHandlers->get($form_state->get('display_id')); $remember_groups = array(); if (!empty($view->form_cache)) { diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 57d4f86..397c07b 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -21,6 +21,7 @@ use Drupal\Core\Render\ElementInfoManagerInterface; use Drupal\Core\Url; use Drupal\user\SharedTempStoreFactory; +use Drupal\views\ViewExecutableFactory; use Drupal\views\Views; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -60,6 +61,13 @@ class ViewEditForm extends ViewFormBase { protected $elementInfo; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * Constructs a new ViewEditForm object. * * @param \Drupal\user\SharedTempStoreFactory $temp_store_factory @@ -70,12 +78,15 @@ class ViewEditForm extends ViewFormBase { * The date Formatter service. * @param \Drupal\Core\Render\ElementInfoManagerInterface $element_info * The element info manager. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatter $date_formatter, ElementInfoManagerInterface $element_info) { + public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatter $date_formatter, ElementInfoManagerInterface $element_info, ViewExecutableFactory $executable_factory) { $this->tempStore = $temp_store_factory->get('views'); $this->requestStack = $requestStack; $this->dateFormatter = $date_formatter; $this->elementInfo = $element_info; + $this->executableFactory = $executable_factory; } /** @@ -86,7 +97,8 @@ public static function create(ContainerInterface $container) { $container->get('user.shared_tempstore'), $container->get('request_stack'), $container->get('date.formatter'), - $container->get('element_info') + $container->get('element_info'), + $container->get('views.executable') ); } @@ -107,7 +119,7 @@ public function form(array $form, FormStateInterface $form_state) { $form_state->disableCache(); if ($display_id) { - if (!Views::executableFactory()->get($view)->setDisplay($display_id)) { + if (!$this->executableFactory->get($view)->setDisplay($display_id)) { $form['#markup'] = $this->t('Invalid display id @display', array('@display' => $display_id)); return $form; } @@ -193,8 +205,8 @@ public function form(array $form, FormStateInterface $form_state) { ); // Add a text that the display is disabled. - if (Views::executableFactory()->get($view)->displayHandlers->has($display_id)) { - if (!Views::executableFactory()->get($view)->displayHandlers->get($display_id)->isEnabled()) { + if ($this->executableFactory->get($view)->displayHandlers->has($display_id)) { + if (!$this->executableFactory->get($view)->displayHandlers->get($display_id)->isEnabled()) { $form['displays']['settings']['disabled']['#markup'] = $this->t('This display is disabled.'); } } @@ -210,8 +222,8 @@ public function form(array $form, FormStateInterface $form_state) { $tab_content['#attributes']['class'][] = 'views-display-deleted'; } // Mark disabled displays as such. - - if (Views::executableFactory()->get($view)->displayHandlers->has($display_id) && !Views::executableFactory()->get($view)->displayHandlers->get($display_id)->isEnabled()) { + $executable = $this->executableFactory->get($view); + if ($executable->displayHandlers->has($display_id) && !$executable->displayHandlers->get($display_id)->isEnabled()) { $tab_content['#attributes']['class'][] = 'views-display-disabled'; } $form['displays']['settings']['settings_content'] = array( @@ -265,7 +277,7 @@ public function validate(array $form, FormStateInterface $form_state) { if ($view->isLocked()) { $form_state->setErrorByName('', $this->t('Changes cannot be made to a locked view.')); } - foreach (Views::executableFactory()->get($view)->validate() as $display_errors) { + foreach ($this->executableFactory->get($view)->validate() as $display_errors) { foreach ($display_errors as $error) { $form_state->setErrorByName('', $error); } @@ -277,7 +289,7 @@ public function validate(array $form, FormStateInterface $form_state) { */ public function save(array $form, FormStateInterface $form_state) { $view = $this->entity; - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->initDisplay(); // Go through and remove displayed scheduled for removal. @@ -324,8 +336,8 @@ public function save(array $form, FormStateInterface $form_state) { continue; } - if (($display->getPluginId() == 'page') && ($old_path == $destination) && ($old_path != Views::executableFactory()->get($view)->displayHandlers->get($id)->getOption('path'))) { - $destination = Views::executableFactory()->get($view)->displayHandlers->get($id)->getOption('path'); + if (($display->getPluginId() == 'page') && ($old_path == $destination) && ($old_path != $this->executableFactory->get($view)->displayHandlers->get($id)->getOption('path'))) { + $destination = $this->executableFactory->get($view)->displayHandlers->get($id)->getOption('path'); $query->remove('destination'); } } @@ -363,7 +375,7 @@ public function cancel(array $form, FormStateInterface $form_state) { public function getDisplayTab($view) { $build = array(); $display_id = $this->displayID; - $display = Views::executableFactory()->get($view)->displayHandlers->get($display_id); + $display = $this->executableFactory->get($view)->displayHandlers->get($display_id); // If the plugin doesn't exist, display an error message instead of an edit // page. if (empty($display)) { @@ -399,7 +411,7 @@ public function getDisplayDetails($view, $display) { // The master display cannot be duplicated. $is_default = $display['id'] == 'default'; // @todo: Figure out why getOption doesn't work here. - $is_enabled = Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->isEnabled(); + $is_enabled = $this->executableFactory->get($view)->displayHandlers->get($display['id'])->isEnabled(); if ($display['id'] != 'default') { $build['top']['#theme_wrappers'] = array('container'); @@ -428,8 +440,8 @@ public function getDisplayDetails($view, $display) { } // Add a link to view the page unless the view is disabled or has no // path. - elseif ($view->status() && Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->hasPath()) { - $path = Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->getPath(); + elseif ($view->status() && $this->executableFactory->get($view)->displayHandlers->get($display['id'])->hasPath()) { + $path = $this->executableFactory->get($view)->displayHandlers->get($display['id'])->getPath(); if ($path && (strpos($path, '%') === FALSE)) { $build['top']['actions']['path'] = array( '#type' => 'link', @@ -504,7 +516,7 @@ public function getDisplayDetails($view, $display) { $build['top']['display_title'] = array( '#theme' => 'views_ui_display_tab_setting', '#description' => $this->t('Display name'), - '#link' => Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->optionLink(SafeMarkup::checkPlain($display_title), 'display_title'), + '#link' => $this->executableFactory->get($view)->displayHandlers->get($display['id'])->optionLink(SafeMarkup::checkPlain($display_title), 'display_title'), ); } @@ -545,7 +557,7 @@ public function getDisplayDetails($view, $display) { // Fetch options from the display plugin, with a list of buckets they go into. $options = array(); - Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->optionsSummary($buckets, $options); + $this->executableFactory->get($view)->displayHandlers->get($display['id'])->optionsSummary($buckets, $options); // Place each option into its bucket. foreach ($options as $id => $option) { @@ -612,7 +624,7 @@ public function submitDisplayEnable($form, FormStateInterface $form_state) { $view = $this->entity; $id = $form_state->get('display_id'); // setOption doesn't work because this would might affect upper displays - Views::executableFactory()->get($view)->displayHandlers->get($id)->setOption('enabled', TRUE); + $this->executableFactory->get($view)->displayHandlers->get($id)->setOption('enabled', TRUE); // Store in cache $view->cacheSet(); @@ -630,7 +642,7 @@ public function submitDisplayEnable($form, FormStateInterface $form_state) { public function submitDisplayDisable($form, FormStateInterface $form_state) { $view = $this->entity; $id = $form_state->get('display_id'); - Views::executableFactory()->get($view)->displayHandlers->get($id)->setOption('enabled', FALSE); + $this->executableFactory->get($view)->displayHandlers->get($id)->setOption('enabled', FALSE); // Store in cache $view->cacheSet(); @@ -672,7 +684,7 @@ public function submitDisplayDelete($form, FormStateInterface $form_state) { */ public function rebuildCurrentTab(ViewUI $view, AjaxResponse $response, $display_id) { $this->displayID = $display_id; - if (!Views::executableFactory()->get($view)->setDisplay('default')) { + if (!$this->executableFactory->get($view)->setDisplay('default')) { return; } @@ -821,10 +833,11 @@ public function submitDelayDestination($form, FormStateInterface $form_state) { public function submitDisplayDuplicate($form, FormStateInterface $form_state) { $view = $this->entity; $display_id = $this->displayID; + $executable = &$this->executableFactory->get($view); // Create the new display. $displays = $view->get('display'); - $display = Views::executableFactory()->get($view)->newDisplay($displays[$display_id]['display_plugin']); + $display = $executable->newDisplay($displays[$display_id]['display_plugin']); $new_display_id = $display->display['id']; $displays[$new_display_id] = $displays[$display_id]; $displays[$new_display_id]['id'] = $new_display_id; @@ -832,7 +845,7 @@ public function submitDisplayDuplicate($form, FormStateInterface $form_state) { // By setting the current display the changed marker will appear on the new // display. - Views::executableFactory()->get($view)->current_display = $new_display_id; + $executable->current_display = $new_display_id; $view->cacheSet(); // Redirect to the new display's edit page. @@ -847,14 +860,15 @@ public function submitDisplayDuplicate($form, FormStateInterface $form_state) { */ public function submitDisplayAdd($form, FormStateInterface $form_state) { $view = $this->entity; + $executable = &$this->executableFactory->get($view); // Create the new display. $parents = $form_state->getTriggeringElement()['#parents']; $display_type = array_pop($parents); - $display = Views::executableFactory()->get($view)->newDisplay($display_type); + $display = $executable->newDisplay($display_type); $display_id = $display->display['id']; // A new display got added so the asterisks symbol should appear on the new // display. - Views::executableFactory()->get($view)->current_display = $display_id; + $executable->current_display = $display_id; $view->cacheSet(); // Redirect to the new display's edit page. @@ -880,7 +894,7 @@ public function submitDuplicateDisplayAsType($form, FormStateInterface $form_sta // By setting the current display the changed marker will appear on the new // display. - Views::executableFactory()->get($view)->current_display = $new_display_id; + $this->executableFactory->get($view)->current_display = $new_display_id; $view->cacheSet(); // Redirect to the new display's edit page. @@ -897,28 +911,30 @@ public function submitDuplicateDisplayAsType($form, FormStateInterface $form_sta * object emerges out of refactoring. */ public function buildOptionForm(ViewUI $view, $id, $option, $display) { + $executable = $this->executableFactory->get($view); + $option_build = array(); $option_build['#theme'] = 'views_ui_display_tab_setting'; $option_build['#description'] = $option['title']; - $option_build['#link'] = Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']); + $option_build['#link'] = $executable->displayHandlers->get($display['id'])->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']); $option_build['#links'] = array(); if (!empty($option['links']) && is_array($option['links'])) { foreach ($option['links'] as $link_id => $link_value) { - $option_build['#settings_links'][] = Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value); + $option_build['#settings_links'][] = $executable->displayHandlers->get($display['id'])->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value); } } - if (!empty(Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->options['defaults'][$id])) { + if (!empty($executable->displayHandlers->get($display['id'])->options['defaults'][$id])) { $display_id = 'default'; $option_build['#defaulted'] = TRUE; } else { $display_id = $display['id']; - if (!Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->isDefaultDisplay()) { - if (Views::executableFactory()->get($view)->displayHandlers->get($display['id'])->defaultableSections($id)) { + if (!$executable->displayHandlers->get($display['id'])->isDefaultDisplay()) { + if ($executable->displayHandlers->get($display['id'])->defaultableSections($id)) { $option_build['#overridden'] = TRUE; } } @@ -931,7 +947,7 @@ public function buildOptionForm(ViewUI $view, $id, $option, $display) { * Add information about a section to a display. */ public function getFormBucket(ViewUI $view, $type, $display) { - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->setDisplay($display['id']); $executable->initStyle(); diff --git a/core/modules/views_ui/src/ViewFormBase.php b/core/modules/views_ui/src/ViewFormBase.php index 55e9ce7..4da7f8b 100644 --- a/core/modules/views_ui/src/ViewFormBase.php +++ b/core/modules/views_ui/src/ViewFormBase.php @@ -9,7 +9,6 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Form\FormStateInterface; -use Drupal\views\Views; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -91,7 +90,7 @@ protected function prepareEntity() { * The display_id which is edited on the current request. */ public function getDisplayTabs(ViewUI $view) { - $executable = Views::executableFactory()->get($view); + $executable = $view->getExecutable(); $executable->initDisplay(); $display_id = $this->displayID; $tabs = array(); @@ -150,7 +149,7 @@ public function isDefaultDisplayShown(ViewUI $view) { $advanced_mode = \Drupal::config('views.settings')->get('ui.show.master_display'); // For other users, show the default display only if there are no others, and // hide it if there's at least one "real" display. - $additional_displays = (count(Views::executableFactory()->get($view)->displayHandlers) == 1); + $additional_displays = (count($view->getExecutable()->displayHandlers) == 1); return $advanced_mode || $additional_displays; } diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php index 8d1bcee..9338ab5 100644 --- a/core/modules/views_ui/src/ViewListBuilder.php +++ b/core/modules/views_ui/src/ViewListBuilder.php @@ -14,7 +14,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Url; -use Drupal\views\Views; +use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -32,13 +32,21 @@ class ViewListBuilder extends ConfigEntityListBuilder { protected $displayManager; /** + * The factory to load a view executable with. + * + * @var \Drupal\views\ViewExecutableFactory + */ + protected $executableFactory; + + /** * {@inheritdoc} */ public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) { return new static( $entity_type, $container->get('entity.manager')->getStorage($entity_type->id()), - $container->get('plugin.manager.views.display') + $container->get('plugin.manager.views.display'), + $container->get('views.executable') ); } @@ -51,11 +59,14 @@ public static function createInstance(ContainerInterface $container, EntityTypeI * The entity storage class. * @param \Drupal\Component\Plugin\PluginManagerInterface $display_manager * The views display plugin manager to use. + * @param \Drupal\views\ViewExecutableFactory $executable_factory + * The factory to load a view executable with. */ - public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, PluginManagerInterface $display_manager) { + public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, PluginManagerInterface $display_manager, ViewExecutableFactory $executable_factory) { parent::__construct($entity_type, $storage); $this->displayManager = $display_manager; + $this->executableFactory = $executable_factory; } /** @@ -258,7 +269,7 @@ protected function getDisplaysList(EntityInterface $view) { */ protected function getDisplayPaths(EntityInterface $view) { $all_paths = array(); - $executable = Views::executableFactory()->get($view); + $executable = $this->executableFactory->get($view); $executable->initDisplay(); foreach ($executable->displayHandlers as $display) { if ($display->hasPath()) { diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php index 67c4d78..4c82de7 100644 --- a/core/modules/views_ui/src/ViewUI.php +++ b/core/modules/views_ui/src/ViewUI.php @@ -248,7 +248,7 @@ public function standardSubmit($form, FormStateInterface $form_state) { $display_id = $form_state->get('display_id'); if ($revert) { // If it's revert just change the override and return. - $display = &Views::executableFactory()->get($this)->displayHandlers->get($display_id); + $display = &$this->getExecutable()->displayHandlers->get($display_id); $display->optionsOverride($form, $form_state); // Don't execute the normal submit handling but still store the changed view into cache. @@ -262,7 +262,7 @@ public function standardSubmit($form, FormStateInterface $form_state) { elseif ($was_defaulted && !$is_defaulted) { // We were using the default display's values, but we're now overriding // the default display and saving values specific to this display. - $display = &Views::executableFactory()->get($this)->displayHandlers->get($display_id); + $display = &$this->getExecutable()->displayHandlers->get($display_id); // optionsOverride toggles the override of this section. $display->optionsOverride($form, $form_state); $display->submitOptionsForm($form, $form_state); @@ -272,7 +272,7 @@ public function standardSubmit($form, FormStateInterface $form_state) { // to go back to the default display. // Overwrite the default display with the current form values, and make // the current display use the new default values. - $display = &Views::executableFactory()->get($this)->displayHandlers->get($display_id); + $display = &$this->getExecutable()->displayHandlers->get($display_id); // optionsOverride toggles the override of this section. $display->optionsOverride($form, $form_state); $display->submitOptionsForm($form, $form_state); @@ -470,7 +470,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) { if ($was_defaulted && !$is_defaulted) { // We were using the default display's values, but we're now overriding // the default display and saving values specific to this display. - $display = &Views::executableFactory()->get($this)->displayHandlers->get($display_id); + $display = &$this->getExecutable()->displayHandlers->get($display_id); // setOverride toggles the override of this section. $display->setOverride($section); } @@ -479,7 +479,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) { // to go back to the default display. // Overwrite the default display with the current form values, and make // the current display use the new default values. - $display = &Views::executableFactory()->get($this)->displayHandlers->get($display_id); + $display = &$this->getExecutable()->displayHandlers->get($display_id); // optionsOverride toggles the override of this section. $display->setOverride($section); } @@ -492,7 +492,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) { if ($cut = strpos($field, '$')) { $field = substr($field, 0, $cut); } - $id = Views::executableFactory()->get($this)->addHandler($display_id, $type, $table, $field); + $id = $this->getExecutable()->addHandler($display_id, $type, $table, $field); // check to see if we have group by settings $key = $type; @@ -505,7 +505,7 @@ public function submitItemAdd($form, FormStateInterface $form_state) { 'field' => $field, ); $handler = Views::handlerManager($key)->getHandler($item); - if (Views::executableFactory()->get($this)->displayHandlers->get('default')->useGroupBy() && $handler->usesGroupBy()) { + if ($this->getExecutable()->displayHandlers->get('default')->useGroupBy() && $handler->usesGroupBy()) { $this->addFormToStack('handler-group', $display_id, $type, $id); } @@ -553,7 +553,7 @@ public function renderPreview($display_id, $args = array()) { // Save the current path so it can be restored before returning from this function. $request_stack = \Drupal::requestStack(); $current_request = $request_stack->getCurrentRequest(); - $executable = Views::executableFactory()->get($this); + $executable = $this->getExecutable(); // Determine where the query and performance statistics should be output. $config = \Drupal::config('views.settings'); @@ -859,7 +859,7 @@ public function cacheSet() { // Let any future object know that this view has changed. $this->changed = TRUE; - $executable = Views::executableFactory()->get($this); + $executable = $this->getExecutable(); if (isset($executable->current_display)) { // Add the knowledge of the changed display, too. $this->changed_display[$executable->current_display] = TRUE; diff --git a/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php b/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php index e51e819..cb26b58 100644 --- a/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php +++ b/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php @@ -11,7 +11,6 @@ use Drupal\Tests\UnitTestCase; use Drupal\views\Entity\View; use Drupal\views\ViewExecutable; -use Drupal\views\Views; use Drupal\views_ui\ViewUI; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -135,7 +134,7 @@ public function testSerialization() { $view_ui = new ViewUI($storage); // Make sure the executable is returned before serializing. - $this->assertInstanceOf('Drupal\views\ViewExecutable', Views::executableFactory()->get($view_ui)); + $this->assertInstanceOf('Drupal\views\ViewExecutable', $view_ui->getExecutable()); $serialized = serialize($view_ui);