Core and composer updates

web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+/**
+ * Test entity class with no bundle.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_no_bundle",
+ *   label = @Translation("Entity Test without bundle"),
+ *   base_table = "entity_test_no_bundle",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "revision" = "revision_id",
+ *   },
+ *   admin_permission = "administer entity_test content",
+ *   links = {
+ *     "add-form" = "/entity_test_no_bundle/add",
+ *   },
+ * )
+ */
+class EntityTestNoBundle extends EntityTest {
+
+}

web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldFormatter/EntityTestReferenceCustomCacheTagFormatter.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Drupal\entity_test\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceFormatterBase;
+
+/**
+ * Plugin implementation of the 'entity_reference_custom_cache_tag' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "entity_reference_custom_cache_tag",
+ *   label = @Translation("Custom cache tag"),
+ *   field_types = {
+ *     "entity_reference"
+ *   }
+ * )
+ */
+class EntityTestReferenceCustomCacheTagFormatter extends EntityReferenceFormatterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    return ['#cache' => ['tags' => ['custom_cache_tag']]];
+  }
+
+}

web/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php

@@ -35,6 +35,18 @@ class TestForm extends FormBase {
       '#default_value' => 'Test name',
     ];
 
+    $form['checkbox_enabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox enabled',
+      '#default_value' => TRUE,
+    ];
+
+    $form['checkbox_disabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox disabled',
+      '#default_value' => FALSE,
+    ];
+
     $form['description'] = [
       '#type' => 'textfield',
       '#title' => 'Description',

web/core/modules/system/tests/src/Functional/Batch/PageTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Batch;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the content of the progress page.
+ *
+ * @group Batch
+ */
+class PageTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['batch_test'];
+
+  /**
+   * Tests that the batch API progress page uses the correct theme.
+   */
+  public function testBatchProgressPageTheme() {
+    // Make sure that the page which starts the batch (an administrative page)
+    // is using a different theme than would normally be used by the batch API.
+    $this->container->get('theme_handler')->install(['seven', 'bartik']);
+    $this->config('system.theme')
+      ->set('default', 'bartik')
+      ->set('admin', 'seven')
+      ->save();
+
+    // Log in as an administrator who can see the administrative theme.
+    $admin_user = $this->drupalCreateUser(['view the administration theme']);
+    $this->drupalLogin($admin_user);
+    // Visit an administrative page that runs a test batch, and check that the
+    // theme that was used during batch execution (which the batch callback
+    // function saved as a variable) matches the theme used on the
+    // administrative page.
+    $this->drupalGet('admin/batch-test/test-theme');
+    // The stack should contain the name of the theme used on the progress
+    // page.
+    $this->assertEqual(batch_test_stack(), ['seven'], 'A progressive batch correctly uses the theme of the page that started the batch.');
+  }
+
+  /**
+   * Tests that the batch API progress page shows the title correctly.
+   */
+  public function testBatchProgressPageTitle() {
+    // Visit an administrative page that runs a test batch, and check that the
+    // title shown during batch execution (which the batch callback function
+    // saved as a variable) matches the theme used on the administrative page.
+    $this->drupalGet('batch-test/test-title');
+    // The stack should contain the title shown on the progress page.
+    $this->assertEqual(batch_test_stack(), ['Batch Test'], 'The batch title is shown on the batch page.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+  }
+
+  /**
+   * Tests that the progress messages are correct.
+   */
+  public function testBatchProgressMessages() {
+    // Go to the initial step only.
+    $this->maximumMetaRefreshCount = 0;
+    $this->drupalGet('batch-test/test-title');
+    $this->assertRaw('<div class="progress__description">Initializing.<br />&nbsp;</div>', 'Initial progress message appears correctly.');
+    $this->assertNoRaw('&amp;nbsp;', 'Initial progress message is not double escaped.');
+    // Now also go to the next step.
+    $this->maximumMetaRefreshCount = 1;
+    $this->drupalGet('batch-test/test-title');
+    $this->assertRaw('<div class="progress__description">Completed 1 of 1.</div>', 'Progress message for second step appears correctly.');
+  }
+
+}

web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php

@@ -0,0 +1,303 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Batch;
+
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests batch processing in form and non-form workflow.
+ *
+ * @group Batch
+ */
+class ProcessingTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['batch_test', 'test_page_test'];
+
+  /**
+   * Tests batches triggered outside of form submission.
+   */
+  public function testBatchNoForm() {
+    // Displaying the page triggers batch 1.
+    $this->drupalGet('batch-test/no-form');
+    $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+  }
+
+  /**
+   * Tests batches that redirect in the batch finished callback.
+   */
+  public function testBatchRedirectFinishedCallback() {
+    // Displaying the page triggers batch 1.
+    $this->drupalGet('batch-test/finish-redirect');
+    $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
+    $this->assertText('Test page text.', 'Custom redirection after batch execution displays the correct page.');
+    $this->assertUrl(Url::fromRoute('test_page_test.test_page'));
+  }
+
+  /**
+   * Tests batches defined in a form submit handler.
+   */
+  public function testBatchForm() {
+    // Batch 0: no operation.
+    $edit = ['batch' => 'batch_0'];
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertBatchMessages($this->_resultMessages('batch_0'), 'Batch with no operation performed successfully.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+
+    // Batch 1: several simple operations.
+    $edit = ['batch' => 'batch_1'];
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch with simple operations performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+
+    // Batch 2: one multistep operation.
+    $edit = ['batch' => 'batch_2'];
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch with multistep operation performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+
+    // Batch 3: simple + multistep combined.
+    $edit = ['batch' => 'batch_3'];
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertBatchMessages($this->_resultMessages('batch_3'), 'Batch with simple and multistep operations performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_3'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+
+    // Batch 4: nested batch.
+    $edit = ['batch' => 'batch_4'];
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_4'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+  }
+
+  /**
+   * Tests batches defined in a multistep form.
+   */
+  public function testBatchFormMultistep() {
+    $this->drupalGet('batch-test/multistep');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+    $this->assertText('step 1', 'Form is displayed in step 1.');
+
+    // First step triggers batch 1.
+    $this->drupalPostForm(NULL, [], 'Submit');
+    $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 1 performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
+    $this->assertText('step 2', 'Form is displayed in step 2.');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+
+    // Second step triggers batch 2.
+    $this->drupalPostForm(NULL, [], 'Submit');
+    $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch for step 2 performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+    $this->assertNoEscaped('<', 'No escaped markup is present.');
+
+    // Extra query arguments will trigger logic that will add them to the
+    // redirect URL. Make sure they are persisted.
+    $this->drupalGet('batch-test/multistep', ['query' => ['big_tree' => 'small_axe']]);
+    $this->drupalPostForm(NULL, [], 'Submit');
+    $this->assertText('step 2', 'Form is displayed in step 2.');
+    $this->assertTrue(strpos($this->getUrl(), 'batch-test/multistep?big_tree=small_axe'), 'Query argument was persisted and another extra argument was added.');
+  }
+
+  /**
+   * Tests batches defined in different submit handlers on the same form.
+   */
+  public function testBatchFormMultipleBatches() {
+    // Batches 1, 2 and 3 are triggered in sequence by different submit
+    // handlers. Each submit handler modify the submitted 'value'.
+    $value = rand(0, 255);
+    $edit = ['value' => $value];
+    $this->drupalPostForm('batch-test/chained', $edit, 'Submit');
+    // Check that result messages are present and in the correct order.
+    $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.');
+    // The stack contains execution order of batch callbacks and submit
+    // handlers and logging of corresponding $form_state->getValues().
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), 'Execution order was correct, and $form_state is correctly persisted.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+  }
+
+  /**
+   * Tests batches defined in a programmatically submitted form.
+   *
+   * Same as above, but the form is submitted through drupal_form_execute().
+   */
+  public function testBatchFormProgrammatic() {
+    // Batches 1, 2 and 3 are triggered in sequence by different submit
+    // handlers. Each submit handler modify the submitted 'value'.
+    $value = rand(0, 255);
+    $this->drupalGet('batch-test/programmatic/' . $value);
+    // Check that result messages are present and in the correct order.
+    $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.');
+    // The stack contains execution order of batch callbacks and submit
+    // handlers and logging of corresponding $form_state->getValues().
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), 'Execution order was correct, and $form_state is correctly persisted.');
+    $this->assertText('Got out of a programmatic batched form.', 'Page execution continues normally.');
+  }
+
+  /**
+   * Test form submission during a batch operation.
+   */
+  public function testDrupalFormSubmitInBatch() {
+    // Displaying the page triggers a batch that programmatically submits a
+    // form.
+    $value = rand(0, 255);
+    $this->drupalGet('batch-test/nested-programmatic/' . $value);
+    $this->assertEqual(batch_test_stack(), ['mock form submitted with value = ' . $value], '\Drupal::formBuilder()->submitForm() ran successfully within a batch operation.');
+  }
+
+  /**
+   * Tests batches that return $context['finished'] > 1 do in fact complete.
+   *
+   * @see https://www.drupal.org/node/600836
+   */
+  public function testBatchLargePercentage() {
+    // Displaying the page triggers batch 5.
+    $this->drupalGet('batch-test/large-percentage');
+    $this->assertBatchMessages($this->_resultMessages('batch_5'), 'Batch for step 2 performed successfully.');
+    $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_5'), 'Execution order was correct.');
+    $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
+  }
+
+
+  /**
+   * Triggers a pass if the texts were found in order in the raw content.
+   *
+   * @param $texts
+   *   Array of raw strings to look for .
+   * @param $message
+   *   Message to display.
+   *
+   * @return
+   *   TRUE on pass, FALSE on fail.
+   */
+  public function assertBatchMessages($texts, $message) {
+    $pattern = '|' . implode('.*', $texts) . '|s';
+    return $this->assertPattern($pattern, $message);
+  }
+
+  /**
+   * Returns expected execution stacks for the test batches.
+   */
+  public function _resultStack($id, $value = 0) {
+    $stack = [];
+    switch ($id) {
+      case 'batch_1':
+        for ($i = 1; $i <= 10; $i++) {
+          $stack[] = "op 1 id $i";
+        }
+        break;
+
+      case 'batch_2':
+        for ($i = 1; $i <= 10; $i++) {
+          $stack[] = "op 2 id $i";
+        }
+        break;
+
+      case 'batch_3':
+        for ($i = 1; $i <= 5; $i++) {
+          $stack[] = "op 1 id $i";
+        }
+        for ($i = 1; $i <= 5; $i++) {
+          $stack[] = "op 2 id $i";
+        }
+        for ($i = 6; $i <= 10; $i++) {
+          $stack[] = "op 1 id $i";
+        }
+        for ($i = 6; $i <= 10; $i++) {
+          $stack[] = "op 2 id $i";
+        }
+        break;
+
+      case 'batch_4':
+        for ($i = 1; $i <= 5; $i++) {
+          $stack[] = "op 1 id $i";
+        }
+        $stack[] = 'setting up batch 2';
+        for ($i = 6; $i <= 10; $i++) {
+          $stack[] = "op 1 id $i";
+        }
+        $stack = array_merge($stack, $this->_resultStack('batch_2'));
+        break;
+
+      case 'batch_5':
+        for ($i = 1; $i <= 10; $i++) {
+          $stack[] = "op 5 id $i";
+        }
+        break;
+
+      case 'chained':
+        $stack[] = 'submit handler 1';
+        $stack[] = 'value = ' . $value;
+        $stack = array_merge($stack, $this->_resultStack('batch_1'));
+        $stack[] = 'submit handler 2';
+        $stack[] = 'value = ' . ($value + 1);
+        $stack = array_merge($stack, $this->_resultStack('batch_2'));
+        $stack[] = 'submit handler 3';
+        $stack[] = 'value = ' . ($value + 2);
+        $stack[] = 'submit handler 4';
+        $stack[] = 'value = ' . ($value + 3);
+        $stack = array_merge($stack, $this->_resultStack('batch_3'));
+        break;
+    }
+    return $stack;
+  }
+
+  /**
+   * Returns expected result messages for the test batches.
+   */
+  public function _resultMessages($id) {
+    $messages = [];
+
+    switch ($id) {
+      case 'batch_0':
+        $messages[] = 'results for batch 0<div class="item-list"><ul><li>none</li></ul></div>';
+        break;
+
+      case 'batch_1':
+        $messages[] = 'results for batch 1<div class="item-list"><ul><li>op 1: processed 10 elements</li></ul></div>';
+        break;
+
+      case 'batch_2':
+        $messages[] = 'results for batch 2<div class="item-list"><ul><li>op 2: processed 10 elements</li></ul></div>';
+        break;
+
+      case 'batch_3':
+        $messages[] = 'results for batch 3<div class="item-list"><ul><li>op 1: processed 10 elements</li><li>op 2: processed 10 elements</li></ul></div>';
+        break;
+
+      case 'batch_4':
+        $messages[] = 'results for batch 4<div class="item-list"><ul><li>op 1: processed 10 elements</li></ul></div>';
+        $messages = array_merge($messages, $this->_resultMessages('batch_2'));
+        break;
+
+      case 'batch_5':
+        $messages[] = 'results for batch 5<div class="item-list"><ul><li>op 5: processed 10 elements</li></ul></div>';
+        break;
+
+      case 'chained':
+        $messages = array_merge($messages, $this->_resultMessages('batch_1'));
+        $messages = array_merge($messages, $this->_resultMessages('batch_2'));
+        $messages = array_merge($messages, $this->_resultMessages('batch_3'));
+        break;
+    }
+    return $messages;
+  }
+
+}

web/core/modules/system/tests/src/Functional/System/StatusTest.php

@@ -5,6 +5,7 @@ namespace Drupal\Tests\system\Functional\System;
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\system\SystemRequirements;
+use Symfony\Component\CssSelector\CssSelectorConverter;
 
 /**
  * Tests output on the status overview page.
@@ -89,6 +90,15 @@ class StatusTest extends BrowserTestBase {
 
     $this->drupalGet('admin/reports/status/php');
     $this->assertResponse(200, 'The phpinfo page is reachable.');
+
+    // Check if cron error is displayed in errors section
+    $cron_last_run = \Drupal::state()->get('system.cron_last');
+    \Drupal::state()->set('system.cron_last', 0);
+    $this->drupalGet('admin/reports/status');
+    $css_selector_converter = new CssSelectorConverter();
+    $xpath = $css_selector_converter->toXPath('details.system-status-report__entry') . '//div[contains(text(), "Cron has not run recently")]';
+    $this->assertNotEmpty($this->xpath($xpath), 'Cron has not run recently error is being displayed.');
+    \Drupal::state()->set('system.cron_last', $cron_last_run);
   }
 
 }

web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateThemeSettingsTest.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests\system\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Theme settings variables to configuration.
+ *
+ * @group system
+ */
+class MigrateThemeSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Install bartik theme.
+    \Drupal::service('theme_handler')->install(['bartik']);
+    // Install seven theme.
+    \Drupal::service('theme_handler')->install(['seven']);
+    $this->executeMigration('d7_theme_settings');
+  }
+
+  /**
+   * Tests migration of theme settings to variables to configuration.
+   */
+  public function testMigrateThemeSettings() {
+    $config = $this->config('bartik.settings');
+
+    $this->assertSame('', $config->get('favicon.path'));
+    $this->assertTrue($config->get('favicon.use_default'));
+    $this->assertTrue($config->get('features.comment_user_picture'));
+    $this->assertTrue($config->get('features.comment_user_verification'));
+    $this->assertTrue($config->get('features.favicon'));
+    $this->assertTrue($config->get('features.node_user_picture'));
+    $this->assertFalse($config->get('features.logo'));
+    $this->assertTrue($config->get('features.name'));
+    $this->assertTrue($config->get('features.slogan'));
+    $this->assertSame('public://gnu.png', $config->get('logo.path'));
+    $this->assertFalse($config->get('logo.use_default'));
+
+    $config = $this->config('seven.settings');
+    $this->assertSame('', $config->get('favicon.path'));
+    $this->assertTrue($config->get('favicon.use_default'));
+    $this->assertFalse($config->get('features.comment_user_picture'));
+    $this->assertTrue($config->get('features.comment_user_verification'));
+    $this->assertTrue($config->get('features.favicon'));
+    $this->assertTrue($config->get('features.node_user_picture'));
+    $this->assertFalse($config->get('features.logo'));
+    $this->assertTrue($config->get('features.name'));
+    $this->assertTrue($config->get('features.slogan'));
+    $this->assertSame('', $config->get('logo.path'));
+    $this->assertTrue($config->get('logo.use_default'));
+  }
+
+}

web/core/modules/system/tests/src/Kernel/Plugin/migrate/source/d7/ThemeSettingsTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\system\Kernel\Plugin\migrate\source\d7;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests D7 theme settings source plugin.
+ *
+ * @covers Drupal\system\Plugin\migrate\source\d7\ThemeSettings
+ *
+ * @group system
+ */
+class ThemeSettingsTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $value = [
+      'toggle_logo' => 1,
+      'toggle_name' => 1,
+      'toggle_slogan' => 1,
+      'toggle_node_user_picture' => 1,
+      'toggle_comment_user_picture' => 1,
+      'toggle_comment_user_verification' => 1,
+      'toggle_favicon' => 1,
+      'toggle_main_menu' => 1,
+      'toggle_secondary_menu' => 1,
+      'default_logo' => 1,
+      'logo_path' => ' ',
+      'logo_upload' => ' ',
+      'default_favicon' => 1,
+      'favicon_path' => ' ',
+      'favicon_upload' => ' ',
+      'scheme' => 'firehouse',
+    ];
+
+    $tests[0]['source_data']['variable'] = [
+      [
+        'name' => 'theme_bartik_settings',
+        'value' => serialize($value),
+      ],
+    ];
+
+    // The expected results are nearly identical to the source data.
+    $tests[0]['expected_data'] = [
+      [
+        'name' => 'theme_bartik_settings',
+        'value' => $value,
+      ],
+    ];
+
+    return $tests;
+  }
+
+}