Update Drupal Attribute classes

Author: aleksip

src/Drupal/Core/Template/Attribute.php

@@ -1,14 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Template\Attribute.
- */
-
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Render\PlainTextOutput;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 
 /**
@@ -75,15 +69,15 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
    *
    * @var \Drupal\Core\Template\AttributeValueBase[]
    */
-  protected $storage = array();
+  protected $storage = [];
 
   /**
    * Constructs a \Drupal\Core\Template\Attribute object.
    *
    * @param array $attributes
    *   An associative array of key-value pairs to be converted to attributes.
    */
-  public function __construct($attributes = array()) {
+  public function __construct($attributes = []) {
     foreach ($attributes as $name => $value) {
       $this->offsetSet($name, $value);
     }
@@ -139,7 +133,7 @@ protected function createAttributeValue($name, $value) {
       $value = new AttributeBoolean($name, $value);
     }
     // As a development aid, we allow the value to be a safe string object.
-    elseif (SafeMarkup::isSafe($value)) {
+    elseif ($value instanceof MarkupInterface) {
       // Attributes are not supposed to display HTML markup, so we just convert
       // the value to plain text.
       $value = PlainTextOutput::renderFromHtml($value);
@@ -176,7 +170,7 @@ public function offsetExists($name) {
   public function addClass() {
     $args = func_get_args();
     if ($args) {
-      $classes = array();
+      $classes = [];
       foreach ($args as $arg) {
         // Merge the values passed in from the classes array.
         // The argument is cast to an array to support comma separated single
@@ -251,7 +245,7 @@ public function removeClass() {
     // With no class attribute, there is no need to remove.
     if (isset($this->storage['class']) && $this->storage['class'] instanceof AttributeArray) {
       $args = func_get_args();
-      $classes = array();
+      $classes = [];
       foreach ($args as $arg) {
         // Merge the values passed in from the classes array.
         // The argument is cast to an array to support comma separated single
@@ -267,6 +261,20 @@ public function removeClass() {
     return $this;
   }
 
+  /**
+   * Gets the class attribute value if set.
+   *
+   * This method is implemented to take precedence over hasClass() for Twig 2.0.
+   *
+   * @return \Drupal\Core\Template\AttributeValueBase
+   *   The class attribute value if set.
+   *
+   * @see twig_get_attribute()
+   */
+  public function getClass() {
+    return $this->offsetGet('class');
+  }
+
   /**
    * Checks if the class array has the given CSS class.
    *
@@ -318,7 +326,7 @@ public function toArray() {
   /**
    * Implements the magic __clone() method.
    */
-  public function  __clone() {
+  public function __clone() {
     foreach ($this->storage as $name => $value) {
       $this->storage[$name] = clone $value;
     }

src/Drupal/Core/Template/AttributeArray.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Template\AttributeArray.
- */
-
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Utility\Html;

src/Drupal/Core/Template/AttributeBoolean.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Template\AttributeBoolean.
- */
-
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Utility\Html;

src/Drupal/Core/Template/AttributeString.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Template\AttributeString.
- */
-
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Utility\Html;

src/Drupal/Core/Template/AttributeValueBase.php

@@ -1,11 +1,7 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Core\Template\AttributeValueBase.
- */
-
 namespace Drupal\Core\Template;
+
 use Drupal\Component\Utility\Html;
 
 /**
@@ -70,6 +66,6 @@ public function value() {
   /**
    * Implements the magic __toString() method.
    */
-  abstract function __toString();
+  abstract public function __toString();
 
 }