updated core from 8.4 to 8.5 : bug with login_destination

core/modules/text/migrations/text_settings.yml

@@ -3,6 +3,7 @@ label: Drupal teaser length configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:

core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php

@@ -29,7 +29,8 @@ abstract class TextItemBase extends FieldItemBase {
       ->setDescription(t('The text with the text format applied.'))
       ->setComputed(TRUE)
       ->setClass('\Drupal\text\TextProcessed')
-      ->setSetting('text source', 'value');
+      ->setSetting('text source', 'value')
+      ->setInternal(FALSE);
 
     return $properties;
   }

core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php

@@ -87,15 +87,7 @@ class TextareaWithSummaryWidget extends TextareaWidget {
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
     $element = parent::errorElement($element, $violation, $form, $form_state);
-    if ($element === FALSE) {
-      return FALSE;
-    }
-    elseif (isset($violation->arrayPropertyPath[0])) {
-      return $element[$violation->arrayPropertyPath[0]];
-    }
-    else {
-      return $element;
-    }
+    return ($element === FALSE) ? FALSE : $element[$violation->arrayPropertyPath[0]];
   }
 
 }

core/modules/text/src/Plugin/migrate/cckfield/TextField.php

@@ -16,7 +16,9 @@ use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
  *     "text_long" = "text_long",
  *     "text_with_summary" = "text_with_summary"
  *   },
- *   core = {6,7}
+ *   core = {6,7},
+ *   source_module = "text",
+ *   destination_module = "text",
  * )
  *
  * @deprecated in Drupal 8.3.x, to be removed before Drupal 9.0.x. Use

core/modules/text/src/Plugin/migrate/field/d6/TextField.php

@@ -14,7 +14,9 @@ use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
  *     "text_long" = "text_long",
  *     "text_with_summary" = "text_with_summary"
  *   },
- *   core = {6}
+ *   core = {6},
+ *   source_module = "text",
+ *   destination_module = "text",
  * )
  */
 class TextField extends FieldPluginBase {

core/modules/text/src/Plugin/migrate/field/d7/TextField.php

@@ -14,7 +14,9 @@ use Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase;
  *     "text_long" = "text_long",
  *     "text_with_summary" = "text_with_summary"
  *   },
- *   core = {7}
+ *   core = {7},
+ *   source_module = "text",
+ *   destination_module = "text",
  * )
  */
 class TextField extends FieldPluginBase {

core/modules/text/src/Tests/TextFieldTest.php

@@ -113,7 +113,7 @@ class TextFieldTest extends StringFieldTest {
       ->save();
 
     $test_file = current($this->drupalGetTestFiles('text'));
-    $edit['files[file_field_0]'] = drupal_realpath($test_file->uri);
+    $edit['files[file_field_0]'] = \Drupal::service('file_system')->realpath($test_file->uri);
     $this->drupalPostForm('entity_test/add', $edit, 'Upload');
     $this->assertResponse(200);
     $edit = [

core/modules/text/src/TextProcessed.php

@@ -2,9 +2,12 @@
 
 namespace Drupal\text;
 
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\TypedData\TypedData;
+use Drupal\filter\FilterProcessResult;
+use Drupal\filter\Render\FilteredMarkup;
 
 /**
  * A computed property for processing text with a format.
@@ -12,12 +15,12 @@ use Drupal\Core\TypedData\TypedData;
  * Required settings (below the definition's 'settings' key) are:
  *  - text source: The text property containing the to be processed text.
  */
-class TextProcessed extends TypedData {
+class TextProcessed extends TypedData implements CacheableDependencyInterface {
 
   /**
    * Cached processed text.
    *
-   * @var string|null
+   * @var \Drupal\filter\FilterProcessResult|null
    */
   protected $processed = NULL;
 
@@ -37,20 +40,29 @@ class TextProcessed extends TypedData {
    */
   public function getValue() {
     if ($this->processed !== NULL) {
-      return $this->processed;
+      return FilteredMarkup::create($this->processed->getProcessedText());
     }
 
     $item = $this->getParent();
     $text = $item->{($this->definition->getSetting('text source'))};
 
-    // Avoid running check_markup() on empty strings.
+    // Avoid doing unnecessary work on empty strings.
     if (!isset($text) || $text === '') {
-      $this->processed = '';
+      $this->processed = new FilterProcessResult('');
     }
     else {
-      $this->processed = check_markup($text, $item->format, $item->getLangcode());
+      $build = [
+        '#type' => 'processed_text',
+        '#text' => $text,
+        '#format' => $item->format,
+        '#filter_types_to_skip' => [],
+        '#langcode' => $item->getLangcode(),
+      ];
+      // Capture the cacheability metadata associated with the processed text.
+      $processed_text = $this->getRenderer()->renderPlain($build);
+      $this->processed = FilterProcessResult::createFromRenderArray($build)->setProcessedText((string) $processed_text);
     }
-    return $this->processed;
+    return FilteredMarkup::create($this->processed->getProcessedText());
   }
 
   /**
@@ -64,4 +76,37 @@ class TextProcessed extends TypedData {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    $this->getValue();
+    return $this->processed->getCacheTags();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    $this->getValue();
+    return $this->processed->getCacheContexts();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    $this->getValue();
+    return $this->processed->getCacheMaxAge();
+  }
+
+  /**
+   * Returns the renderer service.
+   *
+   * @return \Drupal\Core\Render\RendererInterface
+   */
+  protected function getRenderer() {
+    return \Drupal::service('renderer');
+  }
+
 }

core/modules/text/tests/src/Kernel/TextSummaryTest.php

@@ -207,6 +207,15 @@ class TextSummaryTest extends KernelTestBase {
     $this->assertTextSummary($text, "<p>\nHi\n</p>\n<p>\nfolks\n<br />\n!\n</p>", $format, $i++);
   }
 
+  /**
+   * Test text_summary() returns an empty string without any error when called
+   * with an invalid format.
+   */
+  public function testInvalidFilterFormat() {
+
+    $this->assertTextSummary($this->randomString(100), '', 'non_existent_format');
+  }
+
   /**
    * Calls text_summary() and asserts that the expected teaser is returned.
    */

core/modules/text/text.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - field
   - filter
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457825

core/modules/text/text.module

@@ -81,11 +81,11 @@ function text_summary($text, $format = NULL, $size = NULL) {
 
   // Retrieve the filters of the specified text format, if any.
   if (isset($format)) {
-    $filters = FilterFormat::load($format)->filters();
+    $filter_format = FilterFormat::load($format);
     // If the specified format does not exist, return nothing. $text is already
     // filtered text, but the remainder of this function will not be able to
     // ensure a sane and secure summary.
-    if (!$filters) {
+    if (!$filter_format || !($filters = $filter_format->filters())) {
       return '';
     }
   }