diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php index 698ce85..cd1c9f0 100644 --- a/core/lib/Drupal/Core/Template/Attribute.php +++ b/core/lib/Drupal/Core/Template/Attribute.php @@ -101,10 +101,7 @@ protected function createAttributeValue($name, $value) { } // Provide a better exception message when invalid object is passed as value. elseif (is_object($value)) { - throw new \Exception(t('"@attribute_name" attribute value of type "@class" can not be converted to string', array( - '@attribute_name' => $name, - '@class' => get_class($value) - ))); + throw new \Exception('"' . $name . '" attribute value of type "' . get_class($value) . '" can not be converted to string'); } return $value; diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php index 0a83173..7ddb8bb 100644 --- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php +++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php @@ -244,7 +244,7 @@ public function createAttributeValuesProvider() { $testCases[] = array($name, $value, $result); // Test AttributeValue instance passed as value. - $value = $this->getMock('Drupal\Core\Template\AttributeValueBase'); + $value = $this->getMock('Drupal\Core\Template\AttributeValueBase', array(), array(), '', FALSE); $result = $value; $testCases[] = array($name, $value, $result); @@ -305,7 +305,7 @@ public function createAttributeValueExceptionProvider() { // Test object with render and __toString methods present // but it is not instance of AttributeValueBase. - $value = $this->getMock('Drupal\Core\StringTranslation\TranslationWrapper'); + $value = $this->getMock('Drupal\Core\StringTranslation\TranslationWrapper', array(), array(), '', FALSE); $testCases[] = array($name, $value); return $testCases;