diff --git a/core/includes/form.inc b/core/includes/form.inc
index 42206a4..1fbfcc6 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -671,7 +671,7 @@ function form_type_radios_value(&$element, $input = FALSE) {
// unless it's empty. (An empty #default_value, such as NULL or FALSE, can
// be used to indicate that no radio button is selected by default.)
if (!isset($input) && !empty($element['#default_value'])) {
- $element['#needs_validation'] = TRUE;
+ $element['#_needs_validation'] = TRUE;
}
return $input;
}
@@ -2171,7 +2171,7 @@ function form_pre_render_group($element) {
}
// Re-sort the element's children if we injected group member elements.
if (isset($sort)) {
- $element['#sorted'] = FALSE;
+ $element['#_sorted'] = FALSE;
}
}
@@ -2783,7 +2783,7 @@ function form_pre_render_password($element) {
* Expands a weight element into a select element.
*/
function form_process_weight($element) {
- $element['#is_weight'] = TRUE;
+ $element['#_is_weight'] = TRUE;
// If the number of options is small enough, use a select field.
$max_elements = \Drupal::config('system.site')->get('weight_select_max');
@@ -3036,7 +3036,7 @@ function _form_set_attributes(&$element, $class = array()) {
$element['#attributes']['required'] = 'required';
$element['#attributes']['aria-required'] = 'true';
}
- if (isset($element['#parents']) && isset($element['#errors']) && !empty($element['#validated'])) {
+ if (isset($element['#parents']) && isset($element['#errors']) && !empty($element['#_validated'])) {
$element['#attributes']['class'][] = 'error';
$element['#attributes']['aria-invalid'] = 'true';
}
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index d3bedc1..9488c8d 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -308,11 +308,11 @@ public function rebuildForm($form_id, &$form_state, $old_form = NULL) {
// build's data in the form cache; also allowing the user to go back to an
// earlier build, make changes, and re-submit.
// @see self::prepareForm()
- if (isset($old_form['#build_id']) && !empty($form_state['rebuild_info']['copy']['#build_id'])) {
- $form['#build_id'] = $old_form['#build_id'];
+ if (isset($old_form['#_build_id']) && !empty($form_state['rebuild_info']['copy']['#_build_id'])) {
+ $form['#_build_id'] = $old_form['#_build_id'];
}
else {
- $form['#build_id'] = 'form-' . Crypt::randomBytesBase64();
+ $form['#_build_id'] = 'form-' . Crypt::randomBytesBase64();
}
// #action defaults to request_uri(), but in case of Ajax and other partial
@@ -329,7 +329,7 @@ public function rebuildForm($form_id, &$form_state, $old_form = NULL) {
// self::doBuildForm(), so we need to do it here.
// @todo For Drupal 8, find a way to avoid this code duplication.
if (empty($form_state['no_cache'])) {
- $this->setCache($form['#build_id'], $form, $form_state);
+ $this->setCache($form['#_build_id'], $form, $form_state);
}
// Clear out all group associations as these might be different when
@@ -513,13 +513,13 @@ public function processForm($form_id, &$form, &$form_state) {
// With GET, these forms are always submitted if requested.
if ($form_state['method'] == 'get' && !empty($form_state['always_process'])) {
if (!isset($form_state['input']['form_build_id'])) {
- $form_state['input']['form_build_id'] = $form['#build_id'];
+ $form_state['input']['form_build_id'] = $form['#_build_id'];
}
if (!isset($form_state['input']['form_id'])) {
$form_state['input']['form_id'] = $form_id;
}
- if (!isset($form_state['input']['form_token']) && isset($form['#token'])) {
- $form_state['input']['form_token'] = $this->csrfToken->get($form['#token']);
+ if (!isset($form_state['input']['form_token']) && isset($form['#_token'])) {
+ $form_state['input']['form_token'] = $this->csrfToken->get($form['#_token']);
}
}
@@ -601,7 +601,7 @@ public function processForm($form_id, &$form, &$form_state) {
// request to accommodate new user input. Rebuilt forms are not cached here,
// because self::rebuildForm() already takes care of that.
if (!$form_state['rebuild'] && $form_state['cache'] && empty($form_state['no_cache'])) {
- $this->setCache($form['#build_id'], $unprocessed_form, $form_state);
+ $this->setCache($form['#_build_id'], $unprocessed_form, $form_state);
}
}
@@ -625,13 +625,13 @@ public function prepareForm($form_id, &$form, &$form_state) {
// build, make changes, and re-submit.
// @see self::buildForm()
// @see self::rebuildForm()
- if (!isset($form['#build_id'])) {
- $form['#build_id'] = 'form-' . Crypt::randomBytesBase64();
+ if (!isset($form['#_build_id'])) {
+ $form['#_build_id'] = 'form-' . Crypt::randomBytesBase64();
}
$form['form_build_id'] = array(
'#type' => 'hidden',
- '#value' => $form['#build_id'],
- '#id' => $form['#build_id'],
+ '#value' => $form['#_build_id'],
+ '#id' => $form['#_build_id'],
'#name' => 'form_build_id',
// Form processing and validation requires this value, so ensure the
// submitted form value appears literally, regardless of custom #tree
@@ -650,16 +650,16 @@ public function prepareForm($form_id, &$form, &$form_state) {
if ($user && $user->isAuthenticated() && !$form_state['programmed']) {
// Form constructors may explicitly set #token to FALSE when cross site
// request forgery is irrelevant to the form, such as search forms.
- if (isset($form['#token']) && $form['#token'] === FALSE) {
- unset($form['#token']);
+ if (isset($form['#_token']) && $form['#_token'] === FALSE) {
+ unset($form['#_token']);
}
// Otherwise, generate a public token based on the form id.
else {
- $form['#token'] = $form_id;
+ $form['#_token'] = $form_id;
$form['form_token'] = array(
'#id' => $this->drupalHtmlId('edit-' . $form_id . '-form-token'),
'#type' => 'token',
- '#default_value' => $this->csrfToken->get($form['#token']),
+ '#default_value' => $this->csrfToken->get($form['#_token']),
// Form processing and validation requires this value, so ensure the
// submitted form value appears literally, regardless of custom #tree
// and #parents being set elsewhere.
@@ -823,7 +823,7 @@ public function setError(&$element, array &$form_state, $message = '') {
*/
public function doBuildForm($form_id, &$element, &$form_state) {
// Initialize as unprocessed.
- $element['#processed'] = FALSE;
+ $element['#_processed'] = FALSE;
// Use element defaults.
if (isset($element['#type']) && empty($element['#defaults_loaded']) && ($info = $this->getElementInfo($element['#type']))) {
@@ -883,15 +883,15 @@ public function doBuildForm($form_id, &$element, &$form_state) {
}
// Allow for elements to expand to multiple elements, e.g., radios,
// checkboxes and files.
- if (isset($element['#process']) && !$element['#processed']) {
+ if (isset($element['#process']) && !$element['#_processed']) {
foreach ($element['#process'] as $process) {
$element = call_user_func_array($process, array(&$element, &$form_state, &$form_state['complete_form']));
}
- $element['#processed'] = TRUE;
+ $element['#_processed'] = TRUE;
}
// We start off assuming all form elements are in the correct order.
- $element['#sorted'] = TRUE;
+ $element['#_sorted'] = TRUE;
// Recurse through all child elements.
$count = 0;
@@ -939,7 +939,7 @@ public function doBuildForm($form_id, &$element, &$form_state) {
else {
// If one of the child elements has a weight then we will need to sort
// later.
- unset($element['#sorted']);
+ unset($element['#_sorted']);
}
$element[$key] = $this->doBuildForm($form_id, $element[$key], $form_state);
$count++;
@@ -947,11 +947,11 @@ public function doBuildForm($form_id, &$element, &$form_state) {
// The #after_build flag allows any piece of a form to be altered
// after normal input parsing has been completed.
- if (isset($element['#after_build']) && !isset($element['#after_build_done'])) {
+ if (isset($element['#after_build']) && !isset($element['#_after_build_done'])) {
foreach ($element['#after_build'] as $callable) {
$element = call_user_func_array($callable, array($element, &$form_state));
}
- $element['#after_build_done'] = TRUE;
+ $element['#_after_build_done'] = TRUE;
}
// If there is a file element, we need to flip a flag so later the
@@ -989,7 +989,7 @@ public function doBuildForm($form_id, &$element, &$form_state) {
// If the triggering element executes submit handlers, then set the form
// state key that's needed for those handlers to run.
- if (!empty($form_state['triggering_element']['#executes_submit_callback'])) {
+ if (!empty($form_state['triggering_element']['#_executes_submit_callback'])) {
$form_state['submitted'] = TRUE;
}
@@ -1101,7 +1101,7 @@ protected function handleInputElement($form_id, &$element, &$form_state) {
}
// Mark all posted values for validation.
if (isset($element['#value']) || (!empty($element['#required']))) {
- $element['#needs_validation'] = TRUE;
+ $element['#_needs_validation'] = TRUE;
}
}
// Load defaults.
diff --git a/core/modules/field/src/Plugin/views/field/Field.php b/core/modules/field/src/Plugin/views/field/Field.php
index ec794fd..50ece02 100644
--- a/core/modules/field/src/Plugin/views/field/Field.php
+++ b/core/modules/field/src/Plugin/views/field/Field.php
@@ -468,7 +468,7 @@ public function buildOptionsForm(&$form, &$form_state) {
'path' => views_ui_build_form_path($form_state),
),
'#submit' => array(array($this, 'submitTemporaryForm')),
- '#executes_submit_callback' => TRUE,
+ '#_executes_submit_callback' => TRUE,
);
$form['field_api_classes'] = array(
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index f25fe79..1c07bce 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -467,7 +467,7 @@ function filter_process_format($element) {
'#prefix',
'#suffix',
'#attached',
- '#processed',
+ '#_processed',
'#theme_wrappers',
);
// Move this element into sub-element 'value'.
diff --git a/core/modules/system/src/Controller/FormAjaxController.php b/core/modules/system/src/Controller/FormAjaxController.php
index f1645a7..978f91f 100644
--- a/core/modules/system/src/Controller/FormAjaxController.php
+++ b/core/modules/system/src/Controller/FormAjaxController.php
@@ -91,7 +91,7 @@ protected function getForm(Request $request) {
// When a form is rebuilt after Ajax processing, its #build_id and #action
// should not change.
// @see drupal_rebuild_form()
- $form_state['rebuild_info']['copy']['#build_id'] = TRUE;
+ $form_state['rebuild_info']['copy']['#_build_id'] = TRUE;
$form_state['rebuild_info']['copy']['#action'] = TRUE;
// The form needs to be processed; prepare for that by setting a few internal
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 6bd8dd4..2237073 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -328,7 +328,7 @@ function system_element_info() {
'#input' => TRUE,
'#name' => 'op',
'#is_button' => TRUE,
- '#executes_submit_callback' => TRUE,
+ '#_executes_submit_callback' => TRUE,
'#limit_validation_errors' => FALSE,
'#process' => array('form_process_button', 'ajax_process_form'),
'#pre_render' => array('form_pre_render_button'),
@@ -338,7 +338,7 @@ function system_element_info() {
'#input' => TRUE,
'#name' => 'op',
'#is_button' => TRUE,
- '#executes_submit_callback' => FALSE,
+ '#_executes_submit_callback' => FALSE,
'#limit_validation_errors' => FALSE,
'#process' => array('form_process_button', 'ajax_process_form'),
'#pre_render' => array('form_pre_render_button'),
@@ -347,7 +347,7 @@ function system_element_info() {
$types['image_button'] = array(
'#input' => TRUE,
'#is_button' => TRUE,
- '#executes_submit_callback' => TRUE,
+ '#_executes_submit_callback' => TRUE,
'#limit_validation_errors' => FALSE,
'#process' => array('form_process_button', 'ajax_process_form'),
'#return_value' => TRUE,
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index 30c7915..5c740e6 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -107,7 +107,7 @@ function tracker_page($account = NULL) {
'#theme' => 'pager',
'#weight' => 10,
);
- $page['#sorted'] = TRUE;
+ $page['#_sorted'] = TRUE;
return $page;
}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index 03ba5eb..250672c 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -308,19 +308,19 @@ public function testRebuildForm() {
// Do an initial build of the form and track the build ID.
$form_state = array();
$form = $this->formBuilder->buildForm($form_arg, $form_state);
- $original_build_id = $form['#build_id'];
+ $original_build_id = $form['#_build_id'];
// Rebuild the form, and assert that the build ID has not changed.
$form_state['rebuild'] = TRUE;
$form_state['input']['form_id'] = $form_id;
- $form_state['rebuild_info']['copy']['#build_id'] = TRUE;
+ $form_state['rebuild_info']['copy']['#_build_id'] = TRUE;
$this->formBuilder->processForm($form_id, $form, $form_state);
- $this->assertSame($original_build_id, $form['#build_id']);
+ $this->assertSame($original_build_id, $form['#_build_id']);
// Rebuild the form again, and assert that there is a new build ID.
$form_state['rebuild_info'] = array();
$form = $this->formBuilder->buildForm($form_arg, $form_state);
- $this->assertNotSame($original_build_id, $form['#build_id']);
+ $this->assertNotSame($original_build_id, $form['#_build_id']);
}
/**
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 587a9cc..0574b23 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -10,10 +10,11 @@
* your modifications. Failure to remove write permissions to this file is a
* security risk.
*
- * In order to use the selection rules below the multisite aliasing file named
- * sites/sites.php must be present. Its optional settings will be loaded, and
- * the aliases in the array $sites will override the default directory rules
- * below. See sites/example.sites.php for more information about aliases.
+ * The configuration file to be loaded is based upon the rules below. However
+ * if the multisite aliasing file named sites/sites.php is present, it will be
+ * loaded, and the aliases in the array $sites will override the default
+ * directory rules below. See sites/example.sites.php for more information about
+ * aliases.
*
* The configuration directory will be discovered by stripping the website's
* hostname from left to right and pathname from right to left. The first
@@ -49,11 +50,6 @@
*
* @see example.sites.php
* @see conf_path()
- *
- * In addition to customizing application settings through variables in
- * settings.php, you can create a services.yml file in the same directory to
- * register custom, site-specific service definitions and/or swap out default
- * implementations with custom ones.
*/
/**
@@ -219,6 +215,25 @@
$databases = array();
/**
+ * Salt for one-time login links and cancel links, form tokens, etc.
+ *
+ * This variable will be set to a random value by the installer. All one-time
+ * login links will be invalidated if the value is changed. Note that if your
+ * site is deployed on a cluster of web servers, you must ensure that this
+ * variable has the same value on each server. If this variable is empty, a hash
+ * of the serialized database credentials will be used as a fallback salt.
+ *
+ * For enhanced security, you may set this variable to a value using the
+ * contents of a file outside your docroot that is never saved together
+ * with any backups of your Drupal files and database.
+ *
+ * Example:
+ * $drupal_hash_salt = file_get_contents('/home/example/salt.txt');
+ *
+ */
+$drupal_hash_salt = '';
+
+/**
* Location of the site configuration files.
*
* By default, Drupal configuration files are stored in a randomly named
@@ -231,8 +246,14 @@
* Example:
* @code
* $config_directories = array(
- * CONFIG_ACTIVE_DIRECTORY => '/some/directory/outside/webroot',
- * CONFIG_STAGING_DIRECTORY => '/another/directory/outside/webroot',
+ * CONFIG_ACTIVE_DIRECTORY => array(
+ * 'path' => '/some/directory/outside/webroot',
+ * 'absolute' => TRUE,
+ * ),
+ * CONFIG_STAGING_DIRECTORY => array(
+ * 'path' => '/another/directory/outside/webroot',
+ * 'absolute' => TRUE,
+ * ),
* );
* @endcode
*/
@@ -241,31 +262,13 @@
/**
* Settings:
*
- * $settings contains environment-specific configuration, such as the files
- * directory and reverse proxy address, and temporary configuration, such as
- * turning on Twig debugging and security overrides.
- *
- * @see \Drupal\Component\Utility\Settings::get()
- */
-
-/**
- * Salt for one-time login links, cancel links, form tokens, etc.
- *
- * This variable will be set to a random value by the installer. All one-time
- * login links will be invalidated if the value is changed. Note that if your
- * site is deployed on a cluster of web servers, you must ensure that this
- * variable has the same value on each server.
- *
- * For enhanced security, you may set this variable to a value using the
- * contents of a file outside your docroot that is never saved together
- * with any backups of your Drupal files and database.
+ * $settings contains configuration that can not be saved in the configuration
+ * system because it is required too early during bootstrap like the database
+ * information. It is also used for configuration that is specific for a given
+ * environment like reverse proxy settings
*
- * Example:
- * @code
- * $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
- * @endcode
+ * @see settings_get()
*/
-$settings['hash_salt'] = '';
/**
* Access control for update.php script.
@@ -281,6 +284,50 @@
$settings['update_free_access'] = FALSE;
/**
+ * Twig debugging:
+ *
+ * When debugging is enabled:
+ * - The markup of each Twig template is surrounded by HTML comments that
+ * contain theming information, such as template file name suggestions.
+ * - Note that this debugging markup will cause automated tests that directly
+ * check rendered HTML to fail. When running automated tests, 'twig_debug'
+ * should be set to FALSE.
+ * - The dump() function can be used in Twig templates to output information
+ * about template variables.
+ * - Twig templates are automatically recompiled whenever the source code
+ * changes (see twig_auto_reload below).
+ *
+ * For more information about debugging Twig templates, see
+ * http://drupal.org/node/1906392.
+ *
+ * Not recommended in production environments (Default: FALSE).
+ */
+# $settings['twig_debug'] = TRUE;
+
+/**
+ * Twig auto-reload:
+ *
+ * Automatically recompile Twig templates whenever the source code changes. If
+ * you don't provide a value for twig_auto_reload, it will be determined based
+ * on the value of twig_debug.
+ *
+ * Not recommended in production environments (Default: NULL).
+ */
+# $settings['twig_auto_reload'] = TRUE;
+
+/**
+ * Twig cache:
+ *
+ * By default, Twig templates will be compiled and stored in the filesystem to
+ * increase performance. Disabling the Twig cache will recompile the templates
+ * from source each time they are used. In most cases the twig_auto_reload
+ * setting above should be enabled rather than disabling the Twig cache.
+ *
+ * Not recommended in production environments (Default: TRUE).
+ */
+# $settings['twig_cache'] = FALSE;
+
+/**
* External access proxy settings:
*
* If your site must access the Internet via a web proxy then you can enter
@@ -409,14 +456,6 @@
# $settings['mixed_mode_sessions'] = TRUE;
/**
- * Default mode for for directories and files written by Drupal.
- *
- * Value should be in PHP Octal Notation, with leading zero.
- */
-# $settings['file_chmod_directory'] = 0775;
-# $settings['file_chmod_file'] = 0664;
-
-/**
* Public file path:
*
* A local file system path where public files will be stored. This directory
@@ -443,7 +482,7 @@
* Remove the leading hash signs to enable.
*
* The "en" part of the variable name, is dynamic and can be any langcode of
- * any added language. (eg locale_custom_strings_de for german).
+ * any enabled language. (eg locale_custom_strings_de for german).
*/
# $settings['locale_custom_strings_en'][''] = array(
# 'forum' => 'Discussion board',
@@ -543,32 +582,25 @@
# $cookie_domain = '.example.com';
/**
- * Active configuration settings.
- *
- * By default, the active configuration is stored in the database in the
- * {config} table. To install Drupal with a different active configuration
- * storage, you need to override the setting here, in addition to overriding
- * the config.storage.active service definition in a module or profile.
+ * Variable overrides:
*
- * The 'bootstrap_config_storage' setting needs to be a callable that returns
- * core.services.yml.
- */
-# $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');
-
-/**
- * Configuration overrides.
- *
- * To globally override specific configuration values for this site,
+ * To override specific entries in the 'variable' table for this site,
* set them here. You usually don't need to use this feature. This is
* useful in a configuration file for a vhost or directory, rather than
- * the default settings.php.
- *
- * Note that any values you provide in these variable overrides will not be
- * modifiable from the Drupal administration interface.
+ * the default settings.php. Any configuration setting from the 'variable'
+ * table can be given a new value. Note that any values you provide in
+ * these variable overrides will not be modifiable from the Drupal
+ * administration interface.
+ *
+ * The following overrides are examples:
+ * - site_name: Defines the site's name.
+ * - $conf['system.theme']['default']: Defines the default theme for this site.
+ * - anonymous: Defines the human-readable name of anonymous users.
+ * Remove the leading hash signs to enable.
*/
-# $config['system.site']['name'] = 'My Drupal site';
-# $config['system.theme']['default'] = 'stark';
-# $config['user.settings']['anonymous'] = 'Visitor';
+# $conf['system.site']['name'] = 'My Drupal site';
+# $conf['system.theme']['default'] = 'stark';
+# $conf['anonymous'] = 'Visitor';
/**
* CSS/JS aggregated file gzip compression:
@@ -582,8 +614,8 @@
* configured to cache and compress these files itself you may want to uncomment
* one or both of the below lines, which will prevent gzip files being stored.
*/
-# $config['system.performance']['css']['gzip'] = FALSE;
-# $config['system.performance']['js']['gzip'] = FALSE;
+# $conf['system.performance']['css']['gzip'] = FALSE;
+# $conf['system.performance']['js']['gzip'] = FALSE;
/**
* Fast 404 pages:
@@ -607,9 +639,9 @@
*
* Remove the leading hash signs if you would like to alter this functionality.
*/
-# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)\//';
-# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
-# $config['system.performance']['fast_404']['html'] = '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
';
+#$conf['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)\//';
+#$conf['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
+#$conf['system.performance']['fast_404']['html'] = '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
';
/**
* Load local development override configuration, if available.