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

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

Browse source
This commit is contained in:
Pantheon Automation 2015-10-21 21:44:50 -07:00 • committed by Greg Anderson
parent f32e58e4b1
commit 8e18df8c36
3062 changed files with 15044 additions and 172506 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/lib/Drupal/Core/Template/Attribute.php
View file

@ -119,7 +119,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
protected function createAttributeValue($name, $value) {
// If the value is already an AttributeValueBase object, return it
// straight away.
if ($value instanceOf AttributeValueBase) {
if ($value instanceof AttributeValueBase) {
return $value;
}
// An array value or 'class' attribute name are forced to always be an
@ -184,7 +184,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
}
// Merge if there are values, just add them otherwise.
if (isset($this->storage['class']) && $this->storage['class'] instanceOf AttributeArray) {
if (isset($this->storage['class']) && $this->storage['class'] instanceof AttributeArray) {
// Merge the values passed in from the class value array.
$classes = array_merge($this->storage['class']->value(), $classes);
$this->storage['class']->exchangeArray($classes);
@ -248,7 +248,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
*/
public function removeClass() {
// With no class attribute, there is no need to remove.
if (isset($this->storage['class']) && $this->storage['class'] instanceOf AttributeArray) {
if (isset($this->storage['class']) && $this->storage['class'] instanceof AttributeArray) {
$args = func_get_args();
$classes = array();
foreach ($args as $arg) {
@ -276,7 +276,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
* Returns TRUE if the class exists, or FALSE otherwise.
*/
public function hasClass($class) {
if (isset($this->storage['class']) && $this->storage['class'] instanceOf AttributeArray) {
if (isset($this->storage['class']) && $this->storage['class'] instanceof AttributeArray) {
return in_array($class, $this->storage['class']->value());
}
else {

1
core/lib/Drupal/Core/Template/TwigEnvironment.php
View file

@ -7,7 +7,6 @@
namespace Drupal\Core\Template;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Render\Markup;

2
core/lib/Drupal/Core/Template/TwigExtension.php
View file

@ -415,7 +415,7 @@ class TwigExtension extends \Twig_Extension {
}
// Keep Twig_Markup objects intact to support autoescaping.
if ($autoescape && ($arg instanceOf \Twig_Markup || $arg instanceOf MarkupInterface)) {
if ($autoescape && ($arg instanceof \Twig_Markup || $arg instanceof MarkupInterface)) {
return $arg;
}

3
core/lib/Drupal/Core/Template/TwigNodeTrans.php
View file

@ -14,9 +14,6 @@
namespace Drupal\Core\Template;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Site\Settings;
/**
* A class that defines the Twig 'trans' tag for Drupal.
*/