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

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

@@ -8,7 +8,6 @@
 namespace Drupal\text\Plugin\Field\FieldWidget;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\text\Plugin\Field\FieldWidget\TextareaWidget;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 

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

@@ -38,35 +38,55 @@ class TextField extends CckFieldPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
-    $process = array(
-      array(
-        'plugin' => 'iterator',
-        'source' => $field_name,
-        // See \Drupal\migrate_drupal\Plugin\migrate\source\d6\User::baseFields(),
-        // signature_format for an example of the YAML that represents this
-        // process array.
-        'process' => [
-          'value' => 'value',
-          'format' => [
-            [
-              'plugin' => 'static_map',
-              'bypass' => TRUE,
-              'source' => 'format',
-              'map' => [0 => NULL],
-            ],
-            [
-              'plugin' => 'skip_on_empty',
-              'method' => 'process',
-            ],
-            [
-              'plugin' => 'migration',
-              'migration' => 'd6_filter_format',
-              'source' => 'format',
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $field_info) {
+    if ($field_info['widget_type'] == 'optionwidgets_onoff') {
+      $process = [
+        'value' => [
+          'plugin' => 'static_map',
+          'source' => 'value',
+          'default_value' => 0,
+        ],
+      ];
+
+      $checked_value = explode("\n", $field_info['global_settings']['allowed_values'])[1];
+      if (strpos($checked_value, '|') !== FALSE) {
+        $checked_value = substr($checked_value, 0, strpos($checked_value, '|'));
+      }
+      $process['value']['map'][$checked_value] = 1;
+    }
+    else {
+      // See \Drupal\migrate_drupal\Plugin\migrate\source\d6\User::baseFields(),
+      // signature_format for an example of the YAML that represents this
+      // process array.
+      $process = [
+        'value' => 'value',
+        'format' => [
+          [
+            'plugin' => 'static_map',
+            'bypass' => TRUE,
+            'source' => 'format',
+            'map' => [0 => NULL],
+          ],
+          [
+            'plugin' => 'skip_on_empty',
+            'method' => 'process',
+          ],
+          [
+            'plugin' => 'migration',
+            'migration' => [
+              'd6_filter_format',
+              'd7_filter_format',
             ],
+            'source' => 'format',
           ],
         ],
-      ),
+      ];
+    }
+
+    $process = array(
+      'plugin' => 'iterator',
+      'source' => $field_name,
+      'process' => $process,
     );
     $migration->setProcessOfProperty($field_name, $process);
   }

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

@@ -223,7 +223,7 @@ class TextFieldTest extends StringFieldTest {
 
     // Display edition form.
     // We should now have a 'text format' selector.
-    $this->drupalGet('entity_test/manage/' . $id);
+    $this->drupalGet('entity_test/manage/' . $id . '/edit');
     $this->assertFieldByName("{$field_name}[0][value]", NULL, 'Widget is displayed');
     $this->assertFieldByName("{$field_name}[0][format]", NULL, 'Format selector is displayed');
 

core/modules/text/src/TextProcessed.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\text;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\TypedData\TypedData;

core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php

@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\text\Unit\Migrate\TextFieldTest.
+ */
+
+namespace Drupal\Tests\text\Unit\Migrate;
+
+use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\text\Plugin\migrate\cckfield\TextField;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\text\Plugin\migrate\cckfield\TextField
+ * @group text
+ */
+class TextFieldTest extends UnitTestCase {
+
+  /**
+   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
+   */
+  protected $plugin;
+
+  /**
+   * @var \Drupal\migrate\Entity\MigrationInterface
+   */
+  protected $migration;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->plugin = new TextField([], 'text', []);
+
+    $migration = $this->prophesize(MigrationInterface::class);
+
+    // The plugin's processCckFieldValues() method will call
+    // setProcessOfProperty() and return nothing. So, in order to examine the
+    // process pipeline created by the plugin, we need to ensure that
+    // getProcess() always returns the last input to setProcessOfProperty().
+    $migration->setProcessOfProperty(Argument::type('string'), Argument::type('array'))
+      ->will(function($arguments) use ($migration) {
+        $migration->getProcess()->willReturn($arguments[1]);
+      });
+
+    $this->migration = $migration->reveal();
+  }
+
+  /**
+   * @covers ::processCckFieldValues
+   */
+  public function testProcessFilteredTextFieldValues() {
+    $field_info = [
+      'widget_type' => 'text_textfield',
+    ];
+    $this->plugin->processCckFieldValues($this->migration, 'body', $field_info);
+
+    $process = $this->migration->getProcess();
+    $this->assertSame('iterator', $process['plugin']);
+    $this->assertSame('body', $process['source']);
+    $this->assertSame('value', $process['process']['value']);
+
+    // Ensure that filter format IDs will be looked up in the filter format
+    // migrations.
+    $lookup = $process['process']['format'][2];
+    $this->assertSame('migration', $lookup['plugin']);
+    $this->assertContains('d6_filter_format', $lookup['migration']);
+    $this->assertContains('d7_filter_format', $lookup['migration']);
+    $this->assertSame('format', $lookup['source']);
+  }
+
+  /**
+   * @covers ::processCckFieldValues
+   */
+  public function testProcessBooleanTextImplicitValues() {
+    $info = array(
+      'widget_type' => 'optionwidgets_onoff',
+      'global_settings' => array(
+        'allowed_values' => "foo\nbar",
+      )
+    );
+    $this->plugin->processCckFieldValues($this->migration, 'field', $info);
+
+    $expected = [
+      'value' => [
+        'plugin' => 'static_map',
+        'source' => 'value',
+        'default_value' => 0,
+        'map' => [
+          'bar' => 1,
+        ],
+      ],
+    ];
+    $this->assertSame($expected, $this->migration->getProcess()['process']);
+  }
+
+  /**
+   * @covers ::processCckFieldValues
+   */
+  public function testProcessBooleanTextExplicitValues() {
+    $info = array(
+      'widget_type' => 'optionwidgets_onoff',
+      'global_settings' => array(
+        'allowed_values' => "foo|Foo\nbaz|Baz",
+      )
+    );
+    $this->plugin->processCckFieldValues($this->migration, 'field', $info);
+
+    $expected = [
+      'value' => [
+        'plugin' => 'static_map',
+        'source' => 'value',
+        'default_value' => 0,
+        'map' => [
+          'baz' => 1,
+        ],
+      ],
+    ];
+    $this->assertSame($expected, $this->migration->getProcess()['process']);
+  }
+
+}

core/modules/text/text.js

@@ -5,7 +5,7 @@
 
 (function ($) {
 
-  "use strict";
+  'use strict';
 
   /**
    * Auto-hide summary textarea if empty and show hide and unhide links.

core/modules/text/text.module

@@ -7,7 +7,6 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 
 /**