Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1876942 by damiankloip, dawehner, tim.plunkett: Use direct methods instead of arrayAccess for display handlers.

8.0.x
catch 2013-01-15 16:34:32 +00:00
parent c1a725406d
commit d049222620
52 changed files with 222 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
core/lib/Drupal/Component/Plugin/PluginBag.php
View File

@ -13,7 +13,7 @@ namespace Drupal\Component\Plugin;
* The \ArrayAccess implementation is only for backwards compatibility, it is
* deprecated and should not be used by new code.
*/
abstract class PluginBag implements \ArrayAccess, \Iterator, \Countable {
abstract class PluginBag implements \Iterator, \Countable {
/**
* Stores all instantiated plugins.
@ -63,7 +63,7 @@ abstract class PluginBag implements \ArrayAccess, \Iterator, \Countable {
* @param string $instance_id
* The ID of the plugin instance being retrieved.
*/
public function get($instance_id) {
public function &get($instance_id) {
if (!isset($this->pluginInstances[$instance_id])) {
$this->initializePlugin($instance_id);
}
@ -124,50 +124,11 @@ abstract class PluginBag implements \ArrayAccess, \Iterator, \Countable {
$this->instanceIDs = $instance_ids;
}
/**
* Implements \ArrayAccess::offsetExists().
*
* This is deprecated, use \Drupal\Component\Plugin\PluginBag::has().
*/
public function offsetExists($offset) {
return isset($this->pluginInstances[$offset]) || isset($this->instanceIDs[$offset]);
}
/**
* Implements \ArrayAccess::offsetGet().
*
* This is deprecated, use \Drupal\Component\Plugin\PluginBag::get().
*/
public function offsetGet($offset) {
if (!isset($this->pluginInstances[$offset])) {
$this->initializePlugin($offset);
}
return $this->pluginInstances[$offset];
}
/**
* Implements \ArrayAccess::offsetSet().
*
* This is deprecated, use \Drupal\Component\Plugin\PluginBag::set().
*/
public function offsetSet($offset, $value) {
$this->pluginInstances[$offset] = $value;
}
/**
* Implements \ArrayAccess::offsetUnset().
*
* This is deprecated, use \Drupal\Component\Plugin\PluginBag::remove().
*/
public function offsetUnset($offset) {
unset($this->pluginInstances[$offset]);
}
/**
* Implements \Iterator::current().
*/
public function current() {
return $this->offsetGet($this->key());
return $this->get($this->key());
}
/**

38
core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
View File

@ -114,8 +114,8 @@ class HandlerFieldFieldTest extends FieldTestBase {
public function _testFormatterSimpleFieldRender() {
$view = views_get_view('test_view_fieldapi');
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$this->fields[0]['field_name']]['type'] = 'text_trimmed';
$view->displayHandlers['default']->options['fields'][$this->fields[0]['field_name']]['settings'] = array(
$view->displayHandlers->get('default')->options['fields'][$this->fields[0]['field_name']]['type'] = 'text_trimmed';
$view->displayHandlers->get('default')->options['fields'][$this->fields[0]['field_name']]['settings'] = array(
'trim_length' => 3,
);
$this->executeView($view);
@ -134,8 +134,8 @@ class HandlerFieldFieldTest extends FieldTestBase {
// Test delta limit.
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers->get('default')->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_limit'] = 3;
$this->executeView($view);
for ($i = 0; $i < 3; $i++) {
@ -156,9 +156,9 @@ class HandlerFieldFieldTest extends FieldTestBase {
// Test delta limit + offset
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_offset'] = 1;
$view->displayHandlers->get('default')->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_offset'] = 1;
$this->executeView($view);
for ($i = 0; $i < 3; $i++) {
@ -175,10 +175,10 @@ class HandlerFieldFieldTest extends FieldTestBase {
// Test delta limit + reverse.
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$field_name]['delta_offset'] = 0;
$view->displayHandlers['default']->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_reversed'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_offset'] = 0;
$view->displayHandlers->get('default')->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_reversed'] = TRUE;
$this->executeView($view);
for ($i = 0; $i < 3; $i++) {
@ -196,10 +196,10 @@ class HandlerFieldFieldTest extends FieldTestBase {
// Test delta first last.
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_limit'] = 0;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_first_last'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_reversed'] = FALSE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_limit'] = 0;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_first_last'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_reversed'] = FALSE;
$this->executeView($view);
for ($i = 0; $i < 3; $i++) {
@ -214,10 +214,10 @@ class HandlerFieldFieldTest extends FieldTestBase {
// Test delta limit + custom seperator.
$this->prepareView($view);
$view->displayHandlers['default']->options['fields'][$field_name]['delta_first_last'] = FALSE;
$view->displayHandlers['default']->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers['default']->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers['default']->options['fields'][$field_name]['separator'] = ':';
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_first_last'] = FALSE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['delta_limit'] = 3;
$view->displayHandlers->get('default')->options['fields'][$field_name]['group_rows'] = TRUE;
$view->displayHandlers->get('default')->options['fields'][$field_name]['separator'] = ':';
$this->executeView($view);
for ($i = 0; $i < 3; $i++) {

2
core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php
View File

@ -38,7 +38,7 @@ class ArgumentLanguageTest extends LanguageTestBase {
$view = views_get_view('test_view');
foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('arguments', array(
$view->displayHandlers->get('default')->overrideOption('arguments', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test_data',

2
core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php
View File

@ -37,7 +37,7 @@ class FieldLanguageTest extends LanguageTestBase {
public function testField() {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test_data',

2
core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php
View File

@ -38,7 +38,7 @@ class FilterLanguageTest extends LanguageTestBase {
$view = views_get_view('test_view');
foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test_data',

18
core/modules/system/lib/Drupal/system/Tests/Plugin/PluginBagTest.php
View File

@ -36,33 +36,21 @@ class PluginBagTest extends PluginTestBase {
$first_instance_id = key($definitions);
foreach ($definitions as $instance_id => $definition) {
$this->assertTrue(isset($plugin_bag[$instance_id]), format_string('Plugin instance @instance_id exits on the bag', array('@instance_id' => $instance_id)));
$this->assertTrue($plugin_bag->has($instance_id), format_string('Plugin instance @instance_id exits on the bag', array('@instance_id' => $instance_id)));
$this->assertTrue($plugin_bag[$instance_id] instanceof $definition['class'], 'Getting the plugin from the bag worked.');
$this->assertTrue($plugin_bag->get($instance_id) instanceof $definition['class'], 'Getting the plugin from the bag worked.');
}
// A non existing instance_id shouldn't exist on the bag.
$random_name = $this->randomName();
$random_name_2 = $this->randomName();
$this->assertFalse(isset($plugin_bag[$random_name]), 'A random instance_id should not exist on the plugin bag.');
$this->assertFalse($plugin_bag->has($random_name_2), 'A random instance_id should not exist on the plugin bag.');
$this->assertFalse($plugin_bag->has($random_name), 'A random instance_id should not exist on the plugin bag.');
// Set a new plugin instance to the bag, to test offsetSet.
$plugin_bag[$random_name] = $this->mockBlockManager->createInstance($first_instance_id, array());
$plugin_bag->set($random_name_2, $this->mockBlockManager->createInstance($first_instance_id, array()));
$this->assertTrue(isset($plugin_bag[$random_name]), 'A random instance_id should exist after manual setting on the plugin bag.');
$this->assertTrue(isset($plugin_bag[$random_name_2]), 'A random instance_id should exist after manual setting on the plugin bag.');
$plugin_bag->set($random_name, $this->mockBlockManager->createInstance($first_instance_id, array()));
$this->assertTrue($plugin_bag->has($random_name), 'A random instance_id should exist after manual setting on the plugin bag.');
$this->assertTrue($plugin_bag->has($random_name_2), 'A random instance_id should exist after manual setting on the plugin bag.');
// Remove the previous added element and check whether it still exists.
unset($plugin_bag[$random_name]);
$plugin_bag->remove($random_name_2);
$this->assertFalse(isset($plugin_bag[$random_name]), 'A random instance_id should not exist on the plugin bag after removing.');
$this->assertFalse(isset($plugin_bag[$random_name_2]), 'A random instance_id should not exist on the plugin bag after removing.');
$plugin_bag->remove($random_name);
$this->assertFalse($plugin_bag->has($random_name), 'A random instance_id should not exist on the plugin bag after removing.');
$this->assertFalse($plugin_bag->has($random_name_2), 'A random instance_id should not exist on the plugin bag after removing.');
// Test that iterating over the plugins work.
$expected_instance_ids = array_keys($definitions);

2
core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php
View File

@ -38,7 +38,7 @@ class AccessRoleTest extends AccessTestBase {
$view = views_get_view('test_access_role');
$view->setDisplay();
$view->displayHandlers['default']->options['access']['options']['role'] = array(
$view->displayHandlers->get('default')->options['access']['options']['role'] = array(
$this->normalRole => $this->normalRole,
);

2
core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
View File

@ -85,7 +85,7 @@ class ArgumentValidateTest extends UserTestBase {
function view_argument_validate_user($argtype) {
$view = views_get_view('test_view_argument_validate_user');
$view->setDisplay();
$view->displayHandlers['default']->options['arguments']['null']['validate_options']['type'] = $argtype;
$view->displayHandlers->get('default')->options['arguments']['null']['validate_options']['type'] = $argtype;
$view->preExecute();
$view->initHandlers();

2
core/modules/views/includes/ajax.inc
View File

@ -69,7 +69,7 @@ function views_ajax() {
// Override the display's pager_element with the one actually used.
if (isset($pager_element)) {
$commands[] = views_ajax_command_scroll_top('.view-dom-id-' . $dom_id);
$view->displayHandlers[$display_id]->setOption('pager_element', $pager_element);
$view->displayHandlers->get($display_id)->setOption('pager_element', $pager_element);
}
// Reuse the same DOM id so it matches that in Drupal.settings.
$view->dom_id = $dom_id;

2
core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
View File

@ -324,7 +324,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
$executable = $this->get('executable');
$executable->initDisplay();
$executable->displayHandlers->addInstanceID($id);
return $executable->displayHandlers[$id];
return $executable->displayHandlers->get($id);
}
return $id;

6
core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php
View File

@ -195,7 +195,7 @@ class Attachment extends DisplayPluginBase {
$form['#title'] .= t('Attach to');
$displays = array();
foreach ($this->view->storage->get('display') as $display_id => $display) {
if (!empty($this->view->displayHandlers[$display_id]) && $this->view->displayHandlers[$display_id]->acceptAttachments()) {
if ($this->view->displayHandlers->has($display_id) && $this->view->displayHandlers->get($display_id)->acceptAttachments()) {
$displays[$display_id] = $display['display_title'];
}
}
@ -246,8 +246,8 @@ class Attachment extends DisplayPluginBase {
$view->setArguments($args);
$view->setDisplay($this->display['id']);
if ($this->getOption('inherit_pager')) {
$view->display_handler->usesPager = $this->view->displayHandlers[$display_id]->usesPager();
$view->display_handler->setOption('pager', $this->view->displayHandlers[$display_id]->getOption('pager'));
$view->display_handler->usesPager = $this->view->displayHandlers->get($display_id)->usesPager();
$view->display_handler->setOption('pager', $this->view->displayHandlers->get($display_id)->getOption('pager'));
}
$attachment = $view->executeDisplay($this->display['id'], $args);

8
core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
View File

@ -708,7 +708,7 @@ abstract class DisplayPluginBase extends PluginBase {
public function getLinkDisplay() {
$display_id = $this->getOption('link_display');
// If unknown, pick the first one.
if (empty($display_id) || empty($this->view->displayHandlers[$display_id])) {
if (empty($display_id) || !$this->view->displayHandlers->has($display_id)) {
foreach ($this->view->displayHandlers as $display_id => $display) {
if (!empty($display) && $display->hasPath()) {
return $display_id;
@ -733,8 +733,8 @@ abstract class DisplayPluginBase extends PluginBase {
}
$display_id = $this->getLinkDisplay();
if ($display_id && !empty($this->view->displayHandlers[$display_id]) && is_object($this->view->displayHandlers[$display_id])) {
return $this->view->displayHandlers[$display_id]->getPath();
if ($display_id && $this->view->displayHandlers->has($display_id) && is_object($this->view->displayHandlers->get($display_id))) {
return $this->view->displayHandlers->get($display_id)->getPath();
}
}
@ -1655,7 +1655,7 @@ abstract class DisplayPluginBase extends PluginBase {
case 'link_display':
$form['#title'] .= t('Which display to use for path');
foreach ($this->view->storage->get('display') as $display_id => $display) {
if ($this->view->displayHandlers[$display_id]->hasPath()) {
if ($this->view->displayHandlers->get($display_id)->hasPath()) {
$options[$display_id] = $display['display_title'];
}
}

2
core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
View File

@ -213,7 +213,7 @@ class Feed extends PathPluginBase {
$displays = array();
foreach ($this->view->storage->get('display') as $display_id => $display) {
// @todo The display plugin should have display_title and id as well.
if (!empty($this->view->displayHandlers[$display_id]) && $this->view->displayHandlers[$display_id]->acceptAttachments()) {
if ($this->view->displayHandlers->has($display_id) && $this->view->displayHandlers->get($display_id)->acceptAttachments()) {
$displays[$display_id] = $display['display_title'];
}
}

2
core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php
View File

@ -33,7 +33,7 @@ class Rss extends StylePluginBase {
protected $usesRowPlugin = TRUE;
function attach_to($display_id, $path, $title) {
$display = $this->view->displayHandlers[$display_id];
$display = $this->view->displayHandlers->get($display_id);
$url_options = array();
$input = $this->view->getExposedInput();
if ($input) {

2
core/modules/views/lib/Drupal/views/Tests/BasicTest.php
View File

@ -53,7 +53,7 @@ class BasicTest extends ViewUnitTestBase {
$view->setDisplay();
// Add a filter.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'operator' => '<',
'value' => array(

2
core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
View File

@ -161,7 +161,7 @@ class AreaTest extends HandlerTestBase {
$view->initDisplay('page_1');
// Add the title area handler to the empty area.
$view->displayHandlers['page_1']->overrideOption('empty', array(
$view->displayHandlers->get('page_1')->overrideOption('empty', array(
'title' => array(
'id' => 'title',
'table' => 'views',

2
core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
View File

@ -44,7 +44,7 @@ class AreaTextTest extends ViewUnitTestBase {
// add a text header
$string = $this->randomName();
$view->displayHandlers['default']->overrideOption('header', array(
$view->displayHandlers->get('default')->overrideOption('header', array(
'area' => array(
'id' => 'area',
'table' => 'views',

4
core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
View File

@ -43,7 +43,7 @@ class ArgumentNullTest extends ViewUnitTestBase {
// Add a null argument.
$string = $this->randomString();
$view->displayHandlers['default']->overrideOption('arguments', array(
$view->displayHandlers->get('default')->overrideOption('arguments', array(
'null' => array(
'id' => 'null',
'table' => 'views',
@ -69,7 +69,7 @@ class ArgumentNullTest extends ViewUnitTestBase {
// Add a argument, which has null as handler.
$string = $this->randomString();
$view->displayHandlers['default']->overrideOption('arguments', array(
$view->displayHandlers->get('default')->overrideOption('arguments', array(
'id' => array(
'id' => 'id',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
View File

@ -47,7 +47,7 @@ class FieldBooleanTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',

4
core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
View File

@ -38,7 +38,7 @@ class FieldCounterTest extends ViewUnitTestBase {
function testSimple() {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'counter' => array(
'id' => 'counter',
'table' => 'views',
@ -64,7 +64,7 @@ class FieldCounterTest extends ViewUnitTestBase {
$view->setDisplay();
$rand_start = rand(5, 10);
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'counter' => array(
'id' => 'counter',
'table' => 'views',

2
core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
View File

@ -41,7 +41,7 @@ class FieldCustomTest extends ViewUnitTestBase {
// Alter the text of the field to a random string.
$random = $this->randomName();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php
View File

@ -39,7 +39,7 @@ class FieldDateTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'created' => array(
'id' => 'created',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
View File

@ -52,7 +52,7 @@ class FieldFileSizeTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',

4
core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
View File

@ -44,7 +44,7 @@ class FieldUrlTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -62,7 +62,7 @@ class FieldUrlTest extends ViewUnitTestBase {
$view->destroy();
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php
View File

@ -53,7 +53,7 @@ class FieldXssTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',

6
core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
View File

@ -38,8 +38,8 @@ class FilterCombineTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$fields = $view->displayHandlers['default']->getOption('fields');
$view->displayHandlers['default']->overrideOption('fields', $fields + array(
$fields = $view->displayHandlers->get('default')->getOption('fields');
$view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
'job' => array(
'id' => 'job',
'table' => 'views_test_data',
@ -49,7 +49,7 @@ class FilterCombineTest extends ViewUnitTestBase {
));
// Change the filtering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'combine',
'table' => 'views',

8
core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
View File

@ -50,7 +50,7 @@ class FilterEqualityTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -78,7 +78,7 @@ class FilterEqualityTest extends ViewUnitTestBase {
// Filter: Name, Operator: =, Value: Ringo
$filters['name']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -94,7 +94,7 @@ class FilterEqualityTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -131,7 +131,7 @@ class FilterEqualityTest extends ViewUnitTestBase {
// Filter: Name, Operator: !=, Value: Ringo
$filters['name']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(

8
core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
View File

@ -51,7 +51,7 @@ class FilterInOperatorTest extends ViewUnitTestBase {
$view->setDisplay();
// Add a in_operator ordering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'field' => 'age',
@ -81,7 +81,7 @@ class FilterInOperatorTest extends ViewUnitTestBase {
$view->setDisplay();
// Add a in_operator ordering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'field' => 'age',
@ -119,7 +119,7 @@ class FilterInOperatorTest extends ViewUnitTestBase {
// Filter: Age, Operator: in, Value: 26, 30
$filters['age']['group_info']['default_group'] = 1;
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('filters', $filters);
$view->displayHandlers->get('default')->overrideOption('filters', $filters);
$this->executeView($view);
@ -145,7 +145,7 @@ class FilterInOperatorTest extends ViewUnitTestBase {
// Filter: Age, Operator: in, Value: 26, 30
$filters['age']['group_info']['default_group'] = 2;
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('filters', $filters);
$view->displayHandlers->get('default')->overrideOption('filters', $filters);
$this->executeView($view);

22
core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
View File

@ -53,7 +53,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',
@ -82,7 +82,7 @@ class FilterNumericTest extends ViewUnitTestBase {
// Filter: Age, Operator: =, Value: 28
$filters['age']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -99,7 +99,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',
@ -135,7 +135,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',
@ -175,7 +175,7 @@ class FilterNumericTest extends ViewUnitTestBase {
// Filter: Age, Operator: between, Value: 26 and 29
$filters['age']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -203,7 +203,7 @@ class FilterNumericTest extends ViewUnitTestBase {
// Filter: Age, Operator: between, Value: 26 and 29
$filters['age']['group_info']['default_group'] = 3;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -228,7 +228,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',
@ -247,7 +247,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test_data',
@ -291,7 +291,7 @@ class FilterNumericTest extends ViewUnitTestBase {
// Filter: Age, Operator: empty, Value:
$filters['age']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -307,7 +307,7 @@ class FilterNumericTest extends ViewUnitTestBase {
// Filter: Age, Operator: empty, Value:
$filters['age']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -339,7 +339,7 @@ class FilterNumericTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'id' => array(
'id' => 'id',
'table' => 'views_test_data',

52
core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php
View File

@ -95,7 +95,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -122,7 +122,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: =, Value: Ringo
$filters['name']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -140,7 +140,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -177,7 +177,7 @@ class FilterStringTest extends ViewUnitTestBase {
$filters['name']['group_info']['default_group'] = '2';
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -204,7 +204,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -232,7 +232,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: contains, Value: ing
$filters['name']['group_info']['default_group'] = '3';
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -251,7 +251,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -278,7 +278,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -306,7 +306,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: contains, Value: ing
$filters['name']['group_info']['default_group'] = '3';
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -325,7 +325,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Description, Operator: contains, Value: actor
$filters['description']['group_info']['default_group'] = '1';
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -344,7 +344,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -371,7 +371,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: starts, Value: George
$filters['description']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -388,7 +388,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -422,7 +422,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: not_starts, Value: George
$filters['description']['group_info']['default_group'] = 3;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -446,7 +446,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -476,7 +476,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Descriptino, Operator: ends, Value: Beatles
$filters['description']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -496,7 +496,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -527,7 +527,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Description, Operator: not_ends, Value: Beatles
$filters['description']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -548,7 +548,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -580,7 +580,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Description, Operator: not (does not contains), Value: Beatles
$filters['description']['group_info']['default_group'] = 6;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
@ -602,7 +602,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -632,7 +632,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: shorterthan, Value: 5
$filters['name']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -651,7 +651,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -678,7 +678,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Name, Operator: longerthan, Value: 4
$filters['name']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@ -695,7 +695,7 @@ class FilterStringTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the filtering
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test_data',
@ -721,7 +721,7 @@ class FilterStringTest extends ViewUnitTestBase {
// Filter: Description, Operator: empty, Value:
$filters['description']['group_info']['default_group'] = 7;
$view->setDisplay('page_1');
$view->displayHandlers['page_1']->overrideOption('filters', $filters);
$view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(

2
core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php
View File

@ -53,7 +53,7 @@ class HandlerAliasTest extends ViewUnitTestBase {
$view->initDisplay();
// Change the filtering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
'table' => 'views_test_data_alias',

8
core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php
View File

@ -102,7 +102,7 @@ class RelationshipTest extends ViewUnitTestBase {
$view = views_get_view('test_view');
$view->setDisplay();
$view->displayHandlers['default']->overrideOption('relationships', array(
$view->displayHandlers->get('default')->overrideOption('relationships', array(
'uid' => array(
'id' => 'uid',
'table' => 'views_test_data',
@ -110,7 +110,7 @@ class RelationshipTest extends ViewUnitTestBase {
),
));
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'uid' => array(
'id' => 'uid',
'table' => 'users',
@ -119,8 +119,8 @@ class RelationshipTest extends ViewUnitTestBase {
),
));
$fields = $view->displayHandlers['default']->getOption('fields');
$view->displayHandlers['default']->overrideOption('fields', $fields + array(
$fields = $view->displayHandlers->get('default')->getOption('fields');
$view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
'uid' => array(
'id' => 'uid',
'table' => 'users',

4
core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php
View File

@ -161,7 +161,7 @@ class SortDateTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the fields.
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -177,7 +177,7 @@ class SortDateTest extends ViewUnitTestBase {
));
// Change the ordering
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'created' => array(
'id' => 'created',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php
View File

@ -53,7 +53,7 @@ class SortRandomTest extends ViewUnitTestBase {
$view->setDisplay();
// Add a random ordering.
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'random' => array(
'id' => 'random',
'field' => 'random',

8
core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php
View File

@ -37,7 +37,7 @@ class SortTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the ordering
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'age' => array(
'order' => 'ASC',
'id' => 'age',
@ -61,7 +61,7 @@ class SortTest extends ViewUnitTestBase {
$view->setDisplay();
// Reverse the ordering
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'age' => array(
'order' => 'DESC',
'id' => 'age',
@ -90,7 +90,7 @@ class SortTest extends ViewUnitTestBase {
$view->setDisplay();
// Change the ordering
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'name' => array(
'order' => 'ASC',
'id' => 'name',
@ -114,7 +114,7 @@ class SortTest extends ViewUnitTestBase {
$view->setDisplay();
// Reverse the ordering
$view->displayHandlers['default']->overrideOption('sorts', array(
$view->displayHandlers->get('default')->overrideOption('sorts', array(
'name' => array(
'order' => 'DESC',
'id' => 'name',

2
core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
View File

@ -33,7 +33,7 @@ class ArgumentValidatorTest extends ViewUnitTestBase {
$string = $this->randomName();
$view = views_get_view('test_view_argument_validate_php');
$view->setDisplay();
$view->displayHandlers['default']->options['arguments']['null']['validate_options']['code'] = 'return $argument == \''. $string .'\';';
$view->displayHandlers->get('default')->options['arguments']['null']['validate_options']['code'] = 'return $argument == \''. $string .'\';';
$view->initHandlers();
$this->assertTrue($view->argument['null']->validateArgument($string));

6
core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
View File

@ -122,9 +122,9 @@ class DisplayTest extends PluginTestBase {
$view->initDisplay();
// mark is as overridden, yes FALSE, means overridden.
$view->displayHandlers['page']->setOverride('filter_groups', FALSE);
$this->assertFalse($view->displayHandlers['page']->isDefaulted('filter_groups'), "Take sure that 'filter_groups' is marked as overridden.");
$this->assertFalse($view->displayHandlers['page']->isDefaulted('filters'), "Take sure that 'filters'' is marked as overridden.");
$view->displayHandlers->get('page')->setOverride('filter_groups', FALSE);
$this->assertFalse($view->displayHandlers->get('page')->isDefaulted('filter_groups'), "Take sure that 'filter_groups' is marked as overridden.");
$this->assertFalse($view->displayHandlers->get('page')->isDefaulted('filters'), "Take sure that 'filters'' is marked as overridden.");
}
/**

6
core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
View File

@ -66,7 +66,7 @@ class FilterTest extends PluginTestBase {
$view->initDisplay();
// Change the filtering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
'table' => 'views_test_data',
@ -102,7 +102,7 @@ class FilterTest extends PluginTestBase {
$view->initDisplay();
// Change the filtering.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
'table' => 'views_test_data',
@ -128,7 +128,7 @@ class FilterTest extends PluginTestBase {
// Set the test_enable option to FALSE. The 'where' clause should not be
// added to the query.
$view->displayHandlers['default']->overrideOption('filters', array(
$view->displayHandlers->get('default')->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
View File

@ -43,7 +43,7 @@ class StyleMappingTest extends StyleTestBase {
$view->destroy();
$view->setDisplay();
$view->displayHandlers['default']->options['style']['options']['mapping']['name_field'] = 'job';
$view->displayHandlers->get('default')->options['style']['options']['mapping']['name_field'] = 'job';
$output = $this->mappedOutputHelper($view);
$this->assertTrue(strpos($output, 'job') !== FALSE, 'The job field is added to the view and is in the mapping.');
}

8
core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
View File

@ -101,13 +101,13 @@ class StyleTest extends ViewTestBase {
// Reduce the amount of items to make the test a bit easier.
// Set up the pager.
$view->displayHandlers['default']->overrideOption('pager', array(
$view->displayHandlers->get('default')->overrideOption('pager', array(
'type' => 'some',
'options' => array('items_per_page' => 3),
));
// Add the job field .
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',
@ -200,13 +200,13 @@ class StyleTest extends ViewTestBase {
// Reduce the amount of items to make the test a bit easier.
// Set up the pager.
$view->displayHandlers['default']->overrideOption('pager', array(
$view->displayHandlers->get('default')->overrideOption('pager', array(
'type' => 'some',
'options' => array('items_per_page' => 3),
));
// Add the job and age field.
$view->displayHandlers['default']->overrideOption('fields', array(
$view->displayHandlers->get('default')->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test_data',

2
core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
View File

@ -95,7 +95,7 @@ class QueryGroupByTest extends ViewTestBase {
$view = views_get_view('test_group_by_count');
$view->setDisplay();
$view->displayHandlers['default']->options['fields']['nid']['group_type'] = $group_by;
$view->displayHandlers->get('default')->options['fields']['nid']['group_type'] = $group_by;
$this->executeView($view);
$this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');

2
core/modules/views/lib/Drupal/views/Tests/UI/DisplayAttachmentTest.php
View File

@ -48,6 +48,6 @@ class DisplayAttachmentTest extends UITestBase {
$view = views_get_view('test_attachment_ui');
$view->initDisplay();
$this->assertEqual(array_keys($view->displayHandlers['attachment_1']->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected');
$this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected');
}
}

2
core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php
View File

@ -84,7 +84,7 @@ class ViewElementTest extends ViewTestBase {
$this->assertEqual(count($xpath), 5);
// Add an argument and save the view.
$view->displayHandlers['default']->overrideOption('arguments', array(
$view->displayHandlers->get('default')->overrideOption('arguments', array(
'age' => array(
'default_action' => 'ignore',
'style_plugin' => 'default_summary',

34
core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
View File

@ -90,7 +90,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
$view->initDisplay();
$this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
$this->assertTrue($view->displayHandlers['default'] instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
$this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
$view->destroy();
$view->initHandlers();
@ -107,7 +107,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
// initHandlers() should create display handlers automatically as well.
$this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
$this->assertTrue($view->displayHandlers['default'] instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
$this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
$view_hash = spl_object_hash($view);
$display_hash = spl_object_hash($view->display_handler);
@ -154,35 +154,35 @@ class ViewExecutableTest extends ViewUnitTestBase {
$view->initDisplay();
$this->assertTrue($view->displayHandlers instanceof DisplayBag, 'The displayHandlers property has the right class.');
// Tests the classes of the instances.
$this->assertTrue($view->displayHandlers['default'] instanceof DefaultDisplay);
$this->assertTrue($view->displayHandlers['page_1'] instanceof Page);
$this->assertTrue($view->displayHandlers['page_2'] instanceof Page);
$this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay);
$this->assertTrue($view->displayHandlers->get('page_1') instanceof Page);
$this->assertTrue($view->displayHandlers->get('page_2') instanceof Page);
// After initializing the default display is the current used display.
$this->assertEqual($view->current_display, 'default');
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers['default']));
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
// All handlers should have a reference to the default display.
$this->assertEqual(spl_object_hash($view->displayHandlers['page_1']->default_display), spl_object_hash($view->displayHandlers['default']));
$this->assertEqual(spl_object_hash($view->displayHandlers['page_2']->default_display), spl_object_hash($view->displayHandlers['default']));
$this->assertEqual(spl_object_hash($view->displayHandlers->get('page_1')->default_display), spl_object_hash($view->displayHandlers->get('default')));
$this->assertEqual(spl_object_hash($view->displayHandlers->get('page_2')->default_display), spl_object_hash($view->displayHandlers->get('default')));
// Tests Drupal\views\ViewExecutable::setDisplay().
$view->setDisplay();
$this->assertEqual($view->current_display, 'default', 'If setDisplay is called with no parameter the default display should be used.');
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers['default']));
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
// Set two different valid displays.
$view->setDisplay('page_1');
$this->assertEqual($view->current_display, 'page_1', 'If setDisplay is called with a valid display id the appropriate display should be used.');
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers['page_1']));
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_1')));
$view->setDisplay('page_2');
$this->assertEqual($view->current_display, 'page_2', 'If setDisplay is called with a valid display id the appropriate display should be used.');
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers['page_2']));
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_2')));
$view->setDisplay('invalid');
$this->assertEqual($view->current_display, 'default', 'If setDisplay is called with an invalid display id the default display should be used.');
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers['default']));
$this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
}
/**
@ -201,7 +201,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
$this->assertNull($view->usePager());
// Add a pager, initialize, and test.
$view->displayHandlers['default']->overrideOption('pager', array(
$view->displayHandlers->get('default')->overrideOption('pager', array(
'type' => 'full',
'options' => array('items_per_page' => 10),
));
@ -233,7 +233,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
// Test the getPath() method.
$path = $this->randomName();
$view->displayHandlers['page_1']->overrideOption('path', $path);
$view->displayHandlers->get('page_1')->overrideOption('path', $path);
$view->setDisplay('page_1');
$this->assertEqual($view->getPath(), $path);
// Test the override_path property override.
@ -277,9 +277,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
* @param \Drupal\views\ViewExecutable $view
*/
protected function assertViewDestroy($view) {
$this->assertFalse(isset($view->displayHandlers['default']), 'Make sure all displays are destroyed.');
$this->assertFalse(isset($view->displayHandlers['attachment_1']), 'Make sure all displays are destroyed.');
$this->assertFalse(isset($view->displayHandlers), 'Make sure all displays are destroyed');
$this->assertFalse(isset($view->filter), 'Make sure all filter handlers are destroyed');
$this->assertFalse(isset($view->field), 'Make sure all field handlers are destroyed');
$this->assertFalse(isset($view->argument), 'Make sure all argument handlers are destroyed');
@ -341,7 +339,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
$this->assertEqual(count($view->displayHandlers), $count, 'Error messages from all handlers merged.');
// Test that a deleted display is not included.
$view->displayHandlers['default']->deleted = TRUE;
$view->displayHandlers->get('default')->deleted = TRUE;
$validate_deleted = $view->validate();
$this->assertNotEqual(count($validate), count($validate_deleted));

14
core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
View File

@ -179,7 +179,7 @@ class ViewStorageTest extends ViewUnitTestBase {
$executable = $view->get('executable');
$executable->initDisplay();
$this->assertTrue($executable->displayHandlers[$new_id] instanceof Page, 'New page display "test" uses the right display plugin.');
$this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
$view->set('name', 'test_view_storage_new_new2');
$view->save();
@ -297,12 +297,12 @@ class ViewStorageTest extends ViewUnitTestBase {
$executable = $view->get('executable');
$executable->initDisplay();
$this->assertTrue($executable->displayHandlers['page_1'] instanceof Page);
$this->assertTrue($executable->displayHandlers['page_1']->default_display instanceof DefaultDisplay);
$this->assertTrue($executable->displayHandlers['page_2'] instanceof Page);
$this->assertTrue($executable->displayHandlers['page_2']->default_display instanceof DefaultDisplay);
$this->assertTrue($executable->displayHandlers['feed_1'] instanceof Feed);
$this->assertTrue($executable->displayHandlers['feed_1']->default_display instanceof DefaultDisplay);
$this->assertTrue($executable->displayHandlers->get('page_1') instanceof Page);
$this->assertTrue($executable->displayHandlers->get('page_1')->default_display instanceof DefaultDisplay);
$this->assertTrue($executable->displayHandlers->get('page_2') instanceof Page);
$this->assertTrue($executable->displayHandlers->get('page_2')->default_display instanceof DefaultDisplay);
$this->assertTrue($executable->displayHandlers->get('feed_1') instanceof Feed);
$this->assertTrue($executable->displayHandlers->get('feed_1')->default_display instanceof DefaultDisplay);
// Tests item related methods().
$view = $this->controller->create(array('base_table' => 'views_test_data'));

37
core/modules/views/lib/Drupal/views/ViewExecutable.php
View File

@ -592,7 +592,7 @@ class ViewExecutable {
$this->displayHandlers = new DisplayBag($this, drupal_container()->get('plugin.manager.views.display'));
$this->current_display = 'default';
$this->display_handler = $this->displayHandlers['default'];
$this->display_handler = $this->displayHandlers->get('default');
return TRUE;
}
@ -614,7 +614,7 @@ class ViewExecutable {
$this->initDisplay();
foreach ($displays as $display_id) {
if ($this->displayHandlers[$display_id]->access()) {
if ($this->displayHandlers->get($display_id)->access()) {
return $display_id;
}
}
@ -648,9 +648,9 @@ class ViewExecutable {
}
// Ensure the requested display exists.
if (empty($this->displayHandlers[$display_id])) {
if (!$this->displayHandlers->has($display_id)) {
$display_id = 'default';
if (empty($this->displayHandlers[$display_id])) {
if (!$this->displayHandlers->has($display_id)) {
debug(format_string('set_display() called with invalid display ID @display.', array('@display' => $display_id)));
return FALSE;
}
@ -660,12 +660,12 @@ class ViewExecutable {
$this->current_display = $display_id;
// Ensure requested display has a working handler.
if (empty($this->displayHandlers[$display_id])) {
if (!$this->displayHandlers->has($display_id)) {
return FALSE;
}
// Set a shortcut
$this->display_handler = $this->displayHandlers[$display_id];
$this->display_handler = $this->displayHandlers->get($display_id);
return TRUE;
}
@ -1450,7 +1450,7 @@ class ViewExecutable {
foreach ($this->display_handler->getAttachedDisplays() as $id) {
// Create a clone for the attachments to manipulate. 'static' refers to the current class name.
$cloned_view = new static($this->storage);
$this->displayHandlers[$id]->attachTo($cloned_view, $this->current_display);
$this->displayHandlers->get($id)->attachTo($cloned_view, $this->current_display);
}
$this->is_attachment = FALSE;
}
@ -1499,8 +1499,8 @@ class ViewExecutable {
// calls this one.
$displays = (array)$displays;
foreach ($displays as $display_id) {
if (!empty($this->displayHandlers[$display_id])) {
if ($this->displayHandlers[$display_id]->access($account)) {
if ($this->displayHandlers->has($display_id)) {
if ($this->displayHandlers->get($display_id)->access($account)) {
return TRUE;
}
}
@ -1824,7 +1824,7 @@ class ViewExecutable {
continue;
}
$result = $this->displayHandlers[$id]->validate();
$result = $this->displayHandlers->get($id)->validate();
if (!empty($result) && is_array($result)) {
$errors = array_merge($errors, $result);
// Mark this display as having validation errors.
@ -1978,7 +1978,7 @@ class ViewExecutable {
$types = $this::viewsHandlerTypes();
$this->setDisplay($display_id);
$fields = $this->displayHandlers[$display_id]->getOption($types[$type]['plural']);
$fields = $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
if (empty($id)) {
$id = $this->generateItemId($field, $fields);
@ -1996,7 +1996,7 @@ class ViewExecutable {
'field' => $field,
) + $options;
$this->displayHandlers[$display_id]->setOption($types[$type]['plural'], $fields);
$this->displayHandlers->get($display_id)->setOption($types[$type]['plural'], $fields);
return $id;
}
@ -2048,7 +2048,7 @@ class ViewExecutable {
// Get info about the types so we can get the right data.
$types = static::viewsHandlerTypes();
return $this->displayHandlers[$display_id]->getOption($types[$type]['plural']);
return $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
}
/**
@ -2072,7 +2072,7 @@ class ViewExecutable {
$this->setDisplay($display_id);
// Get the existing configuration
$fields = $this->displayHandlers[$display_id]->getOption($types[$type]['plural']);
$fields = $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
return isset($fields[$id]) ? $fields[$id] : NULL;
}
@ -2107,13 +2107,13 @@ class ViewExecutable {
$this->setDisplay($display_id);
// Get the existing configuration.
$fields = $this->displayHandlers[$display_id]->getOption($types[$type]['plural']);
$fields = $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
if (isset($item)) {
$fields[$id] = $item;
}
// Store.
$this->displayHandlers[$display_id]->setOption($types[$type]['plural'], $fields);
$this->displayHandlers->get($display_id)->setOption($types[$type]['plural'], $fields);
}
/**
@ -2133,12 +2133,12 @@ class ViewExecutable {
$this->setDisplay($display_id);
// Get the existing configuration.
$fields = $this->displayHandlers[$display_id]->getOption($types[$type]['plural']);
$fields = $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
// Unset the item.
unset($fields[$id]);
// Store.
$this->displayHandlers[$display_id]->setOption($types[$type]['plural'], $fields);
$this->displayHandlers->get($display_id)->setOption($types[$type]['plural'], $fields);
}
/**
@ -2166,5 +2166,4 @@ class ViewExecutable {
$item[$option] = $value;
$this->setItem($display_id, $type, $id, $item);
}
}

2
core/modules/views/views.module
View File

@ -618,7 +618,7 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable
// Also do not do anything if the display plugin has not defined any
// contextual links that are intended to be displayed in the requested
// location.
$plugin_id = $view->displayHandlers[$display_id]->getPluginId();
$plugin_id = $view->displayHandlers->get($display_id)->getPluginId();
$plugin = drupal_container()->get('plugin.manager.views.display')->getDefinition($plugin_id);
// If contextual_links_locations are not set, provide a sane default. (To
// avoid displaying any contextual links at all, a display plugin can still

4
core/modules/views/views.theme.inc
View File

@ -890,8 +890,8 @@ function template_preprocess_views_view_rss(&$vars) {
// Figure out which display which has a path we're using for this feed. If there isn't
// one, use the global $base_url
$link_display_id = $view->display_handler->getLinkDisplay();
if ($link_display_id && !empty($view->displayHandlers[$link_display_id])) {
$path = $view->displayHandlers[$link_display_id]->getPath();
if ($link_display_id && $display = $view->displayHandlers->get($link_display_id)) {
$path = $view->displayHandlers->get($link_display_id)->getPath();
}
if ($path) {

18
core/modules/views/views_ui/admin.inc
View File

@ -771,7 +771,7 @@ function views_ui_edit_display_form($form, &$form_state) {
* Validate handler for views_ui_edit_display_form
*/
function views_ui_edit_display_form_validate($form, &$form_state) {
$form_state['view']->get('executable')->displayHandlers[$form_state['display_id']]->validateOptionsForm($form['options'], $form_state);
$form_state['view']->get('executable')->displayHandlers->get($form_state['display_id'])->validateOptionsForm($form['options'], $form_state);
if (form_get_errors()) {
$form_state['rerender'] = TRUE;
@ -782,7 +782,7 @@ function views_ui_edit_display_form_validate($form, &$form_state) {
* Submit handler for views_ui_edit_display_form
*/
function views_ui_edit_display_form_submit($form, &$form_state) {
$form_state['view']->get('executable')->displayHandlers[$form_state['display_id']]->submitOptionsForm($form['options'], $form_state);
$form_state['view']->get('executable')->displayHandlers->get($form_state['display_id'])->submitOptionsForm($form['options'], $form_state);
views_ui_cache_set($form_state['view']);
}
@ -793,7 +793,7 @@ function views_ui_edit_display_form_submit($form, &$form_state) {
* @TODO: Not currently used. Remove unless we implement an override toggle.
*/
function views_ui_edit_display_form_override($form, &$form_state) {
$form_state['view']->get('executable')->displayHandlers[$form_state['display_id']]->optionsOverride($form['options'], $form_state);
$form_state['view']->get('executable')->displayHandlers->get($form_state['display_id'])->optionsOverride($form['options'], $form_state);
views_ui_cache_set($form_state['view']);
$form_state['rerender'] = TRUE;
@ -813,7 +813,7 @@ function views_ui_rearrange_form($form, &$form_state) {
if (!$executable->setDisplay($display_id)) {
views_ajax_error(t('Invalid display id @display', array('@display' => $display_id)));
}
$display = &$executable->displayHandlers[$display_id];
$display = &$executable->displayHandlers->get($display_id);
$form['#title'] = t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';
@ -893,7 +893,7 @@ function views_ui_rearrange_form($form, &$form_state) {
*/
function views_ui_rearrange_form_submit($form, &$form_state) {
$types = ViewExecutable::viewsHandlerTypes();
$display = &$form_state['view']->get('executable')->displayHandlers[$form_state['display_id']];
$display = &$form_state['view']->get('executable')->displayHandlers->get($form_state['display_id']);
$old_fields = $display->getOption($types[$form_state['type']]['plural']);
$new_fields = $order = array();
@ -933,7 +933,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
if (!$executable->setDisplay($display_id)) {
views_ajax_render(t('Invalid display id @display', array('@display' => $display_id)));
}
$display = $executable->displayHandlers[$display_id];
$display = $executable->displayHandlers->get($display_id);
$form['#title'] = check_plain($display->display['display_title']) . ': ';
$form['#title'] .= t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';
@ -1103,7 +1103,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
*/
function views_ui_rearrange_filter_form_submit($form, &$form_state) {
$types = ViewExecutable::viewsHandlerTypes();
$display = &$form_state['view']->get('executable')->displayHandlers[$form_state['display_id']];
$display = &$form_state['view']->get('executable')->displayHandlers->get($form_state['display_id']);
$remember_groups = array();
if (!empty($form_state['view']->form_cache)) {
@ -1225,7 +1225,7 @@ function views_ui_add_item_form($form, &$form_state) {
if (!$executable->setDisplay($display_id)) {
views_ajax_error(t('Invalid display id @display', array('@display' => $display_id)));
}
$display = &$executable->displayHandlers[$display_id];
$display = &$executable->displayHandlers->get($display_id);
$types = ViewExecutable::viewsHandlerTypes();
$ltitle = $types[$type]['ltitle'];
@ -1709,7 +1709,7 @@ function views_ui_config_item_form_remove($form, &$form_state) {
list($was_defaulted, $is_defaulted) = $form_state['view']->getOverrideValues($form, $form_state);
// If the display selection was changed toggle the override value.
if ($was_defaulted != $is_defaulted) {
$display =& $form_state['view']->get('executable')->displayHandlers[$form_state['display_id']];
$display =& $form_state['view']->get('executable')->displayHandlers->get($form_state['display_id']);
$display->optionsOverride($form, $form_state);
}
$form_state['view']->get('executable')->removeItem($form_state['display_id'], $form_state['type'], $form_state['id']);

63
core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
View File

@ -139,8 +139,8 @@ class ViewEditFormController extends ViewFormControllerBase {
$display_title = $this->getDisplayLabel($view, $display_id, FALSE);
// Add a text that the display is disabled.
if (!empty($view->get('executable')->displayHandlers[$display_id])) {
if (!$view->get('executable')->displayHandlers[$display_id]->isEnabled()) {
if ($view->get('executable')->displayHandlers->has($display_id)) {
if (!$view->get('executable')->displayHandlers->get($display_id)->isEnabled()) {
$form['displays']['settings']['disabled']['#markup'] = t('This display is disabled.');
}
}
@ -156,7 +156,8 @@ class ViewEditFormController extends ViewFormControllerBase {
$tab_content['#attributes']['class'][] = 'views-display-deleted';
}
// Mark disabled displays as such.
if (isset($view->get('executable')->displayHandlers[$display_id]) && !$view->get('executable')->displayHandlers[$display_id]->isEnabled()) {
if ($view->get('executable')->displayHandlers->has($display_id) && !$view->get('executable')->displayHandlers->get($display_id)->isEnabled()) {
$tab_content['#attributes']['class'][] = 'views-display-disabled';
}
$form['displays']['settings']['settings_content'] = array(
@ -224,7 +225,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$displays = $view->get('display');
foreach ($displays as $id => $display) {
if (!empty($display['deleted'])) {
unset($view->get('executable')->displayHandlers[$id]);
$view->get('executable')->displayHandlers->remove($id);
unset($displays[$id]);
}
}
@ -232,8 +233,8 @@ class ViewEditFormController extends ViewFormControllerBase {
foreach ($view->get('executable')->displayHandlers as $id => $display) {
if (!empty($display->display['new_id'])) {
$new_id = $display->display['new_id'];
$view->get('executable')->displayHandlers[$new_id] = $view->get('executable')->displayHandlers[$id];
$view->get('executable')->displayHandlers[$new_id]->display['id'] = $new_id;
$view->get('executable')->displayHandlers->set($new_id, $view->get('executable')->displayHandlers->get($id));
$view->get('executable')->displayHandlers->get($new_id)->display['id'] = $new_id;
$displays[$new_id] = $displays[$id];
unset($displays[$id]);
@ -258,8 +259,8 @@ class ViewEditFormController extends ViewFormControllerBase {
continue;
}
if (($display->getPluginId() == 'page') && ($old_path == $destination) && ($old_path != $view->get('executable')->displayHandlers[$id]->getOption('path'))) {
$destination = $view->get('executable')->displayHandlers[$id]->getOption('path');
if (($display->getPluginId() == 'page') && ($old_path == $destination) && ($old_path != $view->get('executable')->displayHandlers->get($id)->getOption('path'))) {
$destination = $view->get('executable')->displayHandlers->get($id)->getOption('path');
$query->remove('destination');
// @todo For whatever reason drupal_goto is still using $_GET.
// @see http://drupal.org/node/1668866
@ -314,7 +315,7 @@ class ViewEditFormController extends ViewFormControllerBase {
public function getDisplayTab($view) {
$build = array();
$display_id = $view->displayID;
$display = $view->get('executable')->displayHandlers[$display_id];
$display = $view->get('executable')->displayHandlers->get($display_id);
// If the plugin doesn't exist, display an error message instead of an edit
// page.
if (empty($display)) {
@ -351,7 +352,7 @@ class ViewEditFormController extends ViewFormControllerBase {
// The master display cannot be cloned.
$is_default = $display['id'] == 'default';
// @todo: Figure out why getOption doesn't work here.
$is_enabled = $view->get('executable')->displayHandlers[$display['id']]->isEnabled();
$is_enabled = $view->get('executable')->displayHandlers->get($display['id'])->isEnabled();
if ($display['id'] != 'default') {
$build['top']['#theme_wrappers'] = array('container');
@ -379,8 +380,8 @@ class ViewEditFormController extends ViewFormControllerBase {
);
}
// Add a link to view the page.
elseif ($view->get('executable')->displayHandlers[$display['id']]->hasPath()) {
$path = $view->get('executable')->displayHandlers[$display['id']]->getPath();
elseif ($view->get('executable')->displayHandlers->get($display['id'])->hasPath()) {
$path = $view->get('executable')->displayHandlers->get($display['id'])->getPath();
if (strpos($path, '%') === FALSE) {
$build['top']['actions']['path'] = array(
'#type' => 'link',
@ -438,7 +439,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$build['top']['display_title'] = array(
'#theme' => 'views_ui_display_tab_setting',
'#description' => t('Display name'),
'#link' => $view->get('executable')->displayHandlers[$display['id']]->optionLink(check_plain($display_title), 'display_title'),
'#link' => $view->get('executable')->displayHandlers->get($display['id'])->optionLink(check_plain($display_title), 'display_title'),
);
}
@ -483,7 +484,7 @@ class ViewEditFormController extends ViewFormControllerBase {
// Fetch options from the display plugin, with a list of buckets they go into.
$options = array();
$view->get('executable')->displayHandlers[$display['id']]->optionsSummary($buckets, $options);
$view->get('executable')->displayHandlers->get($display['id'])->optionsSummary($buckets, $options);
// Place each option into its bucket.
foreach ($options as $id => $option) {
@ -547,7 +548,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$view = $this->getEntity($form_state);
$id = $form_state['display_id'];
// setOption doesn't work because this would might affect upper displays
$view->get('executable')->displayHandlers[$id]->setOption('enabled', TRUE);
$view->get('executable')->displayHandlers->get($id)->setOption('enabled', TRUE);
// Store in cache
views_ui_cache_set($view);
@ -562,7 +563,7 @@ class ViewEditFormController extends ViewFormControllerBase {
public function submitDisplayDisable($form, &$form_state) {
$view = $this->getEntity($form_state);
$id = $form_state['display_id'];
$view->get('executable')->displayHandlers[$id]->setOption('enabled', FALSE);
$view->get('executable')->displayHandlers->get($id)->setOption('enabled', FALSE);
// Store in cache
views_ui_cache_set($view);
@ -777,23 +778,23 @@ class ViewEditFormController extends ViewFormControllerBase {
$option_build['#description'] = $option['title'];
$option_build['#link'] = $view->get('executable')->displayHandlers[$display['id']]->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']);
$option_build['#link'] = $view->get('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'][] = $view->get('executable')->displayHandlers[$display['id']]->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value);
$option_build['#settings_links'][] = $view->get('executable')->displayHandlers->get($display['id'])->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value);
}
}
if (!empty($view->get('executable')->displayHandlers[$display['id']]->options['defaults'][$id])) {
if (!empty($view->get('executable')->displayHandlers->get($display['id'])->options['defaults'][$id])) {
$display_id = 'default';
$option_build['#defaulted'] = TRUE;
}
else {
$display_id = $display['id'];
if (!$view->get('executable')->displayHandlers[$display['id']]->isDefaultDisplay()) {
if ($view->get('executable')->displayHandlers[$display['id']]->defaultableSections($id)) {
if (!$view->get('executable')->displayHandlers->get($display['id'])->isDefaultDisplay()) {
if ($view->get('executable')->displayHandlers->get($display['id'])->defaultableSections($id)) {
$option_build['#overridden'] = TRUE;
}
}
@ -827,7 +828,7 @@ class ViewEditFormController extends ViewFormControllerBase {
break;
case 'field':
// Fetch the style plugin info so we know whether to list fields or not.
$style_plugin = $view->get('executable')->displayHandlers[$display['id']]->getPlugin('style');
$style_plugin = $view->get('executable')->displayHandlers->get($display['id'])->getPlugin('style');
$uses_fields = $style_plugin && $style_plugin->usesFields();
if (!$uses_fields) {
$build['fields'][] = array(
@ -840,7 +841,7 @@ class ViewEditFormController extends ViewFormControllerBase {
case 'header':
case 'footer':
case 'empty':
if (!$view->get('executable')->displayHandlers[$display['id']]->usesAreas()) {
if (!$view->get('executable')->displayHandlers->get($display['id'])->usesAreas()) {
$build[$type][] = array(
'#markup' => t('The selected display type does not utilize @type plugins', array('@type' => $type)),
'#theme_wrappers' => array('views_ui_container'),
@ -856,7 +857,7 @@ class ViewEditFormController extends ViewFormControllerBase {
// Create an array of actions to pass to theme_links
$actions = array();
$count_handlers = count($view->get('executable')->displayHandlers[$display['id']]->getHandlers($type));
$count_handlers = count($view->get('executable')->displayHandlers->get($display['id'])->getHandlers($type));
$actions['add'] = array(
'title' => t('Add'),
'href' => "admin/structure/views/nojs/add-item/{$view->get('name')}/{$display['id']}/$type",
@ -881,8 +882,8 @@ class ViewEditFormController extends ViewFormControllerBase {
),
);
if (!$view->get('executable')->displayHandlers[$display['id']]->isDefaultDisplay()) {
if (!$view->get('executable')->displayHandlers[$display['id']]->isDefaulted($types[$type]['plural'])) {
if (!$view->get('executable')->displayHandlers->get($display['id'])->isDefaultDisplay()) {
if (!$view->get('executable')->displayHandlers->get($display['id'])->isDefaulted($types[$type]['plural'])) {
$build['#overridden'] = TRUE;
}
else {
@ -894,7 +895,7 @@ class ViewEditFormController extends ViewFormControllerBase {
if (!isset($relationships)) {
// Get relationship labels
$relationships = array();
foreach ($view->get('executable')->displayHandlers[$display['id']]->getHandlers('relationship') as $id => $handler) {
foreach ($view->get('executable')->displayHandlers->get($display['id'])->getHandlers('relationship') as $id => $handler) {
$relationships[$id] = $handler->label();
}
}
@ -903,7 +904,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$groups = array();
$grouping = FALSE;
if ($type == 'filter') {
$group_info = $view->get('executable')->displayHandlers['default']->getOption('filter_groups');
$group_info = $view->get('executable')->displayHandlers->get('default')->getOption('filter_groups');
// If there is only one group but it is using the "OR" filter, we still
// treat it as a group for display purposes, since we want to display the
// "OR" label next to items within the group.
@ -915,12 +916,12 @@ class ViewEditFormController extends ViewFormControllerBase {
$build['fields'] = array();
foreach ($view->get('executable')->displayHandlers[$display['id']]->getOption($types[$type]['plural']) as $id => $field) {
foreach ($view->get('executable')->displayHandlers->get($display['id'])->getOption($types[$type]['plural']) as $id => $field) {
// Build the option link for this handler ("Node: ID = article").
$build['fields'][$id] = array();
$build['fields'][$id]['#theme'] = 'views_ui_display_tab_setting';
$handler = $view->get('executable')->displayHandlers[$display['id']]->getHandler($type, $id);
$handler = $view->get('executable')->displayHandlers->get($display['id'])->getHandler($type, $id);
if (empty($handler)) {
$build['fields'][$id]['#class'][] = 'broken';
$field_name = t('Broken/missing handler: @table > @field', array('@table' => $field['table'], '@field' => $field['field']));
@ -942,7 +943,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
$build['fields'][$id]['#class'][] = drupal_clean_css_identifier($display['id']. '-' . $type . '-' . $id);
if ($view->get('executable')->displayHandlers[$display['id']]->useGroupBy() && $handler->usesGroupBy()) {
if ($view->get('executable')->displayHandlers->get($display['id'])->useGroupBy() && $handler->usesGroupBy()) {
$build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Aggregation settings') . '</span>', "admin/structure/views/nojs/config-item-group/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE));
}

12
core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
View File

@ -170,7 +170,7 @@ class ViewUI implements ViewStorageInterface {
// these changes apply to.
if ($revert) {
// If it's revert just change the override and return.
$display = &$this->executable->displayHandlers[$form_state['display_id']];
$display = &$this->executable->displayHandlers->get($form_state['display_id']);
$display->optionsOverride($form, $form_state);
// Don't execute the normal submit handling but still store the changed view into cache.
@ -184,7 +184,7 @@ class ViewUI implements ViewStorageInterface {
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 = &$this->executable->displayHandlers[$form_state['display_id']];
$display = &$this->executable->displayHandlers->get($form_state['display_id']);
// optionsOverride toggles the override of this section.
$display->optionsOverride($form, $form_state);
$display->submitOptionsForm($form, $form_state);
@ -194,7 +194,7 @@ class ViewUI implements ViewStorageInterface {
// 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 = &$this->executable->displayHandlers[$form_state['display_id']];
$display = &$this->executable->displayHandlers->get($form_state['display_id']);
// optionsOverride toggles the override of this section.
$display->optionsOverride($form, $form_state);
$display->submitOptionsForm($form, $form_state);
@ -527,7 +527,7 @@ class ViewUI implements ViewStorageInterface {
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 = &$this->executable->displayHandlers[$form_state['display_id']];
$display = &$this->executable->displayHandlers->get($form_state['display_id']);
// setOverride toggles the override of this section.
$display->setOverride($section);
}
@ -536,7 +536,7 @@ class ViewUI implements ViewStorageInterface {
// 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 = &$this->executable->displayHandlers[$form_state['display_id']];
$display = &$this->executable->displayHandlers->get($form_state['display_id']);
// optionsOverride toggles the override of this section.
$display->setOverride($section);
}
@ -558,7 +558,7 @@ class ViewUI implements ViewStorageInterface {
$key = $types[$type]['type'];
}
$handler = views_get_handler($table, $field, $key);
if ($this->executable->displayHandlers['default']->useGroupBy() && $handler->usesGroupBy()) {
if ($this->executable->displayHandlers->get('default')->useGroupBy() && $handler->usesGroupBy()) {
$this->addFormToStack('config-item-group', $form_state['display_id'], array($type, $id));
}

2
core/modules/views/views_ui/views_ui.module
View File

@ -375,7 +375,7 @@ function views_ui_cache_set(ViewUI $view) {
unset($executable->display_handler);
unset($executable->default_display);
$executable->query = NULL;
$executable->displayHandlers = array();
unset($executable->displayHandlers);
drupal_container()->get('user.tempstore')->get('views')->set($view->get('name'), $view);
}