diff core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php	Mon Apr 23 09:46:53 2018 +0100
@@ -24,13 +24,6 @@
   use ToStringTrait;
 
   /**
-   * The string to be translated.
-   *
-   * @var string
-   */
-  protected $string;
-
-  /**
    * The translated markup without placeholder replacements.
    *
    * @var string
@@ -139,8 +132,7 @@
       $message = $string instanceof TranslatableMarkup ? '$string ("' . $string->getUntranslatedString() . '") must be a string.' : '$string ("' . (string) $string . '") must be a string.';
       throw new \InvalidArgumentException($message);
     }
-    $this->string = $string;
-    $this->arguments = $arguments;
+    parent::__construct($string, $arguments);
     $this->options = $options;
     $this->stringTranslation = $string_translation;
   }