- Failed to CREATE a test table');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerEmptySettingsTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerEmptySettingsTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-siteDirectory . '/settings.php');
- parent::setUp();
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-siteDirectory . '/config_read_only', 0444);
- $this->expectedFilePerms = fileperms($this->siteDirectory . '/config_read_only');
- $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [
- 'value' => $this->siteDirectory . '/config_read_only',
- 'required' => TRUE,
- ];
- parent::setUp();
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- $this->assertEqual($this->expectedFilePerms, fileperms($this->siteDirectory . '/config_read_only'));
- $this->assertEqual([], glob($this->siteDirectory . '/config_read_only/*'), 'The sync directory is empty after install because it is read-only.');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-settings['databases']['default'] = (object) [
- 'value' => $connection_info,
- 'required' => TRUE,
- ];
- parent::setUp();
- }
-
- /**
- * {@inheritdoc}
- *
- * @todo The database settings form is not supposed to appear if settings.php
- * contains a valid database connection already (but e.g. no config
- * directories yet).
- */
- protected function setUpSettings() {
- // All database settings should be pre-configured, except password.
- $values = $this->parameters['forms']['install_settings_form'];
- $driver = $values['driver'];
- $edit = [];
- if (isset($values[$driver]['password']) && $values[$driver]['password'] !== '') {
- $edit = $this->translatePostValues([
- $driver => [
- 'password' => $values[$driver]['password'],
- ],
- ]);
- }
- $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']);
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-visitInstaller();
- $this->assertRaw('Drupal already installed');
-
- // Delete settings.php and attempt to reinstall again.
- unlink($this->siteDirectory . '/settings.php');
- $this->visitInstaller();
- $this->setUpLanguage();
- $this->setUpProfile();
- $this->setUpRequirementsProblem();
- $this->setUpSettings();
- $this->assertRaw('Drupal already installed');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-settings['settings']['hash_salt'] = (object) [
- 'value' => __CLASS__,
- 'required' => TRUE,
- ];
-
- // Pre-configure database credentials.
- $connection_info = Database::getConnectionInfo();
- unset($connection_info['default']['pdo']);
- unset($connection_info['default']['init_commands']);
-
- $this->settings['databases']['default'] = (object) [
- 'value' => $connection_info,
- 'required' => TRUE,
- ];
-
- // During interactive install we'll change this to a different profile and
- // this test will ensure that the new value is written to settings.php.
- $this->settings['settings']['install_profile'] = (object) [
- 'value' => 'minimal',
- 'required' => TRUE,
- ];
-
- // Pre-configure config directories.
- $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
- $this->settings['config_directories'] = [
- CONFIG_SYNC_DIRECTORY => (object) [
- 'value' => $site_path . '/files/config_staging',
- 'required' => TRUE,
- ],
- ];
- mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
-
- parent::setUp();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function visitInstaller() {
- // Make settings file not writable. This will break the installer.
- $filename = $this->siteDirectory . '/settings.php';
- // Make the settings file read-only.
- // Not using File API; a potential error must trigger a PHP warning.
- chmod($filename, 0444);
-
- $this->drupalGet($GLOBALS['base_url'] . '/core/install.php?langcode=en&profile=testing');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpLanguage() {
- // This step is skipped, because there is a lagcode as a query param.
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpProfile() {
- // This step is skipped, because there is a profile as a query param.
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSettings() {
- // This step should not appear, since settings.php is fully configured
- // already.
- }
-
- protected function setUpSite() {
- // This step should not appear, since settings.php could not be written.
- }
-
- /**
- * Verifies that installation did not succeed.
- */
- public function testBrokenInstaller() {
- $this->assertTitle('Install profile mismatch | Drupal');
- $this->assertText("The selected profile testing does not match the install_profile setting, which is minimal. Cannot write updated setting to {$this->siteDirectory}/settings.php.");
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-settings['settings']['hash_salt'] = (object) [
- 'value' => __CLASS__,
- 'required' => TRUE,
- ];
-
- // Pre-configure database credentials.
- $connection_info = Database::getConnectionInfo();
- unset($connection_info['default']['pdo']);
- unset($connection_info['default']['init_commands']);
-
- $this->settings['databases']['default'] = (object) [
- 'value' => $connection_info,
- 'required' => TRUE,
- ];
-
- // During interactive install we'll change this to a different profile and
- // this test will ensure that the new value is written to settings.php.
- $this->settings['settings']['install_profile'] = (object) [
- 'value' => 'minimal',
- 'required' => TRUE,
- ];
-
- // Pre-configure config directories.
- $this->settings['config_directories'] = [
- CONFIG_SYNC_DIRECTORY => (object) [
- 'value' => DrupalKernel::findSitePath(Request::createFromGlobals()) . '/files/config_sync',
- 'required' => TRUE,
- ],
- ];
- mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
-
- parent::setUp();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function visitInstaller() {
- // Provide profile and language in query string to skip these pages.
- $this->drupalGet($GLOBALS['base_url'] . '/core/install.php?langcode=en&profile=testing');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpLanguage() {
- // This step is skipped, because there is a lagcode as a query param.
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpProfile() {
- // This step is skipped, because there is a profile as a query param.
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSettings() {
- // This step should not appear, since settings.php is fully configured
- // already.
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- $this->assertEqual('testing', \Drupal::installProfile());
- $this->assertEqual('testing', Settings::get('install_profile'), 'Profile was correctly changed to testing in Settings.php');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-settings['settings']['hash_salt'] = (object) [
- 'value' => __CLASS__,
- 'required' => TRUE,
- ];
-
- // Pre-configure database credentials.
- $connection_info = Database::getConnectionInfo();
- unset($connection_info['default']['pdo']);
- unset($connection_info['default']['init_commands']);
-
- $this->settings['databases']['default'] = (object) [
- 'value' => $connection_info,
- 'required' => TRUE,
- ];
-
- // Pre-configure config directories.
- $this->settings['config_directories'] = [
- CONFIG_SYNC_DIRECTORY => (object) [
- 'value' => DrupalKernel::findSitePath(Request::createFromGlobals()) . '/files/config_sync',
- 'required' => TRUE,
- ],
- ];
- mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
-
- parent::setUp();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSettings() {
- // This step should not appear, since settings.php is fully configured
- // already.
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- $this->assertEqual('testing', \Drupal::installProfile());
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-settings['settings']['hash_salt'] = (object) [
- 'value' => __CLASS__,
- 'required' => TRUE,
- ];
-
- // During interactive install we'll change this to a different profile and
- // this test will ensure that the new value is written to settings.php.
- $this->settings['settings']['install_profile'] = (object) [
- 'value' => 'minimal',
- 'required' => TRUE,
- ];
-
- // Pre-configure database credentials.
- $connection_info = Database::getConnectionInfo();
- unset($connection_info['default']['pdo']);
- unset($connection_info['default']['init_commands']);
-
- $this->settings['databases']['default'] = (object) [
- 'value' => $connection_info,
- 'required' => TRUE,
- ];
-
- // Use the kernel to find the site path because the site.path service should
- // not be available at this point in the install process.
- $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
- // Pre-configure config directories.
- $this->settings['config_directories'] = [
- CONFIG_SYNC_DIRECTORY => (object) [
- 'value' => $site_path . '/files/config_sync',
- 'required' => TRUE,
- ],
- ];
- mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
-
- parent::setUp();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSettings() {
- // This step should not appear, since settings.php is fully configured
- // already.
- }
-
- /**
- * Verifies that installation succeeded.
- */
- public function testInstaller() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- $this->assertEqual('testing', \Drupal::installProfile(), 'Profile was changed from minimal to testing during interactive install.');
- $this->assertEqual('testing', Settings::get('install_profile'), 'Profile was correctly changed to testing in Settings.php');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerLanguageDirectionTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerLanguageDirectionTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-siteDirectory . '/files/translations', 0777, TRUE);
- file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.ar.po', "msgid \"\"\nmsgstr \"\"\nmsgid \"Save and continue\"\nmsgstr \"Save and continue Arabic\"");
-
- parent::setUpLanguage();
- // After selecting a different language than English, all following screens
- // should be translated already.
- $elements = $this->xpath('//input[@type="submit"]/@value');
- $this->assertEqual((string) current($elements), 'Save and continue Arabic');
- $this->translations['Save and continue'] = 'Save and continue Arabic';
-
- // Verify that language direction is right-to-left.
- $direction = (string) current($this->xpath('/html/@dir'));
- $this->assertEqual($direction, 'rtl');
- }
-
- /**
- * Confirms that the installation succeeded.
- */
- public function testInstalled() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-siteDirectory . '/files/translations', 0777, TRUE);
- touch(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.xoxo.po');
-
- // Check that all predefined languages show up with their native names.
- $this->visitInstaller();
- foreach (LanguageManager::getStandardLanguageList() as $langcode => $names) {
- $this->assertOption('edit-langcode', $langcode);
- $this->assertRaw('>' . $names[1] . '<');
- }
-
- // Check that our custom one shows up with the file name indicated language.
- $this->assertOption('edit-langcode', 'xoxo');
- $this->assertRaw('>xoxo<');
-
- parent::setUpLanguage();
- }
-
- /**
- * Confirms that the installation succeeded.
- */
- public function testInstalled() {
- $this->assertUrl('user/1');
- $this->assertResponse(200);
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-assertUrl('user/1');
- $this->assertResponse(200);
- // Confirm that we are logged-in after installation.
- $this->assertText($this->rootUser->getUsername());
-
- // Verify that the confirmation message appears.
- require_once \Drupal::root() . '/core/includes/install.inc';
- $this->assertRaw(t('Congratulations, you installed @drupal!', [
- '@drupal' => drupal_install_profile_distribution_name(),
- ]));
-
- // Ensure that the timezone is correct for sites under test after installing
- // interactively.
- $this->assertEqual($this->config('system.date')->get('timezone.default'), 'Australia/Sydney');
- }
-
- /**
- * Installer step: Select language.
- */
- protected function setUpLanguage() {
- // Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets and
- // metatags as expected to the first page of the installer.
- $this->assertRaw('core/themes/seven/css/components/buttons.css');
- $this->assertRaw('');
-
- // Assert that the expected title is present.
- $this->assertEqual('Choose language', $this->cssSelect('main h2')[0]);
-
- parent::setUpLanguage();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpProfile() {
- // Assert that the expected title is present.
- $this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]);
- $result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', [':class' => 'visually-hidden', ':text' => 'Select an installation profile']);
- $this->assertEqual(count($result), 1, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set");
-
- parent::setUpProfile();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSettings() {
- // Assert that the expected title is present.
- $this->assertEqual('Database configuration', $this->cssSelect('main h2')[0]);
-
- parent::setUpSettings();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function setUpSite() {
- // Assert that the expected title is present.
- $this->assertEqual('Configure site', $this->cssSelect('main h2')[0]);
-
- parent::setUpSite();
- }
-
- /**
- * {@inheritdoc}
- */
- protected function visitInstaller() {
- parent::visitInstaller();
-
- // Assert the title is correct and has the title suffix.
- $this->assertTitle('Choose language | Drupal');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageForeignTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageForeignTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-translations['Save and continue'] = 'Save and continue de';
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageKeepEnglishTest.php
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageKeepEnglishTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-siteDirectory . '/files/translations', 0777, TRUE);
- file_put_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de'));
- file_put_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.es.po', $this->getPo('es'));
-
- parent::setUpLanguage();
- }
-
- /**
- * Returns the string for the test .po file.
- *
- * @param string $langcode
- * The language code.
- * @return string
- * Contents for the test .po file.
- */
- protected function getPo($langcode) {
- return <<
langcode; - return $params; - } - - /** - * Tests that translations ended up at the expected places. - */ - public function testTranslationsLoaded() { - // Ensure the title is correct. - $this->assertEqual('SITE_NAME_' . $this->langcode, \Drupal::config('system.site')->get('name')); - - // Verify German and Spanish were configured. - $this->drupalGet('admin/config/regional/language'); - $this->assertText('German'); - $this->assertText('Spanish'); - // If the installer was English or we used a profile that keeps English, we - // expect that configured also. Otherwise English should not be configured - // on the site. - if ($this->langcode == 'en' || $this->profile == 'testing_multilingual_with_english') { - $this->assertText('English'); - } - else { - $this->assertNoText('English'); - } - - // Verify the strings from the translation files were imported. - $this->verifyImportedStringsTranslated(); - - /** @var \Drupal\language\ConfigurableLanguageManager $language_manager */ - $language_manager = \Drupal::languageManager(); - - // If the site was installed in a foreign language (only tested with German - // in subclasses), then the active configuration should be updated and no - // override should exist in German. Otherwise the German translation should - // end up in overrides the same way as Spanish (which is not used as a site - // installation language). English should be available based on profile - // information and should be possible to add if not yet added, making - // English overrides available. - - $config = \Drupal::config('user.settings'); - $override_de = $language_manager->getLanguageConfigOverride('de', 'user.settings'); - $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings'); - $override_es = $language_manager->getLanguageConfigOverride('es', 'user.settings'); - - if ($this->langcode == 'de') { - // Active configuration should be in German and no German override should - // exist. - $this->assertEqual($config->get('anonymous'), 'Anonymous de'); - $this->assertEqual($config->get('langcode'), 'de'); - $this->assertTrue($override_de->isNew()); - - if ($this->profile == 'testing_multilingual_with_english') { - // English is already added in this profile. Should make the override - // available. - $this->assertEqual($override_en->get('anonymous'), 'Anonymous'); - } - else { - // English is not yet available. - $this->assertTrue($override_en->isNew()); - - // Adding English should make the English override available. - $edit = ['predefined_langcode' => 'en']; - $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language')); - $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings'); - $this->assertEqual($override_en->get('anonymous'), 'Anonymous'); - } - - // Activate a module, to make sure that config is not overridden by module - // installation. - $edit = [ - 'modules[views][enable]' => TRUE, - 'modules[filter][enable]' => TRUE, - ]; - $this->drupalPostForm('admin/modules', $edit, t('Install')); - - // Verify the strings from the translation are still as expected. - $this->verifyImportedStringsTranslated(); - } - else { - // Active configuration should be English. - $this->assertEqual($config->get('anonymous'), 'Anonymous'); - $this->assertEqual($config->get('langcode'), 'en'); - // There should not be an English override. - $this->assertTrue($override_en->isNew()); - // German should be an override. - $this->assertEqual($override_de->get('anonymous'), 'Anonymous de'); - } - - // Spanish is always an override (never used as installation language). - $this->assertEqual($override_es->get('anonymous'), 'Anonymous es'); - - } - - /** - * Helper function to verify that the expected strings are translated. - */ - protected function verifyImportedStringsTranslated() { - $test_samples = ['Save and continue', 'Anonymous', 'Language']; - $langcodes = ['de', 'es']; - - foreach ($test_samples as $sample) { - foreach ($langcodes as $langcode) { - $edit = []; - $edit['langcode'] = $langcode; - $edit['translation'] = 'translated'; - $edit['string'] = $sample; - $this->drupalPostForm('admin/config/regional/translate', $edit, t('Filter')); - $this->assertText($sample . ' ' . $langcode); - } - } - } - -} diff -r e200cb7efeb3 -r c2387f117808 core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php --- a/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php Thu Apr 26 11:26:54 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -siteDirectory . '/files/translations', 0777, TRUE); - file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); - - // The unrouted URL assembler does not exist at this point, so we build the - // URL ourselves. - $this->drupalGet($GLOBALS['base_url'] . '/core/install.php' . '?langcode=' . $this->langcode); - - // The language should have been automatically detected, all following - // screens should be translated already. - $elements = $this->xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); - $this->translations['Save and continue'] = 'Save and continue de'; - - // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); - $this->assertEqual($direction, 'ltr'); - } - - /** - * {@inheritdoc} - */ - protected function setUpLanguage() { - // The language was was preset by passing a query parameter in the URL, so - // no explicit language selection is necessary. - } - - /** - * Verifies the expected behaviors of the installation result. - */ - public function testInstaller() { - $this->assertUrl('user/1'); - $this->assertResponse(200); - - // Verify German was configured but not English. - $this->drupalGet('admin/config/regional/language'); - $this->assertText('German'); - $this->assertNoText('English'); - } - - /** - * Returns the string for the test .po file. - * - * @param string $langcode - * The language code. - * @return string - * Contents for the test .po file. - */ - protected function getPo($langcode) { - return << siteDirectory . '/files/translations', 0777, TRUE); - file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); - - parent::setUpLanguage(); - - // After selecting a different language than English, all following screens - // should be translated already. - $elements = $this->xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); - $this->translations['Save and continue'] = 'Save and continue de'; - - // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); - $this->assertEqual($direction, 'ltr'); - } - - /** - * {@inheritdoc} - */ - protected function setUpSettings() { - // We are creating a table here to force an error in the installer because - // it will try and create the drupal_install_test table as this is part of - // the standard database tests performed by the installer in - // Drupal\Core\Database\Install\Tasks. - Database::getConnection('default')->query('CREATE TABLE {drupal_install_test} (id int NULL)'); - parent::setUpSettings(); - - // Ensure that the error message translation is working. - $this->assertRaw('Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der Installationshandbuch, oder kontaktieren Sie Ihren Hosting-Anbieter.'); - $this->assertRaw('CREATE ein Test-Tabelle auf Ihrem Datenbankserver mit dem Befehl CREATE TABLE {drupal_install_test} (id int NULL) fehlgeschlagen.'); - - // Now do it successfully. - Database::getConnection('default')->query('DROP TABLE {drupal_install_test}'); - parent::setUpSettings(); - } - - /** - * Verifies the expected behaviors of the installation result. - */ - public function testInstaller() { - $this->assertUrl('user/1'); - $this->assertResponse(200); - - // Verify German was configured but not English. - $this->drupalGet('admin/config/regional/language'); - $this->assertText('German'); - $this->assertNoText('English'); - - // The current container still has the english as current language, rebuild. - $this->rebuildContainer(); - /** @var \Drupal\user\Entity\User $account */ - $account = User::load(0); - $this->assertEqual($account->language()->getId(), 'en', 'Anonymous user is English.'); - $account = User::load(1); - $this->assertEqual($account->language()->getId(), 'en', 'Administrator user is English.'); - $account = $this->drupalCreateUser(); - $this->assertEqual($account->language()->getId(), 'de', 'New user is German.'); - - // Ensure that we can enable basic_auth on a non-english site. - $this->drupalPostForm('admin/modules', ['modules[basic_auth][enable]' => TRUE], t('Install')); - $this->assertResponse(200); - - // Assert that the theme CSS was added to the page. - $edit = ['preprocess_css' => FALSE]; - $this->drupalPostForm('admin/config/development/performance', $edit, t('Save configuration')); - $this->drupalGet(' '); - $this->assertRaw('classy/css/components/action-links.css'); - - // Verify the strings from the translation files were imported. - $test_samples = ['Save and continue', 'Anonymous']; - foreach ($test_samples as $sample) { - $edit = []; - $edit['langcode'] = 'de'; - $edit['translation'] = 'translated'; - $edit['string'] = $sample; - $this->drupalPostForm('admin/config/regional/translate', $edit, t('Filter')); - $this->assertText($sample . ' de'); - } - - /** @var \Drupal\language\ConfigurableLanguageManager $language_manager */ - $language_manager = \Drupal::languageManager(); - - // Installed in German, configuration should be in German. No German or - // English overrides should be present. - $config = \Drupal::config('user.settings'); - $override_de = $language_manager->getLanguageConfigOverride('de', 'user.settings'); - $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings'); - $this->assertEqual($config->get('anonymous'), 'Anonymous de'); - $this->assertEqual($config->get('langcode'), 'de'); - $this->assertTrue($override_de->isNew()); - $this->assertTrue($override_en->isNew()); - - // Assert that adding English makes the English override available. - $edit = ['predefined_langcode' => 'en']; - $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language')); - $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings'); - $this->assertFalse($override_en->isNew()); - $this->assertEqual($override_en->get('anonymous'), 'Anonymous'); - } - - /** - * Returns the string for the test .po file. - * - * @param string $langcode - * The language code. - * @return string - * Contents for the test .po file. - */ - protected function getPo($langcode) { - return << installation handbook
+ * @code
* $query->addExpression('SUBSTRING(thread, 1, (LENGTH(thread) - 1))', 'order_field');
* $query->orderBy('order_field', 'ASC');
- *
+ * @endcode
* @param $direction
* The direction to sort. Legal values are "ASC" and "DESC". Any other value
* will be converted to "ASC".
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/Database/StatementInterface.php
--- a/core/lib/Drupal/Core/Database/StatementInterface.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/Database/StatementInterface.php Tue Jul 10 15:07:59 2018 +0100
@@ -44,7 +44,7 @@
*
* @param $args
* An array of values with as many elements as there are bound parameters in
- * the SQL statement being executed.
+ * the SQL statement being executed. This can be NULL.
* @param $options
* An array of options for this query.
*
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/Database/StatementPrefetch.php
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php Tue Jul 10 15:07:59 2018 +0100
@@ -214,8 +214,8 @@
*
* @param $query
* The query.
- * @param array $args
- * An array of arguments.
+ * @param array|null $args
+ * An array of arguments. This can be NULL.
* @return \PDOStatement
* A PDOStatement object.
*/
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/Database/database.api.php
--- a/core/lib/Drupal/Core/Database/database.api.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/Database/database.api.php Tue Jul 10 15:07:59 2018 +0100
@@ -256,7 +256,7 @@
* recent) {node_field_revision}.vid value for this nid."
* - 'type': The generic datatype: 'char', 'varchar', 'text', 'blob', 'int',
* 'float', 'numeric', or 'serial'. Most types just map to the according
- * database engine specific datatypes. Use 'serial' for auto incrementing
+ * database engine specific data types. Use 'serial' for auto incrementing
* fields. This will expand to 'INT auto_increment' on MySQL.
* A special 'varchar_ascii' type is also available for limiting machine
* name field to US ASCII characters.
@@ -272,7 +272,7 @@
* - 'size': The data size: 'tiny', 'small', 'medium', 'normal',
* 'big'. This is a hint about the largest value the field will
* store and determines which of the database engine specific
- * datatypes will be used (e.g. on MySQL, TINYINT vs. INT vs. BIGINT).
+ * data types will be used (e.g. on MySQL, TINYINT vs. INT vs. BIGINT).
* 'normal', the default, selects the base type (e.g. on MySQL,
* INT, VARCHAR, BLOB, etc.).
* Not all sizes are available for all data types. See
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/Datetime/Element/Datetime.php
--- a/core/lib/Drupal/Core/Datetime/Element/Datetime.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/Datetime/Element/Datetime.php Tue Jul 10 15:07:59 2018 +0100
@@ -181,9 +181,13 @@
* dynamic value that is that many years earlier or later than the current
* year at the time the form is displayed. Used in jQueryUI datepicker year
* range and HTML5 min/max date settings. Defaults to '1900:2050'.
- * - #date_increment: The increment to use for minutes and seconds, i.e.
- * '15' would show only :00, :15, :30 and :45. Used for HTML5 step values and
- * jQueryUI datepicker settings. Defaults to 1 to show every minute.
+ * - #date_increment: The interval (step) to use when incrementing or
+ * decrementing time, in seconds. For example, if this value is set to 30,
+ * time increases (or decreases) in steps of 30 seconds (00:00:00,
+ * 00:00:30, 00:01:00, and so on.) If this value is a multiple of 60, the
+ * "seconds"-component will not be shown in the input. Used for HTML5 step
+ * values and jQueryUI datepicker settings. Defaults to 1 to show every
+ * second.
* - #date_timezone: The local timezone to use when creating dates. Generally
* this should be left empty and it will be set correctly for the user using
* the form. Useful if the default value is empty to designate a desired
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
--- a/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,6 +2,7 @@
namespace Drupal\Core\DependencyInjection;
+use Drupal\Core\Entity\EntityStorageInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -17,6 +18,13 @@
protected $_serviceIds = [];
/**
+ * An array of entity type IDs keyed by the property name of their storages.
+ *
+ * @var array
+ */
+ protected $_entityStorages = [];
+
+ /**
* {@inheritdoc}
*/
public function __sleep() {
@@ -35,6 +43,17 @@
$this->_serviceIds[$key] = 'service_container';
unset($vars[$key]);
}
+ elseif ($value instanceof EntityStorageInterface) {
+ // If a class member is an entity storage, only store the entity type ID
+ // the storage is for so it can be used to get a fresh object on
+ // unserialization. By doing this we prevent possible memory leaks when
+ // the storage is serialized when it contains a static cache of entity
+ // objects and additionally we ensure that we'll not have multiple
+ // storage objects for the same entity type and therefore prevent
+ // returning different references for the same entity.
+ $this->_entityStorages[$key] = $value->getEntityTypeId();
+ unset($vars[$key]);
+ }
}
return array_keys($vars);
@@ -61,6 +80,19 @@
$this->$key = $container->get($service_id);
}
$this->_serviceIds = [];
+
+ // In rare cases, when test data is serialized in the parent process, there
+ // is a service container but it doesn't contain all expected services. To
+ // avoid fatal errors during the wrap-up of failing tests, we check for this
+ // case, too.
+ if ($this->_entityStorages && (!$phpunit_bootstrap || $container->has('entity_type.manager'))) {
+ /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
+ $entity_type_manager = $container->get('entity_type.manager');
+ foreach ($this->_entityStorages as $key => $entity_type_id) {
+ $this->$key = $entity_type_manager->getStorage($entity_type_id);
+ }
+ }
+ $this->_entityStorages = [];
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/lib/Drupal/Core/DrupalKernel.php
--- a/core/lib/Drupal/Core/DrupalKernel.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/lib/Drupal/Core/DrupalKernel.php Tue Jul 10 15:07:59 2018 +0100
@@ -318,6 +318,9 @@
* for bootstrap level configuration, file configuration stores, public file
* storage and site specific modules and themes.
*
+ * A file named sites.php must be present in the sites directory for
+ * multisite. If it doesn't exist, then 'sites/default' will be used.
+ *
* Finds a matching site directory file by stripping the website's hostname
* from left to right and pathname from right to left. By default, the
* directory must contain a 'settings.php' file for it to match. If the
@@ -328,9 +331,8 @@
* default.settings.php for examples on how the URL is converted to a
* directory.
*
- * If a file named sites.php is present in the sites directory, it will be
- * loaded prior to scanning for directories. That file can define aliases in
- * an associative array named $sites. The array is written in the format
+ * The sites.php file in the sites directory can define aliases in an
+ * associative array named $sites. The array is written in the format
* 'The name "llama" was adopted by European settlers from native Peruvians.
\n", + ], + ], + 'status' => [ + [ + 'value' => FALSE, + ], + ], + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + return [ + 'type' => [ + [ + 'target_id' => 'basic', + ], + ], + 'info' => [ + [ + 'value' => 'Dramallama', + ], + ], + ]; + } + + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessMessage($method) { + if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessCacheability() { + // @see \Drupal\block_content\BlockContentAccessControlHandler() + return parent::getExpectedUnauthorizedAccessCacheability() + ->addCacheTags(['block_content:1']); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedCacheTags() { + return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedCacheContexts() { + return Cache::mergeContexts(['url.site'], $this->container->getParameter('renderer.config')['required_cache_contexts']); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,24 @@ +grantPermissionsToTestedRole(['administer blocks']); + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + $block_content_type = BlockContentType::create([ + 'id' => 'pascal', + 'label' => 'Pascal', + 'revision' => FALSE, + 'description' => 'Provides a competitive alternative to the "basic" type', + ]); + + $block_content_type->save(); + + return $block_content_type; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + return [ + 'dependencies' => [], + 'description' => 'Provides a competitive alternative to the "basic" type', + 'id' => 'pascal', + 'label' => 'Pascal', + 'langcode' => 'en', + 'revision' => 0, + 'status' => TRUE, + 'uuid' => $this->entity->uuid(), + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + // @todo Update in https://www.drupal.org/node/2300677. + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeXmlAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,26 @@ +save(); } } + +/** + * Implements hook_migration_plugins_alter(). + */ +function book_migration_plugins_alter(array &$migrations) { + // Book settings are migrated identically for Drupal 6 and Drupal 7. However, + // a d6_book_settings migration already existed before the consolidated + // book_settings migration existed, so to maintain backwards compatibility, + // ensure that d6_book_settings is an alias of book_settings. + if (isset($migrations['book_settings'])) { + $migrations['d6_book_settings'] = &$migrations['book_settings']; + } +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/migrations/book_settings.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/migrations/book_settings.yml Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,20 @@ +id: book_settings +label: Book configuration +migration_tags: + - Drupal 6 + - Drupal 7 + - Configuration +source: + plugin: variable + variables: + - book_child_type + - book_block_mode + - book_allowed_types + source_module: book +process: + child_type: book_child_type + 'block/navigation/mode': book_block_mode + allowed_types: book_allowed_types +destination: + plugin: config + config_name: book.settings diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/migrations/d6_book.yml --- a/core/modules/book/migrations/d6_book.yml Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/book/migrations/d6_book.yml Tue Jul 10 15:07:59 2018 +0100 @@ -4,7 +4,7 @@ - Drupal 6 - Content source: - plugin: d6_book + plugin: book process: nid: nid 'book/bid': bid diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/migrations/d6_book_settings.yml --- a/core/modules/book/migrations/d6_book_settings.yml Thu Apr 26 11:26:54 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -id: d6_book_settings -label: Book configuration -migration_tags: - - Drupal 6 - - Configuration -source: - plugin: variable - variables: - - book_child_type - - book_block_mode - - book_allowed_types - source_module: book -process: - child_type: book_child_type - 'block/navigation/mode': book_block_mode - allowed_types: book_allowed_types -destination: - plugin: config - config_name: book.settings diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/migrations/d7_book.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/migrations/d7_book.yml Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,24 @@ +id: d7_book +label: Books +migration_tags: + - Drupal 7 + - Content +source: + plugin: book +process: + nid: nid + 'book/bid': bid + 'book/weight': weight + 'book/pid': + - + plugin: skip_on_empty + method: process + source: plid + - + plugin: migration_lookup + migration: d7_book +destination: + plugin: book +migration_dependencies: + required: + - d7_node diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/src/BookManagerInterface.php --- a/core/modules/book/src/BookManagerInterface.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/book/src/BookManagerInterface.php Tue Jul 10 15:07:59 2018 +0100 @@ -246,7 +246,8 @@ * A data structure representing the tree as returned from buildBookOutlineData. * * @return array - * A structured array to be rendered by drupal_render(). + * A structured array to be rendered by + * \Drupal\Core\Render\RendererInterface::render(). * * @see \Drupal\Core\Menu\MenuLinkTree::build */ diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/src/Plugin/migrate/source/Book.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/src/Plugin/migrate/source/Book.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,63 @@ +select('book', 'b')->fields('b', ['nid', 'bid']); + $query->join('menu_links', 'ml', 'b.mlid = ml.mlid'); + $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth']; + foreach (range(1, 9) as $i) { + $field = "p$i"; + $ml_fields[] = $field; + $query->orderBy('ml.' . $field); + } + return $query->fields('ml', $ml_fields); + } + + /** + * {@inheritdoc} + */ + public function getIds() { + $ids['mlid']['type'] = 'integer'; + $ids['mlid']['alias'] = 'ml'; + return $ids; + } + + /** + * {@inheritdoc} + */ + public function fields() { + return [ + 'nid' => $this->t('Node ID'), + 'bid' => $this->t('Book ID'), + 'mlid' => $this->t('Menu link ID'), + 'plid' => $this->t('Parent link ID'), + 'weight' => $this->t('Weight'), + 'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'), + 'p2' => $this->t('The second mlid in the materialized path. See p1.'), + 'p3' => $this->t('The third mlid in the materialized path. See p1.'), + 'p4' => $this->t('The fourth mlid in the materialized path. See p1.'), + 'p5' => $this->t('The fifth mlid in the materialized path. See p1.'), + 'p6' => $this->t('The sixth mlid in the materialized path. See p1.'), + 'p7' => $this->t('The seventh mlid in the materialized path. See p1.'), + 'p8' => $this->t('The eighth mlid in the materialized path. See p1.'), + 'p9' => $this->t('The ninth mlid in the materialized path. See p1.'), + ]; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/src/Plugin/migrate/source/d6/Book.php --- a/core/modules/book/src/Plugin/migrate/source/d6/Book.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php Tue Jul 10 15:07:59 2018 +0100 @@ -2,7 +2,9 @@ namespace Drupal\book\Plugin\migrate\source\d6; -use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; +use Drupal\book\Plugin\migrate\source\Book as BookGeneral; + +@trigger_error('Book is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.x. Use \Drupal\book\Plugin\migrate\source\Book instead. See https://www.drupal.org/node/2947487 for more information.', E_USER_DEPRECATED); /** * Drupal 6 book source. @@ -11,54 +13,9 @@ * id = "d6_book", * source_module = "book" * ) + * + * @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.x. Use + * \Drupal\book\Plugin\migrate\source\Book instead. See + * https://www.drupal.org/node/2947487 for more information. */ -class Book extends DrupalSqlBase { - - /** - * {@inheritdoc} - */ - public function query() { - $query = $this->select('book', 'b')->fields('b', ['nid', 'bid']); - $query->join('menu_links', 'ml', 'b.mlid = ml.mlid'); - $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth']; - for ($i = 1; $i <= 9; $i++) { - $field = "p$i"; - $ml_fields[] = $field; - $query->orderBy('ml.' . $field); - } - $query->fields('ml', $ml_fields); - return $query; - } - - /** - * {@inheritdoc} - */ - public function getIds() { - $ids['mlid']['type'] = 'integer'; - $ids['mlid']['alias'] = 'ml'; - return $ids; - } - - /** - * {@inheritdoc} - */ - public function fields() { - return [ - 'nid' => $this->t('Node ID'), - 'bid' => $this->t('Book ID'), - 'mlid' => $this->t('Menu link ID'), - 'plid' => $this->t('Parent link ID'), - 'weight' => $this->t('Weight'), - 'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'), - 'p2' => $this->t('The second mlid in the materialized path. See p1.'), - 'p3' => $this->t('The third mlid in the materialized path. See p1.'), - 'p4' => $this->t('The fourth mlid in the materialized path. See p1.'), - 'p5' => $this->t('The fifth mlid in the materialized path. See p1.'), - 'p6' => $this->t('The sixth mlid in the materialized path. See p1.'), - 'p7' => $this->t('The seventh mlid in the materialized path. See p1.'), - 'p8' => $this->t('The eighth mlid in the materialized path. See p1.'), - 'p9' => $this->t('The ninth mlid in the materialized path. See p1.'), - ]; - } - -} +class Book extends BookGeneral {} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php --- a/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -20,17 +20,29 @@ public static $modules = ['book']; /** - * {@inheritdoc} + * Data provider for testBookSettings(). + * + * @return array + * The data for each test scenario. */ - protected function setUp() { - parent::setUp(); - $this->executeMigration('d6_book_settings'); + public function providerBookSettings() { + return [ + // d6_book_settings was renamed to book_settings, but use the old alias to + // prove that it works. + // @see book_migration_plugins_alter() + ['d6_book_settings'], + ['book_settings'], + ]; } /** * Tests migration of book variables to book.settings.yml. + * + * @dataProvider providerBookSettings */ - public function testBookSettings() { + public function testBookSettings($migration_id) { + $this->executeMigration($migration_id); + $config = $this->config('book.settings'); $this->assertIdentical('book', $config->get('child_type')); $this->assertSame('book pages', $config->get('block.navigation.mode')); diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookConfigsTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookConfigsTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,41 @@ +executeMigration('book_settings'); + } + + /** + * Tests migration of book variables to book.settings.yml. + */ + public function testBookSettings() { + $config = $this->config('book.settings'); + $this->assertSame('book', $config->get('child_type')); + $this->assertSame('all pages', $config->get('block.navigation.mode')); + $this->assertSame(['book'], $config->get('allowed_types')); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config->get()); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,69 @@ +installEntitySchema('node'); + $this->installEntitySchema('taxonomy_term'); + $this->installConfig(['node']); + $this->installSchema('book', ['book']); + $this->installSchema('node', ['node_access']); + $this->executeMigrations([ + 'd7_user_role', + 'd7_user', + 'd7_node_type', + 'd7_node', + 'd7_book' + ]); + } + + /** + * Tests the Drupal 7 book structure to Drupal 8 migration. + */ + public function testBook() { + $nodes = Node::loadMultiple([1, 2, 4, 6]); + $this->assertSame('8', $nodes[1]->book['bid']); + $this->assertSame('6', $nodes[1]->book['pid']); + + $this->assertSame('4', $nodes[2]->book['bid']); + $this->assertSame('6', $nodes[2]->book['pid']); + + $this->assertSame('4', $nodes[4]->book['bid']); + $this->assertSame('0', $nodes[4]->book['pid']); + + $this->assertSame('4', $nodes[6]->book['bid']); + $this->assertSame('4', $nodes[6]->book['pid']); + + $tree = \Drupal::service('book.manager')->bookTreeAllData(4); + $this->assertSame('4', $tree['49990 is - The thing about Firefly 4']['link']['nid']); + $this->assertSame('6', $tree['49990 is - The thing about Firefly 4']['below']['50000 Comments are closed :-( 6']['link']['nid']); + $this->assertSame('2', $tree['49990 is - The thing about Firefly 4']['below']['50000 Comments are closed :-( 6']['below']['50000 The thing about Deep Space 9 2']['link']['nid']); + $this->assertSame([], $tree['49990 is - The thing about Firefly 4']['below']['50000 Comments are closed :-( 6']['below']['50000 The thing about Deep Space 9 2']['below']); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/tests/src/Kernel/Plugin/migrate/source/BookTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/book/tests/src/Kernel/Plugin/migrate/source/BookTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,100 @@ + '1', + 'nid' => '4', + 'bid' => '4', + ], + ]; + $tests[0]['source_data']['menu_links'] = [ + [ + 'menu_name' => 'book-toc-1', + 'mlid' => '1', + 'plid' => '0', + 'link_path' => 'node/4', + 'router_path' => 'node/%', + 'link_title' => 'Test top book title', + 'options' => 'a:0:{}', + 'module' => 'book', + 'hidden' => '0', + 'external' => '0', + 'has_children' => '1', + 'expanded' => '0', + 'weight' => '-10', + 'depth' => '1', + 'customized' => '0', + 'p1' => '1', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + 'updated' => '0', + ], + ]; + + // The expected results. + $tests[0]['expected_data'] = [ + [ + 'nid' => '4', + 'bid' => '4', + 'mlid' => '1', + 'plid' => '0', + 'weight' => '-10', + 'p1' => '1', + 'p2' => '0', + 'p3' => '0', + 'p4' => '0', + 'p5' => '0', + 'p6' => '0', + 'p7' => '0', + 'p8' => '0', + 'p9' => '0', + ], + ]; + return $tests; + } + + /** + * @expectedDeprecation Book is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.x. Use \Drupal\book\Plugin\migrate\source\Book instead. See https://www.drupal.org/node/2947487 for more information. + */ + public function testDeprecatedPlugin() { + new D6Book( + [], + 'd6_book', + [], + $this->prophesize('Drupal\migrate\Plugin\MigrationInterface')->reveal(), + $this->prophesize('Drupal\Core\State\StateInterface')->reveal(), + $this->prophesize('Drupal\Core\Entity\EntityManagerInterface')->reveal() + ); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/book/tests/src/Kernel/Plugin/migrate/source/d6/BookTest.php --- a/core/modules/book/tests/src/Kernel/Plugin/migrate/source/d6/BookTest.php Thu Apr 26 11:26:54 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ - '1', - 'nid' => '4', - 'bid' => '4', - ], - ]; - $tests[0]['source_data']['menu_links'] = [ - [ - 'menu_name' => 'book-toc-1', - 'mlid' => '1', - 'plid' => '0', - 'link_path' => 'node/4', - 'router_path' => 'node/%', - 'link_title' => 'Test top book title', - 'options' => 'a:0:{}', - 'module' => 'book', - 'hidden' => '0', - 'external' => '0', - 'has_children' => '1', - 'expanded' => '0', - 'weight' => '-10', - 'depth' => '1', - 'customized' => '0', - 'p1' => '1', - 'p2' => '0', - 'p3' => '0', - 'p4' => '0', - 'p5' => '0', - 'p6' => '0', - 'p7' => '0', - 'p8' => '0', - 'p9' => '0', - 'updated' => '0', - ], - ]; - - // The expected results. - $tests[0]['expected_data'] = [ - [ - 'nid' => '4', - 'bid' => '4', - 'mlid' => '1', - 'plid' => '0', - 'weight' => '-10', - 'p1' => '1', - 'p2' => '0', - 'p3' => '0', - 'p4' => '0', - 'p5' => '0', - 'p6' => '0', - 'p7' => '0', - 'p8' => '0', - 'p9' => '0', - ], - ]; - return $tests; - } - -} diff -r e200cb7efeb3 -r c2387f117808 core/modules/color/migrations/d7_color.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/color/migrations/d7_color.yml Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,54 @@ +id: d7_color +label: Color +migration_tags: + - Drupal 7 + - Configuration +source: + plugin: d7_color + constants: + config_prefix: 'color.theme.' +process: + # Skip if theme not installed on destination. + theme_installed: + plugin: skip_on_empty + source: theme_installed + method: row + element_name: + - + plugin: explode + source: name + delimiter: _ + - + plugin: extract + index: + - 2 + # Skip if the variable name ends in 'screenshot'. + screenshot: + - + plugin: static_map + source: '@element_name' + bypass: true + map: + screenshot: false + - + plugin: skip_on_empty + method: row + # Build the configuration name from the variable name, i.e. + # 'color_themename_element' becomes 'color.theme.themename' + theme_name: + - + plugin: explode + source: name + delimiter: _ + - + plugin: extract + index: + - 1 + configuration_name: + plugin: concat + source: + - constants/config_prefix + - '@theme_name' + value: value +destination: + plugin: color diff -r e200cb7efeb3 -r c2387f117808 core/modules/color/src/Plugin/migrate/destination/Color.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/color/src/Plugin/migrate/destination/Color.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,90 @@ +configFactory = $config_factory; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $migration, + $container->get('config.factory') + ); + } + + /** + * {@inheritdoc} + */ + public function import(Row $row, array $old_destination_id_values = []) { + $imported = FALSE; + $value = $row->getDestinationProperty('value'); + if (isset($value)) { + $this->configFactory->getEditable($row->getDestinationProperty('configuration_name')) + ->set($row->getDestinationProperty('element_name'), $row->getDestinationProperty('value')) + ->save(); + $imported = TRUE; + } + return $imported; + } + + /** + * {@inheritdoc} + */ + public function getIds() { + $ids['name']['type'] = 'string'; + return $ids; + } + + /** + * {@inheritdoc} + */ + public function fields(MigrationInterface $migration = NULL) { + return []; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/color/src/Plugin/migrate/source/d7/Color.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/color/src/Plugin/migrate/source/d7/Color.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,98 @@ +themeHandler = $theme_handler; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $migration, + $container->get('state'), + $container->get('entity.manager'), + $container->get('theme_handler') + ); + } + + /** + * {@inheritdoc} + */ + public function query() { + // Get color data for all themes. + $query = $this->select('variable', 'v') + ->fields('v', ['name', 'value']) + ->condition('name', 'color_%', 'LIKE'); + return $query; + } + + /** + * {@inheritdoc} + */ + public function prepareRow(Row $row) { + $themes = $this->themeHandler->listInfo(); + $themes_installed = []; + /** @var \Drupal\Core\Extension\Extension $theme */ + foreach ($themes as $theme) { + if ($theme->status) { + $themes_installed[] = $theme->getName(); + } + } + + // The name is of the form 'color_theme_variable'. + $name = explode('_', $row->getSourceProperty('name')); + + // Set theme_installed if this source theme is installed. + if (in_array($name[1], $themes_installed)) { + $row->setSourceProperty('theme_installed', TRUE); + } + + return parent::prepareRow($row); + } + + /** + * {@inheritdoc} + */ + public function fields() { + return [ + 'name' => $this->t('A color variable for a theme.'), + 'value' => $this->t('The value of a color variable.'), + ]; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/color/tests/src/Kernel/Migrate/d7/MigrateColorTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/color/tests/src/Kernel/Migrate/d7/MigrateColorTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,61 @@ +container->get('theme_installer')->install(['bartik']); + $this->executeMigration('d7_color'); + } + + /** + * Tests migration of color's variables to configuration. + */ + public function testMigrateColor() { + // Test Bartik migration. + $config = $this->config('color.theme.bartik'); + $files = [ + 'public://color/bartik-e0e23ad7/logo.png', + 'public://color/bartik-e0e23ad7/colors.css', + ]; + $this->assertSame($files, $config->get('files')); + $this->assertSame('public://color/bartik-e0e23ad7/logo.png', $config->get('logo')); + $palette = [ + 'top' => '#d0d0d0', + 'bottom' => '#c2c4c5', + 'bg' => '#ffffff', + 'sidebar' => '#ffffff', + 'sidebarborders' => '#cccccc', + 'footer' => '#24272c', + 'titleslogan' => '#000000', + 'text' => '#4a4a4a', + 'link' => '#019dbf', + ]; + $this->assertSame($palette, $config->get('palette')); + $this->assertSame(['public://color/bartik-e0e23ad7/colors.css'], $config->get('stylesheets')); + // Test that the screenshot was not migrated. + $this->assertNull($config->get('screenshot')); + + // Test that garland was not migrated. + $this->assertEmpty(\Drupal::config('color.theme.garland')->get()); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/color/tests/src/Kernel/Plugin/migrate/source/d7/ColorTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/color/tests/src/Kernel/Plugin/migrate/source/d7/ColorTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,129 @@ + 'color_bartik_palette', + 'value' => [ + 'top' => '#cd2d2d', + 'bottom' => '#d64e4e', + 'bg' => '#ffffff', + 'sidebar' => '#f1f4f0', + 'sidebarborders' => '#ededed', + 'footer' => '#1f1d1c', + 'titleslogan' => '#fffeff', + 'text' => '#888888', + 'link' => '#d6121f', + ], + ], + [ + 'name' => 'color_bartik_logo', + 'value' => 'public://color/bartik-e0e23ad7/logo.png', + ], + [ + 'name' => 'color_bartik_stylesheets', + 'value' => ['public://color/bartik-1d249313/colors.css'], + ], + [ + 'name' => 'color_bartik_files', + 'value' => [ + 'public://color/bartik-e0e23ad7/logo.png', + 'public://color/bartik-e0e23ad7/colors.css', + ], + ], + [ + 'name' => 'color_bartik_screenshot', + 'value' => ['public:://color/bartik-b69cfcec/screenshot.png'], + ], + [ + 'name' => 'color_custom_stylesheets', + 'value' => ['public:://color/custom-beadedff/colors.css'], + ], + ]; + + foreach ($tests[0]['database']['variable'] as $key => $expected) { + $tests[0]['database']['variable'][$key]['value'] = serialize($expected['value']); + } + + $tests[0]['database']['system'] = [ + [ + 'name' => 'bartik', + 'type' => 'theme', + 'status' => '1', + ], + [ + 'name' => 'custom', + 'type' => 'theme', + 'status' => '0', + ], + ]; + + // Expected results are the same as the source. + $tests[0]['expected_results'] = [ + [ + 'name' => 'color_bartik_palette', + 'value' => [ + 'top' => '#cd2d2d', + 'bottom' => '#d64e4e', + 'bg' => '#ffffff', + 'sidebar' => '#f1f4f0', + 'sidebarborders' => '#ededed', + 'footer' => '#1f1d1c', + 'titleslogan' => '#fffeff', + 'text' => '#888888', + 'link' => '#d6121f', + ], + ], + [ + 'name' => 'color_bartik_logo', + 'value' => 'public://color/bartik-e0e23ad7/logo.png', + ], + [ + 'name' => 'color_bartik_stylesheets', + 'value' => ['public://color/bartik-1d249313/colors.css'], + ], + [ + 'name' => 'color_bartik_files', + 'value' => [ + 'public://color/bartik-e0e23ad7/logo.png', + 'public://color/bartik-e0e23ad7/colors.css', + ], + ], + [ + 'name' => 'color_bartik_screenshot', + 'value' => ['public:://color/bartik-b69cfcec/screenshot.png'], + ], + [ + 'name' => 'color_custom_stylesheets', + 'value' => ['public:://color/custom-beadedff/colors.css'], + ], + ]; + + return $tests; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/comment.module --- a/core/modules/comment/comment.module Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/comment/comment.module Tue Jul 10 15:07:59 2018 +0100 @@ -268,7 +268,7 @@ * content language of the current request. * * @return array - * An array as expected by drupal_render(). + * An array as expected by \Drupal\Core\Render\RendererInterface::render(). * * @deprecated in Drupal 8.x and will be removed before Drupal 9.0. * Use \Drupal::entityManager()->getViewBuilder('comment')->view(). @@ -291,12 +291,13 @@ * Defaults to NULL. * * @return array - * An array in the format expected by drupal_render(). + * An array in the format expected by + * \Drupal\Core\Render\RendererInterface::render(). * * @deprecated in Drupal 8.x and will be removed before Drupal 9.0. * Use \Drupal::entityManager()->getViewBuilder('comment')->viewMultiple(). * - * @see drupal_render() + * @see \Drupal\Core\Render\RendererInterface::render() */ function comment_view_multiple($comments, $view_mode = 'full', $langcode = NULL) { return entity_view_multiple($comments, $view_mode, $langcode); @@ -558,7 +559,7 @@ * The current state of the form. * * @return array - * An array as expected by drupal_render(). + * An array as expected by \Drupal\Core\Render\RendererInterface::render(). */ function comment_preview(CommentInterface $comment, FormStateInterface $form_state) { $preview_build = []; diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/src/CommentViewBuilder.php --- a/core/modules/comment/src/CommentViewBuilder.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/comment/src/CommentViewBuilder.php Tue Jul 10 15:07:59 2018 +0100 @@ -98,6 +98,7 @@ // A counter to track the indentation level. $current_indent = 0; + $attach_history = $this->moduleHandler->moduleExists('history') && $this->currentUser->isAuthenticated(); foreach ($entities as $id => $entity) { if ($build[$id]['#comment_threaded']) { @@ -143,7 +144,7 @@ $build[$id]['#attached'] = []; } $build[$id]['#attached']['library'][] = 'comment/drupal.comment-by-viewer'; - if ($this->moduleHandler->moduleExists('history') && $this->currentUser->isAuthenticated()) { + if ($attach_history && $commented_entity->getEntityTypeId() === 'node') { $build[$id]['#attached']['library'][] = 'comment/drupal.comment-new-indicator'; // Embed the metadata for the comment "new" indicators on this node. diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/src/Entity/CommentType.php --- a/core/modules/comment/src/Entity/CommentType.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/comment/src/Entity/CommentType.php Tue Jul 10 15:07:59 2018 +0100 @@ -37,7 +37,7 @@ * "delete-form" = "/admin/structure/comment/manage/{comment_type}/delete", * "edit-form" = "/admin/structure/comment/manage/{comment_type}", * "add-form" = "/admin/structure/comment/types/add", - * "collection" = "/admin/structure/comment/types", + * "collection" = "/admin/structure/comment", * }, * config_export = { * "id", diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/CommentEntityTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/CommentEntityTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,80 @@ +vocab = $this->createVocabulary(); + $this->commentType = CommentType::create([ + 'id' => 'taxonomy_comment', + 'label' => 'Taxonomy comment', + 'description' => '', + 'target_entity_type_id' => 'taxonomy_term', + ]); + $this->commentType->save(); + $this->addDefaultCommentField( + 'taxonomy_term', + $this->vocab->id(), + 'field_comment', + CommentItemInterface::OPEN, + $this->commentType->id() + ); + } + + /** + * Tests CSS classes on comments. + */ + public function testEntityChanges() { + $this->drupalLogin($this->webUser); + // Create a new node. + $term = $this->createTerm($this->vocab, ['uid' => $this->webUser->id()]); + + // Add a comment. + /** @var \Drupal\comment\CommentInterface $comment */ + $comment = Comment::create([ + 'entity_id' => $term->id(), + 'entity_type' => 'taxonomy_term', + 'field_name' => 'field_comment', + 'uid' => $this->webUser->id(), + 'status' => CommentInterface::PUBLISHED, + 'subject' => $this->randomMachineName(), + 'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED, + 'comment_body' => [LanguageInterface::LANGCODE_NOT_SPECIFIED => [$this->randomMachineName()]], + ]); + $comment->save(); + + // Request the node with the comment. + $this->drupalGet('taxonomy/term/' . $term->id()); + $settings = $this->getDrupalSettings(); + $this->assertFalse(isset($settings['ajaxPageState']['libraries']) && in_array('comment/drupal.comment-new-indicator', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.comment-new-indicator library is present.'); + $this->assertFalse(isset($settings['history']['lastReadTimestamps']) && in_array($term->id(), array_keys($settings['history']['lastReadTimestamps'])), 'history.lastReadTimestamps is present.'); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Hal/CommentHalJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Hal/CommentHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,35 @@ +applyHalFieldNormalization($default_normalization); + + // Because \Drupal\comment\Entity\Comment::getOwner() generates an in-memory + // User entity without a UUID, we cannot use it. + $author = User::load($this->entity->getOwnerId()); + $commented_entity = EntityTest::load(1); + return $normalization + [ + '_links' => [ + 'self' => [ + 'href' => $this->baseUrl . '/comment/1?_format=hal_json', + ], + 'type' => [ + 'href' => $this->baseUrl . '/rest/type/comment/comment', + ], + $this->baseUrl . '/rest/relation/comment/comment/entity_id' => [ + [ + 'href' => $this->baseUrl . '/entity_test/1?_format=hal_json', + ], + ], + $this->baseUrl . '/rest/relation/comment/comment/uid' => [ + [ + 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json', + 'lang' => 'en', + ], + ], + ], + '_embedded' => [ + $this->baseUrl . '/rest/relation/comment/comment/entity_id' => [ + [ + '_links' => [ + 'self' => [ + 'href' => $this->baseUrl . '/entity_test/1?_format=hal_json', + ], + 'type' => [ + 'href' => $this->baseUrl . '/rest/type/entity_test/bar', + ], + ], + 'uuid' => [ + ['value' => $commented_entity->uuid()] + ], + ], + ], + $this->baseUrl . '/rest/relation/comment/comment/uid' => [ + [ + '_links' => [ + 'self' => [ + 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json', + ], + 'type' => [ + 'href' => $this->baseUrl . '/rest/type/user/user', + ], + ], + 'uuid' => [ + ['value' => $author->uuid()] + ], + 'lang' => 'en', + ], + ], + ], + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + return parent::getNormalizedPostEntity() + [ + '_links' => [ + 'type' => [ + 'href' => $this->baseUrl . '/rest/type/comment/comment', + ], + ], + ]; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Hal/CommentTypeHalJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Hal/CommentTypeHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,30 @@ +grantPermissionsToTestedRole(['access comments', 'view test entity']); + break; + case 'POST': + $this->grantPermissionsToTestedRole(['post comments']); + break; + case 'PATCH': + // Anononymous users are not ever allowed to edit their own comments. To + // be able to test PATCHing comments as the anonymous user, the more + // permissive 'administer comments' permission must be granted. + // @see \Drupal\comment\CommentAccessControlHandler::checkAccess + if (static::$auth) { + $this->grantPermissionsToTestedRole(['edit own comments']); + } + else { + $this->grantPermissionsToTestedRole(['administer comments']); + } + break; + case 'DELETE': + $this->grantPermissionsToTestedRole(['administer comments']); + break; + } + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + // Create a "bar" bundle for the "entity_test" entity type and create. + $bundle = 'bar'; + entity_test_create_bundle($bundle, NULL, 'entity_test'); + + // Create a comment field on this bundle. + $this->addDefaultCommentField('entity_test', 'bar', 'comment'); + + // Create a "Camelids" test entity that the comment will be assigned to. + $commented_entity = EntityTest::create([ + 'name' => 'Camelids', + 'type' => 'bar', + ]); + $commented_entity->save(); + + // Create a "Llama" comment. + $comment = Comment::create([ + 'comment_body' => [ + 'value' => 'The name "llama" was adopted by European settlers from native Peruvians.', + 'format' => 'plain_text', + ], + 'entity_id' => $commented_entity->id(), + 'entity_type' => 'entity_test', + 'field_name' => 'comment', + ]); + $comment->setSubject('Llama') + ->setOwnerId(static::$auth ? $this->account->id() : 0) + ->setPublished(TRUE) + ->setCreatedTime(123456789) + ->setChangedTime(123456789); + $comment->save(); + + return $comment; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + $author = User::load($this->entity->getOwnerId()); + return [ + 'cid' => [ + ['value' => 1], + ], + 'uuid' => [ + ['value' => $this->entity->uuid()], + ], + 'langcode' => [ + [ + 'value' => 'en', + ], + ], + 'comment_type' => [ + [ + 'target_id' => 'comment', + 'target_type' => 'comment_type', + 'target_uuid' => CommentType::load('comment')->uuid(), + ], + ], + 'subject' => [ + [ + 'value' => 'Llama', + ], + ], + 'status' => [ + [ + 'value' => TRUE, + ], + ], + 'created' => [ + $this->formatExpectedTimestampItemValues(123456789), + ], + 'changed' => [ + $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()), + ], + 'default_langcode' => [ + [ + 'value' => TRUE, + ], + ], + 'uid' => [ + [ + 'target_id' => (int) $author->id(), + 'target_type' => 'user', + 'target_uuid' => $author->uuid(), + 'url' => base_path() . 'user/' . $author->id(), + ], + ], + 'pid' => [], + 'entity_type' => [ + [ + 'value' => 'entity_test', + ], + ], + 'entity_id' => [ + [ + 'target_id' => 1, + 'target_type' => 'entity_test', + 'target_uuid' => EntityTest::load(1)->uuid(), + 'url' => base_path() . 'entity_test/1', + ], + ], + 'field_name' => [ + [ + 'value' => 'comment', + ], + ], + 'name' => [], + 'homepage' => [], + 'thread' => [ + [ + 'value' => '01/', + ], + ], + 'comment_body' => [ + [ + 'value' => 'The name "llama" was adopted by European settlers from native Peruvians.', + 'format' => 'plain_text', + 'processed' => 'The name "llama" was adopted by European settlers from native Peruvians.
' . "\n", + ], + ], + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + return [ + 'comment_type' => [ + [ + 'target_id' => 'comment', + ], + ], + 'entity_type' => [ + [ + 'value' => 'entity_test', + ], + ], + 'entity_id' => [ + [ + 'target_id' => (int) EntityTest::load(1)->id(), + ], + ], + 'field_name' => [ + [ + 'value' => 'comment', + ], + ], + 'subject' => [ + [ + 'value' => 'Dramallama', + ], + ], + 'comment_body' => [ + [ + 'value' => 'Llamas are awesome.', + 'format' => 'plain_text', + ], + ], + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPatchEntity() { + return array_diff_key($this->getNormalizedPostEntity(), ['entity_type' => TRUE, 'entity_id' => TRUE, 'field_name' => TRUE]); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedCacheTags() { + return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedCacheContexts() { + return Cache::mergeContexts(['languages:language_interface', 'theme'], parent::getExpectedCacheContexts()); + } + + /** + * Tests POSTing a comment without critical base fields. + * + * testPost() is testing with the most minimal normalization possible: the one + * returned by ::getNormalizedPostEntity(). + * + * But Comment entities have some very special edge cases: + * - base fields that are not marked as required in + * \Drupal\comment\Entity\Comment::baseFieldDefinitions() yet in fact are + * required. + * - base fields that are marked as required, but yet can still result in + * validation errors other than "missing required field". + */ + public function testPostDxWithoutCriticalBaseFields() { + $this->initAuthentication(); + $this->provisionEntityResource(); + $this->setUpAuthorization('POST'); + + $url = $this->getEntityResourcePostUrl()->setOption('query', ['_format' => static::$format]); + $request_options = []; + $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType; + $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType; + $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('POST')); + + // DX: 422 when missing 'entity_type' field. + $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_type' => TRUE]), static::$format); + $response = $this->request('POST', $url, $request_options); + // @todo Uncomment, remove next 3 lines in https://www.drupal.org/node/2820364. + $this->assertSame(500, $response->getStatusCode()); + $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type')); + $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.Symfony\Component\HttpKernel\Exception\HttpException: Internal Server Error in Drupal\rest\Plugin\rest\resource\EntityResource->post()', (string) $response->getBody()); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); + + // DX: 422 when missing 'entity_id' field. + $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_id' => TRUE]), static::$format); + // @todo Remove the try/catch in favor of the two commented lines in + // https://www.drupal.org/node/2820364. + try { + $response = $this->request('POST', $url, $request_options); + // This happens on DrupalCI. + // $this->assertSame(500, $response->getStatusCode()); + } + catch (\Exception $e) { + // This happens on Wim's local machine. + // $this->assertSame("Error: Call to a member function get() on null\nDrupal\\comment\\Plugin\\Validation\\Constraint\\CommentNameConstraintValidator->getAnonymousContactDetailsSetting()() (Line: 96)\n", $e->getMessage()); + } + // $response = $this->request('POST', $url, $request_options); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); + + // DX: 422 when missing 'entity_type' field. + $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['field_name' => TRUE]), static::$format); + $response = $this->request('POST', $url, $request_options); + // @todo Uncomment, remove next 2 lines in https://www.drupal.org/node/2820364. + $this->assertSame(500, $response->getStatusCode()); + $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type')); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nfield_name: This value should not be null.\n", $response); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessMessage($method) { + if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + switch ($method) { + case 'GET'; + return "The 'access comments' permission is required and the comment must be published."; + case 'POST'; + return "The 'post comments' permission is required."; + default: + return parent::getExpectedUnauthorizedAccessMessage($method); + } + } + + /** + * Tests POSTing a comment with and without 'skip comment approval' + */ + public function testPostSkipCommentApproval() { + $this->initAuthentication(); + $this->provisionEntityResource(); + $this->setUpAuthorization('POST'); + + // Create request. + $request_options = []; + $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType; + $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType; + $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('POST')); + $request_options[RequestOptions::BODY] = $this->serializer->encode($this->getNormalizedPostEntity(), static::$format); + + $url = $this->getEntityResourcePostUrl()->setOption('query', ['_format' => static::$format]); + + // Status should be FALSE when posting as anonymous. + $response = $this->request('POST', $url, $request_options); + $unserialized = $this->serializer->deserialize((string) $response->getBody(), get_class($this->entity), static::$format); + $this->assertResourceResponse(201, FALSE, $response); + $this->assertFalse($unserialized->getStatus()); + + // Grant anonymous permission to skip comment approval. + $this->grantPermissionsToTestedRole(['skip comment approval']); + + // Status should be TRUE when posting as anonymous and skip comment approval. + $response = $this->request('POST', $url, $request_options); + $unserialized = $this->serializer->deserialize((string) $response->getBody(), get_class($this->entity), static::$format); + $this->assertResourceResponse(201, FALSE, $response); + $this->assertTrue($unserialized->getStatus()); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessCacheability() { + // @see \Drupal\comment\CommentAccessControlHandler::checkAccess() + return parent::getExpectedUnauthorizedAccessCacheability() + ->addCacheTags(['comment:1']); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Rest/CommentTypeJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,24 @@ +grantPermissionsToTestedRole(['administer comment types']); + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + // Create a "Camelids" comment type. + $camelids = CommentType::create([ + 'id' => 'camelids', + 'label' => 'Camelids', + 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.', + 'target_entity_type_id' => 'node', + ]); + + $camelids->save(); + + return $camelids; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + return [ + 'dependencies' => [], + 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.', + 'id' => 'camelids', + 'label' => 'Camelids', + 'langcode' => 'en', + 'status' => TRUE, + 'target_entity_type_id' => 'node', + 'uuid' => $this->entity->uuid(), + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + // @todo Update in https://www.drupal.org/node/2300677. + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Rest/CommentTypeXmlAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Rest/CommentTypeXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,26 @@ +markTestSkipped(); + } + + /** + * {@inheritdoc} + */ + public function testPostSkipCommentApproval() { + // Deserialization of the XML format is not supported. + $this->markTestSkipped(); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Rest/CommentXmlBasicAuthTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Rest/CommentXmlBasicAuthTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,52 @@ +markTestSkipped(); + } + + /** + * {@inheritdoc} + */ + public function testPostSkipCommentApproval() { + // Deserialization of the XML format is not supported. + $this->markTestSkipped(); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/comment/tests/src/Functional/Rest/CommentXmlCookieTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/comment/tests/src/Functional/Rest/CommentXmlCookieTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,47 @@ +markTestSkipped(); + } + + /** + * {@inheritdoc} + */ + public function testPostSkipCommentApproval() { + // Deserialization of the XML format is not supported. + $this->markTestSkipped(); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/src/ConfigSubscriber.php --- a/core/modules/config/src/ConfigSubscriber.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config/src/ConfigSubscriber.php Tue Jul 10 15:07:59 2018 +0100 @@ -18,6 +18,11 @@ * The config import event. */ public function onConfigImporterValidate(ConfigImporterEvent $event) { + // Make sure config syncs performed via the Config UI don't break, but + // don't worry about syncs initiated via the command line. + if (PHP_SAPI === 'cli') { + return; + } $importer = $event->getConfigImporter(); $core_extension = $importer->getStorageComparer()->getSourceStorage()->read('core.extension'); if (!isset($core_extension['module']['config'])) { diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/src/Form/ConfigSync.php --- a/core/modules/config/src/Form/ConfigSync.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config/src/Form/ConfigSync.php Tue Jul 10 15:07:59 2018 +0100 @@ -342,7 +342,6 @@ 'init_message' => t('Starting configuration synchronization.'), 'progress_message' => t('Completed step @current of @total.'), 'error_message' => t('Configuration synchronization has encountered an error.'), - 'file' => __DIR__ . '/../../config.admin.inc', ]; foreach ($sync_steps as $sync_step) { $batch['operations'][] = [[get_class($this), 'processBatch'], [$config_importer, $sync_step]]; diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php --- a/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php Tue Jul 10 15:07:59 2018 +0100 @@ -61,17 +61,4 @@ return $metadata; } - /** - * Returns whether or not our overrides are potentially applicable. - * - * @param string $name - * The name of the config object that is being constructed. - * - * @return bool - * TRUE if the merchant ship will be boarded. FALSE if we drink rum instead. - */ - protected function isCacheabilityMetadataApplicable($name) { - return in_array($name, ['system.theme', 'block.block.call_to_action']); - } - } diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/tests/config_test/src/ConfigValidation.php --- a/core/modules/config/tests/config_test/src/ConfigValidation.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config/tests/config_test/src/ConfigValidation.php Tue Jul 10 15:07:59 2018 +0100 @@ -74,8 +74,11 @@ * The validation execution context. */ public static function validateMapping($mapping, ExecutionContextInterface $context) { - if ($diff = array_diff(array_keys($mapping), ['llama', 'cat', 'giraffe', 'uuid', '_core'])) { - $context->addViolation('Missing giraffe.'); + // Ensure we are validating the entire mapping by diffing against all the + // keys. + $mapping_schema = \Drupal::service('config.typed')->get('config_test.validation')->getValue(); + if ($diff = array_diff_key($mapping, $mapping_schema)) { + $context->addViolation('Unexpected keys: ' . implode(', ', array_keys($diff))); } } diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/config/tests/config_test/tests/src/Functional/Hal/ConfigTestHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,30 @@ +grantPermissionsToTestedRole(['view config_test']); + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + $config_test = ConfigTest::create([ + 'id' => 'llama', + 'label' => 'Llama', + ]); + $config_test->save(); + + return $config_test; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + $normalization = [ + 'uuid' => $this->entity->uuid(), + 'id' => 'llama', + 'weight' => 0, + 'langcode' => 'en', + 'status' => TRUE, + 'dependencies' => [], + 'label' => 'Llama', + 'style' => NULL, + 'size' => NULL, + 'size_value' => NULL, + 'protected_property' => NULL, + ]; + + return $normalization; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + // @todo Update in https://www.drupal.org/node/2300677. + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,26 @@ +markTestSkipped('This test has to be run from the CLI'); + } + + $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync')); + + // Set up the ConfigImporter object for testing. + $storage_comparer = new StorageComparer( + $this->container->get('config.storage.sync'), + $this->container->get('config.storage'), + $this->container->get('config.manager') + ); + $this->configImporter = new ConfigImporter( + $storage_comparer->createChangelist(), + $this->container->get('event_dispatcher'), + $this->container->get('config.manager'), + $this->container->get('lock'), + $this->container->get('config.typed'), + $this->container->get('module_handler'), + $this->container->get('module_installer'), + $this->container->get('theme_handler'), + $this->container->get('string_translation') + ); + } + + /** + * Tests that the config mopdule can be uninstalled via CLI config import. + * + * @see \Drupal\config\ConfigSubscriber + */ + public function testConfigUninstallViaCli() { + $this->assertTrue($this->container->get('module_handler')->moduleExists('config')); + $sync = $this->container->get('config.storage.sync'); + $extensions = $sync->read('core.extension'); + unset($extensions['module']['config']); + $sync->write('core.extension', $extensions); + $this->configImporter->reset()->import(); + $this->assertFalse($this->container->get('module_handler')->moduleExists('config')); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml --- a/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml Tue Jul 10 15:07:59 2018 +0100 @@ -12,7 +12,18 @@ langcode: language entity_type: 'constants/entity_type' bundle: 'constants/bundle' - field_name: name + field_name: + - + plugin: migration_lookup + migration: user_profile_field + source: fid + - + plugin: skip_on_empty + method: row + - + plugin: extract + index: + - 1 property: plugin: static_map source: property diff -r e200cb7efeb3 -r c2387f117808 core/modules/config_translation/src/Controller/ConfigTranslationListController.php --- a/core/modules/config_translation/src/Controller/ConfigTranslationListController.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config_translation/src/Controller/ConfigTranslationListController.php Tue Jul 10 15:07:59 2018 +0100 @@ -45,7 +45,8 @@ * The name of the mapper. * * @return array - * A render array as expected by drupal_render(). + * A render array as expected by + * \Drupal\Core\Render\RendererInterface::render(). * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * Throws an exception if a mapper plugin could not be instantiated from the diff -r e200cb7efeb3 -r c2387f117808 core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php --- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -80,6 +80,7 @@ // tests. $this->config('locale.settings') ->set('translation.import_enabled', TRUE) + ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL) ->save(); $this->drupalPlaceBlock('local_tasks_block'); } diff -r e200cb7efeb3 -r c2387f117808 core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php --- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -808,6 +808,7 @@ // tests. $this->config('locale.settings') ->set('translation.import_enabled', TRUE) + ->set('translation.use_source', LOCALE_TRANSLATION_USE_SOURCE_LOCAL) ->save(); $this->drupalLogin($this->adminUser); diff -r e200cb7efeb3 -r c2387f117808 core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -28,7 +28,7 @@ ]); $language_manager = $this->container->get('language_manager'); - $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_love_migrations'); + $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_really_really_love_mig'); $this->assertSame("J'aime les migrations", $config_translation->get('label')); $this->assertSame("Si vous cochez cette case, vous aimez les migrations.", $config_translation->get('description')); diff -r e200cb7efeb3 -r c2387f117808 core/modules/contact/src/Controller/ContactController.php --- a/core/modules/contact/src/Controller/ContactController.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/contact/src/Controller/ContactController.php Tue Jul 10 15:07:59 2018 +0100 @@ -47,7 +47,8 @@ * The contact form to use. * * @return array - * The form as render array as expected by drupal_render(). + * The form as render array as expected by + * \Drupal\Core\Render\RendererInterface::render(). * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * Exception is thrown when user tries to access non existing default @@ -95,7 +96,8 @@ * The account for which a personal contact form should be generated. * * @return array - * The personal contact form as render array as expected by drupal_render(). + * The personal contact form as render array as expected by + * \Drupal\Core\Render\RendererInterface::render(). * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException * Exception is thrown when user tries to access a contact form for a diff -r e200cb7efeb3 -r c2387f117808 core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/contact/tests/src/Functional/Hal/ContactFormHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,30 @@ + [ + 'type' => [ + 'href' => $this->baseUrl . '/rest/type/contact_message/camelids', + ], + ], + ]; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/contact/tests/src/Functional/Hal/MessageHalJsonBasicAuthTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/contact/tests/src/Functional/Hal/MessageHalJsonBasicAuthTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,24 @@ +grantPermissionsToTestedRole(['access site-wide contact form']); + default: + $this->grantPermissionsToTestedRole(['administer contact forms']); + } + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + $contact_form = ContactForm::create([ + 'id' => 'llama', + 'label' => 'Llama', + 'message' => 'Let us know what you think about llamas', + 'reply' => 'Llamas are indeed awesome!', + 'recipients' => [ + 'llama@example.com', + 'contact@example.com', + ], + ]); + $contact_form->save(); + + return $contact_form; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + return [ + 'dependencies' => [], + 'id' => 'llama', + 'label' => 'Llama', + 'langcode' => 'en', + 'message' => 'Let us know what you think about llamas', + 'recipients' => [ + 'llama@example.com', + 'contact@example.com', + ], + 'redirect' => NULL, + 'reply' => 'Llamas are indeed awesome!', + 'status' => TRUE, + 'uuid' => $this->entity->uuid(), + 'weight' => 0, + ]; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + // @todo Update in https://www.drupal.org/node/2300677. + } + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessMessage($method) { + if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + return "The 'access site-wide contact form' permission is required."; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/contact/tests/src/Functional/Rest/ContactFormXmlAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/contact/tests/src/Functional/Rest/ContactFormXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,26 @@ +grantPermissionsToTestedRole(['access site-wide contact form']); + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + if (!ContactForm::load('camelids')) { + // Create a "Camelids" contact form. + ContactForm::create([ + 'id' => 'camelids', + 'label' => 'Llama', + 'message' => 'Let us know what you think about llamas', + 'reply' => 'Llamas are indeed awesome!', + 'recipients' => [ + 'llama@example.com', + 'contact@example.com', + ], + ])->save(); + } + + $message = Message::create([ + 'contact_form' => 'camelids', + 'subject' => 'Llama Gabilondo', + 'message' => 'Llamas are awesome!', + ]); + $message->save(); + + return $message; + } + + /** + * {@inheritdoc} + */ + protected function getNormalizedPostEntity() { + return [ + 'subject' => [ + [ + 'value' => 'Dramallama', + ], + ], + 'contact_form' => [ + [ + 'target_id' => 'camelids', + ], + ], + 'message' => [ + [ + 'value' => 'http://www.urbandictionary.com/define.php?term=drama%20llama', + ], + ], + ]; + } + + /** + * {@inheritdoc} + */ + protected function getExpectedNormalizedEntity() { + throw new \Exception('Not yet supported.'); + } + + /** + * {@inheritdoc} + */ + protected function getExpectedUnauthorizedAccessMessage($method) { + if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + if ($method === 'POST') { + return "The 'access site-wide contact form' permission is required."; + } + return parent::getExpectedUnauthorizedAccessMessage($method); + } + + /** + * {@inheritdoc} + */ + public function testGet() { + // Contact Message entities are not stored, so they cannot be retrieved. + $this->setExpectedException(RouteNotFoundException::class, 'Route "rest.entity.contact_message.GET" does not exist.'); + + $this->provisionEntityResource(); + Url::fromRoute('rest.entity.contact_message.GET')->toString(TRUE); + } + + /** + * {@inheritdoc} + */ + public function testPatch() { + // Contact Message entities are not stored, so they cannot be modified. + $this->setExpectedException(RouteNotFoundException::class, 'Route "rest.entity.contact_message.PATCH" does not exist.'); + + $this->provisionEntityResource(); + Url::fromRoute('rest.entity.contact_message.PATCH')->toString(TRUE); + } + + /** + * {@inheritdoc} + */ + public function testDelete() { + // Contact Message entities are not stored, so they cannot be deleted. + $this->setExpectedException(RouteNotFoundException::class, 'Route "rest.entity.contact_message.DELETE" does not exist.'); + + $this->provisionEntityResource(); + Url::fromRoute('rest.entity.contact_message.DELETE')->toString(TRUE); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/contact/tests/src/Functional/Rest/MessageXmlAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/contact/tests/src/Functional/Rest/MessageXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,26 @@ +entityTypeManager()->getDefinition('node'); diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php --- a/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php Tue Jul 10 15:07:59 2018 +0100 @@ -54,7 +54,7 @@ */ public function enforceRevisionsBundleFormAlter(array &$form, FormStateInterface $form_state, $form_id) { // Force the revision checkbox on. - $form['workflow']['options']['#default_value']['revision'] = 'revision'; + $form['workflow']['options']['#value']['revision'] = 'revision'; $form['workflow']['options']['revision']['#disabled'] = TRUE; } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/EntityOperations.php --- a/core/modules/content_moderation/src/EntityOperations.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/EntityOperations.php Tue Jul 10 15:07:59 2018 +0100 @@ -203,7 +203,6 @@ $moderation_state = $workflow->getTypePlugin()->getInitialState($entity)->id(); } - // @todo what if $entity->moderation_state is null at this point? $content_moderation_state->set('content_entity_revision_id', $entity_revision_id); $content_moderation_state->set('moderation_state', $moderation_state); ContentModerationStateEntity::updateOrCreateFromEntity($content_moderation_state); diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/EntityTypeInfo.php --- a/core/modules/content_moderation/src/EntityTypeInfo.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/EntityTypeInfo.php Tue Jul 10 15:07:59 2018 +0100 @@ -131,7 +131,7 @@ public function entityTypeAlter(array &$entity_types) { foreach ($entity_types as $entity_type_id => $entity_type) { // The ContentModerationState entity type should never be moderated. - if ($entity_type->isRevisionable() && $entity_type_id != 'content_moderation_state') { + if ($entity_type->isRevisionable() && !$entity_type->isInternal()) { $entity_types[$entity_type_id] = $this->addModerationToEntityType($entity_type); } } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/Form/EntityModerationForm.php --- a/core/modules/content_moderation/src/Form/EntityModerationForm.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/Form/EntityModerationForm.php Tue Jul 10 15:07:59 2018 +0100 @@ -128,6 +128,7 @@ ]; $form['#theme'] = ['entity_moderation_form']; + $form['#attached']['library'][] = 'content_moderation/content_moderation'; return $form; } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php --- a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php Tue Jul 10 15:07:59 2018 +0100 @@ -131,6 +131,9 @@ foreach ($transitions as $transition) { $transition_to_state = $transition->to(); $transition_labels[$transition_to_state->id()] = $transition_to_state->label(); + if ($default->id() === $transition_to_state->id()) { + $default_value = $default->id(); + } } $element += [ diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php --- a/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php Tue Jul 10 15:07:59 2018 +0100 @@ -141,11 +141,13 @@ public function setValue($values, $notify = TRUE) { parent::setValue($values, $notify); + if (isset($this->list[0])) { + $this->valueComputed = TRUE; + } // If the parent created a field item and if the parent should be notified // about the change (e.g. this is not initialized with the current value), // update the moderated entity. if (isset($this->list[0]) && $notify) { - $this->valueComputed = TRUE; $this->updateModeratedEntity($this->list[0]->value); } } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/templates/entity-moderation-form.html.twig --- a/core/modules/content_moderation/templates/entity-moderation-form.html.twig Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/templates/entity-moderation-form.html.twig Tue Jul 10 15:07:59 2018 +0100 @@ -1,4 +1,3 @@ -{{ attach_library('content_moderation/content_moderation') }}- {{ form.current }}
- {{ form.new_state }} diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Functional/DefaultContentModerationStateRevisionUpdateTest.php --- a/core/modules/content_moderation/tests/src/Functional/DefaultContentModerationStateRevisionUpdateTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Functional/DefaultContentModerationStateRevisionUpdateTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -20,7 +20,6 @@ $this->databaseDumpFiles = [ __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.4.0.bare.standard.php.gz', __DIR__ . '/../../fixtures/update/drupal-8.4.0-content_moderation_installed.php', - __DIR__ . '/../../fixtures/update/drupal-8.default-cms-entity-id-2941736.php', ]; } @@ -28,6 +27,11 @@ * Test updating the default revision. */ public function testUpdateDefaultRevision() { + // Include the database fixture required to test updating the default + // revision. This is excluded from ::setDatabaseDumpFiles so that we can + // test the same post_update hook with no test content enabled. + require __DIR__ . '/../../fixtures/update/drupal-8.default-cms-entity-id-2941736.php'; + $this->runUpdates(); foreach (['node', 'block_content'] as $entity_type_id) { @@ -46,6 +50,14 @@ } /** + * Test the post_update hook when no entity types are being moderated. + */ + public function testNoEntitiesUnderModeration() { + // If any errors occur during the post_update hook, the test case will fail. + $this->runUpdates(); + } + + /** * Assert for the given entity, the default revision ID matches. * * @param \Drupal\Core\Entity\ContentEntityInterface $entity diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php --- a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -107,6 +107,10 @@ 'moderation_state[0][state]' => 'published', ], t('Save')); + // Check widget default value. + $this->drupalGet($edit_path); + $this->assertFieldByName('moderation_state[0][state]', 'published', 'The moderation default value is set correctly.'); + // The published view should not have a moderation form, because it is the // live revision. $this->drupalGet($canonical_path); diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php --- a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php Tue Jul 10 15:07:59 2018 +0100 @@ -3,6 +3,7 @@ namespace Drupal\Tests\content_moderation\Functional; use Drupal\Core\Session\AccountInterface; +use Drupal\node\Entity\NodeType; use Drupal\Tests\BrowserTestBase; use Drupal\user\Entity\Role; @@ -110,6 +111,9 @@ ]; $this->drupalPostForm(NULL, $edit, t('Save content type')); + // Check the content type has been set to create new revisions. + $this->assertTrue(NodeType::load($content_type_id)->isNewRevision()); + if ($moderated) { $this->enableModerationThroughUi($content_type_id, $workflow_id); } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Kernel/EntityTypeInfoTest.php --- a/core/modules/content_moderation/tests/src/Kernel/EntityTypeInfoTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Kernel/EntityTypeInfoTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -61,4 +61,34 @@ $this->assertTrue($base_fields['moderation_state']->isTranslatable()); } + /** + * Test the correct entity types have moderation added. + * + * @covers ::entityTypeAlter + * + * @dataProvider providerTestEntityTypeAlter + */ + public function testEntityTypeAlter($entity_type_id, $moderatable) { + $entity_types = $this->entityTypeManager->getDefinitions(); + $this->assertSame($moderatable, $entity_types[$entity_type_id]->hasHandlerClass('moderation')); + } + + /** + * Provides test data for testEntityTypeAlter(). + * + * @return array + * An array of test cases, where each test case is an array with the + * following values: + * - An entity type ID. + * - Whether the entity type is moderatable or not. + */ + public function providerTestEntityTypeAlter() { + $tests = []; + $tests['non_internal_non_revisionable'] = ['entity_test', FALSE]; + $tests['non_internal_revisionable'] = ['entity_test_rev', TRUE]; + $tests['internal_non_revisionable'] = ['entity_test_no_label', FALSE]; + $tests['internal_revisionable'] = ['content_moderation_state', FALSE]; + return $tests; + } + } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Kernel/ModerationInformationTest.php --- a/core/modules/content_moderation/tests/src/Kernel/ModerationInformationTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Kernel/ModerationInformationTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -2,8 +2,10 @@ namespace Drupal\Tests\content_moderation\Kernel; +use Drupal\entity_test\Entity\EntityTestMulRevPub; use Drupal\entity_test\Entity\EntityTestRev; use Drupal\KernelTests\KernelTestBase; +use Drupal\language\Entity\ConfigurableLanguage; use Drupal\workflows\Entity\Workflow; /** @@ -15,7 +17,21 @@ /** * {@inheritdoc} */ - public static $modules = ['content_moderation', 'entity_test', 'user', 'workflows']; + public static $modules = [ + 'content_moderation', + 'entity_test', + 'user', + 'workflows', + 'language', + 'content_translation', + ]; + + /** + * The moderation information service. + * + * @var \Drupal\content_moderation\ModerationInformationInterface + */ + protected $moderationInformation; /** * {@inheritdoc} @@ -24,8 +40,20 @@ parent::setUp(); $this->installEntitySchema('entity_test_rev'); + $this->installEntitySchema('entity_test_mulrevpub'); $this->installEntitySchema('content_moderation_state'); $this->installConfig(['content_moderation']); + + $this->moderationInformation = $this->container->get('content_moderation.moderation_information'); + + ConfigurableLanguage::createFromLangcode('de')->save(); + + $workflow = Workflow::load('editorial'); + $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub'); + $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev'); + $workflow->save(); + + $this->container->get('content_translation.manager')->setEnabled('entity_test_mulrevpub', 'entity_test_mulrevpub', TRUE); } /** @@ -33,10 +61,6 @@ * @covers ::getLatestRevisionId */ public function testDefaultAndLatestRevisionId() { - $workflow = Workflow::load('editorial'); - $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev'); - $workflow->save(); - $entity_test_rev = EntityTestRev::create([ 'name' => 'Default Revision', 'moderation_state' => 'published', @@ -47,18 +71,85 @@ $entity_test_rev->moderation_state = 'draft'; $entity_test_rev->save(); - /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */ - $moderation_info = \Drupal::service('content_moderation.moderation_information'); - // Check that moderation information service returns the correct default // revision ID. - $default_revision_id = $moderation_info->getDefaultRevisionId('entity_test_rev', $entity_test_rev->id()); + $default_revision_id = $this->moderationInformation->getDefaultRevisionId('entity_test_rev', $entity_test_rev->id()); $this->assertSame(1, $default_revision_id); // Check that moderation information service returns the correct latest // revision ID. - $latest_revision_id = $moderation_info->getLatestRevisionId('entity_test_rev', $entity_test_rev->id()); + $latest_revision_id = $this->moderationInformation->getLatestRevisionId('entity_test_rev', $entity_test_rev->id()); $this->assertSame(2, $latest_revision_id); } + /** + * @covers ::isDefaultRevisionPublished + * @dataProvider isDefaultRevisionPublishedTestCases + */ + public function testIsDefaultRevisionPublished($initial_state, $final_state, $initial_is_default_published, $final_is_default_published) { + $entity = EntityTestMulRevPub::create([ + 'moderation_state' => $initial_state, + ]); + $entity->save(); + $this->assertEquals($initial_is_default_published, $this->moderationInformation->isDefaultRevisionPublished($entity)); + + $entity->moderation_state = $final_state; + $entity->save(); + $this->assertEquals($final_is_default_published, $this->moderationInformation->isDefaultRevisionPublished($entity)); + } + + /** + * Test cases for ::testIsDefaultRevisionPublished. + */ + public function isDefaultRevisionPublishedTestCases() { + return [ + 'Draft to draft' => [ + 'draft', + 'draft', + FALSE, + FALSE, + ], + 'Draft to published' => [ + 'draft', + 'published', + FALSE, + TRUE, + ], + 'Published to published' => [ + 'published', + 'published', + TRUE, + TRUE, + ], + 'Published to draft' => [ + 'published', + 'draft', + TRUE, + TRUE, + ], + ]; + } + + /** + * @covers ::isDefaultRevisionPublished + */ + public function testIsDefaultRevisionPublishedMultilingual() { + $entity = EntityTestMulRevPub::create([ + 'moderation_state' => 'draft', + ]); + $entity->save(); + $this->assertEquals('draft', $entity->moderation_state->value); + + $translated = $entity->addTranslation('de'); + $translated->moderation_state = 'published'; + $translated->save(); + $this->assertEquals('published', $translated->moderation_state->value); + + // Test a scenario where the default revision exists with the default + // language in a draft state and a non-default language in a published + // state. The method returns TRUE if any of the languages for the default + // revision are in a published state. + $this->assertEquals(TRUE, $this->moderationInformation->isDefaultRevisionPublished($entity)); + } + } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php --- a/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -111,6 +111,9 @@ unset($this->testNode->moderation_state); $this->assertEquals('draft', $this->testNode->moderation_state->value); + + $this->testNode->moderation_state = NULL; + $this->assertEquals('draft', $this->testNode->moderation_state->value); } /** @@ -130,22 +133,58 @@ /** * Tests that moderation state changes also change the related entity state. + * + * @dataProvider moderationStateChangesTestCases */ - public function testModerationStateChanges() { - // Change the moderation state and check that the entity's - // 'isDefaultRevision' flag and the publishing status have also been - // updated. - $this->testNode->moderation_state->value = 'published'; - - $this->assertTrue($this->testNode->isPublished()); - $this->assertTrue($this->testNode->isDefaultRevision()); - + public function testModerationStateChanges($initial_state, $final_state, $first_published, $first_is_default, $second_published, $second_is_default) { + $this->testNode->moderation_state->value = $initial_state; + $this->assertEquals($first_published, $this->testNode->isPublished()); + $this->assertEquals($first_is_default, $this->testNode->isDefaultRevision()); $this->testNode->save(); - // Repeat the checks using an 'unpublished' state. - $this->testNode->moderation_state->value = 'draft'; - $this->assertFalse($this->testNode->isPublished()); - $this->assertFalse($this->testNode->isDefaultRevision()); + $this->testNode->moderation_state->value = $final_state; + $this->assertEquals($second_published, $this->testNode->isPublished()); + $this->assertEquals($second_is_default, $this->testNode->isDefaultRevision()); + } + + /** + * Data provider for ::testModerationStateChanges + */ + public function moderationStateChangesTestCases() { + return [ + 'Draft to draft' => [ + 'draft', + 'draft', + FALSE, + TRUE, + FALSE, + TRUE, + ], + 'Draft to published' => [ + 'draft', + 'published', + FALSE, + TRUE, + TRUE, + TRUE, + ], + 'Published to published' => [ + 'published', + 'published', + TRUE, + TRUE, + TRUE, + TRUE, + ], + 'Published to draft' => [ + 'published', + 'draft', + TRUE, + TRUE, + FALSE, + FALSE, + ], + ]; } /** @@ -175,13 +214,39 @@ /** * Test the moderation_state field after an entity has been serialized. + * + * @dataProvider entityUnserializeTestCases */ - public function testEntityUnserialize() { - $this->testNode->moderation_state->value = 'draft'; + public function testEntityUnserialize($state, $default, $published) { + $this->testNode->moderation_state->value = $state; + + $this->assertEquals($state, $this->testNode->moderation_state->value); + $this->assertEquals($default, $this->testNode->isDefaultRevision()); + $this->assertEquals($published, $this->testNode->isPublished()); + $unserialized = unserialize(serialize($this->testNode)); - $this->assertEquals('Test title', $unserialized->title->value); - $this->assertEquals('draft', $unserialized->moderation_state->value); + $this->assertEquals($state, $unserialized->moderation_state->value); + $this->assertEquals($default, $unserialized->isDefaultRevision()); + $this->assertEquals($published, $unserialized->isPublished()); + } + + /** + * Test cases for ::testEntityUnserialize. + */ + public function entityUnserializeTestCases() { + return [ + 'Default draft state' => [ + 'draft', + TRUE, + FALSE, + ], + 'Non-default published state' => [ + 'published', + TRUE, + TRUE, + ], + ]; } } diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/migrations/d7_entity_translation_settings.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/content_translation/migrations/d7_entity_translation_settings.yml Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,36 @@ +id: d7_entity_translation_settings +label: Drupal 7 Entity Translation settings +migration_tags: + - Drupal 7 + - Configuration +source: + plugin: d7_entity_translation_settings +process: + id: id + target_entity_type_id: target_entity_type_id + target_bundle: target_bundle + default_langcode: + plugin: static_map + source: default_langcode + bypass: true + map: + xx-et-default: site_default + xx-et-current: current_interface + xx-et-author: authors_default + language_alterable: language_alterable + third_party_settings/content_translation/enabled: + plugin: default_value + default_value: true + third_party_settings/content_translation/bundle_settings/untranslatable_fields_hide: untranslatable_fields_hide +destination: + plugin: entity:language_content_settings + content_translation_update_definitions: + - comment + - node + - taxonomy_term + - user +migration_dependencies: + optional: + - d7_comment_type + - d7_node_type + - d7_taxonomy_vocabulary diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/src/ContentTranslationHandler.php --- a/core/modules/content_translation/src/ContentTranslationHandler.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_translation/src/ContentTranslationHandler.php Tue Jul 10 15:07:59 2018 +0100 @@ -743,7 +743,7 @@ * Takes care of entity deletion. */ public function entityFormDelete($form, FormStateInterface $form_state) { - $form_object = $form_state->getFormObject()->getEntity(); + $form_object = $form_state->getFormObject(); $entity = $form_object->getEntity(); if (count($entity->getTranslationLanguages()) > 1) { drupal_set_message(t('This will delete all the translations of %label.', ['%label' => $entity->label()]), 'warning'); diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/src/Plugin/migrate/source/d7/EntityTranslationSettings.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/content_translation/src/Plugin/migrate/source/d7/EntityTranslationSettings.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,195 @@ +select('variable', 'v') + ->fields('v', ['name', 'value']); + $condition = $query->orConditionGroup() + // The 'entity_translation_entity_types' variable tells us which entity + // type uses entity translation. + ->condition('name', 'entity_translation_entity_types') + // The 'entity_translation_taxonomy' variable tells us which taxonomy + // vocabulary uses entity_translation. + ->condition('name', 'entity_translation_taxonomy') + // The 'entity_translation_settings_%' variables give us the entity + // translation settings for each entity type and each bundle. + ->condition('name', 'entity_translation_settings_%', 'LIKE') + // The 'language_content_type_%' variables tells us which node type and + // which comment type uses entity translation. + ->condition('name', 'language_content_type_%', 'LIKE'); + $query->condition($condition); + return $query; + } + + /** + * {@inheritdoc} + */ + protected function initializeIterator() { + $results = array_map('unserialize', $this->prepareQuery()->execute()->fetchAllKeyed()); + $rows = []; + + // Find out which entity type uses entity translation by looking at the + // 'entity_translation_entity_types' variable. + $entity_types = array_filter($results['entity_translation_entity_types']); + + // If no entity type uses entity translation, there's nothing to do. + if (empty($entity_types)) { + return new \ArrayIterator($rows); + } + + // Find out which node type uses entity translation by looking at the + // 'language_content_type_%' variables. + $node_types = []; + foreach ($results as $name => $value) { + if (preg_match('/^language_content_type_(.+)$/', $name, $matches) && (int) $value === 4) { + $node_types[] = $matches[1]; + } + } + + // Find out which vocabulary uses entity translation by looking at the + // 'entity_translation_taxonomy' variable. + $vocabularies = array_keys(array_filter($results['entity_translation_taxonomy'])); + + if (in_array('node', $entity_types, TRUE) && !empty($node_types)) { + // For each node type that uses entity translation, check if a + // settings variable exists for that node type, otherwise use default + // values. + foreach ($node_types as $node_type) { + $settings = isset($results['entity_translation_settings_node__' . $node_type]) ? $results['entity_translation_settings_node__' . $node_type] : []; + $rows[] = [ + 'id' => 'node.' . $node_type, + 'target_entity_type_id' => 'node', + 'target_bundle' => $node_type, + 'default_langcode' => isset($settings['default_language']) ? $settings['default_language'] : 'und', + // The Drupal 7 'hide_language_selector' configuration has become + // 'language_alterable' in Drupal 8 so we need to negate the value we + // receive from the source. The Drupal 7 'hide_language_selector' + // default value for the node entity type was FALSE so in Drupal 8 it + // should be set to TRUE, unlike the other entity types for which + // it's the opposite. + 'language_alterable' => isset($settings['hide_language_selector']) ? (bool) !$settings['hide_language_selector'] : TRUE, + 'untranslatable_fields_hide' => isset($settings['shared_fields_original_only']) ? (bool) $settings['shared_fields_original_only'] : FALSE, + ]; + } + } + + if (in_array('comment', $entity_types, TRUE) && !empty($node_types)) { + // A comment type uses entity translation if the associated node type + // uses it. So, for each node type that uses entity translation, check + // if a settings variable exists for that comment type, otherwise use + // default values. + foreach ($node_types as $node_type) { + $settings = isset($results['entity_translation_settings_comment__comment_node_' . $node_type]) ? $results['entity_translation_settings_comment__comment_node_' . $node_type] : []; + // Forum uses a hardcoded comment type name, so make sure we use it + // when we're dealing with forum comment type. + $bundle = $node_type == 'forum' ? 'comment_forum' : 'comment_node_' . $node_type; + $rows[] = [ + 'id' => 'comment.' . $bundle, + 'target_entity_type_id' => 'comment', + 'target_bundle' => $bundle, + 'default_langcode' => isset($settings['default_language']) ? $settings['default_language'] : 'xx-et-current', + // The Drupal 7 'hide_language_selector' configuration has become + // 'language_alterable' in Drupal 8 so we need to negate the value we + // receive from the source. The Drupal 7 'hide_language_selector' + // default value for the comment entity type was TRUE so in Drupal 8 + // it should be set to FALSE. + 'language_alterable' => isset($settings['hide_language_selector']) ? (bool) !$settings['hide_language_selector'] : FALSE, + 'untranslatable_fields_hide' => isset($settings['shared_fields_original_only']) ? (bool) $settings['shared_fields_original_only'] : FALSE, + ]; + } + } + + if (in_array('taxonomy_term', $entity_types, TRUE) && !empty($vocabularies)) { + // For each vocabulary that uses entity translation, check if a + // settings variable exists for that vocabulary, otherwise use default + // values. + foreach ($vocabularies as $vocabulary) { + $settings = isset($results['entity_translation_settings_taxonomy_term__' . $vocabulary]) ? $results['entity_translation_settings_taxonomy_term__' . $vocabulary] : []; + $rows[] = [ + 'id' => 'taxonomy_term.' . $vocabulary, + 'target_entity_type_id' => 'taxonomy_term', + 'target_bundle' => $vocabulary, + 'default_langcode' => isset($settings['default_language']) ? $settings['default_language'] : 'xx-et-default', + // The Drupal 7 'hide_language_selector' configuration has become + // 'language_alterable' in Drupal 8 so we need to negate the value we + // receive from the source. The Drupal 7 'hide_language_selector' + // default value for the taxonomy_term entity type was TRUE so in + // Drupal 8 it should be set to FALSE. + 'language_alterable' => isset($settings['hide_language_selector']) ? (bool) !$settings['hide_language_selector'] : FALSE, + 'untranslatable_fields_hide' => isset($settings['shared_fields_original_only']) ? (bool) $settings['shared_fields_original_only'] : FALSE, + ]; + } + } + + if (in_array('user', $entity_types, TRUE)) { + // User entity type is not bundleable. Check if a settings variable + // exists, otherwise use default values. + $settings = isset($results['entity_translation_settings_user__user']) ? $results['entity_translation_settings_user__user'] : []; + $rows[] = [ + 'id' => 'user.user', + 'target_entity_type_id' => 'user', + 'target_bundle' => 'user', + 'default_langcode' => isset($settings['default_language']) ? $settings['default_language'] : 'xx-et-default', + // The Drupal 7 'hide_language_selector' configuration has become + // 'language_alterable' in Drupal 8 so we need to negate the value we + // receive from the source. The Drupal 7 'hide_language_selector' + // default value for the user entity type was TRUE so in Drupal 8 it + // should be set to FALSE. + 'language_alterable' => isset($settings['hide_language_selector']) ? (bool) !$settings['hide_language_selector'] : FALSE, + 'untranslatable_fields_hide' => isset($settings['shared_fields_original_only']) ? (bool) $settings['shared_fields_original_only'] : FALSE, + ]; + } + + return new \ArrayIterator($rows); + } + + /** + * {@inheritdoc} + */ + public function fields() { + return [ + 'id' => $this->t('The configuration ID'), + 'target_entity_type_id' => $this->t('The target entity type ID'), + 'target_bundle' => $this->t('The target bundle'), + 'default_langcode' => $this->t('The default language'), + 'language_alterable' => $this->t('Whether to show language selector on create and edit pages'), + 'untranslatable_fields_hide' => $this->t('Whether to hide non translatable fields on translation forms'), + ]; + } + + /** + * {@inheritdoc} + */ + public function getIds() { + $ids['id']['type'] = 'string'; + return $ids; + } + + /** + * {@inheritdoc} + */ + public function count($refresh = FALSE) { + // Since the number of variables we fetch with query() does not match the + // actual number of rows generated by initializeIterator(), we need to + // override count() to return the correct count. + return (int) $this->initializeIterator()->count(); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php --- a/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -78,7 +78,7 @@ $this->assertInstanceOf(TermInterface::class, $entity); $this->assertSame($expected_language, $entity->language()->getId()); $this->assertSame($expected_label, $entity->label()); - $this->assertSame($expected_vid, $entity->getVocabularyId()); + $this->assertSame($expected_vid, $entity->bundle()); $this->assertSame($expected_description, $entity->getDescription()); $this->assertSame($expected_format, $entity->getFormat()); $this->assertSame($expected_weight, $entity->getWeight()); diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,97 @@ +installConfig([ + 'comment', + 'content_translation', + 'node', + 'taxonomy', + 'user', + ]); + + $this->installEntitySchema('comment'); + $this->installEntitySchema('node'); + $this->installEntitySchema('taxonomy_term'); + $this->installEntitySchema('user'); + + $this->executeMigrations([ + 'd7_comment_type', + 'd7_node_type', + 'd7_taxonomy_vocabulary', + 'd7_entity_translation_settings', + ]); + } + + /** + * Tests entity translation settings migration. + */ + public function testEntityTranslationSettingsMigration() { + // Tests 'comment_node_test_content_type' entity translation settings. + $config = $this->config('language.content_settings.comment.comment_node_test_content_type'); + $this->assertSame($config->get('target_entity_type_id'), 'comment'); + $this->assertSame($config->get('target_bundle'), 'comment_node_test_content_type'); + $this->assertSame($config->get('default_langcode'), 'current_interface'); + $this->assertFalse((bool) $config->get('language_alterable')); + $this->assertTrue((bool) $config->get('third_party_settings.content_translation.enabled')); + $this->assertFalse((bool) $config->get('third_party_settings.content_translation.bundle_settings.untranslatable_fields_hide')); + + // Tests 'test_content_type' entity translation settings. + $config = $this->config('language.content_settings.node.test_content_type'); + $this->assertSame($config->get('target_entity_type_id'), 'node'); + $this->assertSame($config->get('target_bundle'), 'test_content_type'); + $this->assertSame($config->get('default_langcode'), LanguageInterface::LANGCODE_NOT_SPECIFIED); + $this->assertTrue((bool) $config->get('language_alterable')); + $this->assertTrue((bool) $config->get('third_party_settings.content_translation.enabled')); + $this->assertFalse((bool) $config->get('third_party_settings.content_translation.bundle_settings.untranslatable_fields_hide')); + + // Tests 'test_vocabulary' entity translation settings. + $config = $this->config('language.content_settings.taxonomy_term.test_vocabulary'); + $this->assertSame($config->get('target_entity_type_id'), 'taxonomy_term'); + $this->assertSame($config->get('target_bundle'), 'test_vocabulary'); + $this->assertSame($config->get('default_langcode'), LanguageInterface::LANGCODE_SITE_DEFAULT); + $this->assertFalse((bool) $config->get('language_alterable')); + $this->assertTrue((bool) $config->get('third_party_settings.content_translation.enabled')); + $this->assertFalse((bool) $config->get('third_party_settings.content_translation.bundle_settings.untranslatable_fields_hide')); + + // Tests 'user' entity translation settings. + $config = $this->config('language.content_settings.user.user'); + $this->assertSame($config->get('target_entity_type_id'), 'user'); + $this->assertSame($config->get('target_bundle'), 'user'); + $this->assertSame($config->get('default_langcode'), LanguageInterface::LANGCODE_SITE_DEFAULT); + $this->assertFalse((bool) $config->get('language_alterable')); + $this->assertTrue((bool) $config->get('third_party_settings.content_translation.enabled')); + $this->assertFalse((bool) $config->get('third_party_settings.content_translation.bundle_settings.untranslatable_fields_hide')); + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/content_translation/tests/src/Kernel/Plugin/migrate/source/d7/EntityTranslationSettingsTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/content_translation/tests/src/Kernel/Plugin/migrate/source/d7/EntityTranslationSettingsTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,241 @@ + 'entity_translation_entity_types', + 'value' => 'a:4:{s:7:"comment";i:0;s:4:"node";i:0;s:13:"taxonomy_term";i:0;s:4:"user";i:0;}', + ], + ]; + + // Source data when there's no bundle settings variables. + $tests[1]['source_data']['variable'] = [ + [ + 'name' => 'entity_translation_entity_types', + 'value' => 'a:4:{s:7:"comment";s:7:"comment";s:4:"node";s:4:"node";s:13:"taxonomy_term";s:13:"taxonomy_term";s:4:"user";s:4:"user";}', + ], + [ + 'name' => 'entity_translation_taxonomy', + 'value' => 'a:3:{s:6:"forums";b:1;s:4:"tags";b:1;s:4:"test";b:0;}', + ], + [ + 'name' => 'language_content_type_article', + 'value' => 's:1:"2";', + ], + [ + 'name' => 'language_content_type_forum', + 'value' => 's:1:"4";', + ], + [ + 'name' => 'language_content_type_page', + 'value' => 's:1:"4";', + ], + ]; + + // Source data when there's bundle settings variables. + $tests[2]['source_data']['variable'] = [ + [ + 'name' => 'entity_translation_entity_types', + 'value' => 'a:4:{s:7:"comment";s:7:"comment";s:4:"node";s:4:"node";s:13:"taxonomy_term";s:13:"taxonomy_term";s:4:"user";s:4:"user";}', + ], + [ + 'name' => 'entity_translation_settings_comment__comment_node_forum', + 'value' => 'a:5:{s:16:"default_language";s:12:"xx-et-author";s:22:"hide_language_selector";i:1;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:0;}', + ], + [ + 'name' => 'entity_translation_settings_comment__comment_node_page', + 'value' => 'a:5:{s:16:"default_language";s:12:"xx-et-author";s:22:"hide_language_selector";i:0;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:1;}', + ], + [ + 'name' => 'entity_translation_settings_node__forum', + 'value' => 'a:5:{s:16:"default_language";s:12:"xx-et-author";s:22:"hide_language_selector";i:0;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:0;}', + ], + [ + 'name' => 'entity_translation_settings_node__page', + 'value' => 'a:5:{s:16:"default_language";s:13:"xx-et-default";s:22:"hide_language_selector";i:1;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:1;}', + ], + [ + 'name' => 'entity_translation_settings_taxonomy_term__forums', + 'value' => 'a:5:{s:16:"default_language";s:13:"xx-et-current";s:22:"hide_language_selector";i:0;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:1;}', + ], + [ + 'name' => 'entity_translation_settings_taxonomy_term__tags', + 'value' => 'a:5:{s:16:"default_language";s:13:"xx-et-current";s:22:"hide_language_selector";i:1;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:0;}', + ], + [ + 'name' => 'entity_translation_settings_user__user', + 'value' => 'a:5:{s:16:"default_language";s:12:"xx-et-author";s:22:"hide_language_selector";i:1;s:21:"exclude_language_none";i:0;s:13:"lock_language";i:0;s:27:"shared_fields_original_only";i:1;}', + ], + [ + 'name' => 'entity_translation_taxonomy', + 'value' => 'a:3:{s:6:"forums";b:1;s:4:"tags";b:1;s:4:"test";b:0;}', + ], + [ + 'name' => 'language_content_type_article', + 'value' => 's:1:"2";', + ], + [ + 'name' => 'language_content_type_forum', + 'value' => 's:1:"4";', + ], + [ + 'name' => 'language_content_type_page', + 'value' => 's:1:"4";', + ], + ]; + + // Expected data when there's no entity type that uses entity translation. + $tests[0]['expected_data'] = []; + + // Expected data when there's no bundle settings variables. + $tests[1]['expected_data'] = [ + [ + 'id' => 'node.forum', + 'target_entity_type_id' => 'node', + 'target_bundle' => 'forum', + 'default_langcode' => 'und', + 'language_alterable' => TRUE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'node.page', + 'target_entity_type_id' => 'node', + 'target_bundle' => 'page', + 'default_langcode' => 'und', + 'language_alterable' => TRUE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'comment.comment_forum', + 'target_entity_type_id' => 'comment', + 'target_bundle' => 'comment_forum', + 'default_langcode' => 'xx-et-current', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'comment.comment_node_page', + 'target_entity_type_id' => 'comment', + 'target_bundle' => 'comment_node_page', + 'default_langcode' => 'xx-et-current', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'taxonomy_term.forums', + 'target_entity_type_id' => 'taxonomy_term', + 'target_bundle' => 'forums', + 'default_langcode' => 'xx-et-default', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'taxonomy_term.tags', + 'target_entity_type_id' => 'taxonomy_term', + 'target_bundle' => 'tags', + 'default_langcode' => 'xx-et-default', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'user.user', + 'target_entity_type_id' => 'user', + 'target_bundle' => 'user', + 'default_langcode' => 'xx-et-default', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + ]; + + // Expected data when there's bundle settings variables. + $tests[2]['expected_data'] = [ + [ + 'id' => 'node.forum', + 'target_entity_type_id' => 'node', + 'target_bundle' => 'forum', + 'default_langcode' => 'xx-et-author', + 'language_alterable' => TRUE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'node.page', + 'target_entity_type_id' => 'node', + 'target_bundle' => 'page', + 'default_langcode' => 'xx-et-default', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => TRUE, + ], + [ + 'id' => 'comment.comment_forum', + 'target_entity_type_id' => 'comment', + 'target_bundle' => 'comment_forum', + 'default_langcode' => 'xx-et-author', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'comment.comment_node_page', + 'target_entity_type_id' => 'comment', + 'target_bundle' => 'comment_node_page', + 'default_langcode' => 'xx-et-author', + 'language_alterable' => TRUE, + 'untranslatable_fields_hide' => TRUE, + ], + [ + 'id' => 'taxonomy_term.forums', + 'target_entity_type_id' => 'taxonomy_term', + 'target_bundle' => 'forums', + 'default_langcode' => 'xx-et-current', + 'language_alterable' => TRUE, + 'untranslatable_fields_hide' => TRUE, + ], + [ + 'id' => 'taxonomy_term.tags', + 'target_entity_type_id' => 'taxonomy_term', + 'target_bundle' => 'tags', + 'default_langcode' => 'xx-et-current', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => FALSE, + ], + [ + 'id' => 'user.user', + 'target_entity_type_id' => 'user', + 'target_bundle' => 'user', + 'default_langcode' => 'xx-et-author', + 'language_alterable' => FALSE, + 'untranslatable_fields_hide' => TRUE, + ], + ]; + + return $tests; + } + +} diff -r e200cb7efeb3 -r c2387f117808 core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinkClickTrait.php --- a/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinkClickTrait.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinkClickTrait.php Tue Jul 10 15:07:59 2018 +0100 @@ -18,6 +18,11 @@ * If true then the button will be forced to visible so it can be clicked. */ protected function clickContextualLink($selector, $link_locator, $force_visible = TRUE) { + $page = $this->getSession()->getPage(); + $page->waitFor(10, function () use ($page, $selector) { + return $page->find('css', "$selector .contextual-links"); + }); + if ($force_visible) { $this->toggleContextualTriggerVisibility($selector); } diff -r e200cb7efeb3 -r c2387f117808 core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php --- a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -7,8 +7,8 @@ use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase; use Drupal\Tests\rest\Functional\AnonResourceTestTrait; -use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase; use GuzzleHttp\RequestOptions; /** diff -r e200cb7efeb3 -r c2387f117808 core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php --- a/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -7,8 +7,8 @@ use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\entity_test\Functional\Rest\EntityTestResourceTestBase; use Drupal\Tests\rest\Functional\AnonResourceTestTrait; -use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase; use GuzzleHttp\RequestOptions; /** diff -r e200cb7efeb3 -r c2387f117808 core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php --- a/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/d6/DateFieldTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -24,6 +24,8 @@ /** * Tests an Exception is thrown when the field type is not a known date type. + * + * @expectedDeprecation DateField is deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\migrate\field\DateField instead. */ public function testUnknownDateType() { $this->migration = $this->prophesize('Drupal\migrate\Plugin\MigrationInterface')->reveal(); diff -r e200cb7efeb3 -r c2387f117808 core/modules/dblog/src/Controller/DbLogController.php --- a/core/modules/dblog/src/Controller/DbLogController.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/modules/dblog/src/Controller/DbLogController.php Tue Jul 10 15:07:59 2018 +0100 @@ -113,7 +113,8 @@ * Full-length messages can be viewed on the message details page. * * @return array - * A render array as expected by drupal_render(). + * A render array as expected by + * \Drupal\Core\Render\RendererInterface::render(). * * @see Drupal\dblog\Form\DblogClearLogConfirmForm * @see Drupal\dblog\Controller\DbLogController::eventDetails() @@ -237,7 +238,7 @@ * * @return array * If the ID is located in the Database Logging table, a build array in the - * format expected by drupal_render(); + * format expected by \Drupal\Core\Render\RendererInterface::render(). */ public function eventDetails($event_id) { $build = []; @@ -378,7 +379,8 @@ * Type of database log events to display (e.g., 'search'). * * @return array - * A build array in the format expected by drupal_render(). + * A build array in the format expected by + * \Drupal\Core\Render\RendererInterface::render(). */ public function topLogMessages($type) { $header = [ diff -r e200cb7efeb3 -r c2387f117808 core/modules/editor/tests/src/Functional/Hal/EditorHalJsonAnonTest.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/modules/editor/tests/src/Functional/Hal/EditorHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100 @@ -0,0 +1,30 @@ +grantPermissionsToTestedRole(['administer filters']); + } + + /** + * {@inheritdoc} + */ + protected function createEntity() { + // Create a "Llama" filter format. + $llama_format = FilterFormat::create([ + 'name' => 'Llama', + 'format' => 'llama', + 'langcode' => 'es', + 'filters' => [ + 'filter_html' => [ + 'status' => TRUE, + 'settings' => [ + 'allowed_html' => '
- Preheat the oven to 400°F/200°C. +
- Finely chop the red onions and sweat gently on a low heat in olive oil for 5 minutes. +
- Peel the garlic and add it to the onions. +
- Meanwhile, chop the bell peppers to 1 inch pieces. Add the bell peppers and tomatoes to a roasting dish, and rub with lemon juice, olive oil and black pepper. Transfer to the oven and roast for 30 minutes. +
- Once the onions and garlic have softened, chop and add the chilies, seeds and all. Mix well and continue to gently fry. +
- Thoroughly wash your hands following handling raw chilies. +
- Once the tomatoes and bell peppers have finished roasting, add them to the pan. Cook for at least 10 minutes, breaking them up with a masher or a hand blender as they simmer. Once broken up, mix in the sugar. +
- Transfer the sauce to a blender and blend until smooth. +
- Return to the pan and add the vinegar and juice of the limes. +
- Cook through for a further 10 minutes, then leave to cool. +
- Transfer to sterilized jars and keep refrigerated. +
- Leave for at least two weeks before tasting. +
- Mix the egg yolks, sugar, and cornstarch with 1/3 of the milk. +
- In a saucepan, boil 2/3 of the milk with the lemon peel and cinnamon. +
- After 3 minutes, remove from the heat and take out the lemon and cinnamon. +
- Slowly add the egg mixture to the hot milk through a strainer to ensure there are no lumps. +
- Return it to the heat until it boils, stirring constantly. +
- Once the mixture has begun to thicken, remove from the heat and put it into individual bowls to cool. +
- For an authentic finish, sprinkle with sugar and brown with a blowtorch or under a preheated broiler to caramelize. +
- {{ form.current }}
- {{ form.new_state }} diff -r e200cb7efeb3 -r c2387f117808 core/themes/stable/templates/misc/status-messages.html.twig --- a/core/themes/stable/templates/misc/status-messages.html.twig Thu Apr 26 11:26:54 2018 +0100 +++ b/core/themes/stable/templates/misc/status-messages.html.twig Tue Jul 10 15:07:59 2018 +0100 @@ -15,8 +15,6 @@ * Available variables: * - message_list: List of messages to be displayed, grouped by type. * - status_headings: List of all status types. - * - display: (optional) May have a value of 'status' or 'error' when only - * displaying messages of that specific type. * - attributes: HTML attributes for the element, including: * - class: HTML classes. */ diff -r e200cb7efeb3 -r c2387f117808 core/themes/stable/templates/views/views-view-grid.html.twig --- a/core/themes/stable/templates/views/views-view-grid.html.twig Thu Apr 26 11:26:54 2018 +0100 +++ b/core/themes/stable/templates/views/views-view-grid.html.twig Tue Jul 10 15:07:59 2018 +0100 @@ -57,7 +57,7 @@
The name "llama" was adopted by European settlers from native Peruvians. The name "llama" was adopted by European settlers from native Peruvians. It is a little known fact that llamas cannot count higher than seven. Are you sure the configured username has the necessary permissions to create tables in the database? Cádiz is the oldest continuously inhabited city in Spain and a nice place to spend a Sunday with friends. This is a dynamic llama. It is a little known fact that llamas cannot count higher than seven. You follow the recipe, you weigh all your ingredients, you use the right oven temperature and you take your time and yet still, your baking comes out with a soggy bottom, fails to rise or just tastes plain horrible. We have come up with a list of the most frustrating baking problems and the techniques you can use to try and avoid them. Don't under any circumstances open the oven door in the middle of the cooking time. The heat will come whooshing out, destroying the chemical reaction taking place inside your cake. Your raising agent needs the heat to become activated and you might kill it off. If your light sponge is the consistency of a spare tyre, you might have over-mixed your batter. Keep the lightness inside your cake mixture by carefully and gently folding in the ingredients and only to the point they are just mixed. If you over-fold, the gluten in the flour will start to come out and you'll be making bread instead of cake. A great trick is to use light colored bakeware, rather than black. It is less likely to absorb the heat and transfer it to the bottom of your biscuits. Using baking paper will also help with this. Also, using too much sugar can result in your cookies browning too much and giving them a caramelized look. Your oven is very likely too hot. If you suspect your oven doesn't keep to the right temperature, invest in a thermometer and check it regularly throughout the cooking. With bread, over-mixing the dough can result in a cracked or split top. As mentioned above, the color of your pan is important. In this case, a dark pan will increase the heat at the bottom and give you that crisp underneath that you want. If you are using a flaky pastry, you really need to blind bake it. Putting your pie towards the bottom of the oven will increase the heat reaching that part. You simply tried to make it stretch too far. When rolling, don't try to make it too thin or too big and when draping over your pan, allow it to settle on its own without stretching it to fit. Or just add more pastry - everyone loves pastry anyway! Are you sure the configured username has the necessary permissions to create tables in the database?');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 120);
- $this->assertEqual($image_file->getHeight(), 60);
-
- // Rotate 90 degrees anticlockwise.
- $effect = [
- 'id' => 'image_rotate',
- 'data' => [
- 'degrees' => -90,
- 'random' => FALSE,
- ],
- 'weight' => 1,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 60);
- $this->assertEqual($image_file->getHeight(), 120);
-
- // Scale an image that is higher than it is wide (rotated by previous effect).
- $effect = [
- 'id' => 'image_scale',
- 'data' => [
- 'width' => 120,
- 'height' => 90,
- 'upscale' => TRUE,
- ],
- 'weight' => 2,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 45);
- $this->assertEqual($image_file->getHeight(), 90);
-
- // Test upscale disabled.
- $effect = [
- 'id' => 'image_scale',
- 'data' => [
- 'width' => 400,
- 'height' => 200,
- 'upscale' => FALSE,
- ],
- 'weight' => 3,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 45);
- $this->assertEqual($image_file->getHeight(), 90);
-
- // Add a desaturate effect.
- $effect = [
- 'id' => 'image_desaturate',
- 'data' => [],
- 'weight' => 4,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 45);
- $this->assertEqual($image_file->getHeight(), 90);
-
- // Add a random rotate effect.
- $effect = [
- 'id' => 'image_rotate',
- 'data' => [
- 'degrees' => 180,
- 'random' => TRUE,
- ],
- 'weight' => 5,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
-
- // Add a crop effect.
- $effect = [
- 'id' => 'image_crop',
- 'data' => [
- 'width' => 30,
- 'height' => 30,
- 'anchor' => 'center-center',
- ],
- 'weight' => 6,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 30);
- $this->assertEqual($image_file->getHeight(), 30);
-
- // Rotate to a non-multiple of 90 degrees.
- $effect = [
- 'id' => 'image_rotate',
- 'data' => [
- 'degrees' => 57,
- 'random' => FALSE,
- ],
- 'weight' => 7,
- ];
-
- $effect_id = $style->addImageEffect($effect);
- $style->save();
- // @todo Uncomment this once
- // https://www.drupal.org/project/drupal/issues/2670966 is resolved.
- // $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- // @todo Uncomment this once
- // https://www.drupal.org/project/drupal/issues/2670966 is resolved.
- // $this->assertEqual($image_file->getWidth(), 41);
- // $this->assertEqual($image_file->getHeight(), 41);
-
- $effect_plugin = $style->getEffect($effect_id);
- $style->deleteImageEffect($effect_plugin);
-
- // Ensure that an effect can unset dimensions.
- $effect = [
- 'id' => 'image_module_test_null',
- 'data' => [],
- 'weight' => 8,
- ];
-
- $style->addImageEffect($effect);
- $style->save();
- $this->assertEqual($this->getImageTag($variables), '
');
-
- // Test URI dependent image effect.
- $style = ImageStyle::create(['name' => 'test_uri', 'label' => 'Test URI']);
- $effect = [
- 'id' => 'image_module_test_uri_dependent',
- 'data' => [],
- 'weight' => 0,
- ];
- $style->addImageEffect($effect);
- $style->save();
- $variables = [
- '#theme' => 'image_style',
- '#style_name' => 'test_uri',
- '#uri' => $original_uri,
- '#width' => 40,
- '#height' => 20,
- ];
- // PNG original image. Should be resized to 100x100.
- $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri);
- $url = file_url_transform_relative($style->buildUrl($original_uri));
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 100);
- $this->assertEqual($image_file->getHeight(), 100);
- // GIF original image. Should be resized to 50x50.
- $file = $files[1];
- $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
- $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri);
- $url = file_url_transform_relative($style->buildUrl($original_uri));
- $variables['#uri'] = $original_uri;
- $this->assertEqual($this->getImageTag($variables), '
');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $image_file = $image_factory->get($generated_uri);
- $this->assertEqual($image_file->getWidth(), 50);
- $this->assertEqual($image_file->getHeight(), 50);
- }
-
- /**
- * Render an image style element.
- *
- * drupal_render() alters the passed $variables array by adding a new key
- * '#printed' => TRUE. This prevents next call to re-render the element. We
- * wrap drupal_render() in a helper protected method and pass each time a
- * fresh array so that $variables won't get altered and the element is
- * re-rendered each time.
- */
- protected function getImageTag($variables) {
- return str_replace("\n", NULL, \Drupal::service('renderer')->renderRoot($variables));
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,392 +0,0 @@
-container->get('entity.manager')->getStorage('node');
- // Create files to use as the default images.
- $files = $this->drupalGetTestFiles('image');
- // Create 10 files so the default image fids are not a single value.
- for ($i = 1; $i <= 10; $i++) {
- $filename = $this->randomMachineName() . "$i";
- $desired_filepath = 'public://' . $filename;
- file_unmanaged_copy($files[0]->uri, $desired_filepath, FILE_EXISTS_ERROR);
- $file = File::create(['uri' => $desired_filepath, 'filename' => $filename, 'name' => $filename]);
- $file->save();
- }
- $default_images = [];
- foreach (['field_storage', 'field', 'field2', 'field_storage_new', 'field_new', 'field_storage_private', 'field_private'] as $image_target) {
- $file = File::create((array) array_pop($files));
- $file->save();
- $default_images[$image_target] = $file;
- }
-
- // Create an image field storage and add a field to the article content
- // type.
- $field_name = strtolower($this->randomMachineName());
- $storage_settings['default_image'] = [
- 'uuid' => $default_images['field_storage']->uuid(),
- 'alt' => '',
- 'title' => '',
- 'width' => 0,
- 'height' => 0,
- ];
- $field_settings['default_image'] = [
- 'uuid' => $default_images['field']->uuid(),
- 'alt' => '',
- 'title' => '',
- 'width' => 0,
- 'height' => 0,
- ];
- $widget_settings = [
- 'preview_image_style' => 'medium',
- ];
- $field = $this->createImageField($field_name, 'article', $storage_settings, $field_settings, $widget_settings);
-
- // The field default image id should be 2.
- $this->assertEqual($field->getSetting('default_image')['uuid'], $default_images['field']->uuid());
-
- // Also test \Drupal\field\Entity\FieldConfig::getSettings().
- $this->assertEqual($field->getSettings()['default_image']['uuid'], $default_images['field']->uuid());
-
- $field_storage = $field->getFieldStorageDefinition();
-
- // The field storage default image id should be 1.
- $this->assertEqual($field_storage->getSetting('default_image')['uuid'], $default_images['field_storage']->uuid());
-
- // Also test \Drupal\field\Entity\FieldStorageConfig::getSettings().
- $this->assertEqual($field_storage->getSettings()['default_image']['uuid'], $default_images['field_storage']->uuid());
-
- // Add another field with another default image to the page content type.
- $field2 = FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'page',
- 'label' => $field->label(),
- 'required' => $field->isRequired(),
- 'settings' => [
- 'default_image' => [
- 'uuid' => $default_images['field2']->uuid(),
- 'alt' => '',
- 'title' => '',
- 'width' => 0,
- 'height' => 0,
- ],
- ],
- ]);
- $field2->save();
-
- $widget_settings = entity_get_form_display('node', $field->getTargetBundle(), 'default')->getComponent($field_name);
- entity_get_form_display('node', 'page', 'default')
- ->setComponent($field_name, $widget_settings)
- ->save();
- entity_get_display('node', 'page', 'default')
- ->setComponent($field_name)
- ->save();
-
- // Confirm the defaults are present on the article field storage settings
- // form.
- $field_id = $field->id();
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_storage']->id(),
- format_string(
- 'Article image field storage default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_storage']->id()]
- )
- );
- // Confirm the defaults are present on the article field edit form.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field']->id(),
- format_string(
- 'Article image field default equals expected file ID of @fid.',
- ['@fid' => $default_images['field']->id()]
- )
- );
-
- // Confirm the defaults are present on the page field storage settings form.
- $this->drupalGet("admin/structure/types/manage/page/fields/$field_id/storage");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_storage']->id(),
- format_string(
- 'Page image field storage default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_storage']->id()]
- )
- );
- // Confirm the defaults are present on the page field edit form.
- $field2_id = $field2->id();
- $this->drupalGet("admin/structure/types/manage/page/fields/$field2_id");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field2']->id(),
- format_string(
- 'Page image field default equals expected file ID of @fid.',
- ['@fid' => $default_images['field2']->id()]
- )
- );
-
- // Confirm that the image default is shown for a new article node.
- $article = $this->drupalCreateNode(['type' => 'article']);
- $article_built = $this->drupalBuildEntityView($article);
- $this->assertEqual(
- $article_built[$field_name][0]['#item']->target_id,
- $default_images['field']->id(),
- format_string(
- 'A new article node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field']->id()]
- )
- );
-
- // Also check that the field renders without warnings when the label is
- // hidden.
- EntityViewDisplay::load('node.article.default')
- ->setComponent($field_name, ['label' => 'hidden', 'type' => 'image'])
- ->save();
- $this->drupalGet('node/' . $article->id());
-
- // Confirm that the image default is shown for a new page node.
- $page = $this->drupalCreateNode(['type' => 'page']);
- $page_built = $this->drupalBuildEntityView($page);
- $this->assertEqual(
- $page_built[$field_name][0]['#item']->target_id,
- $default_images['field2']->id(),
- format_string(
- 'A new page node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field2']->id()]
- )
- );
-
- // Upload a new default for the field storage.
- $default_image_settings = $field_storage->getSetting('default_image');
- $default_image_settings['uuid'] = $default_images['field_storage_new']->uuid();
- $field_storage->setSetting('default_image', $default_image_settings);
- $field_storage->save();
-
- // Confirm that the new default is used on the article field storage
- // settings form.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_storage_new']->id(),
- format_string(
- 'Updated image field storage default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_storage_new']->id()]
- )
- );
-
- // Reload the nodes and confirm the field defaults are used.
- $node_storage->resetCache([$article->id(), $page->id()]);
- $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
- $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
- $this->assertEqual(
- $article_built[$field_name][0]['#item']->target_id,
- $default_images['field']->id(),
- format_string(
- 'An existing article node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field']->id()]
- )
- );
- $this->assertEqual(
- $page_built[$field_name][0]['#item']->target_id,
- $default_images['field2']->id(),
- format_string(
- 'An existing page node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field2']->id()]
- )
- );
-
- // Upload a new default for the article's field.
- $default_image_settings = $field->getSetting('default_image');
- $default_image_settings['uuid'] = $default_images['field_new']->uuid();
- $field->setSetting('default_image', $default_image_settings);
- $field->save();
-
- // Confirm the new field default is used on the article field admin form.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_new']->id(),
- format_string(
- 'Updated article image field default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_new']->id()]
- )
- );
-
- // Reload the nodes.
- $node_storage->resetCache([$article->id(), $page->id()]);
- $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
- $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
-
- // Confirm the article uses the new default.
- $this->assertEqual(
- $article_built[$field_name][0]['#item']->target_id,
- $default_images['field_new']->id(),
- format_string(
- 'An existing article node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field_new']->id()]
- )
- );
- // Confirm the page remains unchanged.
- $this->assertEqual(
- $page_built[$field_name][0]['#item']->target_id,
- $default_images['field2']->id(),
- format_string(
- 'An existing page node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field2']->id()]
- )
- );
-
- // Confirm the default image is shown on the node form.
- $file = File::load($default_images['field_new']->id());
- $this->drupalGet('node/add/article');
- $this->assertRaw($file->getFilename());
-
- // Remove the field default from articles.
- $default_image_settings = $field->getSetting('default_image');
- $default_image_settings['uuid'] = 0;
- $field->setSetting('default_image', $default_image_settings);
- $field->save();
-
- // Confirm the article field default has been removed.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- '',
- 'Updated article image field default has been successfully removed.'
- );
-
- // Reload the nodes.
- $node_storage->resetCache([$article->id(), $page->id()]);
- $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
- $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
- // Confirm the article uses the new field storage (not field) default.
- $this->assertEqual(
- $article_built[$field_name][0]['#item']->target_id,
- $default_images['field_storage_new']->id(),
- format_string(
- 'An existing article node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field_storage_new']->id()]
- )
- );
- // Confirm the page remains unchanged.
- $this->assertEqual(
- $page_built[$field_name][0]['#item']->target_id,
- $default_images['field2']->id(),
- format_string(
- 'An existing page node without an image has the expected default image file ID of @fid.',
- ['@fid' => $default_images['field2']->id()]
- )
- );
-
- $non_image = $this->drupalGetTestFiles('text');
- $this->drupalPostForm(NULL, ['files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($non_image[0]->uri)], t("Upload"));
- $this->assertText('The specified file text-0.txt could not be uploaded.');
- $this->assertText('Only files with the following extensions are allowed: png gif jpg jpeg.');
-
- // Confirm the default image is shown on the node form.
- $file = File::load($default_images['field_storage_new']->id());
- $this->drupalGet('node/add/article');
- $this->assertRaw($file->getFilename());
-
- // Change the default image for the field storage and also change the upload
- // destination to the private filesystem at the same time.
- $default_image_settings = $field_storage->getSetting('default_image');
- $default_image_settings['uuid'] = $default_images['field_storage_private']->uuid();
- $field_storage->setSetting('default_image', $default_image_settings);
- $field_storage->setSetting('uri_scheme', 'private');
- $field_storage->save();
-
- // Confirm that the new default is used on the article field storage
- // settings form.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_storage_private']->id(),
- format_string(
- 'Updated image field storage default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_storage_private']->id()]
- )
- );
-
- // Upload a new default for the article's field after setting the field
- // storage upload destination to 'private'.
- $default_image_settings = $field->getSetting('default_image');
- $default_image_settings['uuid'] = $default_images['field_private']->uuid();
- $field->setSetting('default_image', $default_image_settings);
- $field->save();
-
- // Confirm the new field field default is used on the article field
- // admin form.
- $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
- $this->assertFieldByXpath(
- '//input[@name="settings[default_image][uuid][fids]"]',
- $default_images['field_private']->id(),
- format_string(
- 'Updated article image field default equals expected file ID of @fid.',
- ['@fid' => $default_images['field_private']->id()]
- )
- );
- }
-
- /**
- * Tests image field and field storage having an invalid default image.
- */
- public function testInvalidDefaultImage() {
- $field_storage = FieldStorageConfig::create([
- 'field_name' => Unicode::strtolower($this->randomMachineName()),
- 'entity_type' => 'node',
- 'type' => 'image',
- 'settings' => [
- 'default_image' => [
- 'uuid' => 100000,
- ]
- ],
- ]);
- $field_storage->save();
- $settings = $field_storage->getSettings();
- // The non-existent default image should not be saved.
- $this->assertNull($settings['default_image']['uuid']);
-
- $field = FieldConfig::create([
- 'field_storage' => $field_storage,
- 'bundle' => 'page',
- 'label' => $this->randomMachineName(),
- 'settings' => [
- 'default_image' => [
- 'uuid' => 100000,
- ]
- ],
- ]);
- $field->save();
- $settings = $field->getSettings();
- // The non-existent default image should not be saved.
- $this->assertNull($settings['default_image']['uuid']);
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageFieldDisplayTest.php
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,461 +0,0 @@
-_testImageFieldFormatters('public');
- }
-
- /**
- * Test image formatters on node display for private files.
- */
- public function testImageFieldFormattersPrivate() {
- // Remove access content permission from anonymous users.
- user_role_change_permissions(RoleInterface::ANONYMOUS_ID, ['access content' => FALSE]);
- $this->_testImageFieldFormatters('private');
- }
-
- /**
- * Test image formatters on node display.
- */
- public function _testImageFieldFormatters($scheme) {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = $this->container->get('renderer');
- $node_storage = $this->container->get('entity.manager')->getStorage('node');
- $field_name = strtolower($this->randomMachineName());
- $field_settings = ['alt_field_required' => 0];
- $instance = $this->createImageField($field_name, 'article', ['uri_scheme' => $scheme], $field_settings);
-
- // Go to manage display page.
- $this->drupalGet("admin/structure/types/manage/article/display");
-
- // Test for existence of link to image styles configuration.
- $this->drupalPostAjaxForm(NULL, [], "{$field_name}_settings_edit");
- $this->assertLinkByHref(\Drupal::url('entity.image_style.collection'), 0, 'Link to image styles configuration is found');
-
- // Remove 'administer image styles' permission from testing admin user.
- $admin_user_roles = $this->adminUser->getRoles(TRUE);
- user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => FALSE]);
-
- // Go to manage display page again.
- $this->drupalGet("admin/structure/types/manage/article/display");
-
- // Test for absence of link to image styles configuration.
- $this->drupalPostAjaxForm(NULL, [], "{$field_name}_settings_edit");
- $this->assertNoLinkByHref(\Drupal::url('entity.image_style.collection'), 'Link to image styles configuration is absent when permissions are insufficient');
-
- // Restore 'administer image styles' permission to testing admin user
- user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => TRUE]);
-
- // Create a new node with an image attached.
- $test_image = current($this->drupalGetTestFiles('image'));
-
- // Ensure that preview works.
- $this->previewNodeImage($test_image, $field_name, 'article');
-
- // After previewing, make the alt field required. It cannot be required
- // during preview because the form validation will fail.
- $instance->setSetting('alt_field_required', 1);
- $instance->save();
-
- // Create alt text for the image.
- $alt = $this->randomMachineName();
-
- // Save node.
- $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
- $node_storage->resetCache([$nid]);
- $node = $node_storage->load($nid);
-
- // Test that the default formatter is being used.
- $file = $node->{$field_name}->entity;
- $image_uri = $file->getFileUri();
- $image = [
- '#theme' => 'image',
- '#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
- '#alt' => $alt,
- ];
- $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
-
- // Test the image linked to file formatter.
- $display_options = [
- 'type' => 'image',
- 'settings' => ['image_link' => 'file'],
- ];
- $display = entity_get_display('node', $node->getType(), 'default');
- $display->setComponent($field_name, $display_options)
- ->save();
-
- $image = [
- '#theme' => 'image',
- '#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
- '#alt' => $alt,
- ];
- $default_output = '' . $renderer->renderRoot($image) . '';
- $this->drupalGet('node/' . $nid);
- $this->assertCacheTag($file->getCacheTags()[0]);
- // @todo Remove in https://www.drupal.org/node/2646744.
- $this->assertCacheContext('url.site');
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.');
- // Verify that the image can be downloaded.
- $this->assertEqual(file_get_contents($test_image->uri), $this->drupalGet(file_create_url($image_uri)), 'File was downloaded successfully.');
- if ($scheme == 'private') {
- // Only verify HTTP headers when using private scheme and the headers are
- // sent by Drupal.
- $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.');
- $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.');
-
- // Log out and try to access the file.
- $this->drupalLogout();
- $this->drupalGet(file_create_url($image_uri));
- $this->assertResponse('403', 'Access denied to original image as anonymous user.');
-
- // Log in again.
- $this->drupalLogin($this->adminUser);
- }
-
- // Test the image linked to content formatter.
- $display_options['settings']['image_link'] = 'content';
- $display->setComponent($field_name, $display_options)
- ->save();
- $image = [
- '#theme' => 'image',
- '#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
- ];
- $this->drupalGet('node/' . $nid);
- $this->assertCacheTag($file->getCacheTags()[0]);
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $elements = $this->xpath(
- '//a[@href=:path]/img[@src=:url and @alt=:alt and @width=:width and @height=:height]',
- [
- ':path' => $node->url(),
- ':url' => file_url_transform_relative(file_create_url($image['#uri'])),
- ':width' => $image['#width'],
- ':height' => $image['#height'],
- ':alt' => $alt,
- ]
- );
- $this->assertEqual(count($elements), 1, 'Image linked to content formatter displaying correctly on full node view.');
-
- // Test the image style 'thumbnail' formatter.
- $display_options['settings']['image_link'] = '';
- $display_options['settings']['image_style'] = 'thumbnail';
- $display->setComponent($field_name, $display_options)
- ->save();
-
- // Ensure the derivative image is generated so we do not have to deal with
- // image style callback paths.
- $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
- $image_style = [
- '#theme' => 'image_style',
- '#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
- '#style_name' => 'thumbnail',
- '#alt' => $alt,
- ];
- $default_output = $renderer->renderRoot($image_style);
- $this->drupalGet('node/' . $nid);
- $image_style = ImageStyle::load('thumbnail');
- $this->assertCacheTag($image_style->getCacheTags()[0]);
- $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
-
- if ($scheme == 'private') {
- // Log out and try to access the file.
- $this->drupalLogout();
- $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
- $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
- }
-
- // Test the image URL formatter without an image style.
- $display_options = [
- 'type' => 'image_url',
- 'settings' => ['image_style' => ''],
- ];
- $expected_url = file_url_transform_relative(file_create_url($image_uri));
- $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
-
- // Test the image URL formatter with an image style.
- $display_options['settings']['image_style'] = 'thumbnail';
- $expected_url = file_url_transform_relative(ImageStyle::load('thumbnail')->buildUrl($image_uri));
- $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
- }
-
- /**
- * Tests for image field settings.
- */
- public function testImageFieldSettings() {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = $this->container->get('renderer');
- $node_storage = $this->container->get('entity.manager')->getStorage('node');
- $test_image = current($this->drupalGetTestFiles('image'));
- list(, $test_image_extension) = explode('.', $test_image->filename);
- $field_name = strtolower($this->randomMachineName());
- $field_settings = [
- 'alt_field' => 1,
- 'file_extensions' => $test_image_extension,
- 'max_filesize' => '50 KB',
- 'max_resolution' => '100x100',
- 'min_resolution' => '10x10',
- 'title_field' => 1,
- ];
- $widget_settings = [
- 'preview_image_style' => 'medium',
- ];
- $field = $this->createImageField($field_name, 'article', [], $field_settings, $widget_settings);
-
- // Verify that the min/max resolution set on the field are properly
- // extracted, and displayed, on the image field's configuration form.
- $this->drupalGet('admin/structure/types/manage/article/fields/' . $field->id());
- $this->assertFieldByName('settings[max_resolution][x]', '100', 'Expected max resolution X value of 100.');
- $this->assertFieldByName('settings[max_resolution][y]', '100', 'Expected max resolution Y value of 100.');
- $this->assertFieldByName('settings[min_resolution][x]', '10', 'Expected min resolution X value of 10.');
- $this->assertFieldByName('settings[min_resolution][y]', '10', 'Expected min resolution Y value of 10.');
-
- $this->drupalGet('node/add/article');
- $this->assertText(t('50 KB limit.'), 'Image widget max file size is displayed on article form.');
- $this->assertText(t('Allowed types: @extensions.', ['@extensions' => $test_image_extension]), 'Image widget allowed file types displayed on article form.');
- $this->assertText(t('Images must be larger than 10x10 pixels. Images larger than 100x100 pixels will be resized.'), 'Image widget allowed resolution displayed on article form.');
-
- // We have to create the article first and then edit it because the alt
- // and title fields do not display until the image has been attached.
-
- // Create alt text for the image.
- $alt = $this->randomMachineName();
-
- $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
- $this->drupalGet('node/' . $nid . '/edit');
- $this->assertFieldByName($field_name . '[0][alt]', '', 'Alt field displayed on article form.');
- $this->assertFieldByName($field_name . '[0][title]', '', 'Title field displayed on article form.');
- // Verify that the attached image is being previewed using the 'medium'
- // style.
- $node_storage->resetCache([$nid]);
- $node = $node_storage->load($nid);
- $file = $node->{$field_name}->entity;
-
- $url = file_url_transform_relative(file_create_url(ImageStyle::load('medium')->buildUrl($file->getFileUri())));
- $this->assertTrue($this->cssSelect('img[width=40][height=20][class=image-style-medium][src="' . $url . '"]'));
-
- // Add alt/title fields to the image and verify that they are displayed.
- $image = [
- '#theme' => 'image',
- '#uri' => $file->getFileUri(),
- '#alt' => $alt,
- '#title' => $this->randomMachineName(),
- '#width' => 40,
- '#height' => 20,
- ];
- $edit = [
- $field_name . '[0][alt]' => $image['#alt'],
- $field_name . '[0][title]' => $image['#title'],
- ];
- $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
- $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.');
-
- // Verify that alt/title longer than allowed results in a validation error.
- $test_size = 2000;
- $edit = [
- $field_name . '[0][alt]' => $this->randomMachineName($test_size),
- $field_name . '[0][title]' => $this->randomMachineName($test_size),
- ];
- $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
- $schema = $field->getFieldStorageDefinition()->getSchema();
- $this->assertRaw(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', [
- '%max' => $schema['columns']['alt']['length'],
- '%length' => $test_size,
- ]));
- $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', [
- '%max' => $schema['columns']['title']['length'],
- '%length' => $test_size,
- ]));
-
- // Set cardinality to unlimited and add upload a second image.
- // The image widget is extending on the file widget, but the image field
- // type does not have the 'display_field' setting which is expected by
- // the file widget. This resulted in notices before when cardinality is not
- // 1, so we need to make sure the file widget prevents these notices by
- // providing all settings, even if they are not used.
- // @see FileWidget::formMultipleElements().
- $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', ['cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED], t('Save field settings'));
- $edit = [
- 'files[' . $field_name . '_1][]' => \Drupal::service('file_system')->realpath($test_image->uri),
- ];
- $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- // Add the required alt text.
- $this->drupalPostForm(NULL, [$field_name . '[1][alt]' => $alt], t('Save'));
- $this->assertText(format_string('Article @title has been updated.', ['@title' => $node->getTitle()]));
-
- // Assert ImageWidget::process() calls FieldWidget::process().
- $this->drupalGet('node/' . $node->id() . '/edit');
- $edit = [
- 'files[' . $field_name . '_2][]' => \Drupal::service('file_system')->realpath($test_image->uri),
- ];
- $this->drupalPostAjaxForm(NULL, $edit, $field_name . '_2_upload_button');
- $this->assertNoRaw('');
- $this->assertRaw('');
- }
-
- /**
- * Test use of a default image with an image field.
- */
- public function testImageFieldDefaultImage() {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = $this->container->get('renderer');
-
- $node_storage = $this->container->get('entity.manager')->getStorage('node');
- // Create a new image field.
- $field_name = strtolower($this->randomMachineName());
- $this->createImageField($field_name, 'article');
-
- // Create a new node, with no images and verify that no images are
- // displayed.
- $node = $this->drupalCreateNode(['type' => 'article']);
- $this->drupalGet('node/' . $node->id());
- // Verify that no image is displayed on the page by checking for the class
- // that would be used on the image field.
- $this->assertNoPattern('
', 'No image displayed when no image is attached and no default image specified.');
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
-
- // Add a default image to the public image field.
- $images = $this->drupalGetTestFiles('image');
- $alt = $this->randomString(512);
- $title = $this->randomString(1024);
- $edit = [
- // Get the path of the 'image-test.png' file.
- 'files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($images[0]->uri),
- 'settings[default_image][alt]' => $alt,
- 'settings[default_image][title]' => $title,
- ];
- $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
- // Clear field definition cache so the new default image is detected.
- \Drupal::entityManager()->clearCachedFieldDefinitions();
- $field_storage = FieldStorageConfig::loadByName('node', $field_name);
- $default_image = $field_storage->getSetting('default_image');
- $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
- $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
- $image = [
- '#theme' => 'image',
- '#uri' => $file->getFileUri(),
- '#alt' => $alt,
- '#title' => $title,
- '#width' => 40,
- '#height' => 20,
- ];
- $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->drupalGet('node/' . $node->id());
- $this->assertCacheTag($file->getCacheTags()[0]);
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $this->assertRaw($default_output, 'Default image displayed when no user supplied image is present.');
-
- // Create a node with an image attached and ensure that the default image
- // is not displayed.
-
- // Create alt text for the image.
- $alt = $this->randomMachineName();
-
- // Upload the 'image-test.gif' file.
- $nid = $this->uploadNodeImage($images[2], $field_name, 'article', $alt);
- $node_storage->resetCache([$nid]);
- $node = $node_storage->load($nid);
- $file = $node->{$field_name}->entity;
- $image = [
- '#theme' => 'image',
- '#uri' => $file->getFileUri(),
- '#width' => 40,
- '#height' => 20,
- '#alt' => $alt,
- ];
- $image_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->drupalGet('node/' . $nid);
- $this->assertCacheTag($file->getCacheTags()[0]);
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $this->assertNoRaw($default_output, 'Default image is not displayed when user supplied image is present.');
- $this->assertRaw($image_output, 'User supplied image is displayed.');
-
- // Remove default image from the field and make sure it is no longer used.
- $edit = [
- 'settings[default_image][uuid][fids]' => 0,
- ];
- $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
- // Clear field definition cache so the new default image is detected.
- \Drupal::entityManager()->clearCachedFieldDefinitions();
- $field_storage = FieldStorageConfig::loadByName('node', $field_name);
- $default_image = $field_storage->getSetting('default_image');
- $this->assertFalse($default_image['uuid'], 'Default image removed from field.');
- // Create an image field that uses the private:// scheme and test that the
- // default image works as expected.
- $private_field_name = strtolower($this->randomMachineName());
- $this->createImageField($private_field_name, 'article', ['uri_scheme' => 'private']);
- // Add a default image to the new field.
- $edit = [
- // Get the path of the 'image-test.gif' file.
- 'files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($images[2]->uri),
- 'settings[default_image][alt]' => $alt,
- 'settings[default_image][title]' => $title,
- ];
- $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings'));
- // Clear field definition cache so the new default image is detected.
- \Drupal::entityManager()->clearCachedFieldDefinitions();
-
- $private_field_storage = FieldStorageConfig::loadByName('node', $private_field_name);
- $default_image = $private_field_storage->getSetting('default_image');
- $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
- $this->assertEqual('private', file_uri_scheme($file->getFileUri()), 'Default image uses private:// scheme.');
- $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
- // Create a new node with no image attached and ensure that default private
- // image is displayed.
- $node = $this->drupalCreateNode(['type' => 'article']);
- $image = [
- '#theme' => 'image',
- '#uri' => $file->getFileUri(),
- '#alt' => $alt,
- '#title' => $title,
- '#width' => 40,
- '#height' => 20,
- ];
- $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->drupalGet('node/' . $node->id());
- $this->assertCacheTag($file->getCacheTags()[0]);
- $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
- $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $this->assertRaw($default_output, 'Default private image displayed when no user supplied image is present.');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageFieldTestBase.php
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,6 +2,8 @@
namespace Drupal\image\Tests;
+@trigger_error('The ' . __NAMESPACE__ . '\ImageFieldTestBase class is deprecated in Drupal 8.5.x and will be removed before Drupal 9.0.0. Use \Drupal\Tests\image\Functional\ImageFieldTestBase instead. See https://www.drupal.org/node/2863626.', E_USER_DEPRECATED);
+
use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
use Drupal\simpletest\WebTestBase;
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageFieldValidateTest.php
--- a/core/modules/image/src/Tests/ImageFieldValidateTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-container->get('file_system');
- $image_files = $this->drupalGetTestFiles('image');
-
- $field_name = strtolower($this->randomMachineName());
- $this->createImageField($field_name, 'article', [], ['file_directory' => 'test-upload']);
- $expected_path = 'public://test-upload';
-
- // Create alt text for the image.
- $alt = $this->randomMachineName();
-
- // Create a node with a valid image.
- $node = $this->uploadNodeImage($image_files[0], $field_name, 'article', $alt);
- $this->assertTrue(file_exists($expected_path . '/' . $image_files[0]->filename));
-
- // Remove the image.
- $this->drupalPostForm('node/' . $node . '/edit', [], t('Remove'));
- $this->drupalPostForm(NULL, [], t('Save'));
-
- // Get invalid image test files from simpletest.
- $files = file_scan_directory(drupal_get_path('module', 'simpletest') . '/files', '/invalid-img-.*/');
- $invalid_image_files = [];
- foreach ($files as $file) {
- $invalid_image_files[$file->filename] = $file;
- }
-
- // Try uploading a zero-byte image.
- $zero_size_image = $invalid_image_files['invalid-img-zero-size.png'];
- $edit = [
- 'files[' . $field_name . '_0]' => $file_system->realpath($zero_size_image->uri),
- ];
- $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertFalse(file_exists($expected_path . '/' . $zero_size_image->filename));
-
- // Try uploading an invalid image.
- $invalid_image = $invalid_image_files['invalid-img-test.png'];
- $edit = [
- 'files[' . $field_name . '_0]' => $file_system->realpath($invalid_image->uri),
- ];
- $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertFalse(file_exists($expected_path . '/' . $invalid_image->filename));
-
- // Upload a valid image again.
- $valid_image = $image_files[0];
- $edit = [
- 'files[' . $field_name . '_0]' => $file_system->realpath($valid_image->uri),
- ];
- $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertTrue(file_exists($expected_path . '/' . $valid_image->filename));
- }
-
- /**
- * Test min/max resolution settings.
- */
- public function testResolution() {
- $field_names = [
- 0 => strtolower($this->randomMachineName()),
- 1 => strtolower($this->randomMachineName()),
- 2 => strtolower($this->randomMachineName()),
- ];
- $min_resolution = [
- 'width' => 50,
- 'height' => 50
- ];
- $max_resolution = [
- 'width' => 100,
- 'height' => 100
- ];
- $no_height_min_resolution = [
- 'width' => 50,
- 'height' => NULL
- ];
- $no_height_max_resolution = [
- 'width' => 100,
- 'height' => NULL
- ];
- $no_width_min_resolution = [
- 'width' => NULL,
- 'height' => 50
- ];
- $no_width_max_resolution = [
- 'width' => NULL,
- 'height' => 100
- ];
- $field_settings = [
- 0 => $this->getFieldSettings($min_resolution, $max_resolution),
- 1 => $this->getFieldSettings($no_height_min_resolution, $no_height_max_resolution),
- 2 => $this->getFieldSettings($no_width_min_resolution, $no_width_max_resolution),
- ];
- $this->createImageField($field_names[0], 'article', [], $field_settings[0]);
- $this->createImageField($field_names[1], 'article', [], $field_settings[1]);
- $this->createImageField($field_names[2], 'article', [], $field_settings[2]);
-
- // We want a test image that is too small, and a test image that is too
- // big, so cycle through test image files until we have what we need.
- $image_that_is_too_big = FALSE;
- $image_that_is_too_small = FALSE;
- $image_factory = $this->container->get('image.factory');
- foreach ($this->drupalGetTestFiles('image') as $image) {
- $image_file = $image_factory->get($image->uri);
- if ($image_file->getWidth() > $max_resolution['width']) {
- $image_that_is_too_big = $image;
- }
- if ($image_file->getWidth() < $min_resolution['width']) {
- $image_that_is_too_small = $image;
- $image_that_is_too_small_file = $image_file;
- }
- if ($image_that_is_too_small && $image_that_is_too_big) {
- break;
- }
- }
- $this->uploadNodeImage($image_that_is_too_small, $field_names[0], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
- $this->assertRaw(t('The image is too small. The minimum dimensions are %dimensions pixels and the image size is %widthx%height pixels.', [
- '%dimensions' => '50x50',
- '%width' => $image_that_is_too_small_file->getWidth(),
- '%height' => $image_that_is_too_small_file->getHeight(),
- ]));
- $this->uploadNodeImage($image_that_is_too_big, $field_names[0], 'article');
- $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'));
- $this->uploadNodeImage($image_that_is_too_small, $field_names[1], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
- $this->uploadNodeImage($image_that_is_too_big, $field_names[1], 'article');
- $this->assertText(t('The image was resized to fit within the maximum allowed width of 100 pixels.'));
- $this->uploadNodeImage($image_that_is_too_small, $field_names[2], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
- $this->uploadNodeImage($image_that_is_too_big, $field_names[2], 'article');
- $this->assertText(t('The image was resized to fit within the maximum allowed height of 100 pixels.'));
- }
-
- /**
- * Test that required alt/title fields gets validated right.
- */
- public function testRequiredAttributes() {
- $field_name = strtolower($this->randomMachineName());
- $field_settings = [
- 'alt_field' => 1,
- 'alt_field_required' => 1,
- 'title_field' => 1,
- 'title_field_required' => 1,
- 'required' => 1,
- ];
- $instance = $this->createImageField($field_name, 'article', [], $field_settings);
- $images = $this->drupalGetTestFiles('image');
- // Let's just use the first image.
- $image = $images[0];
- $this->uploadNodeImage($image, $field_name, 'article');
-
- // Look for form-required for the alt text.
- $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-alt" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-alt"]');
-
- $this->assertTrue(isset($elements[0]), 'Required marker is shown for the required alt text.');
-
- $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-title" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-title"]');
-
- $this->assertTrue(isset($elements[0]), 'Required marker is shown for the required title text.');
-
- $this->assertText(t('Alternative text field is required.'));
- $this->assertText(t('Title field is required.'));
-
- $instance->setSetting('alt_field_required', 0);
- $instance->setSetting('title_field_required', 0);
- $instance->save();
-
- $edit = [
- 'title[0][value]' => $this->randomMachineName(),
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save'));
-
- $this->assertNoText(t('Alternative text field is required.'));
- $this->assertNoText(t('Title field is required.'));
-
- $instance->setSetting('required', 0);
- $instance->setSetting('alt_field_required', 1);
- $instance->setSetting('title_field_required', 1);
- $instance->save();
-
- $edit = [
- 'title[0][value]' => $this->randomMachineName(),
- ];
- $this->drupalPostForm('node/add/article', $edit, t('Save'));
-
- $this->assertNoText(t('Alternative text field is required.'));
- $this->assertNoText(t('Title field is required.'));
- }
-
- /**
- * Returns field settings.
- *
- * @param int[] $min_resolution
- * The minimum width and height resolution setting.
- * @param int[] $max_resolution
- * The maximum width and height resolution setting.
- *
- * @return array
- */
- protected function getFieldSettings($min_resolution, $max_resolution) {
- return [
- 'max_resolution' => $max_resolution['width'] . 'x' . $max_resolution['height'],
- 'min_resolution' => $min_resolution['width'] . 'x' . $min_resolution['height'],
- 'alt_field' => 0,
- ];
- }
-
- /**
- * Test the validation message is displayed only once for ajax uploads.
- */
- public function testAJAXValidationMessage() {
- $field_name = strtolower($this->randomMachineName());
- $this->createImageField($field_name, 'article', ['cardinality' => -1]);
-
- $this->drupalGet('node/add/article');
- /** @var \Drupal\file\FileInterface[] $text_files */
- $text_files = $this->drupalGetTestFiles('text');
- $text_file = reset($text_files);
- $edit = [
- 'files[' . $field_name . '_0][]' => $this->container->get('file_system')->realpath($text_file->uri),
- 'title[0][value]' => $this->randomMachineName(),
- ];
- $this->drupalPostAjaxForm(NULL, $edit, $field_name . '_0_upload_button');
- $elements = $this->xpath('//div[contains(@class, :class)]', [
- ':class' => 'messages--error',
- ]);
- $this->assertEqual(count($elements), 1, 'Ajax validation messages are displayed once.');
- }
-
- /**
- * Tests that image field validation works with other form submit handlers.
- */
- public function testFriendlyAjaxValidation() {
- // Add a custom field to the Article content type that contains an AJAX
- // handler on a select field.
- $field_storage = FieldStorageConfig::create([
- 'field_name' => 'field_dummy_select',
- 'type' => 'image_module_test_dummy_ajax',
- 'entity_type' => 'node',
- 'cardinality' => 1,
- ]);
- $field_storage->save();
-
- $field = FieldConfig::create([
- 'field_storage' => $field_storage,
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'field_name' => 'field_dummy_select',
- 'label' => t('Dummy select'),
- ])->save();
-
- \Drupal::entityTypeManager()
- ->getStorage('entity_form_display')
- ->load('node.article.default')
- ->setComponent(
- 'field_dummy_select',
- [
- 'type' => 'image_module_test_dummy_ajax_widget',
- 'weight' => 1,
- ])
- ->save();
-
- // Then, add an image field.
- $this->createImageField('field_dummy_image', 'article');
-
- // Open an article and trigger the AJAX handler.
- $this->drupalGet('node/add/article');
- $edit = [
- 'field_dummy_select[select_widget]' => 'bam',
- ];
- $this->drupalPostAjaxForm(NULL, $edit, 'field_dummy_select[select_widget]');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
--- a/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-config('file.settings')->set('make_unused_managed_files_temporary', TRUE)->save();
-
- // Create the "Basic page" node type.
- // @todo Remove the disabling of new revision creation in
- // https://www.drupal.org/node/1239558.
- $this->drupalCreateContentType(['type' => 'basicpage', 'name' => 'Basic page', 'new_revision' => FALSE]);
-
- // Create a image field on the "Basic page" node type.
- $this->fieldName = strtolower($this->randomMachineName());
- $this->createImageField($this->fieldName, 'basicpage', [], ['title_field' => 1]);
-
- // Create and log in user.
- $permissions = [
- 'access administration pages',
- 'administer content translation',
- 'administer content types',
- 'administer languages',
- 'administer node fields',
- 'create content translations',
- 'create basicpage content',
- 'edit any basicpage content',
- 'translate any entity',
- 'delete any basicpage content',
- ];
- $admin_user = $this->drupalCreateUser($permissions);
- $this->drupalLogin($admin_user);
-
- // Add a second and third language.
- $edit = [];
- $edit['predefined_langcode'] = 'fr';
- $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-
- $edit = [];
- $edit['predefined_langcode'] = 'nl';
- $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
- }
-
- /**
- * Tests synced file fields on translated nodes.
- */
- public function testSyncedImages() {
- // Enable translation for "Basic page" nodes.
- $edit = [
- 'entity_types[node]' => 1,
- 'settings[node][basicpage][translatable]' => 1,
- "settings[node][basicpage][fields][$this->fieldName]" => 1,
- "settings[node][basicpage][columns][$this->fieldName][file]" => 1,
- // Explicitly disable alt and title since the javascript disables the
- // checkboxes on the form.
- "settings[node][basicpage][columns][$this->fieldName][alt]" => FALSE,
- "settings[node][basicpage][columns][$this->fieldName][title]" => FALSE,
- ];
- $this->drupalPostForm('admin/config/regional/content-language', $edit, 'Save configuration');
-
- // Verify that the image field on the "Basic basic" node type is
- // translatable.
- $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'basicpage');
- $this->assertTrue($definitions[$this->fieldName]->isTranslatable(), 'Node image field is translatable.');
-
- // Create a default language node.
- $default_language_node = $this->drupalCreateNode(['type' => 'basicpage', 'title' => 'Lost in translation']);
-
- // Edit the node to upload a file.
- $edit = [];
- $name = 'files[' . $this->fieldName . '_0]';
- $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[0]->uri);
- $this->drupalPostForm('node/' . $default_language_node->id() . '/edit', $edit, t('Save'));
- $edit = [$this->fieldName . '[0][alt]' => 'Lost in translation image', $this->fieldName . '[0][title]' => 'Lost in translation image title'];
- $this->drupalPostForm(NULL, $edit, t('Save'));
- $first_fid = $this->getLastFileId();
-
- // Translate the node into French: remove the existing file.
- $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', [], t('Remove'));
-
- // Upload a different file.
- $edit = [];
- $edit['title[0][value]'] = 'Scarlett Johansson';
- $name = 'files[' . $this->fieldName . '_0]';
- $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[1]->uri);
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $edit = [$this->fieldName . '[0][alt]' => 'Scarlett Johansson image', $this->fieldName . '[0][title]' => 'Scarlett Johansson image title'];
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- // This inspects the HTML after the post of the translation, the image
- // should be displayed on the original node.
- $this->assertRaw('alt="Lost in translation image"');
- $this->assertRaw('title="Lost in translation image title"');
- $second_fid = $this->getLastFileId();
- // View the translated node.
- $this->drupalGet('fr/node/' . $default_language_node->id());
- $this->assertRaw('alt="Scarlett Johansson image"');
-
- \Drupal::entityTypeManager()->getStorage('file')->resetCache();
-
- /* @var $file \Drupal\file\FileInterface */
-
- // Ensure the file status of the first file permanent.
- $file = File::load($first_fid);
- $this->assertTrue($file->isPermanent());
-
- // Ensure the file status of the second file is permanent.
- $file = File::load($second_fid);
- $this->assertTrue($file->isPermanent());
-
- // Translate the node into dutch: remove the existing file.
- $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', [], t('Remove'));
-
- // Upload a different file.
- $edit = [];
- $edit['title[0][value]'] = 'Akiko Takeshita';
- $name = 'files[' . $this->fieldName . '_0]';
- $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[2]->uri);
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $edit = [$this->fieldName . '[0][alt]' => 'Akiko Takeshita image', $this->fieldName . '[0][title]' => 'Akiko Takeshita image title'];
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $third_fid = $this->getLastFileId();
-
- \Drupal::entityTypeManager()->getStorage('file')->resetCache();
-
- // Ensure the first file is untouched.
- $file = File::load($first_fid);
- $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
- // This inspects the HTML after the post of the translation, the image
- // should be displayed on the original node.
- $this->assertRaw('alt="Lost in translation image"');
- $this->assertRaw('title="Lost in translation image title"');
- // View the translated node.
- $this->drupalGet('nl/node/' . $default_language_node->id());
- $this->assertRaw('alt="Akiko Takeshita image"');
- $this->assertRaw('title="Akiko Takeshita image title"');
-
- // Ensure the file status of the second file is permanent.
- $file = File::load($second_fid);
- $this->assertTrue($file->isPermanent());
-
- // Ensure the file status of the third file is permanent.
- $file = File::load($third_fid);
- $this->assertTrue($file->isPermanent());
-
- // Edit the second translation: remove the existing file.
- $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', [], t('Remove'));
-
- // Upload a different file.
- $edit = [];
- $edit['title[0][value]'] = 'Giovanni Ribisi';
- $name = 'files[' . $this->fieldName . '_0]';
- $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[3]->uri);
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $name = $this->fieldName . '[0][alt]';
-
- $edit = [$name => 'Giovanni Ribisi image'];
- $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
- $replaced_second_fid = $this->getLastFileId();
-
- \Drupal::entityTypeManager()->getStorage('file')->resetCache();
-
- // Ensure the first and third files are untouched.
- $file = File::load($first_fid);
- $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
-
- $file = File::load($third_fid);
- $this->assertTrue($file->isPermanent());
-
- // Ensure the file status of the replaced second file is permanent.
- $file = File::load($replaced_second_fid);
- $this->assertTrue($file->isPermanent());
-
- // Delete the third translation.
- $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', [], t('Delete Dutch translation'));
-
- \Drupal::entityTypeManager()->getStorage('file')->resetCache();
-
- // Ensure the first and replaced second files are untouched.
- $file = File::load($first_fid);
- $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
-
- $file = File::load($replaced_second_fid);
- $this->assertTrue($file->isPermanent());
-
- // Ensure the file status of the third file is now temporary.
- $file = File::load($third_fid);
- $this->assertTrue($file->isTemporary());
-
- // Delete the all translations.
- $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', [], t('Delete all translations'));
-
- \Drupal::entityTypeManager()->getStorage('file')->resetCache();
-
- // Ensure the file status of the all files are now temporary.
- $file = File::load($first_fid);
- $this->assertTrue($file->isTemporary(), 'First file still exists and is temporary.');
-
- $file = File::load($replaced_second_fid);
- $this->assertTrue($file->isTemporary());
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageStyleFlushTest.php
--- a/core/modules/image/src/Tests/ImageStyleFlushTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-drupalGetTestFiles('image');
- $file = reset($files);
- }
-
- // Make sure we have an image in our wrapper testing file directory.
- $source_uri = file_unmanaged_copy($file->uri, $wrapper . '://');
- // Build the derivative image.
- $derivative_uri = $style->buildUri($source_uri);
- $derivative = $style->createDerivative($source_uri, $derivative_uri);
-
- return $derivative ? $derivative_uri : FALSE;
- }
-
- /**
- * Count the number of images currently created for a style in a wrapper.
- */
- public function getImageCount($style, $wrapper) {
- return count(file_scan_directory($wrapper . '://styles/' . $style->id(), '/.*/'));
- }
-
- /**
- * General test to flush a style.
- */
- public function testFlush() {
-
- // Setup a style to be created and effects to add to it.
- $style_name = strtolower($this->randomMachineName(10));
- $style_label = $this->randomString();
- $style_path = 'admin/config/media/image-styles/manage/' . $style_name;
- $effect_edits = [
- 'image_resize' => [
- 'data[width]' => 100,
- 'data[height]' => 101,
- ],
- 'image_scale' => [
- 'data[width]' => 110,
- 'data[height]' => 111,
- 'data[upscale]' => 1,
- ],
- ];
-
- // Add style form.
- $edit = [
- 'name' => $style_name,
- 'label' => $style_label,
- ];
- $this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
-
- // Add each sample effect to the style.
- foreach ($effect_edits as $effect => $edit) {
- // Add the effect.
- $this->drupalPostForm($style_path, ['new' => $effect], t('Add'));
- if (!empty($edit)) {
- $this->drupalPostForm(NULL, $edit, t('Add effect'));
- }
- }
-
- // Load the saved image style.
- $style = ImageStyle::load($style_name);
-
- // Create an image for the 'public' wrapper.
- $image_path = $this->createSampleImage($style, 'public');
- // Expecting to find 2 images, one is the sample.png image shown in
- // image style preview.
- $this->assertEqual($this->getImageCount($style, 'public'), 2, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
-
- // Create an image for the 'private' wrapper.
- $image_path = $this->createSampleImage($style, 'private');
- $this->assertEqual($this->getImageCount($style, 'private'), 1, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
-
- // Remove the 'image_scale' effect and updates the style, which in turn
- // forces an image style flush.
- $style_path = 'admin/config/media/image-styles/manage/' . $style->id();
- $uuids = [];
- foreach ($style->getEffects() as $uuid => $effect) {
- $uuids[$effect->getPluginId()] = $uuid;
- }
- $this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', [], t('Delete'));
- $this->assertResponse(200);
- $this->drupalPostForm($style_path, [], t('Update style'));
- $this->assertResponse(200);
-
- // Post flush, expected 1 image in the 'public' wrapper (sample.png).
- $this->assertEqual($this->getImageCount($style, 'public'), 1, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'public']));
-
- // Post flush, expected no image in the 'private' wrapper.
- $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'private']));
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
--- a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +0,0 @@
-style = ImageStyle::create([
- 'name' => 'style_foo',
- 'label' => $this->randomString(),
- ]);
- $this->style->save();
-
- // Create a new language.
- ConfigurableLanguage::createFromLangcode('fr')->save();
- }
-
- /**
- * Tests \Drupal\image\ImageStyleInterface::buildUri().
- */
- public function testImageStylePath() {
- $scheme = 'public';
- $actual = $this->style->buildUri("$scheme://foo/bar.gif");
- $expected = "$scheme://styles/" . $this->style->id() . "/$scheme/foo/bar.gif";
- $this->assertEqual($actual, $expected, 'Got the path for a file URI.');
-
- $actual = $this->style->buildUri('foo/bar.gif');
- $expected = "$scheme://styles/" . $this->style->id() . "/$scheme/foo/bar.gif";
- $this->assertEqual($actual, $expected, 'Got the path for a relative file path.');
- }
-
- /**
- * Tests an image style URL using the "public://" scheme.
- */
- public function testImageStyleUrlAndPathPublic() {
- $this->doImageStyleUrlAndPathTests('public');
- }
-
- /**
- * Tests an image style URL using the "private://" scheme.
- */
- public function testImageStyleUrlAndPathPrivate() {
- $this->doImageStyleUrlAndPathTests('private');
- }
-
- /**
- * Tests an image style URL with the "public://" scheme and unclean URLs.
- */
- public function testImageStyleUrlAndPathPublicUnclean() {
- $this->doImageStyleUrlAndPathTests('public', FALSE);
- }
-
- /**
- * Tests an image style URL with the "private://" schema and unclean URLs.
- */
- public function testImageStyleUrlAndPathPrivateUnclean() {
- $this->doImageStyleUrlAndPathTests('private', FALSE);
- }
-
- /**
- * Tests an image style URL with the "public://" schema and language prefix.
- */
- public function testImageStyleUrlAndPathPublicLanguage() {
- $this->doImageStyleUrlAndPathTests('public', TRUE, TRUE, 'fr');
- }
-
- /**
- * Tests an image style URL with the "private://" schema and language prefix.
- */
- public function testImageStyleUrlAndPathPrivateLanguage() {
- $this->doImageStyleUrlAndPathTests('private', TRUE, TRUE, 'fr');
- }
-
- /**
- * Tests an image style URL with a file URL that has an extra slash in it.
- */
- public function testImageStyleUrlExtraSlash() {
- $this->doImageStyleUrlAndPathTests('public', TRUE, TRUE);
- }
-
- /**
- * Tests that an invalid source image returns a 404.
- */
- public function testImageStyleUrlForMissingSourceImage() {
- $non_existent_uri = 'public://foo.png';
- $generated_url = $this->style->buildUrl($non_existent_uri);
- $this->drupalGet($generated_url);
- $this->assertResponse(404, 'Accessing an image style URL with a source image that does not exist provides a 404 error response.');
- }
-
- /**
- * Tests building an image style URL.
- */
- public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash = FALSE, $langcode = FALSE) {
- $this->prepareRequestForGenerator($clean_url);
-
- // Make the default scheme neither "public" nor "private" to verify the
- // functions work for other than the default scheme.
- $this->config('system.file')->set('default_scheme', 'temporary')->save();
-
- // Create the directories for the styles.
- $directory = $scheme . '://styles/' . $this->style->id();
- $status = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
- $this->assertNotIdentical(FALSE, $status, 'Created the directory for the generated images for the test style.');
-
- // Override the language to build the URL for the correct language.
- if ($langcode) {
- $language_manager = \Drupal::service('language_manager');
- $language = $language_manager->getLanguage($langcode);
- $language_manager->setConfigOverrideLanguage($language);
- }
-
- // Create a working copy of the file.
- $files = $this->drupalGetTestFiles('image');
- $file = array_shift($files);
- $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
- // Let the image_module_test module know about this file, so it can claim
- // ownership in hook_file_download().
- \Drupal::state()->set('image.test_file_download', $original_uri);
- $this->assertNotIdentical(FALSE, $original_uri, 'Created the generated image file.');
-
- // Get the URL of a file that has not been generated and try to create it.
- $generated_uri = $this->style->buildUri($original_uri);
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $generate_url = $this->style->buildUrl($original_uri, $clean_url);
-
- // Make sure that language prefix is never added to the image style URL.
- if ($langcode) {
- $this->assertTrue(strpos($generate_url, "/$langcode/") === FALSE, 'Langcode was not found in the image style URL.');
- }
-
- // Ensure that the tests still pass when the file is generated by accessing
- // a poorly constructed (but still valid) file URL that has an extra slash
- // in it.
- if ($extra_slash) {
- $modified_uri = str_replace('://', ':///', $original_uri);
- $this->assertNotEqual($original_uri, $modified_uri, 'An extra slash was added to the generated file URI.');
- $generate_url = $this->style->buildUrl($modified_uri, $clean_url);
- }
- if (!$clean_url) {
- $this->assertTrue(strpos($generate_url, 'index.php/') !== FALSE, 'When using non-clean URLS, the system path contains the script name.');
- }
- // Add some extra chars to the token.
- $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
- $this->assertResponse(403, 'Image was inaccessible at the URL with an invalid token.');
- // Change the parameter name so the token is missing.
- $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
- $this->assertResponse(403, 'Image was inaccessible at the URL with a missing token.');
-
- // Check that the generated URL is the same when we pass in a relative path
- // rather than a URI. We need to temporarily switch the default scheme to
- // match the desired scheme before testing this, then switch it back to the
- // "temporary" scheme used throughout this test afterwards.
- $this->config('system.file')->set('default_scheme', $scheme)->save();
- $relative_path = file_uri_target($original_uri);
- $generate_url_from_relative_path = $this->style->buildUrl($relative_path, $clean_url);
- $this->assertEqual($generate_url, $generate_url_from_relative_path);
- $this->config('system.file')->set('default_scheme', 'temporary')->save();
-
- // Fetch the URL that generates the file.
- $this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
- $this->assertRaw(file_get_contents($generated_uri), 'URL returns expected file.');
- $image = $this->container->get('image.factory')->get($generated_uri);
- $this->assertEqual($this->drupalGetHeader('Content-Type'), $image->getMimeType(), 'Expected Content-Type was reported.');
- $this->assertEqual($this->drupalGetHeader('Content-Length'), $image->getFileSize(), 'Expected Content-Length was reported.');
-
- // Check that we did not download the original file.
- $original_image = $this->container->get('image.factory')
- ->get($original_uri);
- $this->assertNotEqual($this->drupalGetHeader('Content-Length'), $original_image->getFileSize());
-
- if ($scheme == 'private') {
- $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
- $this->assertNotEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
- $this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.');
-
- // Make sure that a second request to the already existing derivative
- // works too.
- $this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was generated at the URL.');
-
- // Check that the second request also returned the generated image.
- $this->assertEqual($this->drupalGetHeader('Content-Length'), $image->getFileSize());
-
- // Check that we did not download the original file.
- $this->assertNotEqual($this->drupalGetHeader('Content-Length'), $original_image->getFileSize());
-
- // Make sure that access is denied for existing style files if we do not
- // have access.
- \Drupal::state()->delete('image.test_file_download');
- $this->drupalGet($generate_url);
- $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
-
- // Repeat this with a different file that we do not have access to and
- // make sure that access is denied.
- $file_noaccess = array_shift($files);
- $original_uri_noaccess = file_unmanaged_copy($file_noaccess->uri, $scheme . '://', FILE_EXISTS_RENAME);
- $generated_uri_noaccess = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . drupal_basename($original_uri_noaccess);
- $this->assertFalse(file_exists($generated_uri_noaccess), 'Generated file does not exist.');
- $generate_url_noaccess = $this->style->buildUrl($original_uri_noaccess);
-
- $this->drupalGet($generate_url_noaccess);
- $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
- // Verify that images are not appended to the response.
- // Currently this test only uses PNG images.
- if (strpos($generate_url, '.png') === FALSE) {
- $this->fail('Confirming that private image styles are not appended require PNG file.');
- }
- else {
- // Check for PNG-Signature
- // (cf. http://www.libpng.org/pub/png/book/chapter08.html#png.ch08.div.2)
- // in the response body.
- $this->assertNoRaw(chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10), 'No PNG signature found in the response body.');
- }
- }
- else {
- $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
- $this->assertEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
-
- if ($clean_url) {
- // Add some extra chars to the token.
- $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
- $this->assertResponse(200, 'Existing image was accessible at the URL with an invalid token.');
- }
- }
-
- // Allow insecure image derivatives to be created for the remainder of this
- // test.
- $this->config('image.settings')
- ->set('allow_insecure_derivatives', TRUE)
- ->save();
-
- // Create another working copy of the file.
- $files = $this->drupalGetTestFiles('image');
- $file = array_shift($files);
- $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
- // Let the image_module_test module know about this file, so it can claim
- // ownership in hook_file_download().
- \Drupal::state()->set('image.test_file_download', $original_uri);
-
- // Suppress the security token in the URL, then get the URL of a file that
- // has not been created and try to create it. Check that the security token
- // is not present in the URL but that the image is still accessible.
- $this->config('image.settings')->set('suppress_itok_output', TRUE)->save();
- $generated_uri = $this->style->buildUri($original_uri);
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
- $generate_url = $this->style->buildUrl($original_uri, $clean_url);
- $this->assertIdentical(strpos($generate_url, IMAGE_DERIVATIVE_TOKEN . '='), FALSE, 'The security token does not appear in the image style URL.');
- $this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was accessible at the URL with a missing token.');
-
- // Stop supressing the security token in the URL.
- $this->config('image.settings')->set('suppress_itok_output', FALSE)->save();
- // Ensure allow_insecure_derivatives is enabled.
- $this->assertEqual($this->config('image.settings')
- ->get('allow_insecure_derivatives'), TRUE);
- // Check that a security token is still required when generating a second
- // image derivative using the first one as a source.
- $nested_url = $this->style->buildUrl($generated_uri, $clean_url);
- $matches_expected_url_format = (boolean) preg_match('/styles\/' . $this->style->id() . '\/' . $scheme . '\/styles\/' . $this->style->id() . '\/' . $scheme . '/', $nested_url);
- $this->assertTrue($matches_expected_url_format, "URL for a derivative of an image style matches expected format.");
- $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
- $this->drupalGet($nested_url_with_wrong_token);
- $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token.');
- // Check that this restriction cannot be bypassed by adding extra slashes
- // to the URL.
- $this->drupalGet(substr_replace($nested_url_with_wrong_token, '//styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
- $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with an extra forward slash in the URL.');
- $this->drupalGet(substr_replace($nested_url_with_wrong_token, '////styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
- $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with multiple forward slashes in the URL.');
- // Make sure the image can still be generated if a correct token is used.
- $this->drupalGet($nested_url);
- $this->assertResponse(200, 'Image was accessible when a correct token was provided in the URL.');
-
- // Check that requesting a nonexistent image does not create any new
- // directories in the file system.
- $directory = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $this->randomMachineName();
- $this->drupalGet(file_create_url($directory . '/' . $this->randomString()));
- $this->assertFalse(file_exists($directory), 'New directory was not created in the filesystem when requesting an unauthorized image.');
- }
-
-}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/src/Tests/ImageThemeFunctionTest.php
--- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
- 'entity_test',
- 'field_name' => 'image_test',
- 'type' => 'image',
- 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
- ])->save();
- FieldConfig::create([
- 'entity_type' => 'entity_test',
- 'field_name' => 'image_test',
- 'bundle' => 'entity_test',
- ])->save();
- file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
- $this->image = File::create([
- 'uri' => 'public://example.jpg',
- ]);
- $this->image->save();
- $this->imageFactory = $this->container->get('image.factory');
- }
-
- /**
- * Tests usage of the image field formatters.
- */
- public function testImageFormatterTheme() {
- /** @var \Drupal\Core\Render\RendererInterface $renderer */
- $renderer = $this->container->get('renderer');
-
- // Create an image.
- $files = $this->drupalGetTestFiles('image');
- $file = reset($files);
- $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
-
- // Create a style.
- $style = ImageStyle::create(['name' => 'test', 'label' => 'Test']);
- $style->save();
- $url = file_url_transform_relative($style->buildUrl($original_uri));
-
- // Create a test entity with the image field set.
- $entity = EntityTest::create();
- $entity->image_test->target_id = $this->image->id();
- $entity->image_test->alt = NULL;
- $entity->image_test->uri = $original_uri;
- $image = $this->imageFactory->get('public://example.jpg');
- $entity->save();
-
- // Create the base element that we'll use in the tests below.
- $path = $this->randomMachineName();
- $base_element = [
- '#theme' => 'image_formatter',
- '#image_style' => 'test',
- '#item' => $entity->image_test,
- '#url' => Url::fromUri('base:' . $path),
- ];
-
- // Test using theme_image_formatter() with a NULL value for the alt option.
- $element = $base_element;
- $this->setRawContent($renderer->renderRoot($element));
- $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
- $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders with a NULL value for the alt option.');
-
- // Test using theme_image_formatter() without an image title, alt text, or
- // link options.
- $element = $base_element;
- $element['#item']->alt = '';
- $this->setRawContent($renderer->renderRoot($element));
- $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height and @alt=""]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
- $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders without title, alt, or path options.');
-
- // Link the image to a fragment on the page, and not a full URL.
- $fragment = $this->randomMachineName();
- $element = $base_element;
- $element['#url'] = Url::fromRoute('
@@ -69,7 +69,7 @@
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 120);
+ $this->assertEqual($image_file->getHeight(), 60);
+
+ // Rotate 90 degrees anticlockwise.
+ $effect = [
+ 'id' => 'image_rotate',
+ 'data' => [
+ 'degrees' => -90,
+ 'random' => FALSE,
+ ],
+ 'weight' => 1,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 60);
+ $this->assertEqual($image_file->getHeight(), 120);
+
+ // Scale an image that is higher than it is wide (rotated by previous effect).
+ $effect = [
+ 'id' => 'image_scale',
+ 'data' => [
+ 'width' => 120,
+ 'height' => 90,
+ 'upscale' => TRUE,
+ ],
+ 'weight' => 2,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 45);
+ $this->assertEqual($image_file->getHeight(), 90);
+
+ // Test upscale disabled.
+ $effect = [
+ 'id' => 'image_scale',
+ 'data' => [
+ 'width' => 400,
+ 'height' => 200,
+ 'upscale' => FALSE,
+ ],
+ 'weight' => 3,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 45);
+ $this->assertEqual($image_file->getHeight(), 90);
+
+ // Add a desaturate effect.
+ $effect = [
+ 'id' => 'image_desaturate',
+ 'data' => [],
+ 'weight' => 4,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 45);
+ $this->assertEqual($image_file->getHeight(), 90);
+
+ // Add a random rotate effect.
+ $effect = [
+ 'id' => 'image_rotate',
+ 'data' => [
+ 'degrees' => 180,
+ 'random' => TRUE,
+ ],
+ 'weight' => 5,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+
+ // Add a crop effect.
+ $effect = [
+ 'id' => 'image_crop',
+ 'data' => [
+ 'width' => 30,
+ 'height' => 30,
+ 'anchor' => 'center-center',
+ ],
+ 'weight' => 6,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 30);
+ $this->assertEqual($image_file->getHeight(), 30);
+
+ // Rotate to a non-multiple of 90 degrees.
+ $effect = [
+ 'id' => 'image_rotate',
+ 'data' => [
+ 'degrees' => 57,
+ 'random' => FALSE,
+ ],
+ 'weight' => 7,
+ ];
+
+ $effect_id = $style->addImageEffect($effect);
+ $style->save();
+ // @todo Uncomment this once
+ // https://www.drupal.org/project/drupal/issues/2670966 is resolved.
+ // $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ // @todo Uncomment this once
+ // https://www.drupal.org/project/drupal/issues/2670966 is resolved.
+ // $this->assertEqual($image_file->getWidth(), 41);
+ // $this->assertEqual($image_file->getHeight(), 41);
+
+ $effect_plugin = $style->getEffect($effect_id);
+ $style->deleteImageEffect($effect_plugin);
+
+ // Ensure that an effect can unset dimensions.
+ $effect = [
+ 'id' => 'image_module_test_null',
+ 'data' => [],
+ 'weight' => 8,
+ ];
+
+ $style->addImageEffect($effect);
+ $style->save();
+ $this->assertEqual($this->getImageTag($variables), '
');
+
+ // Test URI dependent image effect.
+ $style = ImageStyle::create(['name' => 'test_uri', 'label' => 'Test URI']);
+ $effect = [
+ 'id' => 'image_module_test_uri_dependent',
+ 'data' => [],
+ 'weight' => 0,
+ ];
+ $style->addImageEffect($effect);
+ $style->save();
+ $variables = [
+ '#theme' => 'image_style',
+ '#style_name' => 'test_uri',
+ '#uri' => $original_uri,
+ '#width' => 40,
+ '#height' => 20,
+ ];
+ // PNG original image. Should be resized to 100x100.
+ $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri);
+ $url = file_url_transform_relative($style->buildUrl($original_uri));
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 100);
+ $this->assertEqual($image_file->getHeight(), 100);
+ // GIF original image. Should be resized to 50x50.
+ $file = $files[1];
+ $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
+ $generated_uri = 'public://styles/test_uri/public/' . \Drupal::service('file_system')->basename($original_uri);
+ $url = file_url_transform_relative($style->buildUrl($original_uri));
+ $variables['#uri'] = $original_uri;
+ $this->assertEqual($this->getImageTag($variables), '
');
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->drupalGet($this->getAbsoluteUrl($url));
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $image_file = $image_factory->get($generated_uri);
+ $this->assertEqual($image_file->getWidth(), 50);
+ $this->assertEqual($image_file->getHeight(), 50);
+ }
+
+ /**
+ * Render an image style element.
+ *
+ * drupal_render() alters the passed $variables array by adding a new key
+ * '#printed' => TRUE. This prevents next call to re-render the element. We
+ * wrap drupal_render() in a helper protected method and pass each time a
+ * fresh array so that $variables won't get altered and the element is
+ * re-rendered each time.
+ */
+ protected function getImageTag($variables) {
+ return str_replace("\n", NULL, \Drupal::service('renderer')->renderRoot($variables));
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,402 @@
+container->get('entity.manager')->getStorage('node');
+ // Create files to use as the default images.
+ $files = $this->drupalGetTestFiles('image');
+ // Create 10 files so the default image fids are not a single value.
+ for ($i = 1; $i <= 10; $i++) {
+ $filename = $this->randomMachineName() . "$i";
+ $desired_filepath = 'public://' . $filename;
+ file_unmanaged_copy($files[0]->uri, $desired_filepath, FILE_EXISTS_ERROR);
+ $file = File::create(['uri' => $desired_filepath, 'filename' => $filename, 'name' => $filename]);
+ $file->save();
+ }
+ $default_images = [];
+ foreach (['field_storage', 'field', 'field2', 'field_storage_new', 'field_new', 'field_storage_private', 'field_private'] as $image_target) {
+ $file = File::create((array) array_pop($files));
+ $file->save();
+ $default_images[$image_target] = $file;
+ }
+
+ // Create an image field storage and add a field to the article content
+ // type.
+ $field_name = strtolower($this->randomMachineName());
+ $storage_settings['default_image'] = [
+ 'uuid' => $default_images['field_storage']->uuid(),
+ 'alt' => '',
+ 'title' => '',
+ 'width' => 0,
+ 'height' => 0,
+ ];
+ $field_settings['default_image'] = [
+ 'uuid' => $default_images['field']->uuid(),
+ 'alt' => '',
+ 'title' => '',
+ 'width' => 0,
+ 'height' => 0,
+ ];
+ $widget_settings = [
+ 'preview_image_style' => 'medium',
+ ];
+ $field = $this->createImageField($field_name, 'article', $storage_settings, $field_settings, $widget_settings);
+
+ // The field default image id should be 2.
+ $this->assertEqual($field->getSetting('default_image')['uuid'], $default_images['field']->uuid());
+
+ // Also test \Drupal\field\Entity\FieldConfig::getSettings().
+ $this->assertEqual($field->getSettings()['default_image']['uuid'], $default_images['field']->uuid());
+
+ $field_storage = $field->getFieldStorageDefinition();
+
+ // The field storage default image id should be 1.
+ $this->assertEqual($field_storage->getSetting('default_image')['uuid'], $default_images['field_storage']->uuid());
+
+ // Also test \Drupal\field\Entity\FieldStorageConfig::getSettings().
+ $this->assertEqual($field_storage->getSettings()['default_image']['uuid'], $default_images['field_storage']->uuid());
+
+ // Add another field with another default image to the page content type.
+ $field2 = FieldConfig::create([
+ 'field_storage' => $field_storage,
+ 'bundle' => 'page',
+ 'label' => $field->label(),
+ 'required' => $field->isRequired(),
+ 'settings' => [
+ 'default_image' => [
+ 'uuid' => $default_images['field2']->uuid(),
+ 'alt' => '',
+ 'title' => '',
+ 'width' => 0,
+ 'height' => 0,
+ ],
+ ],
+ ]);
+ $field2->save();
+
+ $widget_settings = entity_get_form_display('node', $field->getTargetBundle(), 'default')->getComponent($field_name);
+ entity_get_form_display('node', 'page', 'default')
+ ->setComponent($field_name, $widget_settings)
+ ->save();
+ entity_get_display('node', 'page', 'default')
+ ->setComponent($field_name)
+ ->save();
+
+ // Confirm the defaults are present on the article field storage settings
+ // form.
+ $field_id = $field->id();
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_storage']->id(),
+ format_string(
+ 'Article image field storage default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_storage']->id()]
+ )
+ );
+ // Confirm the defaults are present on the article field edit form.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field']->id(),
+ format_string(
+ 'Article image field default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field']->id()]
+ )
+ );
+
+ // Confirm the defaults are present on the page field storage settings form.
+ $this->drupalGet("admin/structure/types/manage/page/fields/$field_id/storage");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_storage']->id(),
+ format_string(
+ 'Page image field storage default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_storage']->id()]
+ )
+ );
+ // Confirm the defaults are present on the page field edit form.
+ $field2_id = $field2->id();
+ $this->drupalGet("admin/structure/types/manage/page/fields/$field2_id");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field2']->id(),
+ format_string(
+ 'Page image field default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field2']->id()]
+ )
+ );
+
+ // Confirm that the image default is shown for a new article node.
+ $article = $this->drupalCreateNode(['type' => 'article']);
+ $article_built = $this->drupalBuildEntityView($article);
+ $this->assertEqual(
+ $article_built[$field_name][0]['#item']->target_id,
+ $default_images['field']->id(),
+ format_string(
+ 'A new article node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field']->id()]
+ )
+ );
+
+ // Also check that the field renders without warnings when the label is
+ // hidden.
+ EntityViewDisplay::load('node.article.default')
+ ->setComponent($field_name, ['label' => 'hidden', 'type' => 'image'])
+ ->save();
+ $this->drupalGet('node/' . $article->id());
+
+ // Confirm that the image default is shown for a new page node.
+ $page = $this->drupalCreateNode(['type' => 'page']);
+ $page_built = $this->drupalBuildEntityView($page);
+ $this->assertEqual(
+ $page_built[$field_name][0]['#item']->target_id,
+ $default_images['field2']->id(),
+ format_string(
+ 'A new page node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field2']->id()]
+ )
+ );
+
+ // Upload a new default for the field storage.
+ $default_image_settings = $field_storage->getSetting('default_image');
+ $default_image_settings['uuid'] = $default_images['field_storage_new']->uuid();
+ $field_storage->setSetting('default_image', $default_image_settings);
+ $field_storage->save();
+
+ // Confirm that the new default is used on the article field storage
+ // settings form.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_storage_new']->id(),
+ format_string(
+ 'Updated image field storage default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_storage_new']->id()]
+ )
+ );
+
+ // Reload the nodes and confirm the field defaults are used.
+ $node_storage->resetCache([$article->id(), $page->id()]);
+ $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
+ $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
+ $this->assertEqual(
+ $article_built[$field_name][0]['#item']->target_id,
+ $default_images['field']->id(),
+ format_string(
+ 'An existing article node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field']->id()]
+ )
+ );
+ $this->assertEqual(
+ $page_built[$field_name][0]['#item']->target_id,
+ $default_images['field2']->id(),
+ format_string(
+ 'An existing page node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field2']->id()]
+ )
+ );
+
+ // Upload a new default for the article's field.
+ $default_image_settings = $field->getSetting('default_image');
+ $default_image_settings['uuid'] = $default_images['field_new']->uuid();
+ $field->setSetting('default_image', $default_image_settings);
+ $field->save();
+
+ // Confirm the new field default is used on the article field admin form.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_new']->id(),
+ format_string(
+ 'Updated article image field default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_new']->id()]
+ )
+ );
+
+ // Reload the nodes.
+ $node_storage->resetCache([$article->id(), $page->id()]);
+ $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
+ $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
+
+ // Confirm the article uses the new default.
+ $this->assertEqual(
+ $article_built[$field_name][0]['#item']->target_id,
+ $default_images['field_new']->id(),
+ format_string(
+ 'An existing article node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field_new']->id()]
+ )
+ );
+ // Confirm the page remains unchanged.
+ $this->assertEqual(
+ $page_built[$field_name][0]['#item']->target_id,
+ $default_images['field2']->id(),
+ format_string(
+ 'An existing page node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field2']->id()]
+ )
+ );
+
+ // Confirm the default image is shown on the node form.
+ $file = File::load($default_images['field_new']->id());
+ $this->drupalGet('node/add/article');
+ $this->assertRaw($file->getFilename());
+
+ // Remove the field default from articles.
+ $default_image_settings = $field->getSetting('default_image');
+ $default_image_settings['uuid'] = 0;
+ $field->setSetting('default_image', $default_image_settings);
+ $field->save();
+
+ // Confirm the article field default has been removed.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ '',
+ 'Updated article image field default has been successfully removed.'
+ );
+
+ // Reload the nodes.
+ $node_storage->resetCache([$article->id(), $page->id()]);
+ $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
+ $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
+ // Confirm the article uses the new field storage (not field) default.
+ $this->assertEqual(
+ $article_built[$field_name][0]['#item']->target_id,
+ $default_images['field_storage_new']->id(),
+ format_string(
+ 'An existing article node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field_storage_new']->id()]
+ )
+ );
+ // Confirm the page remains unchanged.
+ $this->assertEqual(
+ $page_built[$field_name][0]['#item']->target_id,
+ $default_images['field2']->id(),
+ format_string(
+ 'An existing page node without an image has the expected default image file ID of @fid.',
+ ['@fid' => $default_images['field2']->id()]
+ )
+ );
+
+ $non_image = $this->drupalGetTestFiles('text');
+ $this->drupalPostForm(NULL, ['files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($non_image[0]->uri)], t("Upload"));
+ $this->assertText('The specified file text-0.txt could not be uploaded.');
+ $this->assertText('Only files with the following extensions are allowed: png gif jpg jpeg.');
+
+ // Confirm the default image is shown on the node form.
+ $file = File::load($default_images['field_storage_new']->id());
+ $this->drupalGet('node/add/article');
+ $this->assertRaw($file->getFilename());
+
+ // Change the default image for the field storage and also change the upload
+ // destination to the private filesystem at the same time.
+ $default_image_settings = $field_storage->getSetting('default_image');
+ $default_image_settings['uuid'] = $default_images['field_storage_private']->uuid();
+ $field_storage->setSetting('default_image', $default_image_settings);
+ $field_storage->setSetting('uri_scheme', 'private');
+ $field_storage->save();
+
+ // Confirm that the new default is used on the article field storage
+ // settings form.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_storage_private']->id(),
+ format_string(
+ 'Updated image field storage default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_storage_private']->id()]
+ )
+ );
+
+ // Upload a new default for the article's field after setting the field
+ // storage upload destination to 'private'.
+ $default_image_settings = $field->getSetting('default_image');
+ $default_image_settings['uuid'] = $default_images['field_private']->uuid();
+ $field->setSetting('default_image', $default_image_settings);
+ $field->save();
+
+ // Confirm the new field field default is used on the article field
+ // admin form.
+ $this->drupalGet("admin/structure/types/manage/article/fields/$field_id");
+ $this->assertFieldByXpath(
+ '//input[@name="settings[default_image][uuid][fids]"]',
+ $default_images['field_private']->id(),
+ format_string(
+ 'Updated article image field default equals expected file ID of @fid.',
+ ['@fid' => $default_images['field_private']->id()]
+ )
+ );
+ }
+
+ /**
+ * Tests image field and field storage having an invalid default image.
+ */
+ public function testInvalidDefaultImage() {
+ $field_storage = FieldStorageConfig::create([
+ 'field_name' => Unicode::strtolower($this->randomMachineName()),
+ 'entity_type' => 'node',
+ 'type' => 'image',
+ 'settings' => [
+ 'default_image' => [
+ 'uuid' => 100000,
+ ]
+ ],
+ ]);
+ $field_storage->save();
+ $settings = $field_storage->getSettings();
+ // The non-existent default image should not be saved.
+ $this->assertNull($settings['default_image']['uuid']);
+
+ $field = FieldConfig::create([
+ 'field_storage' => $field_storage,
+ 'bundle' => 'page',
+ 'label' => $this->randomMachineName(),
+ 'settings' => [
+ 'default_image' => [
+ 'uuid' => 100000,
+ ]
+ ],
+ ]);
+ $field->save();
+ $settings = $field->getSettings();
+ // The non-existent default image should not be saved.
+ $this->assertNull($settings['default_image']['uuid']);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,473 @@
+_testImageFieldFormatters('public');
+ }
+
+ /**
+ * Test image formatters on node display for private files.
+ */
+ public function testImageFieldFormattersPrivate() {
+ // Remove access content permission from anonymous users.
+ user_role_change_permissions(RoleInterface::ANONYMOUS_ID, ['access content' => FALSE]);
+ $this->_testImageFieldFormatters('private');
+ }
+
+ /**
+ * Test image formatters on node display.
+ */
+ public function _testImageFieldFormatters($scheme) {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = $this->container->get('renderer');
+ $node_storage = $this->container->get('entity.manager')->getStorage('node');
+ $field_name = strtolower($this->randomMachineName());
+ $field_settings = ['alt_field_required' => 0];
+ $instance = $this->createImageField($field_name, 'article', ['uri_scheme' => $scheme], $field_settings);
+
+ // Go to manage display page.
+ $this->drupalGet("admin/structure/types/manage/article/display");
+
+ // Test for existence of link to image styles configuration.
+ $this->drupalPostForm(NULL, [], "{$field_name}_settings_edit");
+ $this->assertLinkByHref(\Drupal::url('entity.image_style.collection'), 0, 'Link to image styles configuration is found');
+
+ // Remove 'administer image styles' permission from testing admin user.
+ $admin_user_roles = $this->adminUser->getRoles(TRUE);
+ user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => FALSE]);
+
+ // Go to manage display page again.
+ $this->drupalGet("admin/structure/types/manage/article/display");
+
+ // Test for absence of link to image styles configuration.
+ $this->drupalPostForm(NULL, [], "{$field_name}_settings_edit");
+ $this->assertNoLinkByHref(\Drupal::url('entity.image_style.collection'), 'Link to image styles configuration is absent when permissions are insufficient');
+
+ // Restore 'administer image styles' permission to testing admin user
+ user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => TRUE]);
+
+ // Create a new node with an image attached.
+ $test_image = current($this->drupalGetTestFiles('image'));
+
+ // Ensure that preview works.
+ $this->previewNodeImage($test_image, $field_name, 'article');
+
+ // After previewing, make the alt field required. It cannot be required
+ // during preview because the form validation will fail.
+ $instance->setSetting('alt_field_required', 1);
+ $instance->save();
+
+ // Create alt text for the image.
+ $alt = $this->randomMachineName();
+
+ // Save node.
+ $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
+ $node_storage->resetCache([$nid]);
+ $node = $node_storage->load($nid);
+
+ // Test that the default formatter is being used.
+ $file = $node->{$field_name}->entity;
+ $image_uri = $file->getFileUri();
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $image_uri,
+ '#width' => 40,
+ '#height' => 20,
+ '#alt' => $alt,
+ ];
+ $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
+ $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+
+ // Test the image linked to file formatter.
+ $display_options = [
+ 'type' => 'image',
+ 'settings' => ['image_link' => 'file'],
+ ];
+ $display = entity_get_display('node', $node->getType(), 'default');
+ $display->setComponent($field_name, $display_options)
+ ->save();
+
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $image_uri,
+ '#width' => 40,
+ '#height' => 20,
+ '#alt' => $alt,
+ ];
+ $default_output = '' . $renderer->renderRoot($image) . '';
+ $this->drupalGet('node/' . $nid);
+ $this->assertCacheTag($file->getCacheTags()[0]);
+ // @todo Remove in https://www.drupal.org/node/2646744.
+ $this->assertCacheContext('url.site');
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+ $this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.');
+ // Verify that the image can be downloaded.
+ $this->assertEqual(file_get_contents($test_image->uri), $this->drupalGet(file_create_url($image_uri)), 'File was downloaded successfully.');
+ if ($scheme == 'private') {
+ // Only verify HTTP headers when using private scheme and the headers are
+ // sent by Drupal.
+ $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.');
+ $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.');
+
+ // Log out and try to access the file.
+ $this->drupalLogout();
+ $this->drupalGet(file_create_url($image_uri));
+ $this->assertResponse('403', 'Access denied to original image as anonymous user.');
+
+ // Log in again.
+ $this->drupalLogin($this->adminUser);
+ }
+
+ // Test the image linked to content formatter.
+ $display_options['settings']['image_link'] = 'content';
+ $display->setComponent($field_name, $display_options)
+ ->save();
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $image_uri,
+ '#width' => 40,
+ '#height' => 20,
+ ];
+ $this->drupalGet('node/' . $nid);
+ $this->assertCacheTag($file->getCacheTags()[0]);
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+ $elements = $this->xpath(
+ '//a[@href=:path]/img[@src=:url and @alt=:alt and @width=:width and @height=:height]',
+ [
+ ':path' => $node->url(),
+ ':url' => file_url_transform_relative(file_create_url($image['#uri'])),
+ ':width' => $image['#width'],
+ ':height' => $image['#height'],
+ ':alt' => $alt,
+ ]
+ );
+ $this->assertEqual(count($elements), 1, 'Image linked to content formatter displaying correctly on full node view.');
+
+ // Test the image style 'thumbnail' formatter.
+ $display_options['settings']['image_link'] = '';
+ $display_options['settings']['image_style'] = 'thumbnail';
+ $display->setComponent($field_name, $display_options)
+ ->save();
+
+ // Ensure the derivative image is generated so we do not have to deal with
+ // image style callback paths.
+ $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
+ $image_style = [
+ '#theme' => 'image_style',
+ '#uri' => $image_uri,
+ '#width' => 40,
+ '#height' => 20,
+ '#style_name' => 'thumbnail',
+ '#alt' => $alt,
+ ];
+ $default_output = $renderer->renderRoot($image_style);
+ $this->drupalGet('node/' . $nid);
+ $image_style = ImageStyle::load('thumbnail');
+ $this->assertCacheTag($image_style->getCacheTags()[0]);
+ $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
+
+ if ($scheme == 'private') {
+ // Log out and try to access the file.
+ $this->drupalLogout();
+ $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
+ $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
+ }
+
+ // Test the image URL formatter without an image style.
+ $display_options = [
+ 'type' => 'image_url',
+ 'settings' => ['image_style' => ''],
+ ];
+ $expected_url = file_url_transform_relative(file_create_url($image_uri));
+ $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
+
+ // Test the image URL formatter with an image style.
+ $display_options['settings']['image_style'] = 'thumbnail';
+ $expected_url = file_url_transform_relative(ImageStyle::load('thumbnail')->buildUrl($image_uri));
+ $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
+ }
+
+ /**
+ * Tests for image field settings.
+ */
+ public function testImageFieldSettings() {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = $this->container->get('renderer');
+ $node_storage = $this->container->get('entity.manager')->getStorage('node');
+ $test_image = current($this->drupalGetTestFiles('image'));
+ list(, $test_image_extension) = explode('.', $test_image->filename);
+ $field_name = strtolower($this->randomMachineName());
+ $field_settings = [
+ 'alt_field' => 1,
+ 'file_extensions' => $test_image_extension,
+ 'max_filesize' => '50 KB',
+ 'max_resolution' => '100x100',
+ 'min_resolution' => '10x10',
+ 'title_field' => 1,
+ ];
+ $widget_settings = [
+ 'preview_image_style' => 'medium',
+ ];
+ $field = $this->createImageField($field_name, 'article', [], $field_settings, $widget_settings);
+
+ // Verify that the min/max resolution set on the field are properly
+ // extracted, and displayed, on the image field's configuration form.
+ $this->drupalGet('admin/structure/types/manage/article/fields/' . $field->id());
+ $this->assertFieldByName('settings[max_resolution][x]', '100', 'Expected max resolution X value of 100.');
+ $this->assertFieldByName('settings[max_resolution][y]', '100', 'Expected max resolution Y value of 100.');
+ $this->assertFieldByName('settings[min_resolution][x]', '10', 'Expected min resolution X value of 10.');
+ $this->assertFieldByName('settings[min_resolution][y]', '10', 'Expected min resolution Y value of 10.');
+
+ $this->drupalGet('node/add/article');
+ $this->assertText(t('50 KB limit.'), 'Image widget max file size is displayed on article form.');
+ $this->assertText(t('Allowed types: @extensions.', ['@extensions' => $test_image_extension]), 'Image widget allowed file types displayed on article form.');
+ $this->assertText(t('Images must be larger than 10x10 pixels. Images larger than 100x100 pixels will be resized.'), 'Image widget allowed resolution displayed on article form.');
+
+ // We have to create the article first and then edit it because the alt
+ // and title fields do not display until the image has been attached.
+
+ // Create alt text for the image.
+ $alt = $this->randomMachineName();
+
+ $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
+ $this->drupalGet('node/' . $nid . '/edit');
+
+ // Verify that the optional fields alt & title are saved & filled.
+ $this->assertFieldByName($field_name . '[0][alt]', $alt, 'Alt field displayed on article form.');
+ $this->assertFieldByName($field_name . '[0][title]', '', 'Title field displayed on article form.');
+
+ // Verify that the attached image is being previewed using the 'medium'
+ // style.
+ $node_storage->resetCache([$nid]);
+ $node = $node_storage->load($nid);
+ $file = $node->{$field_name}->entity;
+
+ $url = file_url_transform_relative(file_create_url(ImageStyle::load('medium')->buildUrl($file->getFileUri())));
+ $this->assertTrue($this->cssSelect('img[width=40][height=20][class=image-style-medium][src="' . $url . '"]'));
+
+ // Add alt/title fields to the image and verify that they are displayed.
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $file->getFileUri(),
+ '#alt' => $alt,
+ '#title' => $this->randomMachineName(),
+ '#width' => 40,
+ '#height' => 20,
+ ];
+ $edit = [
+ $field_name . '[0][alt]' => $image['#alt'],
+ $field_name . '[0][title]' => $image['#title'],
+ ];
+ $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
+ $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
+ $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.');
+
+ // Verify that alt/title longer than allowed results in a validation error.
+ $test_size = 2000;
+ $edit = [
+ $field_name . '[0][alt]' => $this->randomMachineName($test_size),
+ $field_name . '[0][title]' => $this->randomMachineName($test_size),
+ ];
+ $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
+ $schema = $field->getFieldStorageDefinition()->getSchema();
+ $this->assertRaw(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', [
+ '%max' => $schema['columns']['alt']['length'],
+ '%length' => $test_size,
+ ]));
+ $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', [
+ '%max' => $schema['columns']['title']['length'],
+ '%length' => $test_size,
+ ]));
+
+ // Set cardinality to unlimited and add upload a second image.
+ // The image widget is extending on the file widget, but the image field
+ // type does not have the 'display_field' setting which is expected by
+ // the file widget. This resulted in notices before when cardinality is not
+ // 1, so we need to make sure the file widget prevents these notices by
+ // providing all settings, even if they are not used.
+ // @see FileWidget::formMultipleElements().
+ $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', ['cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED], t('Save field settings'));
+ $edit = [
+ 'files[' . $field_name . '_1][]' => \Drupal::service('file_system')->realpath($test_image->uri),
+ ];
+ $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
+ // Add the required alt text.
+ $this->drupalPostForm(NULL, [$field_name . '[1][alt]' => $alt], t('Save'));
+ $this->assertText(format_string('Article @title has been updated.', ['@title' => $node->getTitle()]));
+
+ // Assert ImageWidget::process() calls FieldWidget::process().
+ $this->drupalGet('node/' . $node->id() . '/edit');
+ $edit = [
+ 'files[' . $field_name . '_2][]' => \Drupal::service('file_system')->realpath($test_image->uri),
+ ];
+ $this->drupalPostForm(NULL, $edit, $field_name . '_2_upload_button');
+ $this->assertSession()->elementNotExists('css', 'input[name="files[' . $field_name . '_2][]"]');
+ $this->assertSession()->elementExists('css', 'input[name="files[' . $field_name . '_3][]"]');
+ }
+
+ /**
+ * Test use of a default image with an image field.
+ */
+ public function testImageFieldDefaultImage() {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = $this->container->get('renderer');
+
+ $node_storage = $this->container->get('entity.manager')->getStorage('node');
+ // Create a new image field.
+ $field_name = strtolower($this->randomMachineName());
+ $this->createImageField($field_name, 'article');
+
+ // Create a new node, with no images and verify that no images are
+ // displayed.
+ $node = $this->drupalCreateNode(['type' => 'article']);
+ $this->drupalGet('node/' . $node->id());
+ // Verify that no image is displayed on the page by checking for the class
+ // that would be used on the image field.
+ $this->assertNoPattern('
', 'No image displayed when no image is attached and no default image specified.');
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+
+ // Add a default image to the public image field.
+ $images = $this->drupalGetTestFiles('image');
+ $alt = $this->randomString(512);
+ $title = $this->randomString(1024);
+ $edit = [
+ // Get the path of the 'image-test.png' file.
+ 'files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($images[0]->uri),
+ 'settings[default_image][alt]' => $alt,
+ 'settings[default_image][title]' => $title,
+ ];
+ $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
+ // Clear field definition cache so the new default image is detected.
+ \Drupal::entityManager()->clearCachedFieldDefinitions();
+ $field_storage = FieldStorageConfig::loadByName('node', $field_name);
+ $default_image = $field_storage->getSetting('default_image');
+ $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
+ $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $file->getFileUri(),
+ '#alt' => $alt,
+ '#title' => $title,
+ '#width' => 40,
+ '#height' => 20,
+ ];
+ $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
+ $this->drupalGet('node/' . $node->id());
+ $this->assertCacheTag($file->getCacheTags()[0]);
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+ $this->assertRaw($default_output, 'Default image displayed when no user supplied image is present.');
+
+ // Create a node with an image attached and ensure that the default image
+ // is not displayed.
+
+ // Create alt text for the image.
+ $alt = $this->randomMachineName();
+
+ // Upload the 'image-test.gif' file.
+ $nid = $this->uploadNodeImage($images[2], $field_name, 'article', $alt);
+ $node_storage->resetCache([$nid]);
+ $node = $node_storage->load($nid);
+ $file = $node->{$field_name}->entity;
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $file->getFileUri(),
+ '#width' => 40,
+ '#height' => 20,
+ '#alt' => $alt,
+ ];
+ $image_output = str_replace("\n", NULL, $renderer->renderRoot($image));
+ $this->drupalGet('node/' . $nid);
+ $this->assertCacheTag($file->getCacheTags()[0]);
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+ $this->assertNoRaw($default_output, 'Default image is not displayed when user supplied image is present.');
+ $this->assertRaw($image_output, 'User supplied image is displayed.');
+
+ // Remove default image from the field and make sure it is no longer used.
+ // Can't use fillField cause Mink can't fill hidden fields.
+ $this->drupalGet("admin/structure/types/manage/article/fields/node.article.$field_name/storage");
+ $this->getSession()->getPage()->find('css', 'input[name="settings[default_image][uuid][fids]"]')->setValue(0);
+ $this->getSession()->getPage()->pressButton(t('Save field settings'));
+
+ // Clear field definition cache so the new default image is detected.
+ \Drupal::entityManager()->clearCachedFieldDefinitions();
+ $field_storage = FieldStorageConfig::loadByName('node', $field_name);
+ $default_image = $field_storage->getSetting('default_image');
+ $this->assertFalse($default_image['uuid'], 'Default image removed from field.');
+ // Create an image field that uses the private:// scheme and test that the
+ // default image works as expected.
+ $private_field_name = strtolower($this->randomMachineName());
+ $this->createImageField($private_field_name, 'article', ['uri_scheme' => 'private']);
+ // Add a default image to the new field.
+ $edit = [
+ // Get the path of the 'image-test.gif' file.
+ 'files[settings_default_image_uuid]' => \Drupal::service('file_system')->realpath($images[2]->uri),
+ 'settings[default_image][alt]' => $alt,
+ 'settings[default_image][title]' => $title,
+ ];
+ $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings'));
+ // Clear field definition cache so the new default image is detected.
+ \Drupal::entityManager()->clearCachedFieldDefinitions();
+
+ $private_field_storage = FieldStorageConfig::loadByName('node', $private_field_name);
+ $default_image = $private_field_storage->getSetting('default_image');
+ $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
+ $this->assertEqual('private', file_uri_scheme($file->getFileUri()), 'Default image uses private:// scheme.');
+ $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
+ // Create a new node with no image attached and ensure that default private
+ // image is displayed.
+ $node = $this->drupalCreateNode(['type' => 'article']);
+ $image = [
+ '#theme' => 'image',
+ '#uri' => $file->getFileUri(),
+ '#alt' => $alt,
+ '#title' => $title,
+ '#width' => 40,
+ '#height' => 20,
+ ];
+ $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
+ $this->drupalGet('node/' . $node->id());
+ $this->assertCacheTag($file->getCacheTags()[0]);
+ $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+ $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
+ $this->assertRaw($default_output, 'Default private image displayed when no user supplied image is present.');
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageFieldTestBase.php
--- a/core/modules/image/tests/src/Functional/ImageFieldTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/image/tests/src/Functional/ImageFieldTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -87,10 +87,10 @@
'title[0][value]' => $this->randomMachineName(),
];
$edit['files[' . $field_name . '_0]'] = \Drupal::service('file_system')->realpath($image->uri);
- $this->drupalPostForm('node/add/' . $type, $edit, t('Save and publish'));
+ $this->drupalPostForm('node/add/' . $type, $edit, t('Save'));
if ($alt) {
// Add alt text.
- $this->drupalPostForm(NULL, [$field_name . '[0][alt]' => $alt], t('Save and publish'));
+ $this->drupalPostForm(NULL, [$field_name . '[0][alt]' => $alt], t('Save'));
}
// Retrieve ID of the newly created node from the current URL.
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,226 @@
+container->get('file_system');
+ $image_files = $this->drupalGetTestFiles('image');
+
+ $field_name = strtolower($this->randomMachineName());
+ $this->createImageField($field_name, 'article', [], ['file_directory' => 'test-upload']);
+ $expected_path = 'public://test-upload';
+
+ // Create alt text for the image.
+ $alt = $this->randomMachineName();
+
+ // Create a node with a valid image.
+ $node = $this->uploadNodeImage($image_files[0], $field_name, 'article', $alt);
+ $this->assertTrue(file_exists($expected_path . '/' . $image_files[0]->filename));
+
+ // Remove the image.
+ $this->drupalPostForm('node/' . $node . '/edit', [], t('Remove'));
+ $this->drupalPostForm(NULL, [], t('Save'));
+
+ // Get invalid image test files from simpletest.
+ $files = file_scan_directory(drupal_get_path('module', 'simpletest') . '/files', '/invalid-img-.*/');
+ $invalid_image_files = [];
+ foreach ($files as $file) {
+ $invalid_image_files[$file->filename] = $file;
+ }
+
+ // Try uploading a zero-byte image.
+ $zero_size_image = $invalid_image_files['invalid-img-zero-size.png'];
+ $edit = [
+ 'files[' . $field_name . '_0]' => $file_system->realpath($zero_size_image->uri),
+ ];
+ $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
+ $this->assertFalse(file_exists($expected_path . '/' . $zero_size_image->filename));
+
+ // Try uploading an invalid image.
+ $invalid_image = $invalid_image_files['invalid-img-test.png'];
+ $edit = [
+ 'files[' . $field_name . '_0]' => $file_system->realpath($invalid_image->uri),
+ ];
+ $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
+ $this->assertFalse(file_exists($expected_path . '/' . $invalid_image->filename));
+
+ // Upload a valid image again.
+ $valid_image = $image_files[0];
+ $edit = [
+ 'files[' . $field_name . '_0]' => $file_system->realpath($valid_image->uri),
+ ];
+ $this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
+ $this->assertTrue(file_exists($expected_path . '/' . $valid_image->filename));
+ }
+
+ /**
+ * Test min/max resolution settings.
+ */
+ public function testResolution() {
+ $field_names = [
+ 0 => strtolower($this->randomMachineName()),
+ 1 => strtolower($this->randomMachineName()),
+ 2 => strtolower($this->randomMachineName()),
+ ];
+ $min_resolution = [
+ 'width' => 50,
+ 'height' => 50
+ ];
+ $max_resolution = [
+ 'width' => 100,
+ 'height' => 100
+ ];
+ $no_height_min_resolution = [
+ 'width' => 50,
+ 'height' => NULL
+ ];
+ $no_height_max_resolution = [
+ 'width' => 100,
+ 'height' => NULL
+ ];
+ $no_width_min_resolution = [
+ 'width' => NULL,
+ 'height' => 50
+ ];
+ $no_width_max_resolution = [
+ 'width' => NULL,
+ 'height' => 100
+ ];
+ $field_settings = [
+ 0 => $this->getFieldSettings($min_resolution, $max_resolution),
+ 1 => $this->getFieldSettings($no_height_min_resolution, $no_height_max_resolution),
+ 2 => $this->getFieldSettings($no_width_min_resolution, $no_width_max_resolution),
+ ];
+ $this->createImageField($field_names[0], 'article', [], $field_settings[0]);
+ $this->createImageField($field_names[1], 'article', [], $field_settings[1]);
+ $this->createImageField($field_names[2], 'article', [], $field_settings[2]);
+
+ // We want a test image that is too small, and a test image that is too
+ // big, so cycle through test image files until we have what we need.
+ $image_that_is_too_big = FALSE;
+ $image_that_is_too_small = FALSE;
+ $image_factory = $this->container->get('image.factory');
+ foreach ($this->drupalGetTestFiles('image') as $image) {
+ $image_file = $image_factory->get($image->uri);
+ if ($image_file->getWidth() > $max_resolution['width']) {
+ $image_that_is_too_big = $image;
+ }
+ if ($image_file->getWidth() < $min_resolution['width']) {
+ $image_that_is_too_small = $image;
+ $image_that_is_too_small_file = $image_file;
+ }
+ if ($image_that_is_too_small && $image_that_is_too_big) {
+ break;
+ }
+ }
+ $this->uploadNodeImage($image_that_is_too_small, $field_names[0], 'article');
+ $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->assertRaw(t('The image is too small. The minimum dimensions are %dimensions pixels and the image size is %widthx%height pixels.', [
+ '%dimensions' => '50x50',
+ '%width' => $image_that_is_too_small_file->getWidth(),
+ '%height' => $image_that_is_too_small_file->getHeight(),
+ ]));
+ $this->uploadNodeImage($image_that_is_too_big, $field_names[0], 'article');
+ $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'));
+ $this->uploadNodeImage($image_that_is_too_small, $field_names[1], 'article');
+ $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->uploadNodeImage($image_that_is_too_big, $field_names[1], 'article');
+ $this->assertText(t('The image was resized to fit within the maximum allowed width of 100 pixels.'));
+ $this->uploadNodeImage($image_that_is_too_small, $field_names[2], 'article');
+ $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->uploadNodeImage($image_that_is_too_big, $field_names[2], 'article');
+ $this->assertText(t('The image was resized to fit within the maximum allowed height of 100 pixels.'));
+ }
+
+ /**
+ * Test that required alt/title fields gets validated right.
+ */
+ public function testRequiredAttributes() {
+ $field_name = strtolower($this->randomMachineName());
+ $field_settings = [
+ 'alt_field' => 1,
+ 'alt_field_required' => 1,
+ 'title_field' => 1,
+ 'title_field_required' => 1,
+ 'required' => 1,
+ ];
+ $instance = $this->createImageField($field_name, 'article', [], $field_settings);
+ $images = $this->drupalGetTestFiles('image');
+ // Let's just use the first image.
+ $image = $images[0];
+ $this->uploadNodeImage($image, $field_name, 'article');
+
+ // Look for form-required for the alt text.
+ $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-alt" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-alt"]');
+
+ $this->assertTrue(isset($elements[0]), 'Required marker is shown for the required alt text.');
+
+ $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-title" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-title"]');
+
+ $this->assertTrue(isset($elements[0]), 'Required marker is shown for the required title text.');
+
+ $this->assertText(t('Alternative text field is required.'));
+ $this->assertText(t('Title field is required.'));
+
+ $instance->setSetting('alt_field_required', 0);
+ $instance->setSetting('title_field_required', 0);
+ $instance->save();
+
+ $edit = [
+ 'title[0][value]' => $this->randomMachineName(),
+ ];
+ $this->drupalPostForm('node/add/article', $edit, t('Save'));
+
+ $this->assertNoText(t('Alternative text field is required.'));
+ $this->assertNoText(t('Title field is required.'));
+
+ $instance->setSetting('required', 0);
+ $instance->setSetting('alt_field_required', 1);
+ $instance->setSetting('title_field_required', 1);
+ $instance->save();
+
+ $edit = [
+ 'title[0][value]' => $this->randomMachineName(),
+ ];
+ $this->drupalPostForm('node/add/article', $edit, t('Save'));
+
+ $this->assertNoText(t('Alternative text field is required.'));
+ $this->assertNoText(t('Title field is required.'));
+ }
+
+ /**
+ * Returns field settings.
+ *
+ * @param int[] $min_resolution
+ * The minimum width and height resolution setting.
+ * @param int[] $max_resolution
+ * The maximum width and height resolution setting.
+ *
+ * @return array
+ */
+ protected function getFieldSettings($min_resolution, $max_resolution) {
+ return [
+ 'max_resolution' => $max_resolution['width'] . 'x' . $max_resolution['height'],
+ 'min_resolution' => $min_resolution['width'] . 'x' . $min_resolution['height'],
+ 'alt_field' => 0,
+ ];
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,234 @@
+config('file.settings')->set('make_unused_managed_files_temporary', TRUE)->save();
+
+ // Create the "Basic page" node type.
+ // @todo Remove the disabling of new revision creation in
+ // https://www.drupal.org/node/1239558.
+ $this->drupalCreateContentType(['type' => 'basicpage', 'name' => 'Basic page', 'new_revision' => FALSE]);
+
+ // Create a image field on the "Basic page" node type.
+ $this->fieldName = strtolower($this->randomMachineName());
+ $this->createImageField($this->fieldName, 'basicpage', [], ['title_field' => 1]);
+
+ // Create and log in user.
+ $permissions = [
+ 'access administration pages',
+ 'administer content translation',
+ 'administer content types',
+ 'administer languages',
+ 'administer node fields',
+ 'create content translations',
+ 'create basicpage content',
+ 'edit any basicpage content',
+ 'translate any entity',
+ 'delete any basicpage content',
+ ];
+ $admin_user = $this->drupalCreateUser($permissions);
+ $this->drupalLogin($admin_user);
+
+ // Add a second and third language.
+ $edit = [];
+ $edit['predefined_langcode'] = 'fr';
+ $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+ $edit = [];
+ $edit['predefined_langcode'] = 'nl';
+ $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+ }
+
+ /**
+ * Tests synced file fields on translated nodes.
+ */
+ public function testSyncedImages() {
+ // Enable translation for "Basic page" nodes.
+ $edit = [
+ 'entity_types[node]' => 1,
+ 'settings[node][basicpage][translatable]' => 1,
+ "settings[node][basicpage][fields][$this->fieldName]" => 1,
+ "settings[node][basicpage][columns][$this->fieldName][file]" => 1,
+ // Explicitly disable alt and title since the javascript disables the
+ // checkboxes on the form.
+ "settings[node][basicpage][columns][$this->fieldName][alt]" => FALSE,
+ "settings[node][basicpage][columns][$this->fieldName][title]" => FALSE,
+ ];
+ $this->drupalPostForm('admin/config/regional/content-language', $edit, 'Save configuration');
+
+ // Verify that the image field on the "Basic basic" node type is
+ // translatable.
+ $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'basicpage');
+ $this->assertTrue($definitions[$this->fieldName]->isTranslatable(), 'Node image field is translatable.');
+
+ // Create a default language node.
+ $default_language_node = $this->drupalCreateNode(['type' => 'basicpage', 'title' => 'Lost in translation']);
+
+ // Edit the node to upload a file.
+ $edit = [];
+ $name = 'files[' . $this->fieldName . '_0]';
+ $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[0]->uri);
+ $this->drupalPostForm('node/' . $default_language_node->id() . '/edit', $edit, t('Save'));
+ $edit = [$this->fieldName . '[0][alt]' => 'Lost in translation image', $this->fieldName . '[0][title]' => 'Lost in translation image title'];
+ $this->drupalPostForm(NULL, $edit, t('Save'));
+ $first_fid = $this->getLastFileId();
+
+ // Translate the node into French: remove the existing file.
+ $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', [], t('Remove'));
+
+ // Upload a different file.
+ $edit = [];
+ $edit['title[0][value]'] = 'Scarlett Johansson';
+ $name = 'files[' . $this->fieldName . '_0]';
+ $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[1]->uri);
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ $edit = [$this->fieldName . '[0][alt]' => 'Scarlett Johansson image', $this->fieldName . '[0][title]' => 'Scarlett Johansson image title'];
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ // This inspects the HTML after the post of the translation, the image
+ // should be displayed on the original node.
+ $this->assertRaw('alt="Lost in translation image"');
+ $this->assertRaw('title="Lost in translation image title"');
+ $second_fid = $this->getLastFileId();
+ // View the translated node.
+ $this->drupalGet('fr/node/' . $default_language_node->id());
+ $this->assertRaw('alt="Scarlett Johansson image"');
+
+ \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+ /* @var $file \Drupal\file\FileInterface */
+
+ // Ensure the file status of the first file permanent.
+ $file = File::load($first_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Ensure the file status of the second file is permanent.
+ $file = File::load($second_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Translate the node into dutch: remove the existing file.
+ $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', [], t('Remove'));
+
+ // Upload a different file.
+ $edit = [];
+ $edit['title[0][value]'] = 'Akiko Takeshita';
+ $name = 'files[' . $this->fieldName . '_0]';
+ $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[2]->uri);
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ $edit = [$this->fieldName . '[0][alt]' => 'Akiko Takeshita image', $this->fieldName . '[0][title]' => 'Akiko Takeshita image title'];
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ $third_fid = $this->getLastFileId();
+
+ \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+ // Ensure the first file is untouched.
+ $file = File::load($first_fid);
+ $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
+ // This inspects the HTML after the post of the translation, the image
+ // should be displayed on the original node.
+ $this->assertRaw('alt="Lost in translation image"');
+ $this->assertRaw('title="Lost in translation image title"');
+ // View the translated node.
+ $this->drupalGet('nl/node/' . $default_language_node->id());
+ $this->assertRaw('alt="Akiko Takeshita image"');
+ $this->assertRaw('title="Akiko Takeshita image title"');
+
+ // Ensure the file status of the second file is permanent.
+ $file = File::load($second_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Ensure the file status of the third file is permanent.
+ $file = File::load($third_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Edit the second translation: remove the existing file.
+ $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', [], t('Remove'));
+
+ // Upload a different file.
+ $edit = [];
+ $edit['title[0][value]'] = 'Giovanni Ribisi';
+ $name = 'files[' . $this->fieldName . '_0]';
+ $edit[$name] = \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('image')[3]->uri);
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ $name = $this->fieldName . '[0][alt]';
+
+ $edit = [$name => 'Giovanni Ribisi image'];
+ $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+ $replaced_second_fid = $this->getLastFileId();
+
+ \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+ // Ensure the first and third files are untouched.
+ $file = File::load($first_fid);
+ $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
+
+ $file = File::load($third_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Ensure the file status of the replaced second file is permanent.
+ $file = File::load($replaced_second_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Delete the third translation.
+ $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', [], t('Delete Dutch translation'));
+
+ \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+ // Ensure the first and replaced second files are untouched.
+ $file = File::load($first_fid);
+ $this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
+
+ $file = File::load($replaced_second_fid);
+ $this->assertTrue($file->isPermanent());
+
+ // Ensure the file status of the third file is now temporary.
+ $file = File::load($third_fid);
+ $this->assertTrue($file->isTemporary());
+
+ // Delete the all translations.
+ $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', [], t('Delete all translations'));
+
+ \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+ // Ensure the file status of the all files are now temporary.
+ $file = File::load($first_fid);
+ $this->assertTrue($file->isTemporary(), 'First file still exists and is temporary.');
+
+ $file = File::load($replaced_second_fid);
+ $this->assertTrue($file->isTemporary());
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,116 @@
+drupalGetTestFiles('image');
+ $file = reset($files);
+ }
+
+ // Make sure we have an image in our wrapper testing file directory.
+ $source_uri = file_unmanaged_copy($file->uri, $wrapper . '://');
+ // Build the derivative image.
+ $derivative_uri = $style->buildUri($source_uri);
+ $derivative = $style->createDerivative($source_uri, $derivative_uri);
+
+ return $derivative ? $derivative_uri : FALSE;
+ }
+
+ /**
+ * Count the number of images currently created for a style in a wrapper.
+ */
+ public function getImageCount($style, $wrapper) {
+ return count(file_scan_directory($wrapper . '://styles/' . $style->id(), '/.*/'));
+ }
+
+ /**
+ * General test to flush a style.
+ */
+ public function testFlush() {
+
+ // Setup a style to be created and effects to add to it.
+ $style_name = strtolower($this->randomMachineName(10));
+ $style_label = $this->randomString();
+ $style_path = 'admin/config/media/image-styles/manage/' . $style_name;
+ $effect_edits = [
+ 'image_resize' => [
+ 'data[width]' => 100,
+ 'data[height]' => 101,
+ ],
+ 'image_scale' => [
+ 'data[width]' => 110,
+ 'data[height]' => 111,
+ 'data[upscale]' => 1,
+ ],
+ ];
+
+ // Add style form.
+ $edit = [
+ 'name' => $style_name,
+ 'label' => $style_label,
+ ];
+ $this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
+
+ // Add each sample effect to the style.
+ foreach ($effect_edits as $effect => $edit) {
+ // Add the effect.
+ $this->drupalPostForm($style_path, ['new' => $effect], t('Add'));
+ if (!empty($edit)) {
+ $this->drupalPostForm(NULL, $edit, t('Add effect'));
+ }
+ }
+
+ // Load the saved image style.
+ $style = ImageStyle::load($style_name);
+
+ // Create an image for the 'public' wrapper.
+ $image_path = $this->createSampleImage($style, 'public');
+ // Expecting to find 2 images, one is the sample.png image shown in
+ // image style preview.
+ $this->assertEqual($this->getImageCount($style, 'public'), 2, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
+
+ // Create an image for the 'private' wrapper.
+ $image_path = $this->createSampleImage($style, 'private');
+ $this->assertEqual($this->getImageCount($style, 'private'), 1, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
+
+ // Remove the 'image_scale' effect and updates the style, which in turn
+ // forces an image style flush.
+ $style_path = 'admin/config/media/image-styles/manage/' . $style->id();
+ $uuids = [];
+ foreach ($style->getEffects() as $uuid => $effect) {
+ $uuids[$effect->getPluginId()] = $uuid;
+ }
+ $this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', [], t('Delete'));
+ $this->assertResponse(200);
+ $this->drupalPostForm($style_path, [], t('Update style'));
+ $this->assertResponse(200);
+
+ // Post flush, expected 1 image in the 'public' wrapper (sample.png).
+ $this->assertEqual($this->getImageCount($style, 'public'), 1, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'public']));
+
+ // Post flush, expected no image in the 'private' wrapper.
+ $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'private']));
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,320 @@
+style = ImageStyle::create([
+ 'name' => 'style_foo',
+ 'label' => $this->randomString(),
+ ]);
+ $this->style->save();
+
+ // Create a new language.
+ ConfigurableLanguage::createFromLangcode('fr')->save();
+ }
+
+ /**
+ * Tests \Drupal\image\ImageStyleInterface::buildUri().
+ */
+ public function testImageStylePath() {
+ $scheme = 'public';
+ $actual = $this->style->buildUri("$scheme://foo/bar.gif");
+ $expected = "$scheme://styles/" . $this->style->id() . "/$scheme/foo/bar.gif";
+ $this->assertEqual($actual, $expected, 'Got the path for a file URI.');
+
+ $actual = $this->style->buildUri('foo/bar.gif');
+ $expected = "$scheme://styles/" . $this->style->id() . "/$scheme/foo/bar.gif";
+ $this->assertEqual($actual, $expected, 'Got the path for a relative file path.');
+ }
+
+ /**
+ * Tests an image style URL using the "public://" scheme.
+ */
+ public function testImageStyleUrlAndPathPublic() {
+ $this->doImageStyleUrlAndPathTests('public');
+ }
+
+ /**
+ * Tests an image style URL using the "private://" scheme.
+ */
+ public function testImageStyleUrlAndPathPrivate() {
+ $this->doImageStyleUrlAndPathTests('private');
+ }
+
+ /**
+ * Tests an image style URL with the "public://" scheme and unclean URLs.
+ */
+ public function testImageStyleUrlAndPathPublicUnclean() {
+ $this->doImageStyleUrlAndPathTests('public', FALSE);
+ }
+
+ /**
+ * Tests an image style URL with the "private://" schema and unclean URLs.
+ */
+ public function testImageStyleUrlAndPathPrivateUnclean() {
+ $this->doImageStyleUrlAndPathTests('private', FALSE);
+ }
+
+ /**
+ * Tests an image style URL with the "public://" schema and language prefix.
+ */
+ public function testImageStyleUrlAndPathPublicLanguage() {
+ $this->doImageStyleUrlAndPathTests('public', TRUE, TRUE, 'fr');
+ }
+
+ /**
+ * Tests an image style URL with the "private://" schema and language prefix.
+ */
+ public function testImageStyleUrlAndPathPrivateLanguage() {
+ $this->doImageStyleUrlAndPathTests('private', TRUE, TRUE, 'fr');
+ }
+
+ /**
+ * Tests an image style URL with a file URL that has an extra slash in it.
+ */
+ public function testImageStyleUrlExtraSlash() {
+ $this->doImageStyleUrlAndPathTests('public', TRUE, TRUE);
+ }
+
+ /**
+ * Tests that an invalid source image returns a 404.
+ */
+ public function testImageStyleUrlForMissingSourceImage() {
+ $non_existent_uri = 'public://foo.png';
+ $generated_url = $this->style->buildUrl($non_existent_uri);
+ $this->drupalGet($generated_url);
+ $this->assertResponse(404, 'Accessing an image style URL with a source image that does not exist provides a 404 error response.');
+ }
+
+ /**
+ * Tests building an image style URL.
+ */
+ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash = FALSE, $langcode = FALSE) {
+ $this->prepareRequestForGenerator($clean_url);
+
+ // Make the default scheme neither "public" nor "private" to verify the
+ // functions work for other than the default scheme.
+ $this->config('system.file')->set('default_scheme', 'temporary')->save();
+
+ // Create the directories for the styles.
+ $directory = $scheme . '://styles/' . $this->style->id();
+ $status = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
+ $this->assertNotIdentical(FALSE, $status, 'Created the directory for the generated images for the test style.');
+
+ // Override the language to build the URL for the correct language.
+ if ($langcode) {
+ $language_manager = \Drupal::service('language_manager');
+ $language = $language_manager->getLanguage($langcode);
+ $language_manager->setConfigOverrideLanguage($language);
+ }
+
+ // Create a working copy of the file.
+ $files = $this->drupalGetTestFiles('image');
+ $file = array_shift($files);
+ $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
+ // Let the image_module_test module know about this file, so it can claim
+ // ownership in hook_file_download().
+ \Drupal::state()->set('image.test_file_download', $original_uri);
+ $this->assertNotIdentical(FALSE, $original_uri, 'Created the generated image file.');
+
+ // Get the URL of a file that has not been generated and try to create it.
+ $generated_uri = $this->style->buildUri($original_uri);
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $generate_url = $this->style->buildUrl($original_uri, $clean_url);
+
+ // Make sure that language prefix is never added to the image style URL.
+ if ($langcode) {
+ $this->assertTrue(strpos($generate_url, "/$langcode/") === FALSE, 'Langcode was not found in the image style URL.');
+ }
+
+ // Ensure that the tests still pass when the file is generated by accessing
+ // a poorly constructed (but still valid) file URL that has an extra slash
+ // in it.
+ if ($extra_slash) {
+ $modified_uri = str_replace('://', ':///', $original_uri);
+ $this->assertNotEqual($original_uri, $modified_uri, 'An extra slash was added to the generated file URI.');
+ $generate_url = $this->style->buildUrl($modified_uri, $clean_url);
+ }
+ if (!$clean_url) {
+ $this->assertTrue(strpos($generate_url, 'index.php/') !== FALSE, 'When using non-clean URLS, the system path contains the script name.');
+ }
+ // Add some extra chars to the token.
+ $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
+ $this->assertResponse(404, 'Image was inaccessible at the URL with an invalid token.');
+ // Change the parameter name so the token is missing.
+ $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
+ $this->assertResponse(404, 'Image was inaccessible at the URL with a missing token.');
+
+ // Check that the generated URL is the same when we pass in a relative path
+ // rather than a URI. We need to temporarily switch the default scheme to
+ // match the desired scheme before testing this, then switch it back to the
+ // "temporary" scheme used throughout this test afterwards.
+ $this->config('system.file')->set('default_scheme', $scheme)->save();
+ $relative_path = file_uri_target($original_uri);
+ $generate_url_from_relative_path = $this->style->buildUrl($relative_path, $clean_url);
+ $this->assertEqual($generate_url, $generate_url_from_relative_path);
+ $this->config('system.file')->set('default_scheme', 'temporary')->save();
+
+ // Fetch the URL that generates the file.
+ $this->drupalGet($generate_url);
+ $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ // assertRaw can't be used with string containing non UTF-8 chars.
+ $this->assertNotEmpty(file_get_contents($generated_uri), 'URL returns expected file.');
+ $image = $this->container->get('image.factory')->get($generated_uri);
+ $this->assertEqual($this->drupalGetHeader('Content-Type'), $image->getMimeType(), 'Expected Content-Type was reported.');
+ $this->assertEqual($this->drupalGetHeader('Content-Length'), $image->getFileSize(), 'Expected Content-Length was reported.');
+
+ // Check that we did not download the original file.
+ $original_image = $this->container->get('image.factory')
+ ->get($original_uri);
+ $this->assertNotEqual($this->drupalGetHeader('Content-Length'), $original_image->getFileSize());
+
+ if ($scheme == 'private') {
+ $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
+ $this->assertNotEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
+ $this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.');
+
+ // Make sure that a second request to the already existing derivative
+ // works too.
+ $this->drupalGet($generate_url);
+ $this->assertResponse(200, 'Image was generated at the URL.');
+
+ // Check that the second request also returned the generated image.
+ $this->assertEqual($this->drupalGetHeader('Content-Length'), $image->getFileSize());
+
+ // Check that we did not download the original file.
+ $this->assertNotEqual($this->drupalGetHeader('Content-Length'), $original_image->getFileSize());
+
+ // Make sure that access is denied for existing style files if we do not
+ // have access.
+ \Drupal::state()->delete('image.test_file_download');
+ $this->drupalGet($generate_url);
+ $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
+
+ // Repeat this with a different file that we do not have access to and
+ // make sure that access is denied.
+ $file_noaccess = array_shift($files);
+ $original_uri_noaccess = file_unmanaged_copy($file_noaccess->uri, $scheme . '://', FILE_EXISTS_RENAME);
+ $generated_uri_noaccess = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . drupal_basename($original_uri_noaccess);
+ $this->assertFalse(file_exists($generated_uri_noaccess), 'Generated file does not exist.');
+ $generate_url_noaccess = $this->style->buildUrl($original_uri_noaccess);
+
+ $this->drupalGet($generate_url_noaccess);
+ $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
+ // Verify that images are not appended to the response.
+ // Currently this test only uses PNG images.
+ if (strpos($generate_url, '.png') === FALSE) {
+ $this->fail('Confirming that private image styles are not appended require PNG file.');
+ }
+ else {
+ // Check for PNG-Signature
+ // (cf. http://www.libpng.org/pub/png/book/chapter08.html#png.ch08.div.2)
+ // in the response body.
+ $raw = $this->getSession()->getPage()->getContent();
+ $this->assertFalse(strpos($raw, chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10)));
+ }
+ }
+ else {
+ $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
+ $this->assertEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
+
+ if ($clean_url) {
+ // Add some extra chars to the token.
+ $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
+ $this->assertResponse(200, 'Existing image was accessible at the URL with an invalid token.');
+ }
+ }
+
+ // Allow insecure image derivatives to be created for the remainder of this
+ // test.
+ $this->config('image.settings')
+ ->set('allow_insecure_derivatives', TRUE)
+ ->save();
+
+ // Create another working copy of the file.
+ $files = $this->drupalGetTestFiles('image');
+ $file = array_shift($files);
+ $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
+ // Let the image_module_test module know about this file, so it can claim
+ // ownership in hook_file_download().
+ \Drupal::state()->set('image.test_file_download', $original_uri);
+
+ // Suppress the security token in the URL, then get the URL of a file that
+ // has not been created and try to create it. Check that the security token
+ // is not present in the URL but that the image is still accessible.
+ $this->config('image.settings')->set('suppress_itok_output', TRUE)->save();
+ $generated_uri = $this->style->buildUri($original_uri);
+ $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $generate_url = $this->style->buildUrl($original_uri, $clean_url);
+ $this->assertIdentical(strpos($generate_url, IMAGE_DERIVATIVE_TOKEN . '='), FALSE, 'The security token does not appear in the image style URL.');
+ $this->drupalGet($generate_url);
+ $this->assertResponse(200, 'Image was accessible at the URL with a missing token.');
+
+ // Stop supressing the security token in the URL.
+ $this->config('image.settings')->set('suppress_itok_output', FALSE)->save();
+ // Ensure allow_insecure_derivatives is enabled.
+ $this->assertEqual($this->config('image.settings')
+ ->get('allow_insecure_derivatives'), TRUE);
+ // Check that a security token is still required when generating a second
+ // image derivative using the first one as a source.
+ $nested_url = $this->style->buildUrl($generated_uri, $clean_url);
+ $matches_expected_url_format = (boolean) preg_match('/styles\/' . $this->style->id() . '\/' . $scheme . '\/styles\/' . $this->style->id() . '\/' . $scheme . '/', $nested_url);
+ $this->assertTrue($matches_expected_url_format, "URL for a derivative of an image style matches expected format.");
+ $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
+ $this->drupalGet($nested_url_with_wrong_token);
+ $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token.');
+ // Check that this restriction cannot be bypassed by adding extra slashes
+ // to the URL.
+ $this->drupalGet(substr_replace($nested_url_with_wrong_token, '//styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
+ $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with an extra forward slash in the URL.');
+ $this->drupalGet(substr_replace($nested_url_with_wrong_token, '////styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
+ $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with multiple forward slashes in the URL.');
+ // Make sure the image can still be generated if a correct token is used.
+ $this->drupalGet($nested_url);
+ $this->assertResponse(200, 'Image was accessible when a correct token was provided in the URL.');
+
+ // Check that requesting a nonexistent image does not create any new
+ // directories in the file system.
+ $directory = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $this->randomMachineName();
+ $this->drupalGet(file_create_url($directory . '/' . $this->randomString()));
+ $this->assertFalse(file_exists($directory), 'New directory was not created in the filesystem when requesting an unauthorized image.');
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,186 @@
+drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+
+ // Log in as a content author who can use Quick Edit and edit Articles.
+ $this->contentAuthorUser = $this->drupalCreateUser([
+ 'access contextual links',
+ 'access in-place editing',
+ 'access content',
+ 'create article content',
+ 'edit any article content',
+ 'delete any article content',
+ ]);
+ $this->drupalLogin($this->contentAuthorUser);
+
+ // Create a field with basic resolution validators.
+ $this->fieldName = strtolower($this->randomMachineName());
+ $field_settings = [
+ 'max_resolution' => '100x',
+ 'min_resolution' => '50x',
+ ];
+ $this->createImageField($this->fieldName, 'article', [], $field_settings);
+ }
+
+ /**
+ * Tests that routes restrict access for un-privileged users.
+ */
+ public function testAccess() {
+ // Create an anonymous user.
+ $user = $this->createUser();
+ $this->drupalLogin($user);
+
+ // Create a test Node.
+ $node = $this->drupalCreateNode([
+ 'type' => 'article',
+ 'title' => t('Test Node'),
+ ]);
+ $this->drupalGet('quickedit/image/info/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default');
+ $this->assertResponse('403');
+
+ /** @var \Symfony\Component\BrowserKit\Client $client */
+ $client = $this->getSession()->getDriver()->getClient();
+ $client->request('POST', '/quickedit/image/upload/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default');
+ $this->assertEquals('403', $client->getResponse()->getStatus());
+ }
+
+ /**
+ * Tests that the field info route returns expected data.
+ */
+ public function testFieldInfo() {
+ // Create a test Node.
+ $node = $this->drupalCreateNode([
+ 'type' => 'article',
+ 'title' => t('Test Node'),
+ ]);
+ $json = $this->drupalGet('quickedit/image/info/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default', ['query' => ['_format' => 'json']]);
+ $info = Json::decode($json);
+ // Assert that the default settings for our field are respected by our JSON
+ // endpoint.
+ $this->assertTrue($info['alt_field']);
+ $this->assertFalse($info['title_field']);
+ }
+
+ /**
+ * Tests that uploading a valid image works.
+ */
+ public function testValidImageUpload() {
+ // Create a test Node.
+ $node = $this->drupalCreateNode([
+ 'type' => 'article',
+ 'title' => t('Test Node'),
+ ]);
+
+ // We want a test image that is a valid size.
+ $valid_image = FALSE;
+ $image_factory = $this->container->get('image.factory');
+ foreach ($this->drupalGetTestFiles('image') as $image) {
+ $image_file = $image_factory->get($image->uri);
+ if ($image_file->getWidth() > 50 && $image_file->getWidth() < 100) {
+ $valid_image = $image;
+ break;
+ }
+ }
+ $this->assertTrue($valid_image);
+
+ $this->drupalLogin($this->contentAuthorUser);
+ $this->uploadImage($valid_image, $node->id(), $this->fieldName, $node->language()->getId());
+ $this->assertContains('"fid":"1"', $this->getSession()->getPage()->getContent(), 'Valid upload completed successfully.');
+ }
+
+ /**
+ * Tests that uploading a invalid image does not work.
+ */
+ public function testInvalidUpload() {
+ // Create a test Node.
+ $node = $this->drupalCreateNode([
+ 'type' => 'article',
+ 'title' => t('Test Node'),
+ ]);
+
+ // We want a test image that will fail validation.
+ $invalid_image = FALSE;
+ /** @var \Drupal\Core\Image\ImageFactory $image_factory */
+ $image_factory = $this->container->get('image.factory');
+ foreach ($this->drupalGetTestFiles('image') as $image) {
+ /** @var \Drupal\Core\Image\ImageInterface $image_file */
+ $image_file = $image_factory->get($image->uri);
+ if ($image_file->getWidth() < 50 || $image_file->getWidth() > 100) {
+ $invalid_image = $image;
+ break;
+ }
+ }
+ $this->assertTrue($invalid_image);
+
+ $this->drupalLogin($this->contentAuthorUser);
+ $this->uploadImage($invalid_image, $node->id(), $this->fieldName, $node->language()->getId());
+ $this->assertContains('"main_error":"The image failed validation."', $this->getSession()->getPage()->getContent(), 'Invalid upload returned errors.');
+ }
+
+ /**
+ * Uploads an image using the image module's Quick Edit route.
+ *
+ * @param object $image
+ * The image to upload.
+ * @param int $nid
+ * The target node ID.
+ * @param string $field_name
+ * The target field machine name.
+ * @param string $langcode
+ * The langcode to use when setting the field's value.
+ */
+ public function uploadImage($image, $nid, $field_name, $langcode) {
+ $filepath = $this->container->get('file_system')->realpath($image->uri);
+ $path = 'quickedit/image/upload/node/' . $nid . '/' . $field_name . '/' . $langcode . '/default';
+
+ $this->prepareRequest();
+ $client = $this->getSession()->getDriver()->getClient();
+ $client->request('POST', $this->buildUrl($path, []), [], ['files[image]' => $filepath]);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/Rest/ImageStyleJsonAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/Rest/ImageStyleJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,24 @@
+grantPermissionsToTestedRole(['administer image styles']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function createEntity() {
+ // Create a "Camelids" image style.
+ $camelids = ImageStyle::create([
+ 'name' => 'camelids',
+ 'label' => 'Camelids',
+ ]);
+
+ // Add an image effect.
+ $effect = [
+ 'id' => 'image_scale_and_crop',
+ 'data' => [
+ 'width' => 120,
+ 'height' => 121,
+ ],
+ 'weight' => 0,
+ ];
+ $this->effectUuid = $camelids->addImageEffect($effect);
+
+ $camelids->save();
+
+ return $camelids;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedNormalizedEntity() {
+ return [
+ 'dependencies' => [],
+ 'effects' => [
+ $this->effectUuid => [
+ 'uuid' => $this->effectUuid,
+ 'id' => 'image_scale_and_crop',
+ 'weight' => 0,
+ 'data' => [
+ 'width' => 120,
+ 'height' => 121,
+ ],
+ ],
+ ],
+ 'label' => 'Camelids',
+ 'langcode' => 'en',
+ 'name' => 'camelids',
+ 'status' => TRUE,
+ 'uuid' => $this->entity->uuid(),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getNormalizedPostEntity() {
+ // @todo Update in https://www.drupal.org/node/2300677.
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedUnauthorizedAccessMessage($method) {
+ if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+ return parent::getExpectedUnauthorizedAccessMessage($method);
+ }
+
+ return "The 'administer image styles' permission is required.";
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/Rest/ImageStyleXmlAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/Rest/ImageStyleXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,34 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/Rest/ImageStyleXmlBasicAuthTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/Rest/ImageStyleXmlBasicAuthTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,44 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Functional/Rest/ImageStyleXmlCookieTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Functional/Rest/ImageStyleXmlCookieTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,39 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/FunctionalJavascript/ImageAdminStylesTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/FunctionalJavascript/ImageAdminStylesTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,64 @@
+randomMachineName(10));
+ $style_label = $this->randomString();
+ $style_path = $admin_path . '/manage/' . $style_name;
+ $effect_edit = [
+ 'data[test_parameter]' => 100,
+ ];
+
+ // Add style form.
+ $page = $this->getSession()->getPage();
+ $assert = $this->assertSession();
+ $this->drupalGet($admin_path . '/add');
+ $page->findField('label')->setValue($style_label);
+ $assert->waitForElementVisible('named', ['button', 'Edit'])->press();
+ $assert->waitForElementVisible('named', ['id_or_name', 'name'])->setValue($style_name);
+ $page->pressButton('Create new style');
+ $assert->pageTextContains("Style $style_label was created.");
+
+ // Add two Ajax-enabled test effects.
+ $this->drupalPostForm($style_path, ['new' => 'image_module_test_ajax'], t('Add'));
+ $this->drupalPostForm(NULL, $effect_edit, t('Add effect'));
+ $this->drupalPostForm($style_path, ['new' => 'image_module_test_ajax'], t('Add'));
+ $this->drupalPostForm(NULL, $effect_edit, t('Add effect'));
+
+ // Load the saved image style.
+ $style = ImageStyle::load($style_name);
+
+ // Edit back the effects.
+ foreach ($style->getEffects() as $uuid => $effect) {
+ $effect_path = $admin_path . '/manage/' . $style_name . '/effects/' . $uuid;
+ $this->drupalGet($effect_path);
+ $page->findField('data[test_parameter]')->setValue(111);
+ $ajax_value = $page->find('css', '#ajax-value')->getText();
+ $this->assertSame('Ajax value bar', $ajax_value);
+ $this->getSession()->getPage()->pressButton('Ajax refresh');
+ $this->assertTrue($page->waitFor(10, function ($page) {
+ $ajax_value = $page->find('css', '#ajax-value')->getText();
+ return preg_match('/^Ajax value [0-9.]+ [0-9.]+$/', $ajax_value);
+ }));
+ $page->pressButton('Update effect');
+ $assert->pageTextContains('The image effect was successfully applied.');
+ }
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/FunctionalJavascript/ImageFieldTestBase.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/FunctionalJavascript/ImageFieldTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,72 @@
+profile !== 'standard') {
+ $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+ $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+ }
+
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer content types',
+ 'administer node fields',
+ 'administer nodes',
+ 'create article content',
+ 'edit any article content',
+ 'delete any article content',
+ 'administer image styles',
+ 'administer node display',
+ ]);
+ $this->drupalLogin($this->adminUser);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,82 @@
+randomMachineName());
+ $this->createImageField($field_name, 'article', ['cardinality' => -1]);
+
+ $this->drupalGet('node/add/article');
+ /** @var \Drupal\file\FileInterface[] $text_files */
+ $text_files = $this->drupalGetTestFiles('text');
+ $text_file = reset($text_files);
+
+ $field = $this->getSession()->getPage()->findField('files[' . $field_name . '_0][]');
+ $field->attachFile($this->container->get('file_system')->realpath($text_file->uri));
+ $this->assertSession()->waitForElement('css', '.messages--error');
+
+ $elements = $this->xpath('//div[contains(@class, :class)]', [
+ ':class' => 'messages--error',
+ ]);
+ $this->assertEqual(count($elements), 1, 'Ajax validation messages are displayed once.');
+ }
+
+ /**
+ * Tests that image field validation works with other form submit handlers.
+ */
+ public function testFriendlyAjaxValidation() {
+ // Add a custom field to the Article content type that contains an AJAX
+ // handler on a select field.
+ $field_storage = FieldStorageConfig::create([
+ 'field_name' => 'field_dummy_select',
+ 'type' => 'image_module_test_dummy_ajax',
+ 'entity_type' => 'node',
+ 'cardinality' => 1,
+ ]);
+ $field_storage->save();
+
+ $field = FieldConfig::create([
+ 'field_storage' => $field_storage,
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'field_name' => 'field_dummy_select',
+ 'label' => t('Dummy select'),
+ ])->save();
+
+ \Drupal::entityTypeManager()
+ ->getStorage('entity_form_display')
+ ->load('node.article.default')
+ ->setComponent(
+ 'field_dummy_select',
+ [
+ 'type' => 'image_module_test_dummy_ajax_widget',
+ 'weight' => 1,
+ ])
+ ->save();
+
+ // Then, add an image field.
+ $this->createImageField('field_dummy_image', 'article');
+
+ // Open an article and trigger the AJAX handler.
+ $this->drupalGet('node/add/article');
+ $id = $this->getSession()->getPage()->find('css', '[name="form_build_id"]')->getValue();
+ $field = $this->getSession()->getPage()->findField('field_dummy_select[select_widget]');
+ $field->setValue('bam');
+ // Make sure that the operation did not end with an exception.
+ $this->assertSession()->waitForElement('css', "[name='form_build_id']:not([value='$id'])");
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,232 @@
+installEntitySchema('entity_test');
+ $this->installEntitySchema('file');
+ $this->installSchema('file', ['file_usage']);
+ $this->installEntitySchema('user');
+
+ FieldStorageConfig::create([
+ 'entity_type' => 'entity_test',
+ 'field_name' => 'image_test',
+ 'type' => 'image',
+ 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+ ])->save();
+ FieldConfig::create([
+ 'entity_type' => 'entity_test',
+ 'field_name' => 'image_test',
+ 'bundle' => 'entity_test',
+ ])->save();
+ file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
+ $this->image = File::create([
+ 'uri' => 'public://example.jpg',
+ ]);
+ $this->image->save();
+ $this->imageFactory = $this->container->get('image.factory');
+ }
+
+ /**
+ * Tests usage of the image field formatters.
+ */
+ public function testImageFormatterTheme() {
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = $this->container->get('renderer');
+
+ // Create an image.
+ $files = $this->drupalGetTestFiles('image');
+ $file = reset($files);
+ $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
+
+ // Create a style.
+ $style = ImageStyle::create(['name' => 'test', 'label' => 'Test']);
+ $style->save();
+ $url = file_url_transform_relative($style->buildUrl($original_uri));
+
+ // Create a test entity with the image field set.
+ $entity = EntityTest::create();
+ $entity->image_test->target_id = $this->image->id();
+ $entity->image_test->alt = NULL;
+ $entity->image_test->uri = $original_uri;
+ $image = $this->imageFactory->get('public://example.jpg');
+ $entity->save();
+
+ // Create the base element that we'll use in the tests below.
+ $path = $this->randomMachineName();
+ $base_element = [
+ '#theme' => 'image_formatter',
+ '#image_style' => 'test',
+ '#item' => $entity->image_test,
+ '#url' => Url::fromUri('base:' . $path),
+ ];
+
+ // Test using theme_image_formatter() with a NULL value for the alt option.
+ $element = $base_element;
+ $this->setRawContent($renderer->renderRoot($element));
+ $elements = $this->xpath('//a[@href=:path]/img[@src=:url and @width=:width and @height=:height]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
+ $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders with a NULL value for the alt option.');
+
+ // Test using theme_image_formatter() without an image title, alt text, or
+ // link options.
+ $element = $base_element;
+ $element['#item']->alt = '';
+ $this->setRawContent($renderer->renderRoot($element));
+ $elements = $this->xpath('//a[@href=:path]/img[@src=:url and @width=:width and @height=:height and @alt=""]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
+ $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders without title, alt, or path options.');
+
+ // Link the image to a fragment on the page, and not a full URL.
+ $fragment = $this->randomMachineName();
+ $element = $base_element;
+ $element['#url'] = Url::fromRoute('
{% endfor %}
Resolve all issues below to continue the upgrade.
'));
+ foreach ($this->errors as $name => $message) {
$form_state->setErrorByName($name, $message);
}
- return;
}
+ }
- try {
- $connection = $this->getConnection($database);
- $version = (string) $this->getLegacyDrupalVersion($connection);
- if (!$version) {
- $form_state->setErrorByName($database['driver'] . '][0', $this->t('Source database does not contain a recognizable Drupal version.'));
+ /**
+ * The #element_validate handler for the source path elements.
+ *
+ * Ensures that entered path can be read.
+ */
+ public function validatePaths($element, FormStateInterface $form_state) {
+ if ($source = $element['#value']) {
+ $msg = $this->t('Unable to read from @title.', ['@title' => $element['#title']]);
+ if (UrlHelper::isExternal($source)) {
+ try {
+ $this->httpClient->head($source);
+ }
+ catch (TransferException $e) {
+ $this->errors[$element['#name']] = $msg . ' ' . $e->getMessage();
+ }
}
- elseif ($version !== (string) $form_state->getValue('version')) {
- $form_state->setErrorByName($database['driver'] . '][0', $this->t('Source database is Drupal version @version but version @selected was selected.', [
- '@version' => $version,
- '@selected' => $form_state->getValue('version'),
- ]));
+ elseif (!file_exists($source) || (!is_dir($source)) || (!is_readable($source))) {
+ $this->errors[$element['#name']] = $msg;
}
- else {
- // Setup migrations and save form data to private store.
- $this->setupMigrations($database, $form_state);
- }
- }
- catch (\Exception $e) {
- $error_message = [
- '#title' => $this->t('Resolve the issue below to continue the upgrade.'),
- '#theme' => 'item_list',
- '#items' => [$e->getMessage()],
- ];
- $form_state->setErrorByName($database['driver'] . '][0', $this->renderer->renderPlain($error_message));
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
--- a/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php Tue Jul 10 15:07:59 2018 +0100
@@ -237,7 +237,7 @@
// Add source_module and destination_module for modules that do not need an
// upgrade path and are enabled on the source site.
foreach ($this->noUpgradePaths[$version] as $extension) {
- if ($system_data['module'][$extension]['status']) {
+ if (isset($system_data['module'][$extension]) && $system_data['module'][$extension]['status']) {
$table_data[$extension]['core'][$extension] = $extension;
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -179,8 +179,8 @@
$this->drupalPostForm(NULL, [], t('Perform upgrade'));
$this->assertText(t('Congratulations, you upgraded Drupal!'));
- // Have to reset all the statics after migration to ensure entities are
- // loadable.
+ // Have to reset all the static caches after migration to ensure entities
+ // are loadable.
$this->resetAll();
$expected_counts = $this->getEntityCounts();
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,7 +2,6 @@
namespace Drupal\Tests\migrate_drupal_ui\Functional;
-use Drupal\migrate_drupal\MigrationConfigurationTrait;
use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;
/**
@@ -10,7 +9,6 @@
*/
abstract class MigrateUpgradeExecuteTestBase extends MigrateUpgradeTestBase {
- use MigrationConfigurationTrait;
use CreateTestContentEntitiesTrait;
/**
@@ -70,16 +68,35 @@
// Ensure submitting the form with invalid database credentials gives us a
// nice warning.
$this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
- $session->pageTextContains('Resolve the issue below to continue the upgrade.');
+ $session->pageTextContains('Resolve all issues below to continue the upgrade.');
$this->drupalPostForm(NULL, $edits, t('Review upgrade'));
// Ensure we get errors about missing modules.
- $session->pageTextContains(t('Resolve the issue below to continue the upgrade'));
+ $session->pageTextContains(t('Resolve all issues below to continue the upgrade.'));
$session->pageTextContains(t('The no_source_module plugin must define the source_module property.'));
// Uninstall the module causing the missing module error messages.
$this->container->get('module_installer')->uninstall(['migration_provider_test'], TRUE);
+ // Test the file sources.
+ $this->drupalGet('/upgrade');
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ if ($version == 6) {
+ $paths['d6_source_base_path'] = DRUPAL_ROOT . '/wrong-path';
+ }
+ else {
+ $paths['source_base_path'] = 'https://example.com/wrong-path';
+ $paths['source_private_file_path'] = DRUPAL_ROOT . '/wrong-path';
+ }
+ $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));
+ if ($version == 6) {
+ $session->responseContains('Unable to read from Files directory.');
+ }
+ else {
+ $session->responseContains('Unable to read from Public files directory.');
+ $session->responseContains('Unable to read from Private file directory.');
+ }
+
// Restart the upgrade process.
$this->drupalGet('/upgrade');
$session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeReviewPageTestBase.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeReviewPageTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeReviewPageTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,7 +2,6 @@
namespace Drupal\Tests\migrate_drupal_ui\Functional;
-use Drupal\migrate_drupal\MigrationConfigurationTrait;
use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;
/**
@@ -10,7 +9,6 @@
*/
abstract class MigrateUpgradeReviewPageTestBase extends MigrateUpgradeTestBase {
- use MigrationConfigurationTrait;
use CreateTestContentEntitiesTrait;
/**
@@ -112,6 +110,28 @@
$available_paths = $this->getAvailablePaths();
$missing_paths = $this->getMissingPaths();
$this->assertUpgradePaths($session, $available_paths, $missing_paths);
+
+ // Check there are no errors when a module in noUpgradePaths is not in the
+ // source system tables. Test with a module that is listed in noUpgradePaths
+ // for both Drupal 6 and Drupal 7.
+ // @see \Drupal\migrate_drupal_ui\Form\ReviewForm::$noUpgradePaths
+ $module = 'help';
+ $query = $this->sourceDatabase->delete('system');
+ $query->condition('type', 'module');
+ $query->condition('name', $module);
+ $query->execute();
+
+ // Start the upgrade process.
+ $this->drupalGet('/upgrade');
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+ $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
+
+ // Test the upgrade paths.
+ $available_paths = $this->getAvailablePaths();
+ $available_paths = array_diff($available_paths, [$module]);
+ $missing_paths = $this->getMissingPaths();
+ $this->assertUpgradePaths($session, $available_paths, $missing_paths);
}
/**
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -98,28 +98,6 @@
}
/**
- * Transforms a nested array into a flat array suitable for BrowserTestBase::drupalPostForm().
- *
- * @param array $values
- * A multi-dimensional form values array to convert.
- *
- * @return array
- * The flattened $edit array suitable for BrowserTestBase::drupalPostForm().
- */
- protected function translatePostValues(array $values) {
- $edit = [];
- // The easiest and most straightforward way to translate values suitable for
- // BrowserTestBase::drupalPostForm() is to actually build the POST data string
- // and convert the resulting key/value pairs back into a flat array.
- $query = http_build_query($values);
- foreach (explode('&', $query) as $item) {
- list($key, $value) = explode('=', $item);
- $edit[urldecode($key)] = urldecode($value);
- }
- return $edit;
- }
-
- /**
* Tests the displayed upgrade paths.
*
* @param \Drupal\Tests\WebAssert $session
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -89,6 +89,7 @@
'filefield_meta',
'help',
'i18n',
+ 'i18nmenu',
'i18nstrings',
'imageapi',
'imageapi_gd',
@@ -123,7 +124,6 @@
'i18nblocks',
'i18ncck',
'i18ncontent',
- 'i18nmenu',
'i18npoll',
'i18nprofile',
'i18nsync',
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,6 +2,7 @@
namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
+use Drupal\node\Entity\Node;
use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
use Drupal\user\Entity\User;
@@ -63,12 +64,12 @@
'contact_form' => 5,
'configurable_language' => 5,
'editor' => 2,
- 'field_config' => 84,
- 'field_storage_config' => 58,
+ 'field_config' => 89,
+ 'field_storage_config' => 63,
'file' => 8,
'filter_format' => 7,
'image_style' => 5,
- 'language_content_settings' => 2,
+ 'language_content_settings' => 3,
'migration' => 105,
'node' => 17,
// The 'book' module provides the 'book' node type, and the migration
@@ -85,12 +86,12 @@
'tour' => 4,
'user' => 7,
'user_role' => 6,
- 'menu_link_content' => 5,
+ 'menu_link_content' => 10,
'view' => 16,
'date_format' => 11,
'entity_form_display' => 29,
'entity_form_mode' => 1,
- 'entity_view_display' => 53,
+ 'entity_view_display' => 55,
'entity_view_mode' => 14,
'base_field_override' => 38,
];
@@ -103,10 +104,10 @@
$counts = $this->getEntityCounts();
$counts['block_content'] = 3;
$counts['comment'] = 7;
- $counts['entity_view_display'] = 53;
+ $counts['entity_view_display'] = 55;
$counts['entity_view_mode'] = 14;
$counts['file'] = 9;
- $counts['menu_link_content'] = 6;
+ $counts['menu_link_content'] = 11;
$counts['node'] = 18;
$counts['taxonomy_term'] = 9;
$counts['user'] = 8;
@@ -131,6 +132,7 @@
'filefield',
'filter',
'forum',
+ 'i18nmenu',
'i18ntaxonomy',
'imagecache',
'imagefield',
@@ -175,7 +177,6 @@
'i18nblocks',
'i18ncck',
'i18ncontent',
- 'i18nmenu',
// This module is in the missing path list because it is installed on the
// source site but it is not installed on the destination site.
'i18nprofile',
@@ -192,6 +193,26 @@
$user = User::load(2);
$user->passRaw = 'john.doe_pass';
$this->drupalLogin($user);
+ $this->assertFollowUpMigrationResults();
+ }
+
+ /**
+ * Tests that follow-up migrations have been run successfully.
+ */
+ protected function assertFollowUpMigrationResults() {
+ $node = Node::load(10);
+ $this->assertSame('12', $node->get('field_reference')->target_id);
+ $this->assertSame('12', $node->get('field_reference_2')->target_id);
+ $translation = $node->getTranslation('fr');
+ $this->assertSame('12', $translation->get('field_reference')->target_id);
+ $this->assertSame('12', $translation->get('field_reference_2')->target_id);
+
+ $node = Node::load(12)->getTranslation('en');
+ $this->assertSame('10', $node->get('field_reference')->target_id);
+ $this->assertSame('10', $node->get('field_reference_2')->target_id);
+ $translation = $node->getTranslation('fr');
+ $this->assertSame('10', $translation->get('field_reference')->target_id);
+ $this->assertSame('10', $translation->get('field_reference_2')->target_id);
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -34,11 +34,14 @@
return [
'aggregator',
'block',
+ 'book',
+ 'color',
'comment',
'contact',
'date',
'dblog',
'email',
+ 'entity_translation',
'field',
'field_sql_storage',
'file',
@@ -115,8 +118,6 @@
*/
protected function getMissingPaths() {
return [
- 'book',
- 'color',
'rdf',
'views',
];
diff -r e200cb7efeb3 -r c2387f117808 core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,6 +2,7 @@
namespace Drupal\Tests\migrate_drupal_ui\Functional\d7;
+use Drupal\node\Entity\Node;
use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
use Drupal\user\Entity\User;
@@ -65,12 +66,12 @@
'configurable_language' => 4,
'contact_form' => 3,
'editor' => 2,
- 'field_config' => 63,
- 'field_storage_config' => 46,
+ 'field_config' => 66,
+ 'field_storage_config' => 49,
'file' => 3,
'filter_format' => 7,
'image_style' => 6,
- 'language_content_settings' => 2,
+ 'language_content_settings' => 6,
'migration' => 73,
'node' => 5,
'node_type' => 6,
@@ -85,7 +86,7 @@
'tour' => 4,
'user' => 4,
'user_role' => 3,
- 'menu_link_content' => 8,
+ 'menu_link_content' => 12,
'view' => 16,
'date_format' => 11,
'entity_form_display' => 17,
@@ -104,7 +105,7 @@
$counts['block_content'] = 2;
$counts['comment'] = 2;
$counts['file'] = 4;
- $counts['menu_link_content'] = 9;
+ $counts['menu_link_content'] = 13;
$counts['node'] = 6;
$counts['taxonomy_term'] = 19;
$counts['user'] = 5;
@@ -118,12 +119,15 @@
return [
'aggregator',
'block',
+ 'book',
+ 'color',
'comment',
'contact',
'date',
'dblog',
'email',
'entityreference',
+ 'entity_translation',
'field',
'field_sql_storage',
'file',
@@ -169,8 +173,6 @@
*/
protected function getMissingPaths() {
return [
- 'book',
- 'color',
'rdf',
// These modules are in the missing path list because they are installed
// on the source site but they are not installed on the destination site.
@@ -190,6 +192,27 @@
$user = User::load(2);
$user->passRaw = 'a password';
$this->drupalLogin($user);
+ $this->assertFollowUpMigrationResults();
+ }
+
+ /**
+ * Tests that follow-up migrations have been run successfully.
+ */
+ protected function assertFollowUpMigrationResults() {
+ $node = Node::load(2);
+ $this->assertSame('4', $node->get('field_reference')->target_id);
+ $this->assertSame('4', $node->get('field_reference_2')->target_id);
+ $translation = $node->getTranslation('is');
+ $this->assertSame('4', $translation->get('field_reference')->target_id);
+ $this->assertSame('4', $translation->get('field_reference_2')->target_id);
+
+ $node = Node::load(4);
+ $this->assertSame('2', $node->get('field_reference')->target_id);
+ $this->assertSame('2', $node->get('field_reference_2')->target_id);
+ $translation = $node->getTranslation('en');
+ $this->assertSame('2', $translation->get('field_reference')->target_id);
+ $this->assertSame('2', $translation->get('field_reference_2')->target_id);
+
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/migrations/d6_node_translation.yml
--- a/core/modules/node/migrations/d6_node_translation.yml Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/migrations/d6_node_translation.yml Tue Jul 10 15:07:59 2018 +0100
@@ -2,7 +2,9 @@
label: Node translations
migration_tags:
- Drupal 6
+ - translation
- Content
+class: Drupal\node\Plugin\migrate\D6NodeTranslation
deriver: Drupal\node\Plugin\migrate\D6NodeDeriver
source:
plugin: d6_node
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/migrations/d7_node_translation.yml
--- a/core/modules/node/migrations/d7_node_translation.yml Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/migrations/d7_node_translation.yml Tue Jul 10 15:07:59 2018 +0100
@@ -4,6 +4,7 @@
- Drupal 7
- translation
- Content
+class: Drupal\node\Plugin\migrate\D7NodeTranslation
deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
source:
plugin: d7_node
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/node.module
--- a/core/modules/node/node.module Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/node.module Tue Jul 10 15:07:59 2018 +0100
@@ -806,7 +806,7 @@
* the global content language of the current request.
*
* @return array
- * An array as expected by drupal_render().
+ * An array as expected by \Drupal\Core\Render\RendererInterface::render().
*/
function node_view(NodeInterface $node, $view_mode = 'full', $langcode = NULL) {
return entity_view($node, $view_mode, $langcode);
@@ -824,7 +824,8 @@
* content language of the current request.
*
* @return array
- * An array in the format expected by drupal_render().
+ * An array in the format expected by
+ * \Drupal\Core\Render\RendererInterface::render().
*/
function node_view_multiple($nodes, $view_mode = 'teaser', $langcode = NULL) {
return entity_view_multiple($nodes, $view_mode, $langcode);
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/src/Controller/NodeController.php
--- a/core/modules/node/src/Controller/NodeController.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/src/Controller/NodeController.php Tue Jul 10 15:07:59 2018 +0100
@@ -122,7 +122,7 @@
* The node revision ID.
*
* @return array
- * An array suitable for drupal_render().
+ * An array suitable for \Drupal\Core\Render\RendererInterface::render().
*/
public function revisionShow($node_revision) {
$node = $this->entityManager()->getStorage('node')->loadRevision($node_revision);
@@ -154,7 +154,7 @@
* A node object.
*
* @return array
- * An array as expected by drupal_render().
+ * An array as expected by \Drupal\Core\Render\RendererInterface::render().
*/
public function revisionOverview(NodeInterface $node) {
$account = $this->currentUser();
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/src/Form/NodeRevisionRevertForm.php
--- a/core/modules/node/src/Form/NodeRevisionRevertForm.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php Tue Jul 10 15:07:59 2018 +0100
@@ -128,6 +128,7 @@
$this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
$this->revision->revision_log = t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]);
+ $this->revision->setRevisionUserId($this->currentUser()->id());
$this->revision->setRevisionCreationTime($this->time->getRequestTime());
$this->revision->setChangedTime($this->time->getRequestTime());
$this->revision->save();
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/src/Plugin/migrate/D6NodeTranslation.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/src/Plugin/migrate/D6NodeTranslation.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,21 @@
+migrationPluginManager->clearCachedDefinitions();
+ return $this->migrationPluginManager->createInstances('d6_entity_reference_translation');
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/src/Plugin/migrate/D7NodeTranslation.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/src/Plugin/migrate/D7NodeTranslation.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,21 @@
+migrationPluginManager->clearCachedDefinitions();
+ return $this->migrationPluginManager->createInstances('d7_entity_reference_translation');
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/src/Tests/NodeRevisionsTest.php
--- a/core/modules/node/src/Tests/NodeRevisionsTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/src/Tests/NodeRevisionsTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -109,8 +109,8 @@
$node->untranslatable_string_field->value = $this->randomString();
$node->setNewRevision();
- // Edit the 2nd revision with a different user.
- if ($i == 1) {
+ // Edit the 1st and 2nd revision with a different user.
+ if ($i < 2) {
$editor = $this->drupalCreateUser();
$node->setRevisionUserId($editor->id());
}
@@ -179,6 +179,10 @@
$node_storage->resetCache([$node->id()]);
$reverted_node = $node_storage->load($node->id());
$this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.');
+ // Confirm the revision author is the user performing the revert.
+ $this->assertTrue($reverted_node->getRevisionUserId() == $this->loggedInUser->id(), 'Node revision author is user performing revert.');
+ // And that its not the revision author.
+ $this->assertTrue($reverted_node->getRevisionUserId() != $nodes[1]->getRevisionUserId(), 'Node revision author is not original revision author.');
// Confirm that this is not the default version.
$node = node_revision_load($node->getRevisionId());
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml Tue Jul 10 15:07:59 2018 +0100
@@ -202,7 +202,7 @@
hide_empty: false
empty_zero: false
hide_alter_empty: true
- text: 'Link to delete revision'
+ text: 'Link to revert revision'
entity_type: node
plugin_id: node_revision_link_revert
filters: { }
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Hal/NodeHalJsonAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Hal/NodeHalJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,111 @@
+applyHalFieldNormalization($default_normalization);
+
+ $author = User::load($this->entity->getOwnerId());
+ return $normalization + [
+ '_links' => [
+ 'self' => [
+ 'href' => $this->baseUrl . '/llama?_format=hal_json',
+ ],
+ 'type' => [
+ 'href' => $this->baseUrl . '/rest/type/node/camelids',
+ ],
+ $this->baseUrl . '/rest/relation/node/camelids/revision_uid' => [
+ [
+ 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
+ ],
+ ],
+ $this->baseUrl . '/rest/relation/node/camelids/uid' => [
+ [
+ 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
+ 'lang' => 'en',
+ ],
+ ],
+ ],
+ '_embedded' => [
+ $this->baseUrl . '/rest/relation/node/camelids/revision_uid' => [
+ [
+ '_links' => [
+ 'self' => [
+ 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
+ ],
+ 'type' => [
+ 'href' => $this->baseUrl . '/rest/type/user/user',
+ ],
+ ],
+ 'uuid' => [
+ ['value' => $author->uuid()]
+ ],
+ ],
+ ],
+ $this->baseUrl . '/rest/relation/node/camelids/uid' => [
+ [
+ '_links' => [
+ 'self' => [
+ 'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
+ ],
+ 'type' => [
+ 'href' => $this->baseUrl . '/rest/type/user/user',
+ ],
+ ],
+ 'uuid' => [
+ ['value' => $author->uuid()]
+ ],
+ 'lang' => 'en',
+ ],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getNormalizedPostEntity() {
+ return parent::getNormalizedPostEntity() + [
+ '_links' => [
+ 'type' => [
+ 'href' => $this->baseUrl . '/rest/type/node/camelids',
+ ],
+ ],
+ ];
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Hal/NodeHalJsonBasicAuthTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Hal/NodeHalJsonBasicAuthTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,24 @@
+drupalCreateContentType([
+ 'type' => 'page',
+ 'name' => 'Basic page',
+ 'display_submitted' => FALSE,
+ ]);
+
+ // Grant create and editing permissions to anonymous user:
+ $anonymous_role = Role::load(AccountInterface::ANONYMOUS_ROLE);
+ $anonymous_role->grantPermission('create page content');
+ $anonymous_role->save();
+ }
+
+ /**
+ * Checks the node preview functionality for anonymous users.
+ */
+ public function testAnonymousPagePreview() {
+
+ $title_key = 'title[0][value]';
+ $body_key = 'body[0][value]';
+
+ // Fill in node creation form and preview node.
+ $edit = [
+ $title_key => $this->randomMachineName(),
+ $body_key => $this->randomMachineName()
+ ];
+ $this->drupalPostForm('node/add/page', $edit, t('Preview'));
+
+ // Check that the preview is displaying the title, body and term.
+ $this->assertSession()->linkExists(t('Back to content editing'));
+ $this->assertSession()->responseContains($edit[$body_key]);
+ $this->assertSession()->titleEquals($edit[$title_key] . ' | Drupal');
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
--- a/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -27,6 +27,13 @@
protected $revisionLogs;
/**
+ * An arbitrary user for revision authoring.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $revisionUser;
+
+ /**
* {@inheritdoc}
*/
protected function setUp() {
@@ -47,6 +54,10 @@
// Create an initial node.
$node = $this->drupalCreateNode();
+ // Create a user for revision authoring.
+ // This must be different from user performing revert.
+ $this->revisionUser = $this->drupalCreateUser();
+
$settings = get_object_vars($node);
$settings['revision'] = 1;
@@ -86,6 +97,8 @@
'format' => filter_default_format(),
];
$node->setNewRevision();
+ // Ensure the revision author is a different user.
+ $node->setRevisionUserId($this->revisionUser->id());
$node->save();
return $node;
@@ -141,6 +154,11 @@
$reverted_node = $node_storage->load($node->id());
$this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.');
+ // Confirm the revision author is the user performing the revert.
+ $this->assertTrue($reverted_node->getRevisionUserId() == $this->loggedInUser->id(), 'Node revision author is user performing revert.');
+ // And that its not the revision author.
+ $this->assertTrue($reverted_node->getRevisionUserId() != $this->revisionUser->id(), 'Node revision author is not original revision author.');
+
// Confirm that this is not the current version.
$node = node_revision_load($node->getRevisionId());
$this->assertFalse($node->isDefaultRevision(), 'Third node revision is not the current one.');
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
--- a/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -83,6 +83,11 @@
protected function installParameters() {
$parameters = parent::installParameters();
$parameters['parameters']['langcode'] = $this->defaultLangcode;
+ // Create an empty po file so we don't attempt to download one from
+ // localize.drupal.org. It does not need to match the version exactly as the
+ // multi-lingual system will fallback.
+ \Drupal::service('file_system')->mkdir($this->publicFilesDirectory . '/translations', NULL, TRUE);
+ file_put_contents($this->publicFilesDirectory . "/translations/drupal-8.0.0.{$this->defaultLangcode}.po", '');
return $parameters;
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Rest/NodeJsonAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Rest/NodeJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,24 @@
+grantPermissionsToTestedRole(['access content']);
+ break;
+ case 'POST':
+ $this->grantPermissionsToTestedRole(['access content', 'create camelids content']);
+ break;
+ case 'PATCH':
+ // Do not grant the 'create url aliases' permission to test the case
+ // when the path field is protected/not accessible, see
+ // \Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase
+ // for a positive test.
+ $this->grantPermissionsToTestedRole(['access content', 'edit any camelids content']);
+ break;
+ case 'DELETE':
+ $this->grantPermissionsToTestedRole(['access content', 'delete any camelids content']);
+ break;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function createEntity() {
+ if (!NodeType::load('camelids')) {
+ // Create a "Camelids" node type.
+ NodeType::create([
+ 'name' => 'Camelids',
+ 'type' => 'camelids',
+ ])->save();
+ }
+
+ // Create a "Llama" node.
+ $node = Node::create(['type' => 'camelids']);
+ $node->setTitle('Llama')
+ ->setOwnerId(static::$auth ? $this->account->id() : 0)
+ ->setPublished(TRUE)
+ ->setCreatedTime(123456789)
+ ->setChangedTime(123456789)
+ ->setRevisionCreationTime(123456789)
+ ->set('path', '/llama')
+ ->save();
+
+ return $node;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedNormalizedEntity() {
+ $author = User::load($this->entity->getOwnerId());
+ return [
+ 'nid' => [
+ ['value' => 1],
+ ],
+ 'uuid' => [
+ ['value' => $this->entity->uuid()],
+ ],
+ 'vid' => [
+ ['value' => 1],
+ ],
+ 'langcode' => [
+ [
+ 'value' => 'en',
+ ],
+ ],
+ 'type' => [
+ [
+ 'target_id' => 'camelids',
+ 'target_type' => 'node_type',
+ 'target_uuid' => NodeType::load('camelids')->uuid(),
+ ],
+ ],
+ 'title' => [
+ [
+ 'value' => 'Llama',
+ ],
+ ],
+ 'status' => [
+ [
+ 'value' => TRUE,
+ ],
+ ],
+ 'created' => [
+ $this->formatExpectedTimestampItemValues(123456789),
+ ],
+ 'changed' => [
+ $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()),
+ ],
+ 'promote' => [
+ [
+ 'value' => TRUE,
+ ],
+ ],
+ 'sticky' => [
+ [
+ 'value' => FALSE,
+ ],
+ ],
+ 'revision_timestamp' => [
+ $this->formatExpectedTimestampItemValues(123456789),
+ ],
+ 'revision_translation_affected' => [
+ [
+ 'value' => TRUE,
+ ],
+ ],
+ 'default_langcode' => [
+ [
+ 'value' => TRUE,
+ ],
+ ],
+ 'uid' => [
+ [
+ 'target_id' => (int) $author->id(),
+ 'target_type' => 'user',
+ 'target_uuid' => $author->uuid(),
+ 'url' => base_path() . 'user/' . $author->id(),
+ ],
+ ],
+ 'revision_uid' => [
+ [
+ 'target_id' => (int) $author->id(),
+ 'target_type' => 'user',
+ 'target_uuid' => $author->uuid(),
+ 'url' => base_path() . 'user/' . $author->id(),
+ ],
+ ],
+ 'revision_log' => [],
+ 'path' => [
+ [
+ 'alias' => '/llama',
+ 'pid' => 1,
+ 'langcode' => 'en',
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getNormalizedPostEntity() {
+ return [
+ 'type' => [
+ [
+ 'target_id' => 'camelids',
+ ],
+ ],
+ 'title' => [
+ [
+ 'value' => 'Dramallama',
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedUnauthorizedAccessMessage($method) {
+ if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+ return parent::getExpectedUnauthorizedAccessMessage($method);
+ }
+
+ if ($method === 'GET' || $method == 'PATCH' || $method == 'DELETE') {
+ return "The 'access content' permission is required.";
+ }
+ return parent::getExpectedUnauthorizedAccessMessage($method);
+ }
+
+ /**
+ * Tests PATCHing a node's path with and without 'create url aliases'.
+ *
+ * For a positive test, see the similar test coverage for Term.
+ *
+ * @see \Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase::testPatchPath()
+ */
+ public function testPatchPath() {
+ $this->initAuthentication();
+ $this->provisionEntityResource();
+ $this->setUpAuthorization('GET');
+ $this->setUpAuthorization('PATCH');
+
+ $url = $this->getEntityResourceUrl()->setOption('query', ['_format' => static::$format]);
+
+ // GET node's current normalization.
+ $response = $this->request('GET', $url, $this->getAuthenticationRequestOptions('GET'));
+ $normalization = $this->serializer->decode((string) $response->getBody(), static::$format);
+
+ // Change node's path alias.
+ $normalization['path'][0]['alias'] .= 's-rule-the-world';
+
+ // Create node PATCH request.
+ $request_options = [];
+ $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
+ $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('PATCH'));
+ $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
+
+ // PATCH request: 403 when creating URL aliases unauthorized. Before
+ // asserting the 403 response, assert that the stored path alias remains
+ // unchanged.
+ $response = $this->request('PATCH', $url, $request_options);
+ $this->assertSame('/llama', $this->entityStorage->loadUnchanged($this->entity->id())->get('path')->alias);
+ $this->assertResourceErrorResponse(403, "Access denied on updating field 'path'.", $response);
+
+ // Grant permission to create URL aliases.
+ $this->grantPermissionsToTestedRole(['create url aliases']);
+
+ // Repeat PATCH request: 200.
+ $response = $this->request('PATCH', $url, $request_options);
+ $this->assertResourceResponse(200, FALSE, $response);
+ $updated_normalization = $this->serializer->decode((string) $response->getBody(), static::$format);
+ $this->assertSame($normalization['path'], $updated_normalization['path']);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Rest/NodeTypeJsonAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Rest/NodeTypeJsonAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,24 @@
+grantPermissionsToTestedRole(['administer content types', 'access content']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function createEntity() {
+ // Create a "Camelids" node type.
+ $camelids = NodeType::create([
+ 'name' => 'Camelids',
+ 'type' => 'camelids',
+ 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+ ]);
+
+ $camelids->save();
+
+ return $camelids;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedNormalizedEntity() {
+ return [
+ 'dependencies' => [],
+ 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+ 'display_submitted' => TRUE,
+ 'help' => NULL,
+ 'langcode' => 'en',
+ 'name' => 'Camelids',
+ 'new_revision' => TRUE,
+ 'preview_mode' => 1,
+ 'status' => TRUE,
+ 'type' => 'camelids',
+ 'uuid' => $this->entity->uuid(),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getNormalizedPostEntity() {
+ // @todo Update in https://www.drupal.org/node/2300677.
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getExpectedUnauthorizedAccessMessage($method) {
+ if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+ return parent::getExpectedUnauthorizedAccessMessage($method);
+ }
+
+ return "The 'access content' permission is required.";
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Rest/NodeTypeXmlAnonTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Rest/NodeTypeXmlAnonTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,26 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Rest/NodeXmlBasicAuthTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Rest/NodeXmlBasicAuthTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,44 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Functional/Rest/NodeXmlCookieTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/modules/node/tests/src/Functional/Rest/NodeXmlCookieTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,39 @@
+markTestSkipped();
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -94,6 +94,10 @@
$this->assertCount(2, $node->field_company);
$this->assertSame('Klingon Empire', $node->field_company[0]->entity->label());
$this->assertSame('Romulan Empire', $node->field_company[1]->entity->label());
+ $this->assertCount(1, $node->field_company_2);
+ $this->assertSame('Klingon Empire', $node->field_company_2[0]->entity->label());
+ $this->assertCount(1, $node->field_company_3);
+ $this->assertSame('Romulan Empire', $node->field_company_3[0]->entity->label());
// Test that user reference field values were migrated.
$this->assertCount(1, $node->field_commander);
@@ -223,7 +227,7 @@
$default_connection = \Drupal::database();
$default_connection->truncate($table_name)->execute();
if ($new_row) {
- $hash = $migration->getIdMap()->getSourceIDsHash(['nid' => $new_row['sourceid1']]);
+ $hash = $migration->getIdMap()->getSourceIdsHash(['nid' => $new_row['sourceid1']]);
$new_row['source_ids_hash'] = $hash;
$default_connection->insert($table_name)
->fields($new_row)
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -38,7 +38,7 @@
$this->assertIdentical(TRUE, $node_type_page->displaySubmitted());
$this->assertIdentical(FALSE, $node_type_page->isNewRevision());
$this->assertIdentical(DRUPAL_OPTIONAL, $node_type_page->getPreviewMode());
- $this->assertIdentical($id_map->lookupDestinationID(['test_page']), ['test_page']);
+ $this->assertIdentical($id_map->lookupDestinationId(['test_page']), ['test_page']);
// Test we have a body field.
$field = FieldConfig::loadByName('node', 'test_page', 'body');
@@ -57,7 +57,7 @@
$this->assertIdentical(TRUE, $node_type_story->displaySubmitted());
$this->assertIdentical(FALSE, $node_type_story->isNewRevision());
$this->assertIdentical(DRUPAL_OPTIONAL, $node_type_story->getPreviewMode());
- $this->assertIdentical($id_map->lookupDestinationID(['test_story']), ['test_story']);
+ $this->assertIdentical($id_map->lookupDestinationId(['test_story']), ['test_story']);
// Test we don't have a body field.
$field = FieldConfig::loadByName('node', 'test_story', 'body');
@@ -76,7 +76,7 @@
$this->assertIdentical(TRUE, $node_type_event->displaySubmitted());
$this->assertIdentical(TRUE, $node_type_event->isNewRevision());
$this->assertIdentical(DRUPAL_OPTIONAL, $node_type_event->getPreviewMode());
- $this->assertIdentical($id_map->lookupDestinationID(['test_event']), ['test_event']);
+ $this->assertIdentical($id_map->lookupDestinationId(['test_event']), ['test_event']);
// Test we have a body field.
$field = FieldConfig::loadByName('node', 'test_event', 'body');
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -29,7 +29,7 @@
$this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
$this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
// Test the ID map.
- $this->assertIdentical(['node', 'preview'], $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationID([1]));
+ $this->assertIdentical(['node', 'preview'], $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationId([1]));
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -72,6 +72,18 @@
}
/**
+ * {@inheritdoc}
+ */
+ protected function getFileMigrationInfo() {
+ return [
+ 'path' => 'public://sites/default/files/cube.jpeg',
+ 'size' => '3620',
+ 'base_path' => 'public://',
+ 'plugin_id' => 'd7_file',
+ ];
+ }
+
+ /**
* Asserts various aspects of a node.
*
* @param string $id
@@ -164,6 +176,7 @@
$this->assertEquals('default@example.com', $node->field_email->value);
$this->assertEquals('another@example.com', $node->field_email[1]->value);
$this->assertEquals(CommentItemInterface::OPEN, $node->comment_node_test_content_type->status);
+ $this->assertEquals('3.1416', $node->field_float_list[0]->value);
$node = Node::load(2);
$this->assertEquals('en', $node->langcode->value);
diff -r e200cb7efeb3 -r c2387f117808 core/modules/options/src/Plugin/migrate/field/d7/ListField.php
--- a/core/modules/options/src/Plugin/migrate/field/d7/ListField.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/options/src/Plugin/migrate/field/d7/ListField.php Tue Jul 10 15:07:59 2018 +0100
@@ -11,6 +11,7 @@
* "list_boolean" = "boolean",
* "list_integer" = "list_integer",
* "list_text" = "list_string",
+ * "list_float" = "list_float",
* },
* core = {7},
* source_module = "list",
diff -r e200cb7efeb3 -r c2387f117808 core/modules/path/src/Controller/PathController.php
--- a/core/modules/path/src/Controller/PathController.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/path/src/Controller/PathController.php Tue Jul 10 15:07:59 2018 +0100
@@ -59,7 +59,8 @@
* The request object.
*
* @return array
- * A render array as expected by drupal_render().
+ * A render array as expected by
+ * \Drupal\Core\Render\RendererInterface::render().
*/
public function adminOverview(Request $request) {
$keys = $request->query->get('search');
diff -r e200cb7efeb3 -r c2387f117808 core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
--- a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -68,7 +68,7 @@
];
$path = \Drupal::service('path.alias_storage')->load($conditions);
$this->assertPath('1', $conditions, $path);
- $this->assertIdentical($id_map->lookupDestinationID([$path['pid']]), ['1'], "Test IdMap");
+ $this->assertIdentical($id_map->lookupDestinationId([$path['pid']]), ['1'], "Test IdMap");
$conditions = [
'source' => '/node/2',
diff -r e200cb7efeb3 -r c2387f117808 core/modules/rdf/src/Tests/CommentAttributesTest.php
--- a/core/modules/rdf/src/Tests/CommentAttributesTest.php Thu Apr 26 11:26:54 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,376 +0,0 @@
- TRUE,
- 'post comments' => TRUE,
- 'skip comment approval' => TRUE,
- ]);
- // Allows anonymous to leave their contact information.
- $this->setCommentAnonymous(COMMENT_ANONYMOUS_MAY_CONTACT);
- $this->setCommentPreview(DRUPAL_OPTIONAL);
- $this->setCommentForm(TRUE);
- $this->setCommentSubject(TRUE);
- $this->setCommentSettings('comment_default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
-
- // Prepares commonly used URIs.
- $this->baseUri = \Drupal::url('Your cake failed to rise
+Your cake is chewy and tough
+Your cookies burned
+Split top to your cake or bread
+The dreaded soggy bottom
+Your pastry has shrunk
+
+
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/crema-catalana-umami.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/crema-catalana-umami.html Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,9 @@
+
+
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/modules/demo_umami_content/default_content/recipes.csv
--- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipes.csv Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipes.csv Tue Jul 10 15:07:59 2018 +0100
@@ -6,3 +6,5 @@
Victoria sponge cake,victoria-sponge-umami.jpg,"A classic, uncut Victoria sponge with a deep filling of butter cream and jam","A traditional Victoria sponge cake, perfect for any afternoon with a cup of tea.",Umami,Desert,20,20,40,easy,"225g butter or margarine,225g caster sugar,225g self-raising flour,4 eggs,1 tsp baking powder,3 tbsp of jam for the filling,Icing sugar to dust the top,Cream to serve",victoria-sponge-umami.html,10,Cake,recipes/victoria-sponge-cake
Gluten free pizza,pizza-umami.jpg,"Olives, basil, and mozzarella top a gluten free pizza crust with marinara sauce.","A gorgeous and simple gluten free pizza, with deliciously indulgent mozzeralla and Parma ham. Can easily be vegetarian by leaving out the ham.",Umami,Main course,15,15,30,,"400g gluten free flour, 125ml warm water, 125ml milk, 1 sachet dried yeast, 2 tsp sugar, 1 tsp salt, 2 tbsp olive oil, 4 tbsp tomato puree, 1 garlic clove, Fresh basil, 200g mozzarella, 100g rocket, 5 slices Parma ham",pizza-umami.html,4,,recipes/gluten-free-pizza
Thai green curry,thai-green-curry-umami.jpg,"A traditional bowl of creamy, aromatic Thai green curry with chunks of chicken in a small bowl with jasmine rice.",A quick and easy version of the classic Thai green curry. Perfect for a midweek meal!,Umami,Main course,10,15,25,,"400g coconut milk, 400g chicken or tofu, 1 tbsp Thai green curry paste, 1 garlic clove, 2 tsp fish sauce, 400g mushrooms, 200g green beans, Fresh coriander leaves, Jasmine rice",thai-green-curry-umami.html,4,,recipes/thai-green-curry
+Crema catalana,crema-catalana-umami.jpg,"Typical Catalan dessert made from cream and egg yolks, covered with a traditional layer of caramelized sugar to provide a crispy contrast.",Enjoy this sweet recipe for one of the oldest desserts in Europe. It requires very few ingredients!,Umami,Dessert,10,20,30,,"1l milk, 200g sugar, 6 egg yolks, 30g cornstarch, 1 cinnamon stick, 1 piece lemon peel",crema-catalana-umami.html,8,"Egg, Vegetarian",recipes/crema-catalana
+Fiery chili sauce,chili-sauce-umami.jpg,"An iridescent array of chilies, onions, and garlic, slowly sweating over a low heat","A rich and fiery chili sauce. Take care when handling chili peppers. And serve sparingly!",Umami,Accompaniment,10,50,60,easy,"2 red onions, 1 lemon, 2 limes, 250ml malt vinegar, 7 garlic cloves, 1 green bell pepper, 1 red bell pepper, 800g cherry tomatoes, 30 mixed chilies, Olive oil, 1 tbsp ground black pepper, 1 tbsp brown sugar",chili-sauce-umami.html,60,Vegetarian,recipes/fiery-chili-sauce
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/base.css
--- a/core/profiles/demo_umami/themes/umami/css/base.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/base.css Tue Jul 10 15:07:59 2018 +0100
@@ -22,6 +22,7 @@
background-color: #e6eee0;
color: #444;
text-decoration: none;
+ outline-offset: 1px;
}
body {
@@ -71,7 +72,6 @@
font-family: 'Scope One', Georgia, serif;
font-size: 1.2rem;
font-weight: 400;
- font-weight: normal;
transition: background-color 0.5s ease;
}
button:hover,
@@ -218,7 +218,7 @@
color: #464646;
display: block;
font-size: 1rem;
- font-weight: bold;
+ font-weight: 700;
margin: 0.25rem 0;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css Tue Jul 10 15:07:59 2018 +0100
@@ -35,7 +35,6 @@
font-family: 'Scope One', Georgia, serif;
font-size: 1.2rem;
font-weight: 400;
- font-weight: normal;
transition: background-color 0.5s ease;
}
@@ -43,8 +42,8 @@
.block-type-banner-block .field--name-field-content-link a:hover {
background-color: #00836d;
color: #fff;
- outline: 2px solid currentColor;
- outline-offset: -2px;
+ box-shadow: 0 0 0 2px currentColor inset;
+ outline: none;
}
/* 768px */
@@ -62,6 +61,7 @@
margin: 0 auto;
display: flex;
padding: 0 1em;
+ height: 0; /* Required for flexbox vertical centering in IE11. Min-height will take precedence. */
min-height: 43vw;
align-items: center;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css Tue Jul 10 15:07:59 2018 +0100
@@ -9,7 +9,7 @@
.block-type-footer-promo-block .block__title {
font-size: 1.5rem;
- font-weight: normal;
+ font-weight: 400;
}
.block-type-footer-promo-block .footer-promo-content {
@@ -18,17 +18,14 @@
.block-type-footer-promo-block .footer-promo-content a {
background-color: inherit;
- display: block;
color: #fff;
- font-weight: bold;
- text-decoration: none;
+ font-weight: 700;
}
.block-type-footer-promo-block .footer-promo-content a:active,
.block-type-footer-promo-block .footer-promo-content a:focus,
.block-type-footer-promo-block .footer-promo-content a:hover {
background-color: transparent;
- text-decoration: underline;
}
.block-type-footer-promo-block .footer-promo-content a:after {
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/search/search.css Tue Jul 10 15:07:59 2018 +0100
@@ -67,6 +67,7 @@
margin-top: 0;
margin-bottom: 0;
}
+
.form-search {
width: 20em;
max-width: calc(100vw - 6.25em);
@@ -79,9 +80,9 @@
font-size: 0.875rem;
line-height: normal;
background: url(../../../../images/svg/search.svg) no-repeat 0.5em center #fff;
- background-size: 1.5em;
color: #464646;
}
+
.form-search:focus {
outline: none;
margin: 0 0 -2px -2px;
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css
--- a/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/content-types/recipe/recipe.css Tue Jul 10 15:07:59 2018 +0100
@@ -36,7 +36,8 @@
.node--type-recipe.node--view-mode-full .layout__region--top-first,
.node--type-recipe.node--view-mode-full .layout__region--top-second {
- flex: 0 0 calc(50% - 1rem);
+ flex: 0 0;
+ flex-basis: calc(50% - 1rem); /* fixed IE11 bug calc in shorthand */
}
/* Recipe meta */
@@ -98,13 +99,13 @@
}
}
-.node--type-recipe.node--view-mode-full .layout__region--top-second .field {
+.node--type-recipe.node--view-mode-full .layout__region--top-second .recipe-meta .field {
flex: 1 0 auto;
}
/* Large */
@media screen and (min-width: 60rem) { /* 960px */
- .node--type-recipe.node--view-mode-full .layout__region--top-second .field {
- flex: 0 0 100%;
+ .node--type-recipe.node--view-mode-full .layout__region--top-second .recipe-meta .field {
+ width: 100%;
}
}
.node--type-recipe.node--view-mode-full .layout__region--top-second .field .field__label,
@@ -143,7 +144,7 @@
}
}
.node--type-recipe.node--view-mode-full .layout__region--bottom > h2 {
- flex: 0 0 100%;
+ flex: 0 1 100%;
font-family: 'Scope One', Georgia, serif;
font-size: 1.424em;
font-weight: 400;
@@ -169,6 +170,7 @@
.node--type-recipe.node--view-mode-full .layout__region--bottom-first {
flex: 0 0 33%;
padding: 0 2.369em 2.369em 2.369em;
+ max-width: 33%; /* fixed IE11 bug */
}
}
@@ -180,6 +182,7 @@
.node--type-recipe.node--view-mode-full .layout__region--bottom-second {
flex: 0 0 67%;
padding: 0 2.369em 2.369em 2.369em;
+ max-width: 67%; /* fixed IE11 bug */
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css Tue Jul 10 15:07:59 2018 +0100
@@ -13,7 +13,7 @@
}
.node--view-mode-highlighted-bottom .node__title {
- font-weight: normal;
+ font-weight: 400;
margin-bottom: 1rem;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css Tue Jul 10 15:07:59 2018 +0100
@@ -10,6 +10,10 @@
flex-direction: column;
}
+.node--view-mode-highlighted-medium .node__content {
+ flex: 0 0 auto;
+}
+
.node--view-mode-highlighted-medium .node__meta {
padding: 1rem 1.5rem 0 1.5rem;
}
@@ -20,7 +24,7 @@
}
.node--view-mode-highlighted-medium .node__title {
- font-weight: normal;
+ font-weight: 400;
margin-bottom: 1rem;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css Tue Jul 10 15:07:59 2018 +0100
@@ -10,6 +10,10 @@
flex-direction: column;
}
+.node--view-mode-highlighted-small .node__content {
+ flex: 0 0 auto;
+}
+
.node--view-mode-highlighted-small .node__meta {
padding: 1rem 1.5rem 0 1.5rem;
}
@@ -20,7 +24,7 @@
}
.node--view-mode-highlighted-small .node__title {
- font-weight: normal;
+ font-weight: 400;
margin-bottom: 1rem;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css Tue Jul 10 15:07:59 2018 +0100
@@ -31,6 +31,10 @@
/* Large */
@media screen and (min-width: 60rem) { /* 960px */
+ .view-promoted-items--single .node--view-mode-highlighted-top .node__content {
+ flex: 0 0 auto;
+ }
+
.view-promoted-items--single .node--view-mode-highlighted-top .node__meta {
order: -1;
}
@@ -41,7 +45,7 @@
}
.node--view-mode-highlighted-top .node__title {
- font-weight: normal;
+ font-weight: 400;
margin-bottom: 1rem;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css
--- a/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css Tue Jul 10 15:07:59 2018 +0100
@@ -20,5 +20,5 @@
}
.label-items .field__label {
- font-weight: normal;
+ font-weight: 400;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/navigation/menu-account/menu-account.css
--- a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-account/menu-account.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-account/menu-account.css Tue Jul 10 15:07:59 2018 +0100
@@ -33,3 +33,6 @@
text-decoration: none;
background-color: inherit;
}
+.menu-account__link:hover {
+ text-decoration: underline;
+}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css
--- a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css Tue Jul 10 15:07:59 2018 +0100
@@ -9,7 +9,7 @@
.menu-footer__title {
font-size: 1.5rem;
- font-weight: normal;
+ font-weight: 400;
}
.menu-footer__item {
@@ -18,8 +18,7 @@
.menu-footer .menu-footer__link {
background-color: transparent;
- text-decoration: none;
- font-weight: bold;
+ font-weight: 700;
color: #fff;
}
@@ -27,7 +26,6 @@
.menu-footer .menu-footer__link:focus,
.menu-footer .menu-footer__link:hover {
background-color: transparent;
- text-decoration: underline;
}
@media screen and (min-width: 60rem) {
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css
--- a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-main/menu-main.css Tue Jul 10 15:07:59 2018 +0100
@@ -75,7 +75,7 @@
display: flex;
justify-content: flex-end;
flex-wrap: wrap;
- max-height: initial;
+ max-height: none;
overflow: auto;
}
.menu-main-toggle {
@@ -111,7 +111,9 @@
@media screen and (min-width: 48em) {
.menu-main__wrapper {
order: 4;
- flex: 0 1 calc(100% - 220px);
+ flex-grow: 0;
+ flex-shrink: 1;
+ flex-basis: calc(100% - 220px);
text-align: right;
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/layout/grid-2.css
--- a/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-2.css Tue Jul 10 15:07:59 2018 +0100
@@ -19,7 +19,9 @@
}
.grid--2 .views-row {
display: flex;
- flex: 0 0 calc(50% - 28px);
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: calc(50% - 28px);
margin: 0 14px 28px;
padding: 0;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/layout/grid-3.css
--- a/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-3.css Tue Jul 10 15:07:59 2018 +0100
@@ -19,7 +19,9 @@
}
.grid--3 .views-row {
display: flex;
- flex: 0 0 calc(50% - 28px);
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: calc(50% - 28px);
margin: 0 14px 28px;
padding: 0;
}
@@ -27,7 +29,9 @@
@media screen and (min-width: 60em) {
.grid--3 .views-row {
- flex: 0 0 calc(33% - 28px);
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: calc(33% - 28px);
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/layout/grid-4.css
--- a/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/layout/grid-4.css Tue Jul 10 15:07:59 2018 +0100
@@ -20,7 +20,9 @@
.grid--4 .views-row {
display: flex;
- flex: 0 0 calc(50% - 28px);
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: calc(50% - 28px);
margin: 0 14px 28px;
padding: 0;
}
@@ -28,7 +30,9 @@
@media screen and (min-width: 60em) {
.grid--4 .views-row {
- flex: 0 0 calc(25% - 28px);
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: calc(25% - 28px);
}
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css
--- a/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/css/layout/layout-2-col.css Tue Jul 10 15:07:59 2018 +0100
@@ -12,7 +12,12 @@
justify-content: space-between;
}
+ .two-columns .main .layout-content {
+ flex: 0 0 75%;
+ }
+
.layout-sidebar {
+ flex: 0 0 25%;
min-width: 300px;
width: 25%;
}
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/images/svg/search.svg
--- a/core/profiles/demo_umami/themes/umami/images/svg/search.svg Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/images/svg/search.svg Tue Jul 10 15:07:59 2018 +0100
@@ -1,12 +1,14 @@
-
+
\ No newline at end of file
diff -r e200cb7efeb3 -r c2387f117808 core/profiles/demo_umami/themes/umami/logo.svg
--- a/core/profiles/demo_umami/themes/umami/logo.svg Thu Apr 26 11:26:54 2018 +0100
+++ b/core/profiles/demo_umami/themes/umami/logo.svg Tue Jul 10 15:07:59 2018 +0100
@@ -1,5 +1,5 @@
-
Validation handler errors: %errors', $args));
+
+ foreach ($this->values as $data) {
+ $this->assertEqual($data['#value'], $this->config($data['#config_name'])->get($data['#config_key']));
+ }
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
--- a/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -28,15 +28,22 @@
/**
* Tests string concatenation with field values.
+ *
+ * We use 'job' and 'age' fields from the {test} table. Using the 'name' field
+ * for concatenation causes issues with custom or contrib database drivers,
+ * since its type 'varchar_ascii' may lead to using field-level collations not
+ * compatible with the other fields.
*/
public function testConcatFields() {
- $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', [
- ':a1' => 'The age of ',
- ':a2' => ' is ',
- ':a3' => '.',
- ':age' => 25,
- ]);
- $this->assertIdentical($result->fetchField(), 'The age of John is 25.', 'Field CONCAT works.');
+ $result = $this->connection->query(
+ 'SELECT CONCAT(:a1, CONCAT(job, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', [
+ ':a1' => 'The age of ',
+ ':a2' => ' is ',
+ ':a3' => '.',
+ ':age' => 25,
+ ]
+ );
+ $this->assertSame('The age of Singer is 25.', $result->fetchField(), 'Field CONCAT works.');
}
/**
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
--- a/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -63,7 +63,7 @@
*
* @return int
*/
- protected function getConnectionID() {
+ protected function getConnectionId() {
return (int) Database::getConnection($this->target, $this->key)->query('SELECT CONNECTION_ID()')->fetchField();
}
@@ -92,7 +92,7 @@
/**
* Tests Database::closeConnection() without query.
*
- * @todo getConnectionID() executes a query.
+ * @todo getConnectionId() executes a query.
*/
public function testOpenClose() {
if ($this->skipTest) {
@@ -100,7 +100,7 @@
}
// Add and open a new connection.
$this->addConnection();
- $id = $this->getConnectionID();
+ $id = $this->getConnectionId();
Database::getConnection($this->target, $this->key);
// Verify that there is a new connection.
@@ -124,7 +124,7 @@
}
// Add and open a new connection.
$this->addConnection();
- $id = $this->getConnectionID();
+ $id = $this->getConnectionId();
Database::getConnection($this->target, $this->key);
// Verify that there is a new connection.
@@ -151,7 +151,7 @@
}
// Add and open a new connection.
$this->addConnection();
- $id = $this->getConnectionID();
+ $id = $this->getConnectionId();
Database::getConnection($this->target, $this->key);
// Verify that there is a new connection.
@@ -178,7 +178,7 @@
}
// Add and open a new connection.
$this->addConnection();
- $id = $this->getConnectionID();
+ $id = $this->getConnectionId();
Database::getConnection($this->target, $this->key);
// Verify that there is a new connection.
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
--- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,6 +2,7 @@
namespace Drupal\KernelTests\Core\Database;
+use Drupal\Core\Database\Database;
use Drupal\KernelTests\KernelTestBase;
/**
@@ -14,8 +15,16 @@
public static $modules = ['database_test'];
+ /**
+ * The database connection for testing.
+ *
+ * @var \Drupal\Core\Database\Connection
+ */
+ protected $connection;
+
protected function setUp() {
parent::setUp();
+ $this->connection = Database::getConnection();
$this->installSchema('database_test', [
'test',
'test_people',
@@ -35,7 +44,7 @@
* Sets up tables for NULL handling.
*/
public function ensureSampleDataNull() {
- db_insert('test_null')
+ $this->connection->insert('test_null')
->fields(['name', 'age'])
->values([
'name' => 'Kermit',
@@ -56,8 +65,10 @@
* Sets up our sample data.
*/
public static function addSampleData() {
+ $connection = Database::getConnection();
+
// We need the IDs, so we can't use a multi-insert here.
- $john = db_insert('test')
+ $john = $connection->insert('test')
->fields([
'name' => 'John',
'age' => 25,
@@ -65,7 +76,7 @@
])
->execute();
- $george = db_insert('test')
+ $george = $connection->insert('test')
->fields([
'name' => 'George',
'age' => 27,
@@ -73,7 +84,7 @@
])
->execute();
- db_insert('test')
+ $connection->insert('test')
->fields([
'name' => 'Ringo',
'age' => 28,
@@ -81,7 +92,7 @@
])
->execute();
- $paul = db_insert('test')
+ $paul = $connection->insert('test')
->fields([
'name' => 'Paul',
'age' => 26,
@@ -89,7 +100,7 @@
])
->execute();
- db_insert('test_people')
+ $connection->insert('test_people')
->fields([
'name' => 'Meredith',
'age' => 30,
@@ -97,7 +108,7 @@
])
->execute();
- db_insert('test_task')
+ $connection->insert('test_task')
->fields(['pid', 'task', 'priority'])
->values([
'pid' => $john,
@@ -136,7 +147,7 @@
])
->execute();
- db_insert('test_special_columns')
+ $connection->insert('test_special_columns')
->fields([
'id' => 1,
'offset' => 'Offset value 1',
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
--- a/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -67,6 +67,84 @@
}
/**
+ * Confirms that we can truncate a whole table while in transaction.
+ */
+ public function testTruncateInTransaction() {
+ // This test won't work right if transactions are not supported.
+ if (!$this->connection->supportsTransactions()) {
+ $this->markTestSkipped('The database driver does not support transactions.');
+ }
+
+ $num_records_before = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertGreaterThan(0, $num_records_before, 'The table is not empty.');
+
+ $transaction = $this->connection->startTransaction('test_truncate_in_transaction');
+ $this->connection->insert('test')
+ ->fields([
+ 'name' => 'Freddie',
+ 'age' => 45,
+ 'job' => 'Great singer',
+ ])
+ ->execute();
+ $num_records_after_insert = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals($num_records_before + 1, $num_records_after_insert);
+
+ $this->connection->truncate('test')->execute();
+
+ // Checks that there are no records left in the table, and transaction is
+ // still active.
+ $this->assertTrue($this->connection->inTransaction());
+ $num_records_after = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals(0, $num_records_after);
+
+ // Close the transaction, and check that there are still no records in the
+ // table.
+ $transaction = NULL;
+ $this->assertFalse($this->connection->inTransaction());
+ $num_records_after = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals(0, $num_records_after);
+ }
+
+ /**
+ * Confirms that transaction rollback voids a truncate operation.
+ */
+ public function testTruncateTransactionRollback() {
+ // This test won't work right if transactions are not supported.
+ if (!$this->connection->supportsTransactions()) {
+ $this->markTestSkipped('The database driver does not support transactions.');
+ }
+
+ $num_records_before = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertGreaterThan(0, $num_records_before, 'The table is not empty.');
+
+ $transaction = $this->connection->startTransaction('test_truncate_in_transaction');
+ $this->connection->insert('test')
+ ->fields([
+ 'name' => 'Freddie',
+ 'age' => 45,
+ 'job' => 'Great singer',
+ ])
+ ->execute();
+ $num_records_after_insert = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals($num_records_before + 1, $num_records_after_insert);
+
+ $this->connection->truncate('test')->execute();
+
+ // Checks that there are no records left in the table, and transaction is
+ // still active.
+ $this->assertTrue($this->connection->inTransaction());
+ $num_records_after = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals(0, $num_records_after);
+
+ // Roll back the transaction, and check that we are back to status before
+ // insert and truncate.
+ $this->connection->rollBack();
+ $this->assertFalse($this->connection->inTransaction());
+ $num_records_after = $this->connection->select('test')->countQuery()->execute()->fetchField();
+ $this->assertEquals($num_records_before, $num_records_after);
+ }
+
+ /**
* Confirms that we can delete a single special column name record successfully.
*/
public function testSpecialColumnDelete() {
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
--- a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -528,6 +528,11 @@
['not null' => TRUE, 'initial' => 1],
['not null' => TRUE, 'initial' => 1, 'default' => 7],
['not null' => TRUE, 'initial_from_field' => 'serial_column'],
+ [
+ 'not null' => TRUE,
+ 'initial_from_field' => 'test_nullable_field',
+ 'initial' => 100,
+ ],
];
foreach ($variations as $variation) {
@@ -581,6 +586,7 @@
$table_spec = [
'fields' => [
'serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE],
+ 'test_nullable_field' => ['type' => 'int', 'not null' => FALSE],
'test_field' => $field_spec,
],
'primary key' => ['serial_column'],
@@ -599,6 +605,7 @@
$table_spec = [
'fields' => [
'serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE],
+ 'test_nullable_field' => ['type' => 'int', 'not null' => FALSE],
],
'primary key' => ['serial_column'],
];
@@ -609,9 +616,15 @@
for ($i = 0; $i < 3; $i++) {
db_insert($table_name)
->useDefaults(['serial_column'])
+ ->fields(['test_nullable_field' => 100])
->execute();
}
+ // Add another row with no value for the 'test_nullable_field' column.
+ db_insert($table_name)
+ ->useDefaults(['serial_column'])
+ ->execute();
+
db_add_field($table_name, 'test_field', $field_spec);
$this->pass(format_string('Column %column created.', ['%column' => 'test_field']));
@@ -645,7 +658,7 @@
}
// Check that the initial value from another field has been registered.
- if (isset($field_spec['initial_from_field'])) {
+ if (isset($field_spec['initial_from_field']) && !isset($field_spec['initial'])) {
// There should be no row with a value different than
// $field_spec['initial_from_field'].
$count = db_select($table_name)
@@ -656,6 +669,16 @@
->fetchField();
$this->assertEqual($count, 0, 'Initial values from another field filled out.');
}
+ elseif (isset($field_spec['initial_from_field']) && isset($field_spec['initial'])) {
+ // There should be no row with a value different than '100'.
+ $count = db_select($table_name)
+ ->fields($table_name, ['serial_column'])
+ ->condition($field_name, 100, '<>')
+ ->countQuery()
+ ->execute()
+ ->fetchField();
+ $this->assertEqual($count, 0, 'Initial values from another field or a default value filled out.');
+ }
// Check that the default value has been registered.
if (isset($field_spec['default'])) {
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
--- a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -297,7 +297,7 @@
// Retrieve the entity properties.
$reflection = new \ReflectionClass($entity);
$properties = $reflection->getProperties(~\ReflectionProperty::IS_STATIC);
- $translation_unique_properties = ['activeLangcode', 'translationInitialize', 'fieldDefinitions', 'languages', 'langcodeKey', 'defaultLangcode', 'defaultLangcodeKey', 'revisionTranslationAffectedKey', 'validated', 'validationRequired', 'entityTypeId', 'typedData', 'cacheContexts', 'cacheTags', 'cacheMaxAge', '_serviceIds'];
+ $translation_unique_properties = ['activeLangcode', 'translationInitialize', 'fieldDefinitions', 'languages', 'langcodeKey', 'defaultLangcode', 'defaultLangcodeKey', 'revisionTranslationAffectedKey', 'validated', 'validationRequired', 'entityTypeId', 'typedData', 'cacheContexts', 'cacheTags', 'cacheMaxAge', '_serviceIds', '_entityStorages'];
foreach ($properties as $property) {
// Modify each entity property on the clone and assert that the change is
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php
--- a/core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -19,7 +19,7 @@
/**
* The table mapping for the tested entity type.
*
- * @var \Drupal\Core\Entity\Sql\TableMappingInterface
+ * @var \Drupal\Core\Entity\Sql\DefaultTableMapping
*/
protected $tableMapping;
@@ -39,11 +39,18 @@
->setName('multivalued_base_field')
->setTargetEntityTypeId('entity_test_mulrev')
->setTargetBundle('entity_test_mulrev')
- ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+ ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
+ // Base fields are non-translatable and non-revisionable by default, but
+ // we explicitly set these values here for extra clarity.
+ ->setTranslatable(FALSE)
+ ->setRevisionable(FALSE);
$this->state->set('entity_test_mulrev.additional_base_field_definitions', $definitions);
$this->entityManager->clearCachedDefinitions();
$this->tableMapping = $this->entityManager->getStorage('entity_test_mulrev')->getTableMapping();
+
+ // Ensure that the tables for the new field are created.
+ \Drupal::entityDefinitionUpdateManager()->applyUpdates();
}
/**
@@ -68,4 +75,33 @@
$this->assertEquals($this->tableMapping->getFieldTableName('multivalued_base_field'), $expected);
}
+ /**
+ * Tests DefaultTableMapping::getTableNames().
+ *
+ * @covers ::getTableNames
+ */
+ public function testGetTableNames() {
+ $storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test_mulrev');
+ $dedicated_data_table = $this->tableMapping->getDedicatedDataTableName($storage_definitions['multivalued_base_field']);
+ $dedicated_revision_table = $this->tableMapping->getDedicatedRevisionTableName($storage_definitions['multivalued_base_field']);
+
+ // Check that both the data and the revision tables exist for a multi-valued
+ // base field.
+ $database_schema = \Drupal::database()->schema();
+ $this->assertTrue($database_schema->tableExists($dedicated_data_table));
+ $this->assertTrue($database_schema->tableExists($dedicated_revision_table));
+
+ // Check that the table mapping contains both the data and the revision
+ // tables exist for a multi-valued base field.
+ $expected = [
+ 'entity_test_mulrev',
+ 'entity_test_mulrev_property_data',
+ 'entity_test_mulrev_revision',
+ 'entity_test_mulrev_property_revision',
+ $dedicated_data_table,
+ $dedicated_revision_table,
+ ];
+ $this->assertEquals($expected, $this->tableMapping->getTableNames());
+ }
+
}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -1049,31 +1049,78 @@
/**
* Tests adding a base field with initial values inherited from another field.
+ *
+ * @dataProvider initialValueFromFieldTestCases
*/
- public function testInitialValueFromField() {
+ public function testInitialValueFromField($default_initial_value, $expected_value) {
$storage = \Drupal::entityTypeManager()->getStorage('entity_test_update');
$db_schema = $this->database->schema();
// Create two entities before adding the base field.
- /** @var \Drupal\entity_test\Entity\EntityTestUpdate $entity */
- $storage->create(['name' => 'First entity'])->save();
- $storage->create(['name' => 'Second entity'])->save();
+ /** @var \Drupal\entity_test_update\Entity\EntityTestUpdate $entity */
+ $storage->create([
+ 'name' => 'First entity',
+ 'test_single_property' => 'test existing value',
+ ])->save();
+
+ // The second entity does not have any value for the 'test_single_property'
+ // field, allowing us to test the 'default_value' parameter of
+ // \Drupal\Core\Field\BaseFieldDefinition::setInitialValueFromField().
+ $storage->create([
+ 'name' => 'Second entity'
+ ])->save();
// Add a base field with an initial value inherited from another field.
- $this->addBaseField();
- $storage_definition = BaseFieldDefinition::create('string')
- ->setLabel(t('A new base field'))
+ $definitions['new_base_field'] = BaseFieldDefinition::create('string')
+ ->setName('new_base_field')
+ ->setLabel('A new base field')
->setInitialValueFromField('name');
+ $definitions['another_base_field'] = BaseFieldDefinition::create('string')
+ ->setName('another_base_field')
+ ->setLabel('Another base field')
+ ->setInitialValueFromField('test_single_property', $default_initial_value);
+
+ $this->state->set('entity_test_update.additional_base_field_definitions', $definitions);
$this->assertFalse($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' does not exist before applying the update.");
- $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $storage_definition);
+ $this->assertFalse($db_schema->fieldExists('entity_test_update', 'another_base_field'), "New field 'another_base_field' does not exist before applying the update.");
+ $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $definitions['new_base_field']);
+ $this->entityDefinitionUpdateManager->installFieldStorageDefinition('another_base_field', 'entity_test_update', 'entity_test', $definitions['another_base_field']);
$this->assertTrue($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
+ $this->assertTrue($db_schema->fieldExists('entity_test_update', 'another_base_field'), "New field 'another_base_field' has been created on the 'entity_test_update' table.");
// Check that the initial values have been applied.
$storage = \Drupal::entityTypeManager()->getStorage('entity_test_update');
$entities = $storage->loadMultiple();
$this->assertEquals('First entity', $entities[1]->get('new_base_field')->value);
$this->assertEquals('Second entity', $entities[2]->get('new_base_field')->value);
+
+ $this->assertEquals('test existing value', $entities[1]->get('another_base_field')->value);
+ $this->assertEquals($expected_value, $entities[2]->get('another_base_field')->value);
+ }
+
+ /**
+ * Test cases for ::testInitialValueFromField.
+ */
+ public function initialValueFromFieldTestCases() {
+ return [
+ 'literal value' => [
+ 'test initial value',
+ 'test initial value',
+ ],
+ 'indexed array' => [
+ ['value' => 'test initial value'],
+ 'test initial value',
+ ],
+ 'empty array' => [
+ [],
+ NULL,
+ ],
+ 'null' => [
+ NULL,
+ NULL,
+ ],
+ ];
}
/**
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -16,6 +16,7 @@
use Drupal\Core\TypedData\ListInterface;
use Drupal\Core\TypedData\Type\StringInterface;
use Drupal\Core\TypedData\TypedDataInterface;
+use Drupal\entity_test\Entity\EntityTest;
use Drupal\entity_test\Entity\EntityTestComputedField;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
@@ -871,6 +872,32 @@
}
/**
+ * Tests an entity reference computed field.
+ */
+ public function testEntityReferenceComputedField() {
+ $this->installEntitySchema('entity_test_computed_field');
+
+ // Create 2 entities to be referenced.
+ $ref1 = EntityTest::create(['name' => 'foo', 'type' => 'bar']);
+ $ref1->save();
+ $ref2 = EntityTest::create(['name' => 'baz', 'type' => 'bar']);
+ $ref2->save();
+ \Drupal::state()->set('entity_test_reference_computed_target_ids', [$ref1->id(), $ref2->id()]);
+
+ $entity = EntityTestComputedField::create([]);
+ $entity->save();
+
+ /** @var \Drupal\entity_test\Plugin\Field\ComputedReferenceTestFieldItemList $field */
+ $field = $entity->get('computed_reference_field');
+ /** @var \Drupal\Core\Entity\EntityInterface[] $referenced_entities */
+ $referenced_entities = $field->referencedEntities();
+
+ // Check that ::referencedEntities() is working with computed fields.
+ $this->assertEquals($ref1->id(), $referenced_entities[0]->id());
+ $this->assertEquals($ref2->id(), $referenced_entities[1]->id());
+ }
+
+ /**
* Executes the computed properties tests for the given entity type.
*
* @param string $entity_type
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/EntityKeysTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityKeysTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,56 @@
+state->set('entity_test.additional_base_field_definitions', [
+ 'test_field' => BaseFieldDefinition::create('string')->setTranslatable($translatable),
+ ]);
+ $this->state->set('entity_test.entity_keys', [
+ 'key_1' => 'test_field',
+ 'key_2' => 'test_field',
+ ]);
+ drupal_flush_all_caches();
+ $this->installEntitySchema('entity_test');
+
+ $entity = EntityTest::create([]);
+
+ $entity->set('test_field', 'foo');
+ $this->assertEquals('foo', $entity->getEntityKey('key_1'));
+ $this->assertEquals('foo', $entity->getEntityKey('key_2'));
+
+ $entity->set('test_field', 'bar');
+ $this->assertEquals('bar', $entity->getEntityKey('key_1'));
+ $this->assertEquals('bar', $entity->getEntityKey('key_2'));
+ }
+
+ /**
+ * Data provider for ::testMultipleKeysCache.
+ */
+ public function multipleKeysCacheTestCases() {
+ return [
+ 'translatable Entity Key' => [
+ TRUE,
+ ],
+ 'Non-translatable entity key' => [
+ FALSE,
+ ],
+ ];
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -526,7 +526,7 @@
->sort('id')
->execute();
- $this->assertResult(6, 14);
+ $this->assertResult(4, 6, 12, 14);
}
/**
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,130 @@
+container->get('keyvalue');
+ $this->installedStorageSchema = $key_value_factory->get('entity.storage_schema.sql');
+ $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
+ }
+
+ /**
+ * Tests updating a shared table field definition.
+ */
+ public function testOnFieldStorageDefinitionUpdateShared() {
+ // Install the test entity type with an additional field. Use a multi-column
+ // field so that field name and column name(s) do not match.
+ $field = BaseFieldDefinition::create('shape')
+ // Avoid creating a foreign key which is irrelevant for this test.
+ ->setSetting('foreign_key_name', NULL)
+ ->setName('shape')
+ ->setProvider('entity_test');
+ $this->state->set('entity_test.additional_base_field_definitions', [
+ 'shape' => $field,
+ ]);
+ $this->entityDefinitionUpdateManager->installFieldStorageDefinition(
+ 'shape',
+ 'entity_test',
+ 'entity_test',
+ $field
+ );
+
+ // Make sure the field is not marked as NOT NULL initially.
+ $expected = [
+ 'entity_test' => [
+ 'fields' => [
+ 'shape__shape' => [
+ 'type' => 'varchar',
+ 'length' => 32,
+ 'not null' => FALSE,
+ ],
+ 'shape__color' => [
+ 'type' => 'varchar',
+ 'length' => 32,
+ 'not null' => FALSE,
+ ],
+ ],
+ ],
+ ];
+ $actual = $this->installedStorageSchema->get('entity_test.field_schema_data.shape');
+ $this->assertSame($expected, $actual);
+
+ // Make the field an entity key, so that it will get marked as NOT NULL.
+ $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test');
+ $original_keys = $entity_type->getKeys();
+ $entity_type->set('entity_keys', $original_keys + ['shape' => 'shape']);
+ $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
+
+ // Update the field and make sure the schema got updated.
+ $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($field);
+ $expected['entity_test']['fields']['shape__shape']['not null'] = TRUE;
+ $expected['entity_test']['fields']['shape__color']['not null'] = TRUE;
+ $actual = $this->installedStorageSchema->get('entity_test.field_schema_data.shape');
+ $this->assertSame($expected, $actual);
+
+ // Remove the entity key again and check that the schema got reverted.
+ $entity_type->set('entity_keys', $original_keys);
+ $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
+
+ $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($field);
+ $expected['entity_test']['fields']['shape__shape']['not null'] = FALSE;
+ $expected['entity_test']['fields']['shape__color']['not null'] = FALSE;
+ $actual = $this->installedStorageSchema->get('entity_test.field_schema_data.shape');
+ $this->assertSame($expected, $actual);
+
+ // Now add an entity and repeat the process.
+ $entity_storage = $this->entityManager->getStorage('entity_test');
+ $entity_storage->create([
+ 'shape' => [
+ 'shape' => 'rectangle',
+ 'color' => 'pink',
+ ],
+ ])->save();
+
+ $entity_type->set('entity_keys', $original_keys + ['shape' => 'shape']);
+ $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
+
+ $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($field);
+ $expected['entity_test']['fields']['shape__shape']['not null'] = TRUE;
+ $expected['entity_test']['fields']['shape__color']['not null'] = TRUE;
+ $actual = $this->installedStorageSchema->get('entity_test.field_schema_data.shape');
+ $this->assertSame($expected, $actual);
+
+ $entity_type->set('entity_keys', $original_keys);
+ $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
+ $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($field);
+ $expected['entity_test']['fields']['shape__shape']['not null'] = FALSE;
+ $expected['entity_test']['fields']['shape__color']['not null'] = FALSE;
+ $actual = $this->installedStorageSchema->get('entity_test.field_schema_data.shape');
+ $this->assertSame($expected, $actual);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,83 @@
+push($request);
+
+ $this->assertSame($expected, file_url_transform_relative($url));
+ }
+
+ public function providerFileUrlTransformRelative() {
+ $data = [];
+ $data[] = [
+ 'example.com',
+ 80,
+ '',
+ 'http://example.com/page',
+ '/page',
+ ];
+ $data[] = [
+ 'example.com',
+ 443,
+ 'on',
+ 'https://example.com/page',
+ '/page',
+ ];
+ $data[] = [
+ 'example.com',
+ 8080,
+ '',
+ 'https://example.com:8080/page',
+ '/page',
+ ];
+ $data[] = [
+ 'example.com',
+ 8443,
+ 'on',
+ 'https://example.com:8443/page',
+ '/page',
+ ];
+ $data[] = [
+ 'example.com',
+ 80,
+ '',
+ 'http://exampleXcom/page',
+ 'http://exampleXcom/page',
+ ];
+ return $data;
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Plugin/ContextDefinitionTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/ContextDefinitionTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,37 @@
+installEntitySchema('user');
+
+ $value = EntityTest::create([]);
+ // Assert that the entity has at least one violation.
+ $this->assertNotEmpty($value->validate());
+ // Assert that these violations do not prevent it from satisfying the
+ // requirements of another object.
+ $requirement = new ContextDefinition('any');
+ $context = new Context(new ContextDefinition('entity:entity_test'), $value);
+ $this->assertTrue($requirement->isSatisfiedBy($context));
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/Render/Element/WeightTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/Render/Element/WeightTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,52 @@
+installConfig(['system']);
+ }
+
+ /**
+ * Test existing #default_value value in #options list.
+ *
+ * @covers ::processWeight
+ */
+ public function testProcessWeight() {
+ $element = [];
+ $form_state = new FormState();
+ $complete_form = [];
+
+ $element_object = new Weight([], 'weight', []);
+ $info = $element_object->getInfo();
+ $element += $info;
+
+ $element['#default_value'] = $element['#delta'] + 5;
+
+ Weight::processWeight($element, $form_state, $complete_form);
+
+ $this->assertTrue(
+ isset($element['#options'][$element['#default_value']]),
+ 'Default value exists in the #options list'
+ );
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/Core/TempStore/AnonymousPrivateTempStoreTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/KernelTests/Core/TempStore/AnonymousPrivateTempStoreTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,60 @@
+installSchema('system', ['key_value_expire']);
+
+ $session = $this->container->get('session');
+ $request = Request::create('/');
+ $request->setSession($session);
+
+ $stack = $this->container->get('request_stack');
+ $stack->pop();
+ $stack->push($request);
+
+ }
+
+ /**
+ * Tests anonymous can use the PrivateTempStore.
+ */
+ public function testAnonymousCanUsePrivateTempStore() {
+ $temp_store = $this->container->get('tempstore.private')->get('anonymous_private_temp_store');
+ $temp_store->set('foo', 'bar');
+ $metadata1 = $temp_store->getMetadata('foo');
+
+ $this->assertEquals('bar', $temp_store->get('foo'));
+ $this->assertNotEmpty($metadata1->owner);
+
+ $temp_store->set('foo', 'bar2');
+ $metadata2 = $temp_store->getMetadata('foo');
+ $this->assertEquals('bar2', $temp_store->get('foo'));
+ $this->assertNotEmpty($metadata2->owner);
+ $this->assertEquals($metadata2->owner, $metadata1->owner);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/KernelTests/KernelTestBase.php
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -1027,7 +1027,7 @@
* Test authors should follow the provided instructions and adjust their tests
* accordingly.
*
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 8.2.0.
+ * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
*/
public function __get($name) {
if (in_array($name, [
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/BrowserTestBase.php
--- a/core/tests/Drupal/Tests/BrowserTestBase.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php Tue Jul 10 15:07:59 2018 +0100
@@ -321,18 +321,27 @@
$this->mink->setDefaultSessionName('default');
$this->registerSessions();
- // According to the W3C WebDriver specification a cookie can only be set if
- // the cookie domain is equal to the domain of the active document. When the
- // browser starts up the active document is not our domain but 'about:blank'
- // or similar. To be able to set our User-Agent and Xdebug cookies at the
- // start of the test we now do a request to the front page so the active
- // document matches the domain.
- // @see https://w3c.github.io/webdriver/webdriver-spec.html#add-cookie
- // @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=20975
+ $this->initFrontPage();
+
+ return $session;
+ }
+
+ /**
+ * Visits the front page when initializing Mink.
+ *
+ * According to the W3C WebDriver specification a cookie can only be set if
+ * the cookie domain is equal to the domain of the active document. When the
+ * browser starts up the active document is not our domain but 'about:blank'
+ * or similar. To be able to set our User-Agent and Xdebug cookies at the
+ * start of the test we now do a request to the front page so the active
+ * document matches the domain.
+ *
+ * @see https://w3c.github.io/webdriver/webdriver-spec.html#add-cookie
+ * @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=20975
+ */
+ protected function initFrontPage() {
$session = $this->getSession();
$session->visit($this->baseUrl);
-
- return $session;
}
/**
@@ -584,6 +593,33 @@
}
/**
+ * Obtain the HTTP client for the system under test.
+ *
+ * Use this method for arbitrary HTTP requests to the site under test. For
+ * most tests, you should not get the HTTP client and instead use navigation
+ * methods such as drupalGet() and clickLink() in order to benefit from
+ * assertions.
+ *
+ * Subclasses which substitute a different Mink driver should override this
+ * method and provide a Guzzle client if the Mink driver provides one.
+ *
+ * @return \GuzzleHttp\ClientInterface
+ * The client with BrowserTestBase configuration.
+ *
+ * @throws \RuntimeException
+ * If the Mink driver does not support a Guzzle HTTP client, throw an
+ * exception.
+ */
+ protected function getHttpClient() {
+ /* @var $mink_driver \Behat\Mink\Driver\DriverInterface */
+ $mink_driver = $this->getSession()->getDriver();
+ if ($mink_driver instanceof GoutteDriver) {
+ return $mink_driver->getClient()->getClient();
+ }
+ throw new \RuntimeException('The Mink client type ' . get_class($mink_driver) . ' does not support getHttpClient().');
+ }
+
+ /**
* Returns WebAssert object.
*
* @param string $name
@@ -593,6 +629,7 @@
* A new web-assert option for asserting the presence of elements with.
*/
public function assertSession($name = NULL) {
+ $this->addToAssertionCount(1);
return new WebAssert($this->getSession($name), $this->baseUrl);
}
@@ -662,11 +699,13 @@
* to set for example the "Accept-Language" header for requesting the page
* in a different language. Note that not all headers are supported, for
* example the "Accept" header is always overridden by the browser. For
- * testing REST APIs it is recommended to directly use an HTTP client such
- * as Guzzle instead.
+ * testing REST APIs it is recommended to obtain a separate HTTP client
+ * using getHttpClient() and performing requests that way.
*
* @return string
* The retrieved HTML string, also available as $this->getRawContent()
+ *
+ * @see \Drupal\Tests\BrowserTestBase::getHttpClient()
*/
protected function drupalGet($path, array $options = [], array $headers = []) {
$options['absolute'] = TRUE;
@@ -1167,6 +1206,7 @@
protected function clickLink($label, $index = 0) {
$label = (string) $label;
$links = $this->getSession()->getPage()->findAll('named', ['link', $label]);
+ $this->assertArrayHasKey($index, $links, 'The link ' . $label . ' was not found on the page.');
$links[$index]->click();
}
@@ -1308,6 +1348,28 @@
}
/**
+ * Transforms a nested array into a flat array suitable for drupalPostForm().
+ *
+ * @param array $values
+ * A multi-dimensional form values array to convert.
+ *
+ * @return array
+ * The flattened $edit array suitable for BrowserTestBase::drupalPostForm().
+ */
+ protected function translatePostValues(array $values) {
+ $edit = [];
+ // The easiest and most straightforward way to translate values suitable for
+ // BrowserTestBase::drupalPostForm() is to actually build the POST data
+ // string and convert the resulting key/value pairs back into a flat array.
+ $query = http_build_query($values);
+ foreach (explode('&', $query) as $item) {
+ list($key, $value) = explode('=', $item);
+ $edit[urldecode($key)] = urldecode($value);
+ }
+ return $edit;
+ }
+
+ /**
* Checks for meta refresh tag and if found call drupalGet() recursively.
*
* This function looks for the http-equiv attribute to be set to "Refresh" and
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
--- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -269,8 +269,12 @@
*/
public function testOrIf() {
$neutral = AccessResult::neutral('neutral message');
+ $neutral_other = AccessResult::neutral('other neutral message');
+ $neutral_reasonless = AccessResult::neutral();
$allowed = AccessResult::allowed();
$forbidden = AccessResult::forbidden('forbidden message');
+ $forbidden_other = AccessResult::forbidden('other forbidden message');
+ $forbidden_reasonless = AccessResult::forbidden();
$unused_access_result_due_to_lazy_evaluation = $this->getMock('\Drupal\Core\Access\AccessResultInterface');
$unused_access_result_due_to_lazy_evaluation->expects($this->never())
->method($this->anything());
@@ -304,6 +308,18 @@
$this->assertTrue($access->isNeutral());
$this->assertEquals('neutral message', $access->getReason());
$this->assertDefaultCacheability($access);
+ // Reason inheritance edge case: first reason is kept.
+ $access = $neutral->orIf($neutral_other);
+ $this->assertEquals('neutral message', $access->getReason());
+ $access = $neutral_other->orIf($neutral);
+ $this->assertEquals('other neutral message', $access->getReason());
+ // Reason inheritance edge case: one of the operands is reasonless.
+ $access = $neutral->orIf($neutral_reasonless);
+ $this->assertEquals('neutral message', $access->getReason());
+ $access = $neutral_reasonless->orIf($neutral);
+ $this->assertEquals('neutral message', $access->getReason());
+ $access = $neutral_reasonless->orIf($neutral_reasonless);
+ $this->assertNull($access->getReason());
// NEUTRAL || ALLOWED === ALLOWED.
$access = $neutral->orIf($allowed);
@@ -329,7 +345,7 @@
$this->assertDefaultCacheability($access);
// FORBIDDEN || NEUTRAL === FORBIDDEN.
- $access = $forbidden->orIf($allowed);
+ $access = $forbidden->orIf($neutral);
$this->assertFalse($access->isAllowed());
$this->assertTrue($access->isForbidden());
$this->assertFalse($access->isNeutral());
@@ -337,12 +353,24 @@
$this->assertDefaultCacheability($access);
// FORBIDDEN || FORBIDDEN === FORBIDDEN.
- $access = $forbidden->orIf($allowed);
+ $access = $forbidden->orIf($forbidden);
$this->assertFalse($access->isAllowed());
$this->assertTrue($access->isForbidden());
$this->assertFalse($access->isNeutral());
$this->assertEquals('forbidden message', $access->getReason());
$this->assertDefaultCacheability($access);
+ // Reason inheritance edge case: first reason is kept.
+ $access = $forbidden->orIf($forbidden_other);
+ $this->assertEquals('forbidden message', $access->getReason());
+ $access = $forbidden_other->orIf($forbidden);
+ $this->assertEquals('other forbidden message', $access->getReason());
+ // Reason inheritance edge case: one of the operands is reasonless.
+ $access = $forbidden->orIf($forbidden_reasonless);
+ $this->assertEquals('forbidden message', $access->getReason());
+ $access = $forbidden_reasonless->orIf($forbidden);
+ $this->assertEquals('forbidden message', $access->getReason());
+ $access = $forbidden_reasonless->orIf($forbidden_reasonless);
+ $this->assertNull($access->getReason());
// FORBIDDEN || * === FORBIDDEN.
$access = $forbidden->orIf($unused_access_result_due_to_lazy_evaluation);
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -2,14 +2,18 @@
namespace Drupal\Tests\Core\Entity;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Entity\Entity;
use Drupal\Core\Entity\EntityMalformedException;
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Routing\UrlGeneratorInterface;
use Drupal\Core\Url;
use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
/**
* Tests URL handling of the \Drupal\Core\Entity\Entity class.
@@ -497,6 +501,38 @@
}
/**
+ * Tests the uriRelationships() method.
+ *
+ * @covers ::uriRelationships
+ */
+ public function testUriRelationships() {
+ $entity = $this->getEntity(Entity::class, ['id' => $this->entityId]);
+
+ $container_builder = new ContainerBuilder();
+ $url_generator = $this->createMock(UrlGeneratorInterface::class);
+ $container_builder->set('url_generator', $url_generator);
+ \Drupal::setContainer($container_builder);
+
+ // Test route with no mandatory parameters.
+ $this->registerLinkTemplate('canonical');
+ $route_name_0 = 'entity.' . $this->entityTypeId . '.canonical';
+ $url_generator->expects($this->at(0))
+ ->method('generateFromRoute')
+ ->with($route_name_0)
+ ->willReturn((new GeneratedUrl())->setGeneratedUrl('/entity_test'));
+ $this->assertEquals(['canonical'], $entity->uriRelationships());
+
+ // Test route with non-default mandatory parameters.
+ $this->registerLinkTemplate('{non_default_parameter}');
+ $route_name_1 = 'entity.' . $this->entityTypeId . '.{non_default_parameter}';
+ $url_generator->expects($this->at(0))
+ ->method('generateFromRoute')
+ ->with($route_name_1)
+ ->willThrowException(new MissingMandatoryParametersException());
+ $this->assertEquals([], $entity->uriRelationships());
+ }
+
+ /**
* Returns a mock entity for testing.
*
* @param string $class
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -238,6 +238,19 @@
$situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => ""]];
$situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => TRUE]];
+ // Query with unsorted keys must match when the attribute is in sorted form.
+ $context = [
+ 'path' => 'myfrontpage',
+ 'front' => TRUE,
+ 'language' => 'en',
+ 'query' => ['foo' => 'bar', 'baz' => 'qux'],
+ ];
+ $attributes = [
+ 'data-drupal-link-system-path' => 'myfrontpage',
+ 'data-drupal-link-query' => Json::encode(['baz' => 'qux', 'foo' => 'bar']),
+ ];
+ $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+
// Loop over the surrounding HTML variations.
$data = [];
for ($h = 0; $h < count($html); $h++) {
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php
--- a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionIsSatisfiedTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -17,6 +17,7 @@
use Drupal\Core\Plugin\Context\ContextDefinition;
use Drupal\Core\TypedData\TypedDataManager;
use Drupal\Core\Validation\ConstraintManager;
+use Drupal\Tests\Core\Plugin\Fixtures\InheritedContextDefinition;
use Drupal\Tests\UnitTestCase;
use Prophecy\Argument;
@@ -196,6 +197,13 @@
new ContextDefinition('entity:test_config'),
];
+ // Inherited context definition class.
+ $data['both any, inherited context requirement definition'] = [
+ TRUE,
+ new InheritedContextDefinition('any'),
+ new ContextDefinition('any'),
+ ];
+
return $data;
}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Plugin/Fixtures/InheritedContextDefinition.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/Tests/Core/Plugin/Fixtures/InheritedContextDefinition.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,12 @@
+ 'foo'],
'foo',
];
+ // Basic #markup based renderable array with value '0'.
+ $data[] = [
+ ['#markup' => '0'],
+ '0',
+ ];
+ // Basic #markup based renderable array with value 0.
+ $data[] = [
+ ['#markup' => 0],
+ '0',
+ ];
+ // Basic #markup based renderable array with value ''.
+ $data[] = [
+ ['#markup' => ''],
+ '',
+ ];
+ // Basic #markup based renderable array with value NULL.
+ $data[] = [
+ ['#markup' => NULL],
+ '',
+ ];
// Basic #plain_text based renderable array.
$data[] = [
['#plain_text' => 'foo'],
@@ -104,6 +124,26 @@
['#plain_text' => Markup::create('foo')],
'<em>foo</em>',
];
+ // #plain_text based renderable array with value '0'.
+ $data[] = [
+ ['#plain_text' => '0'],
+ '0',
+ ];
+ // #plain_text based renderable array with value 0.
+ $data[] = [
+ ['#plain_text' => 0],
+ '0',
+ ];
+ // #plain_text based renderable array with value ''.
+ $data[] = [
+ ['#plain_text' => ''],
+ '',
+ ];
+ // #plain_text based renderable array with value NULL.
+ $data[] = [
+ ['#plain_text' => NULL],
+ '',
+ ];
// Renderable child element.
$data[] = [
['child' => ['#markup' => 'bar']],
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
--- a/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -61,6 +61,7 @@
['HEAD'],
['OPTIONS'],
['TRACE'],
+ ['DELETE'],
];
}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php
--- a/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -68,10 +68,10 @@
*
* @covers ::getContentType
*/
- public function testUnknowContentTypeReturnsHtmlByDefault() {
+ public function testUnknowContentTypeReturnsNull() {
$request = new Request();
- $this->assertSame('html', $this->contentNegotiation->getContentType($request));
+ $this->assertNull($this->contentNegotiation->getContentType($request));
}
/**
@@ -83,7 +83,7 @@
$request = new Request();
$request->headers->set('X-Requested-With', 'XMLHttpRequest');
- $this->assertSame('html', $this->contentNegotiation->getContentType($request));
+ $this->assertNull($this->contentNegotiation->getContentType($request));
}
/**
@@ -98,7 +98,7 @@
$request->setFormat()->shouldNotBeCalled();
// Request format will be set with default format.
- $request->setRequestFormat('html')->shouldBeCalled();
+ $request->setRequestFormat()->shouldNotBeCalled();
// Some getContentType calls we don't really care about but have to mock.
$request_data = $this->prophesize(ParameterBag::class);
@@ -127,7 +127,7 @@
$request->setFormat('david', 'geeky/david')->shouldBeCalled();
// Some calls we don't care about.
- $request->setRequestFormat('html')->shouldBeCalled();
+ $request->setRequestFormat()->shouldNotBeCalled();
$request_data = $this->prophesize(ParameterBag::class);
$request_data->get('ajax_iframe_upload', FALSE)->shouldBeCalled();
$request_mock = $request->reveal();
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Template/Loader/ThemeRegistryLoaderTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/Tests/Core/Template/Loader/ThemeRegistryLoaderTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,29 @@
+prophesize('Drupal\Core\Theme\Registry');
+ $runtime = $this->prophesize('Drupal\Core\Utility\ThemeRegistry');
+ $runtime->has('foo')
+ ->shouldBeCalled()
+ ->willReturn(FALSE);
+ $registry->getRuntime()->willReturn($runtime);
+
+ $loader = new ThemeRegistryLoader($registry->reveal());
+ $this->assertFalse($loader->exists('foo'));
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Test/BrowserTestBaseTest.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/tests/Drupal/Tests/Core/Test/BrowserTestBaseTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,82 @@
+getMockBuilder(Session::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getDriver'])
+ ->getMock();
+ $session->expects($this->once())
+ ->method('getDriver')
+ ->willReturn($driver);
+
+ $btb = $this->getMockBuilder(BrowserTestBase::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getSession'])
+ ->getMockForAbstractClass();
+ $btb->expects($this->once())
+ ->method('getSession')
+ ->willReturn($session);
+
+ return $btb;
+ }
+
+ /**
+ * @covers ::getHttpClient
+ */
+ public function testGetHttpClient() {
+ // Our stand-in for the Guzzle client object.
+ $expected = new \stdClass();
+
+ $browserkit_client = $this->getMockBuilder(Client::class)
+ ->setMethods(['getClient'])
+ ->getMockForAbstractClass();
+ $browserkit_client->expects($this->once())
+ ->method('getClient')
+ ->willReturn($expected);
+
+ // Because the driver is a GoutteDriver, we'll get back a client.
+ $driver = $this->getMockBuilder(GoutteDriver::class)
+ ->setMethods(['getClient'])
+ ->getMock();
+ $driver->expects($this->once())
+ ->method('getClient')
+ ->willReturn($browserkit_client);
+
+ $btb = $this->mockBrowserTestBaseWithDriver($driver);
+
+ $ref_gethttpclient = new \ReflectionMethod($btb, 'getHttpClient');
+ $ref_gethttpclient->setAccessible(TRUE);
+
+ $this->assertSame(get_class($expected), get_class($ref_gethttpclient->invoke($btb)));
+ }
+
+ /**
+ * @covers ::getHttpClient
+ */
+ public function testGetHttpClientException() {
+ // A driver type that isn't GoutteDriver. This should cause a
+ // RuntimeException.
+ $btb = $this->mockBrowserTestBaseWithDriver(new \stdClass());
+
+ $ref_gethttpclient = new \ReflectionMethod($btb, 'getHttpClient');
+ $ref_gethttpclient->setAccessible(TRUE);
+
+ $this->setExpectedException(\RuntimeException::class, 'The Mink client type stdClass does not support getHttpClient().');
+ $ref_gethttpclient->invoke($btb);
+ }
+
+}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
--- a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php Tue Jul 10 15:07:59 2018 +0100
@@ -96,6 +96,10 @@
['http://example.com/test', ['https' => TRUE], 'https://example.com/test'],
['https://example.com/test', ['https' => FALSE], 'http://example.com/test'],
['https://example.com/test?foo=1#bar', [], 'https://example.com/test?foo=1#bar'],
+ 'override-query' => ['https://example.com/test?foo=1#bar', ['query' => ['foo' => 2]], 'https://example.com/test?foo=2#bar'],
+ 'override-query-merge' => ['https://example.com/test?foo=1#bar', ['query' => ['bar' => 2]], 'https://example.com/test?bar=2&foo=1#bar'],
+ 'override-deep-query-merge' => ['https://example.com/test?foo=1#bar', ['query' => ['bar' => ['baz' => 'foo']]], 'https://example.com/test?bar%5Bbaz%5D=foo&foo=1#bar'],
+ 'override-fragment' => ['https://example.com/test?foo=1#bar', ['fragment' => 'baz'], 'https://example.com/test?foo=1#baz'],
['//www.drupal.org', [], '//www.drupal.org'],
];
}
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/EntityViewTrait.php
--- a/core/tests/Drupal/Tests/EntityViewTrait.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/EntityViewTrait.php Tue Jul 10 15:07:59 2018 +0100
@@ -32,7 +32,7 @@
* (optional) Whether to clear the cache for this entity.
* @return array
*
- * @see drupal_render()
+ * @see \Drupal\Core\Render\RendererInterface::render()
*/
protected function buildEntityView(EntityInterface $entity, $view_mode = 'full', $langcode = NULL, $reset = FALSE) {
$ensure_fully_built = function (&$elements) use (&$ensure_fully_built) {
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
--- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php Tue Jul 10 15:07:59 2018 +0100
@@ -113,7 +113,6 @@
'MigrateCckFieldPluginManager is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManager instead.',
'MigrateCckFieldPluginManagerInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManagerInterface instead.',
'The "plugin.manager.migrate.cckfield" service is deprecated. You should use the \'plugin.manager.migrate.field\' service instead. See https://www.drupal.org/node/2751897',
- 'The Drupal\migrate\Plugin\migrate\process\Iterator is deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.0. Instead, use Drupal\migrate\Plugin\migrate\process\SubProcess',
'Drupal\system\Tests\Update\DbUpdatesTrait is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Use \Drupal\FunctionalTests\Update\DbUpdatesTrait instead. See https://www.drupal.org/node/2896640.',
'Using "null" for the value of node "count" of "Drupal\Core\Template\TwigNodeTrans" is deprecated since version 1.25 and will be removed in 2.0.',
'Using "null" for the value of node "options" of "Drupal\Core\Template\TwigNodeTrans" is deprecated since version 1.25 and will be removed in 2.0.',
@@ -137,14 +136,10 @@
'Using UTF-8 route patterns without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for pattern "/somewhere/{item}/over/the/קainbow".',
'Using UTF-8 route patterns without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for pattern "/place/meφω".',
'Using UTF-8 route patterns without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for pattern "/PLACE/meφω".',
- 'Passing a Session object to the ExpectationException constructor is deprecated as of Mink 1.7. Pass the driver instead.',
'The Drupal\editor\Plugin\EditorBase::settingsFormValidate method is deprecated since version 8.3.x and will be removed in 9.0.0.',
- 'CckFile is deprecated in Drupal 8.3.x and will be be removed before Drupal 9.0.x. Use \Drupal\file\Plugin\migrate\process\d6\FieldFile instead.',
'The Drupal\migrate\Plugin\migrate\process\Migration is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use Drupal\migrate\Plugin\migrate\process\MigrationLookup',
- 'LinkField is deprecated in Drupal 8.3.x and will be be removed before Drupal 9.0.x. Use \Drupal\link\Plugin\migrate\field\d7\LinkField instead.',
'LinkField is deprecated in Drupal 8.3.x and will be be removed before Drupal 9.0.x. Use \Drupal\link\Plugin\migrate\field\d6\LinkField instead.',
'CckFieldPluginBase is deprecated in Drupal 8.3.x and will be be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Plugin\migrate\field\FieldPluginBase instead.',
- 'MigrateCckFieldInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateField instead.',
'Drupal\system\Plugin\views\field\BulkForm is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\views\Plugin\views\field\BulkForm instead. See https://www.drupal.org/node/2916716.',
'The numeric plugin for watchdog.wid field is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Must use standard plugin instead. See https://www.drupal.org/node/2876378.',
'The numeric plugin for watchdog.uid field is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Must use standard plugin instead. See https://www.drupal.org/node/2876378.',
@@ -159,7 +154,6 @@
'Referencing the "twig_extension_test.test_extension" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.',
'Passing in arguments the legacy way is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Provide the right parameter names in the method, similar to controllers. See https://www.drupal.org/node/2894819',
'DateField is deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.x. Use \Drupal\datetime\Plugin\migrate\field\DateField instead.',
- 'The Drupal\taxonomy\Entity\Term::getVocabularyId method is deprecated since version 8.4.0 and will be removed before 9.0.0. Use Drupal\taxonomy\Entity\Term::bundle() instead to get the vocabulary ID.',
'The Drupal\editor\Plugin\EditorBase::settingsFormSubmit method is deprecated since version 8.3.x and will be removed in 9.0.0.',
'CommentVariable is deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.x. Use \Drupal\node\Plugin\migrate\source\d6\NodeType instead.',
'CommentType is deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.x. Use \Drupal\node\Plugin\migrate\source\d7\NodeType instead.',
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php
--- a/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php Tue Jul 10 15:07:59 2018 +0100
@@ -35,6 +35,19 @@
$this->fail($message);
}
+ // Test a valid schema, where the value is accessed before saving. Ensures
+ // that overridden data is correctly reset after casting.
+ $message = 'Unexpected SchemaIncompleteException thrown';
+ $config = $this->config('config_test.types')->set('int', '10');
+ $config->get('int');
+ try {
+ $config->save();
+ $this->pass($message);
+ }
+ catch (SchemaIncompleteException $e) {
+ $this->fail($message);
+ }
+
// Test an invalid schema.
$message = 'Expected SchemaIncompleteException thrown';
$config = $this->config('config_test.types')
diff -r e200cb7efeb3 -r c2387f117808 core/tests/Drupal/Tests/WebAssert.php
--- a/core/tests/Drupal/Tests/WebAssert.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/Drupal/Tests/WebAssert.php Tue Jul 10 15:07:59 2018 +0100
@@ -202,7 +202,7 @@
public function titleEquals($expected_title) {
$title_element = $this->session->getPage()->find('css', 'title');
if (!$title_element) {
- throw new ExpectationException('No title element found on the page', $this->session);
+ throw new ExpectationException('No title element found on the page', $this->session->getDriver());
}
$actual_title = $title_element->getText();
$this->assert($expected_title === $actual_title, 'Title found');
diff -r e200cb7efeb3 -r c2387f117808 core/tests/bootstrap.php
--- a/core/tests/bootstrap.php Thu Apr 26 11:26:54 2018 +0100
+++ b/core/tests/bootstrap.php Tue Jul 10 15:07:59 2018 +0100
@@ -66,7 +66,7 @@
$paths[] = is_dir("$path/profiles") ? realpath("$path/profiles") : NULL;
$paths[] = is_dir("$path/themes") ? realpath("$path/themes") : NULL;
}
- return array_filter($paths);
+ return array_filter($paths, 'file_exists');
}
/**
diff -r e200cb7efeb3 -r c2387f117808 core/themes/bartik/README.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/themes/bartik/README.txt Tue Jul 10 15:07:59 2018 +0100
@@ -0,0 +1,19 @@
+ABOUT BARTIK
+------------
+
+Bartik is the default theme for Drupal 8. It is a flexible, recolorable theme
+with a responsive and mobile-first layout, supporting 16 regions.
+
+The Bartik theme is named after Jean Bartik, one of the original programmers
+for the ENIAC computer.
+
+This theme is not intended to be used as a base theme.
+
+To read more about the Bartik theme please see:
+https://www.drupal.org/docs/8/core/themes/bartik-theme
+
+ABOUT DRUPAL THEMING
+--------------------
+
+See https://www.drupal.org/docs/8/theming for more information on Drupal
+theming.
diff -r e200cb7efeb3 -r c2387f117808 core/themes/bartik/css/colors.css
--- a/core/themes/bartik/css/colors.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/themes/bartik/css/colors.css Tue Jul 10 15:07:59 2018 +0100
@@ -46,10 +46,10 @@
.region-header,
.region-header a,
.region-header li a.is-active,
-.site-branding__text,
-.site-branding,
-.site-branding__text a,
-.site-branding a,
+.region-header .site-branding__text,
+.region-header .site-branding,
+.region-header .site-branding__text a,
+.region-header .site-branding a,
.region-secondary-menu .menu-item a,
.region-secondary-menu .menu-item a.is-active {
color: #fffeff;
diff -r e200cb7efeb3 -r c2387f117808 core/themes/bartik/css/components/site-branding.css
--- a/core/themes/bartik/css/components/site-branding.css Thu Apr 26 11:26:54 2018 +0100
+++ b/core/themes/bartik/css/components/site-branding.css Tue Jul 10 15:07:59 2018 +0100
@@ -7,6 +7,7 @@
display: inline-block;
margin-right: 1em; /* LTR */
margin-bottom: 0.286em;
+ border-bottom: 0;
}
[dir="rtl"] .site-branding__logo {
margin-right: 0;
diff -r e200cb7efeb3 -r c2387f117808 core/themes/bartik/templates/status-messages.html.twig
--- a/core/themes/bartik/templates/status-messages.html.twig Thu Apr 26 11:26:54 2018 +0100
+++ b/core/themes/bartik/templates/status-messages.html.twig Tue Jul 10 15:07:59 2018 +0100
@@ -16,8 +16,6 @@
* Available variables:
* - message_list: List of messages to be displayed, grouped by type.
* - status_headings: List of all status types.
- * - display: (optional) May have a value of 'status' or 'error' when only
- * displaying messages of that specific type.
*/
#}
{% block messages %}
diff -r e200cb7efeb3 -r c2387f117808 core/themes/classy/templates/content/media.html.twig
--- a/core/themes/classy/templates/content/media.html.twig Thu Apr 26 11:26:54 2018 +0100
+++ b/core/themes/classy/templates/content/media.html.twig Tue Jul 10 15:07:59 2018 +0100
@@ -17,7 +17,7 @@
'media',
'media--type-' ~ media.bundle()|clean_class,
not media.isPublished() ? 'media--unpublished',
- view_mode ? 'media--view-mode-' ~ view_mode.id()|clean_class,
+ view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
]
%}