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

Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

Browse source
This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
View file

@ -8,7 +8,7 @@
namespace Drupal\options\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Field\FieldFilteredString;
use Drupal\Core\Field\FieldFilteredMarkup;
use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Form\OptGroup;
@ -33,7 +33,7 @@ class OptionsDefaultFormatter extends FormatterBase {
/**
* {@inheritdoc}
*/
public function viewElements(FieldItemListInterface $items) {
public function viewElements(FieldItemListInterface $items, $langcode) {
$elements = array();
// Only collect allowed options if there are actually items to display.
@ -51,7 +51,7 @@ class OptionsDefaultFormatter extends FormatterBase {
$output = isset($options[$value]) ? $options[$value] : $value;
$elements[$delta] = array(
'#markup' => $output,
'#allowed_tags' => FieldFilteredString::allowedTags(),
'#allowed_tags' => FieldFilteredMarkup::allowedTags(),
);
}
}

6
core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
View file

@ -8,7 +8,7 @@
namespace Drupal\options\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Field\FieldFilteredString;
use Drupal\Core\Field\FieldFilteredMarkup;
use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Field\FieldItemListInterface;
@ -32,13 +32,13 @@ class OptionsKeyFormatter extends FormatterBase {
/**
* {@inheritdoc}
*/
public function viewElements(FieldItemListInterface $items) {
public function viewElements(FieldItemListInterface $items, $langcode) {
$elements = array();
foreach ($items as $delta => $item) {
$elements[$delta] = array(
'#markup' => $item->value,
'#allowed_tags' => FieldFilteredString::allowedTags(),
'#allowed_tags' => FieldFilteredMarkup::allowedTags(),
);
}

7
core/modules/options/src/Plugin/views/argument/NumberListField.php
View file

@ -7,9 +7,8 @@
namespace Drupal\options\Plugin\views\argument;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Field\FieldFilteredString;
use Drupal\Core\Field\FieldFilteredMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\FieldAPIHandlerTrait;
use Drupal\views\ViewExecutable;
@ -81,11 +80,11 @@ class NumberListField extends NumericArgument {
$value = $data->{$this->name_alias};
// If the list element has a human readable name show it.
if (isset($this->allowedValues[$value]) && !empty($this->options['summary']['human'])) {
return FieldFilteredString::create($this->allowedValues[$value]);
return FieldFilteredMarkup::create($this->allowedValues[$value]);
}
// Else, fallback to the key.
else {
return SafeMarkup::checkPlain($value);
return $value;
}
}

4
core/modules/options/src/Plugin/views/argument/StringListField.php
View file

@ -8,7 +8,7 @@
namespace Drupal\options\Plugin\views\argument;
use Drupal\Core\Field\AllowedTagsXssTrait;
use Drupal\Core\Field\FieldFilteredString;
use Drupal\Core\Field\FieldFilteredMarkup;
use Drupal\Core\Form\FormStateInterface;
use Drupal\views\FieldAPIHandlerTrait;
use Drupal\views\ViewExecutable;
@ -83,7 +83,7 @@ class StringListField extends StringArgument {
if (isset($this->allowedValues[$value]) && !empty($this->options['summary']['human'])) {
$value = $this->allowedValues[$value];
}
return FieldFilteredString::create($this->caseTransform($value, $this->options['case']));
return FieldFilteredMarkup::create($this->caseTransform($value, $this->options['case']));
}
}