Skip to content

Commit 29937e0

Browse files
tbutterftbutterf
authored
Merge pull request #45 from ASUWebPlatforms/ws2-2-8-0
WS2 2.8.0
2 parents a240496 + dfc8b34 commit 29937e0

File tree

4 files changed

+78
-51
lines changed

4 files changed

+78
-51
lines changed

‎composer.json‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
}
4343
],
4444
"require": {
45-
"drush/drush": "^10",
45+
"drush/drush": "^11",
4646
"pantheon-upstreams/upstream-configuration": "*"
4747
},
4848
"conflict": {
@@ -54,10 +54,7 @@
5454
"enable-patching": true,
5555
"patches": {
5656
"drupal/radix": {
57-
"3053579: Integrate with OffCanvas (Layout Builder)": "https://www.drupal.org/files/issues/2020-10-20/3053579-25_0.patch"
58-
},
59-
"drupal/paragraphs" : {
60-
"2901390: fixing issue langcode cannot be null": "https://www.drupal.org/files/issues/2021-05-03/paragraphs-2901390-82-withtests.patch"
57+
"3053579: Integrate with OffCanvas (Layout Builder)": "https://www.drupal.org/files/issues/2021-12-15/3053579-32.patch"
6158
},
6259
"drupal/fakeobjects" : {
6360
"3002953: Fix js plugin seems to be missing": "https://www.drupal.org/files/issues/2020-06-22/fakeobjects-missing_plugin-3002953-5.patch"
@@ -72,6 +69,18 @@
7269
},
7370
"drupal/field_states_ui": {
7471
"#3225009: Cant add custom block with field states ui using layout builder": "https://www.drupal.org/files/issues/2022-03-07/3225009-5.patch"
72+
},
73+
"drupal/linkit": {
74+
"2877535: Fix issue with path alias": "https://www.drupal.org/files/issues/2022-06-07/2877535-39.patch"
75+
},
76+
"drupal/allowed_formats": {
77+
"3269869: Drupal 10 compatibility": "https://git.drupalcode.org/project/allowed_formats/-/commit/9b52e52.patch"
78+
},
79+
"drupal/fontawesome": {
80+
"#3219579: Hidding font awesome additional settings": "https://www.drupal.org/files/issues/2022-12-14/hidding_font_awesome_additional_settings-3219579-18.patch"
81+
},
82+
"drupal/cas": {
83+
"3318382: TypeError: in_array(): Argument #2 ($haystack) must be of type array": "https://www.drupal.org/files/issues/2022-10-31/cas-null-in_array-3318382-0.patch"
7584
}
7685
},
7786
"installer-paths": {
@@ -117,7 +126,7 @@
117126
"preferred-install": "dist",
118127
"sort-packages": true,
119128
"platform": {
120-
"php": "7.4"
129+
"php": "8.1.6"
121130
},
122131
"allow-plugins": {
123132
"composer/installers": true,

‎pantheon.upstream.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ api_version: 1
22
web_docroot: true
33
# See https://pantheon.io/docs/pantheon-yml/#enforce-https--hsts for valid values.
44
enforce_https: transitional
5-
php_version: 7.4
5+
php_version: 8.1
66
database:
77
version: 10.4
88
drush_version: 10

‎upstream-configuration/composer.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,80 +8,80 @@
88
}
99
],
1010
"require": {
11-
"php": ">=7.3",
11+
"php": ">=8.1.6",
1212
"composer/installers": "v1.11.0",
13-
"drupal/core-composer-scaffold": "9.3.22",
14-
"drupal/core-recommended": "9.3.22",
13+
"drupal/core-composer-scaffold": "9.4.9",
14+
"drupal/core-recommended": "9.4.9",
1515
"pantheon-systems/drupal-integrations": "9.0.2",
1616
"cweagans/composer-patches": "1.7.1",
1717
"zaporylie/composer-drupal-optimizations": "1.2.0",
1818
"drupal/environment_indicator": "4.0.3",
19-
"drupal/cas": "1.7.0",
20-
"asuwebplatforms/webspark-theme-renovation": "1.0.37",
19+
"drupal/cas": "2.1.0",
20+
"asuwebplatforms/webspark-theme-renovation": "1.0.44",
2121
"drupal/seckit": "2.0.0",
22-
"asuwebplatforms/webspark-module-asu_brand": "1.2.12",
23-
"drupal/radix": "4.10.0",
24-
"asuwebplatforms/webspark-profile-webspark": "1.1.12",
25-
"drupal/components" : "2.4.0",
22+
"asuwebplatforms/webspark-module-asu_brand": "1.2.13",
23+
"drupal/radix": "4.11.0",
24+
"asuwebplatforms/webspark-profile-webspark": "1.1.14",
25+
"drupal/components": "2.4.0",
2626
"npm-asset/select2": "4.1.0-RC.0",
2727
"npm-asset/fonticonpicker--fonticonpicker": "3.1.1",
2828
"oomphinc/composer-installers-extender": "2.0.0",
2929
"asuwebplatforms/webspark-module-webspark_utility": "1.1.6",
30-
"asuwebplatforms/webspark_module_renovation_layouts": "1.0.5",
31-
"drupal/select2" : "1.13.0",
32-
"drupal/paragraphs" : "1.13.0",
33-
"drupal/fontawesome" : "2.21.0",
30+
"asuwebplatforms/webspark_module_renovation_layouts": "1.0.6",
31+
"drupal/select2": "1.13.0",
32+
"drupal/paragraphs": "1.15.0",
33+
"drupal/fontawesome": "2.24.0",
3434
"drupal/devel": "^4.1",
3535
"drupal/devel_kint_extras": "^1.0",
36-
"drupal/crop": "2.1.0",
37-
"drupal/image_widget_crop": "2.3.0",
38-
"drupal/layout_builder_restrictions" : "2.12.0",
36+
"drupal/crop": "2.3.0",
37+
"drupal/image_widget_crop": "2.4.0",
38+
"drupal/layout_builder_restrictions": "2.16.0",
3939
"asuwebplatforms/webspark_module_views_pager": "1.0.3",
40-
"asuwebplatforms/webspark-module-webspark_blocks": "1.1.16",
40+
"asuwebplatforms/webspark-module-webspark_blocks": "1.1.18",
4141
"drupal/linkit": "6.0.0-beta3",
4242
"bower-asset/fontawesome": "^5.15",
4343
"drupal/current_page_crumb": "1.3.0",
44-
"drupal/pathauto": "1.9.0",
44+
"drupal/pathauto": "1.11.0",
4545
"asuwebplatforms/webspark-module-webspark_isearch": "1.0.2",
46-
"drupal/media_library_form_element": "2.0.3",
47-
"drupal/admin_toolbar": "3.1.0",
48-
"drupal/allowed_formats": "1.4.0",
46+
"drupal/media_library_form_element": "2.0.4",
47+
"drupal/admin_toolbar": "3.2.1",
48+
"drupal/allowed_formats": "1.5",
4949
"drupal/field_menu": "2.0.1",
5050
"asuwebplatforms/webspark-module-asu_news": "1.2.4",
5151
"asuwebplatforms/webspark-module-asu_events": "1.3.0",
52-
"asuwebplatforms/webspark-module-asu_footer": "1.0.13",
52+
"asuwebplatforms/webspark-module-asu_footer": "1.0.14",
5353
"asuwebplatforms/webspark-module-asu_react_integration": "1.0.1",
5454
"asuwebplatforms/webspark_module_asu_breadcrumb": "1.0.1",
55-
"asuwebplatforms/webspark-module-asu_react_core": "1.4.0",
55+
"asuwebplatforms/webspark-module-asu_react_core": "1.4.1",
5656
"asuwebplatforms/webspark-module-asu_components_appearance": "1.0.1",
57-
"drupal/layout_section_classes": "1.1.0",
58-
"drupal/field_group": "3.2.0",
59-
"drupal/metatag": "1.19.0",
60-
"asuwebplatforms/webspark-module-webspark_ckeditor_plugins": "1.0.6",
57+
"drupal/layout_section_classes": "1.2.0",
58+
"drupal/field_group": "3.4.0",
59+
"drupal/metatag": "1.22.0",
60+
"asuwebplatforms/webspark-module-webspark_ckeditor_plugins": "1.0.7",
6161
"drupal/layout_builder_component_attributes": "2.0.1",
62-
"asuwebplatforms/webspark-module-asu_user": "1.1.0",
63-
"asuwebplatforms/webspark-module-asu_degree_rfi": "1.2.4",
62+
"asuwebplatforms/webspark-module-asu_user": "1.1.1",
63+
"asuwebplatforms/webspark-module-asu_degree_rfi": "1.2.8",
6464
"asuwebplatforms/webspark-module-webspark_cropper_theme": "1.0.1",
6565
"drupal/ckeditor_responsive_plugin": "2.0.1",
6666
"drupal/maxlength": "1.0.0-rc1",
6767
"drupal/anchor_link": "2.5.0",
6868
"ckeditor/fakeobjects": "4.16.0",
6969
"ckeditor/link": "4.16.1",
70-
"drupal/redirect": "1.7.0",
71-
"drupal/simple_sitemap": "4.1.1",
70+
"drupal/redirect": "1.8.0",
71+
"drupal/simple_sitemap": "4.1.3",
7272
"drupal/config_readonly": "1.0.0-beta4",
7373
"drupal/config_update": "1.7.0",
74-
"drupal/webform": "6.1.2",
74+
"drupal/webform": "6.2.0-beta3",
7575
"drupal/robotstxt": "1.4",
76-
"drupal/captcha": "1.2",
76+
"drupal/captcha": "1.5",
7777
"drupal/schema_metatag": "2.3",
78-
"drupal/editoria11y": "1.0",
79-
"drupal/decorative_image_widget":"1.0.0-alpha4",
80-
"drupal/block_field": "1.0.0-rc2",
81-
"asuwebplatforms/webspark-module-webspark_cas": "1.0.1",
82-
"asuwebplatforms/webspark-module-webspark_webdir": "1.1.0",
78+
"drupal/editoria11y": "2.0.2",
79+
"drupal/decorative_image_widget": "1.0.0-alpha4",
80+
"drupal/block_field": "1.0.0-rc4",
81+
"asuwebplatforms/webspark-module-webspark_cas": "1.0.4",
82+
"asuwebplatforms/webspark-module-webspark_webdir": "1.1.1",
8383
"drupal/field_states_ui": "2.0",
8484
"drupal/ctools": "^3.11.0"
8585
},
86-
"version": "2.7.0"
86+
"version": "2.8.0"
8787
}

‎web/sites/default/settings.php‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@
2626
// $settings['skip_permissions_hardening'] = TRUE;
2727

2828
/**
29-
* If there is a local settings file, then include it
29+
* Enable the configuration readonly functionality.
3030
*/
31-
$local_settings = __DIR__ . "/settings.local.php";
32-
33-
if (file_exists($local_settings)) {
34-
include $local_settings;
31+
if (PHP_SAPI !== 'cli') {
32+
$settings['config_readonly'] = TRUE;
3533
}
3634

35+
/**
36+
* Allow all configuration to be changed.
37+
*/
38+
$settings['config_readonly_whitelist_patterns'] = ['*'];
39+
40+
/**
41+
* Allow files to be deleted from the file system, similar to Drupal 7.
42+
* See: https://www.drupal.org/node/2891902
43+
*/
44+
$config['file.settings']['make_unused_managed_files_temporary'] = TRUE;
45+
3746
/**
3847
* Enable the configuration readonly functionality.
3948
*/
@@ -51,3 +60,12 @@
5160
* See: https://www.drupal.org/node/2891902
5261
*/
5362
$config['file.settings']['make_unused_managed_files_temporary'] = TRUE;
63+
64+
/**
65+
* If there is a local settings file, then include it
66+
*/
67+
$local_settings = __DIR__ . "/settings.local.php";
68+
69+
if (file_exists($local_settings)) {
70+
include $local_settings;
71+
}

0 commit comments

Comments
 (0)