Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"parserOptions": {
"ecmaVersion": 2020
},
"plugins": [
"jsdoc"
],
"globals": {
"Drupal": true,
"drupalSettings": true,
Expand Down Expand Up @@ -43,15 +46,27 @@
}],
"no-param-reassign": ["off"],
"no-prototype-builtins": ["off"],
"valid-jsdoc": ["warn", {
"prefer": {
"returns": "return",
"property": "prop"
},
"requireReturn": false
}],
"jsdoc/require-returns": ["off"],
"jsdoc/require-returns-type": ["warn"],
"jsdoc/require-returns-description": ["warn"],
"jsdoc/require-returns-check": ["warn"],
"jsdoc/require-param": ["warn"],
"jsdoc/require-param-type": ["warn"],
"jsdoc/require-param-description": ["warn"],
"jsdoc/check-param-names": ["warn"],
"jsdoc/valid-types": ["warn"],
"jsdoc/require-param-name": ["warn"],
"jsdoc/check-tag-names": ["warn"],
"no-unused-vars": ["warn"],
"operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
"yml/indent": ["error", 2]
},
"settings": {
"jsdoc": {
"tagNamePreference": {
"returns": "return",
"property": "prop"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"parserOptions": {
"ecmaVersion": 2020
},
"plugins": [
"jsdoc"
],
"globals": {
"Drupal": true,
"drupalSettings": true,
Expand Down Expand Up @@ -43,15 +46,27 @@
}],
"no-param-reassign": ["off"],
"no-prototype-builtins": ["off"],
"valid-jsdoc": ["warn", {
"prefer": {
"returns": "return",
"property": "prop"
},
"requireReturn": false
}],
"jsdoc/require-returns": ["off"],
"jsdoc/require-returns-type": ["warn"],
"jsdoc/require-returns-description": ["warn"],
"jsdoc/require-returns-check": ["warn"],
"jsdoc/require-param": ["warn"],
"jsdoc/require-param-type": ["warn"],
"jsdoc/require-param-description": ["warn"],
"jsdoc/check-param-names": ["warn"],
"jsdoc/valid-types": ["warn"],
"jsdoc/require-param-name": ["warn"],
"jsdoc/check-tag-names": ["warn"],
"no-unused-vars": ["warn"],
"operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
"yml/indent": ["error", 2]
},
"settings": {
"jsdoc": {
"tagNamePreference": {
"returns": "return",
"property": "prop"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"eslint-config-airbnb-base": "__VERSION__",
"eslint-config-prettier": "__VERSION__",
"eslint-plugin-import": "__VERSION__",
"eslint-plugin-jsdoc": "__VERSION__",
"eslint-plugin-no-jquery": "__VERSION__",
"eslint-plugin-prettier": "__VERSION__",
"eslint-plugin-yml": "__VERSION__",
"prettier": "__VERSION__",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public function testEnvironmentNoOverrides(): void {
$config['system.performance']['cache']['page']['max_age'] = 900;
$this->assertConfig($config);

$settings['auto_create_htaccess'] = FALSE;
$settings['config_exclude_modules'] = [];
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
$settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -154,6 +155,7 @@ public function testEnvironmentOverrides(): void {
$this->assertConfig($config);

// Verify settings overrides.
$settings['auto_create_htaccess'] = FALSE;
$settings['config_exclude_modules'] = [];
$settings['config_sync_directory'] = 'custom_config';
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
Expand Down Expand Up @@ -200,6 +202,7 @@ public function testEnvironmentLocal(): void {
$config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE;
$this->assertConfig($config);

$settings['auto_create_htaccess'] = FALSE;
$settings['config_exclude_modules'] = [];
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
$settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -246,6 +249,7 @@ public function testEnvironmentLocalContainer(): void {
$config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE;
$this->assertConfig($config);

$settings['auto_create_htaccess'] = FALSE;
$settings['config_exclude_modules'] = [];
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
$settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -294,6 +298,7 @@ public function testEnvironmentGha(): void {
$config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE;
$this->assertConfig($config);

$settings['auto_create_htaccess'] = FALSE;
$settings['config_exclude_modules'] = [];
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
$settings['entity_update_batch_size'] = 50;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,18 @@
*/
# $settings['file_temp_path'] = '/tmp';

/**
* Automatically create an Apache HTTP .htaccess file in writable directories.
*
* This setting can be disabled if you are not using Apache HTTP server, or if
* you have a web server configuration that protects the various writable file
* directories.
*
* @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess()
* @see https://www.drupal.org/docs/administering-a-drupal-site/security-in-drupal/securing-file-permissions-and-ownership
*/
# $settings['auto_create_htaccess'] = FALSE;

/**
* Session write interval:
*
Expand All @@ -623,7 +635,7 @@
*/
# $settings['locale_custom_strings_en'][''] = [
# 'Home' => 'Front page',
# '@count min' => '@count minutes',
# 'Last run @time ago' => 'Last run was done @time ago',
# ];

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
'bower_components',
];

// Do not automatically create an Apache HTTP .htaccess file in writable
// directories. Overridden in hosting provider settings files as needed.
$settings['auto_create_htaccess'] = FALSE;

// The default number of entities to update in a batch process.
$settings['entity_update_batch_size'] = 50;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -270,9 +270,9 @@
@@ -274,9 +274,9 @@
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -270,9 +270,9 @@
@@ -274,9 +274,9 @@
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -270,9 +270,9 @@
@@ -274,9 +274,9 @@
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -270,9 +270,9 @@
@@ -274,9 +274,9 @@
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,18 @@
*/
# $settings['file_temp_path'] = '/tmp';

/**
* Automatically create an Apache HTTP .htaccess file in writable directories.
*
* This setting can be disabled if you are not using Apache HTTP server, or if
* you have a web server configuration that protects the various writable file
* directories.
*
* @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess()
* @see https://www.drupal.org/docs/administering-a-drupal-site/security-in-drupal/securing-file-permissions-and-ownership
*/
# $settings['auto_create_htaccess'] = FALSE;

/**
* Session write interval:
*
Expand All @@ -621,7 +633,7 @@
*/
# $settings['locale_custom_strings_en'][''] = [
# 'Home' => 'Front page',
# '@count min' => '@count minutes',
# 'Last run @time ago' => 'Last run was done @time ago',
# ];

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
$settings['config_sync_directory'] = getenv('DRUPAL_CONFIG_PATH') ?: $settings['config_vcs_directory'];
}

// Automatically create an Apache HTTP .htaccess file in writable directories.
$settings['auto_create_htaccess'] = TRUE;

// Default all environments to 'dev', including ODE environments.
$settings['environment'] = ENVIRONMENT_DEV;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
'bower_components',
];

// Do not automatically create an Apache HTTP .htaccess file in writable
// directories. Overridden in hosting provider settings files as needed.
$settings['auto_create_htaccess'] = FALSE;

// The default number of entities to update in a batch process.
$settings['entity_update_batch_size'] = 50;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
];
}

@@ -310,6 +354,173 @@
@@ -315,6 +359,177 @@
$settings['skip_permissions_hardening'] = TRUE;
$settings['config_sync_directory'] = '../config/default';
$settings['suspend_mail_send'] = TRUE;
Expand Down Expand Up @@ -81,6 +81,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -123,6 +124,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -165,6 +167,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
Expand Down Expand Up @@ -206,6 +209,7 @@
+ $config['system.performance']['js']['preprocess'] = TRUE;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
];
}

@@ -312,6 +492,214 @@
@@ -317,6 +497,218 @@
$settings['suspend_mail_send'] = TRUE;
$settings['trusted_host_patterns'] = [
'^localhost$',
Expand Down Expand Up @@ -219,6 +219,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = FALSE;
+ $settings['cache_prefix']['default'] = 'test_project_test_branch';
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '../config/default';
Expand Down Expand Up @@ -271,6 +272,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = FALSE;
+ $settings['cache_prefix']['default'] = 'test_project_develop';
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '../config/default';
Expand Down Expand Up @@ -323,6 +325,7 @@
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = FALSE;
+ $settings['cache_prefix']['default'] = 'test_project_master';
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '../config/default';
Expand Down Expand Up @@ -375,6 +378,7 @@
+ $config['system.performance']['js']['preprocess'] = TRUE;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = FALSE;
+ $settings['cache_prefix']['default'] = 'test_project_production';
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '../config/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,18 @@
*/
# $settings['file_temp_path'] = '/tmp';

/**
* Automatically create an Apache HTTP .htaccess file in writable directories.
*
* This setting can be disabled if you are not using Apache HTTP server, or if
* you have a web server configuration that protects the various writable file
* directories.
*
* @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess()
* @see https://www.drupal.org/docs/administering-a-drupal-site/security-in-drupal/securing-file-permissions-and-ownership
*/
# $settings['auto_create_htaccess'] = FALSE;

/**
* Session write interval:
*
Expand All @@ -621,7 +633,7 @@
*/
# $settings['locale_custom_strings_en'][''] = [
# 'Home' => 'Front page',
# '@count min' => '@count minutes',
# 'Last run @time ago' => 'Last run was done @time ago',
# ];

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
$settings['config_sync_directory'] = getenv('DRUPAL_CONFIG_PATH') ?: $settings['config_vcs_directory'];
}

// Automatically create an Apache HTTP .htaccess file in writable directories.
$settings['auto_create_htaccess'] = TRUE;

// Default all environments to 'dev', including ODE environments.
$settings['environment'] = ENVIRONMENT_DEV;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
'bower_components',
];

// Do not automatically create an Apache HTTP .htaccess file in writable
// directories. Overridden in hosting provider settings files as needed.
$settings['auto_create_htaccess'] = FALSE;

// The default number of entities to update in a batch process.
$settings['entity_update_batch_size'] = 50;

Expand Down
Loading