Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #2081: Upgrade Drupal core to 10.0.9 #2354

Merged
merged 47 commits into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d80c2a1
WIP D10 compatibility changes.
joeparsons Apr 19, 2023
52cf5ec
Merge branch 'main' into issue/2081-D10
joeparsons Apr 19, 2023
faefe86
Updated .lando.yml.
joeparsons Apr 20, 2023
8aa8c46
Update better_exposed_filters.
joeparsons Apr 20, 2023
5f5c2ca
Merge branch 'main' into issue/2081-D10
joeparsons Apr 21, 2023
e8479a7
Merge branch 'main' into issue/2081-D10
joeparsons Apr 27, 2023
6e02584
Merge branch 'main' into issue/2081-D10
joeparsons May 12, 2023
a767377
Update drupal/migrate_tools requirement from 5.2.0 to 6.0.1
dependabot[bot] May 29, 2023
aa3deb9
Add return typehints to match parent class.
joeparsons May 31, 2023
ecd8e46
Merge branch 'main' into issue/2081-D10
joeparsons Jun 2, 2023
48e1b24
Update phpcs.xml.dist
joeparsons Jun 2, 2023
6019334
Update .lando.yml
joeparsons Jun 2, 2023
6ca46b3
Delete drupal
joeparsons Jun 2, 2023
70f3bd1
Update phpcs.xml.dist
joeparsons Jun 2, 2023
e719fff
Merge branch 'main' into issue/2081-D10
joeparsons Jun 11, 2023
b6bb2f0
More progress.
joeparsons Jun 14, 2023
b635a7d
Try requiring D10.
joeparsons Jun 14, 2023
d5e718d
Update composer.json
joeparsons Jun 14, 2023
f4eb7aa
Revert "Update composer.json"
joeparsons Jun 14, 2023
6d95a0e
Working build (finally).
joeparsons Jun 14, 2023
13872ec
Use forks for background_image_formatter and smart_title.
joeparsons Jun 15, 2023
ff39605
Fix Probo config.
joeparsons Jun 15, 2023
7f08ab2
Try setting drush fallback for drush launcher on Probo.
joeparsons Jun 15, 2023
4fa6d0c
Merge branch 'main' into issue/2081-D10
joeparsons Jun 15, 2023
088568f
Address test failures.
joeparsons Jun 15, 2023
71fdb2b
Merge branch 'dependabot/composer/drupal/migrate_tools-6.0.1' into is…
joeparsons Jun 15, 2023
0c0032b
Fix bootstrap_barrio patch.
joeparsons Jun 15, 2023
18fd954
Make phpstan happy.
joeparsons Jun 15, 2023
589bd1e
Make PHPCS happy.
joeparsons Jun 15, 2023
e0b2998
Try to make drush on ProboCI happy.
joeparsons Jun 15, 2023
cf3eac5
Try fixing Probo Drush another way.
joeparsons Jun 15, 2023
81f41ba
Fix failing migration tests.
joeparsons Jun 15, 2023
8c6292e
Troy's fix for once.js issues affecting event calendar and publicatio…
tadean Jun 15, 2023
218d38b
Revert "Try to make drush on ProboCI happy."
joeparsons Jun 15, 2023
517a2d2
Disable bootstrap_barrio_source and bootstrap_barrio_library settings…
joeparsons Jun 1, 2023
2f9a460
Add other Bootstrap Barrio patch from issue/2442.
joeparsons Jun 15, 2023
de3981e
Setting composer version in lando file not needed.
joeparsons Jun 15, 2023
2c45962
Latest module versions.
joeparsons Jun 15, 2023
c425bd1
Merge branch 'main' into issue/2081-D10
joeparsons Jun 15, 2023
f05a92a
Restored config_distro storage comparer issue patch. Fixed patch alp…
joeparsons Jun 16, 2023
d5869ac
Merge branch 'main' into issue/2081-D10
joeparsons Jun 16, 2023
c543836
Applied @tadean's fix for attribute widget issue.
joeparsons Jun 16, 2023
9c4948c
Merge branch 'main' into issue/2081-D10
joeparsons Jun 16, 2023
e87bb03
Merge branch 'main' into issue/2081-D10
joeparsons Jun 16, 2023
31b454e
Update .lando.yml.
joeparsons Jun 16, 2023
10ca945
Update composer.json
trackleft Jun 16, 2023
33470ac
Merge branch 'main' into issue/2081-D10
trackleft Jun 17, 2023
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
14 changes: 7 additions & 7 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: az_quickstart
recipe: drupal9
recipe: drupal10
config:
php: '8.1'
via: apache:2.4
Expand All @@ -19,16 +19,16 @@ services:
- '3306'
environment:
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 'true'
MARIADB_DATABASE: drupal9
MYSQL_DATABASE: drupal9
MARIADB_USER: drupal9
MARIADB_PASSWORD: drupal9
MARIADB_DATABASE: drupal10
MYSQL_DATABASE: drupal10
MARIADB_USER: drupal10
MARIADB_PASSWORD: drupal10
appserver:
config:
php: .vscode/php.ini
overrides:
environment:
SIMPLETEST_DB: 'mysql://drupal9:drupal9@database/drupal9'
SIMPLETEST_DB: 'mysql://drupal10:drupal10@database/drupal10'
SIMPLETEST_BASE_URL: 'http://appserver'
MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--disable-dev-shm-usage","--headless","--no-sandbox"],"w3c":false}},"http://chromedriver:4444/wd/hub"]'
XDEBUG_MODE: debug
Expand Down Expand Up @@ -63,7 +63,7 @@ tooling:
install:
service: appserver
cmd:
- /app/vendor/bin/drush --root=/app/web site:install [email protected] --account-name=azadmin --account-pass=azadmin --db-url=mysql://drupal9:drupal9@database:3306/drupal9 -y --verbose
- /app/vendor/bin/drush --root=/app/web site:install [email protected] --account-name=azadmin --account-pass=azadmin --db-url=mysql://drupal10:drupal10@database:3306/drupal10 -y --verbose
- /app/vendor/bin/drush --root=/app/web config:set -y az_cas.settings disable_login_form 0
- /app/vendor/bin/drush --root=/app/web cache:rebuild
# Enable theme debugging.
Expand Down
3 changes: 2 additions & 1 deletion .probo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ steps:
- yarn run eslint --color .
- name: Install Arizona Quickstart
plugin: Drupal
drupalVersion: 9
drupalVersion: 10
subDirectory: az-quickstart-scaffolding/web
runInstall: true
profileName: az_quickstart
installArgs: "--site-name='Quickstart Review' --account-name=azadmin --account-pass=azadmin --verbose --yes -n"
cliDefines: {DRUSH_LAUNCHER_FALLBACK: '$SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush'}
- name: Post-Installation Steps
plugin: Script
script:
Expand Down
2 changes: 1 addition & 1 deletion az_quickstart.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install:
- drupal:history
- drupal:block
- drupal:breakpoint
- drupal:ckeditor
- ckeditor:ckeditor
- drupal:config
- drupal:content_moderation
- drupal:contextual
Expand Down
56 changes: 28 additions & 28 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
}
],
"require": {
"php": ">=7.4",
"php": ">=8.1",
"az-digital/arizona-bootstrap": "2.0.23",
"npm-asset/bootstrap-datepicker": "1.10.0",
"az-digital/background_image_formatter": "dev-az-digital",
"az-digital/smart_title": "dev-az-digital",
"citation-style-language/locales": "0.0.5",
"citation-style-language/styles": "0.0.249",
"composer/installers": "^1.9",
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"drupal/access_unpublished": "1.5.0",
"drupal/antibot": "2.0.2",
"drupal/asset_injector": "2.17.0",
"drupal/auto_entitylabel": "3.0.0",
"drupal/background_image_formatter": "1.7",
"drupal/better_exposed_filters": "6.0.3",
"drupal/blazy": "2.16.0",
"drupal/block_class": "2.0.11",
Expand All @@ -50,16 +50,17 @@
"drupal/bootstrap_utilities": "2.0.0",
"drupal/cas": "2.1.0",
"drupal/chosen": "4.0.0",
"drupal/ckeditor": "1.0.1",
"drupal/ckeditor_bs_grid": "2.0.9",
"drupal/coffee": "1.3.0",
"drupal/config_distro": "1.0-alpha4",
"drupal/config_provider": "2.0-rc4",
"drupal/config_snapshot": "1.0-rc2",
"drupal/config_sync": "2.0-beta7",
"drupal/config_update": "1.7",
"drupal/core-recommended": "9.5.9",
"drupal/config_distro": "2.0.0-alpha1",
"drupal/config_provider": "3.0.0-alpha1",
"drupal/config_snapshot": "2.0.0-alpha1",
"drupal/config_sync": "3.0.0-alpha2",
"drupal/config_update": "2.0.0-alpha3",
"drupal/core-recommended": "10.0.9",
"drupal/crop": "2.3.0",
"drupal/ctools": "3.11",
"drupal/ctools": "3.14.0",
"drupal/date_ap_style": "1.5.0",
"drupal/draggableviews": "2.1.3",
"drupal/easy_breadcrumb": "2.0.5",
Expand Down Expand Up @@ -90,7 +91,7 @@
"drupal/menu_block": "1.10.0",
"drupal/menu_link_attributes": "1.3.0",
"drupal/metatag": "1.22.0",
"drupal/migrate_plus": "5.3.0",
"drupal/migrate_plus": "6.0.1",
"drupal/migrate_queue_importer": "2.1.0",
"drupal/migrate_tools": "6.0.1",
"drupal/optional_end_date": "1.3.0",
Expand All @@ -105,16 +106,16 @@
"drupal/slick": "2.9.0",
"drupal/slick_views": "2.7.0",
"drupal/smart_date": "3.6.1 || 3.7.2",
"drupal/smart_title": "1.0-beta1",
"drupal/smtp": "1.2.0",
"drupal/token": "1.11.0",
"drupal/views_bootstrap": "5.4.0",
"drupal/viewsreference": "2.0.0-beta4",
"drupal/webform": "6.1.4",
"drupal/webform": "6.2.0-beta6",
"drupal/workbench_access": "2.0.1",
"drupal/xmlsitemap": "1.4.0",
"jjj/chosen": "2.2.1",
"npm-asset/blazy": "1.8.2",
"npm-asset/bootstrap-datepicker": "1.10.0",
"npm-asset/jquery-ui-touch-punch": "0.2.3",
"npm-asset/slick-carousel": "1.8.0",
"renanbr/bibtex-parser": "2.1.2",
Expand All @@ -135,38 +136,37 @@
"Support entities without bundles (2945387)": "https://www.drupal.org/files/issues/2022-05-20/2945387-19-support-bundleless-entities.patch"
},
"drupal/bootstrap_barrio": {
"Affix library still broken (3366908)": "https://www.drupal.org/files/issues/2023-06-14/3366908-3_5-x.patch",
"Fix schema (3217958)": "https://gist.githubusercontent.com/joeparsons/7d36cefca83823e93b44cb5b36374b04/raw/c495d02fddcb8364f9d6163bcd74f75e3d47f24f/3217958-5-x.patch"
},
"drupal/cas": {
"ServiceNotFoundException when logging out (2948185)": "https://www.drupal.org/files/issues/cas_logout_error-2948185-2.patch",
"Drupal 9.2's change to session handling is not compatible with this module (3190842)": "https://www.drupal.org/files/issues/2022-08-04/3190842-only-get-session-id-when-necessary.patch"
},
"drupal/config_sync": {
"Config_sync_test core constraint": "https://gist.githubusercontent.com/tadean/602c6412fbbdcc16a2d8a0fb58642f9e/raw/2ef503a4c0ae7d459f7c789d6ad3720d92945880/config_sync_test_core_requirement_issue.patch"
"drupal/ckeditor": {
"MediaEmbed conflates default view mode with user-selected view mode (3109289)": "https://www.drupal.org/files/issues/2023-02-28/3109289-ckeditor-contrib-67.patch",
"Changing an existing embedded media's alignment or alt data attributes does not get saved with CKEditor (3330723)": "https://www.drupal.org/files/issues/2023-01-03/3330723-3.patch"
},
"drupal/config_distro": {
"Storage comparer issue": "https://gist.githubusercontent.com/tadean/e2e0dd57f1a9c4eae28d8e713cb01d82/raw/e114987d4a76c183208c763de4dbfecbf41b7f35/config_distro_storage_comparer_issue.patch"
},
"drupal/config_provider": {
"ConfigProviderInterface::addConfigToCreate() @return annotation is wrong (3281977)": "https://www.drupal.org/files/issues/2022-05-23/3281977-2.patch"
},
"drupal/core": {
"Rendered content view with relationship issue (2457999)": "https://www.drupal.org/files/issues/2023-01-04/2457999-9.5.x-309.patch",
"Views Date Filter Datetime Granularity Option (2868014)": "https://www.drupal.org/files/issues/2022-11-16/2868014-127.datetime-granularity.patch",
"Unnecessary restrictions on logo format: Can't upload replacement SVG logo (2259567)": "https://www.drupal.org/files/issues/2022-05-05/2259567-160-9-3-x.patch",
"Ajax CSS load order issue (1461322)": "https://www.drupal.org/files/issues/2020-06-05/1461322-25.patch",
"Ajax CSS load order issue (1461322)": "https://www.drupal.org/files/issues/2023-06-14/1461322-10-0-x-40.patch",
"Layout builder revisions issue (3033516)": "https://www.drupal.org/files/issues/2019-06-17/3033516-17.patch",
"Allow text field to enforce a specific text format (784672)": "https://www.drupal.org/files/issues/2023-01-05/784672-302.patch",
"Allow text field to enforce a specific text format (784672)": "https://www.drupal.org/files/issues/2023-04-04/784672-drupal-10.0.x-305.patch",
"Unable to select single view display for view settings (2552541)": "https://www.drupal.org/files/issues/2020-11-03/2552541-43.patch",
trackleft marked this conversation as resolved.
Show resolved Hide resolved
"MediaEmbed conflates default view mode with user-selected view mode (3109289)": "https://www.drupal.org/files/issues/2022-12-07/drupal_core-mediaembed_default_view_mode-3109289-65.patch",
"MediaEmbed conflates default view mode with user-selected view mode (3109289)": "https://www.drupal.org/files/issues/2023-03-23/3109289-68.patch",
"Unrelated error message when running tests with database errors (3163925)": "https://www.drupal.org/files/issues/2022-05-12/3163925-19-9-2-x.patch",
"Add skip-method option to file_copy and download process plugins (2766369)": "https://www.drupal.org/files/issues/2022-04-23/2766369-33.patch",
"Move content overview default task link out of content_moderation module (3199682)": "https://www.drupal.org/files/issues/2022-02-10/3199682-11-9-4-x.patch",
"Changing an existing embedded media does not get saved with CKEditor (3102249)": "https://www.drupal.org/files/issues/2022-09-19/3102249-48.patch",
"Improve migration system performance: statically cache DrupalSqlBase::$systemData (3154156)": "https://www.drupal.org/files/issues/2022-01-24/3154156-12.patch"
},
"drupal/config_distro": {
"fnmatch issue": "https://www.drupal.org/files/issues/2020-07-04/3144145-replace-fnmatch-with-preg-match-6.patch",
"missing parent class": "https://git.drupalcode.org/issue/config_distro-3199197/-/commit/c312096d486caa2f01703ca7de1abf2285b6fac8.diff",
"Storage comparer issue": "https://gist.githubusercontent.com/tadean/4ad67c67a56d9fcec83db8f403ac58d7/raw/9a6762de5b014dffecf06c9a5b311f75c534fce4/config_distro_comparer.patch"
},
"drupal/config_provider": {
"ConfigProviderInterface::addConfigToCreate() @return annotation is wrong (3281977)": "https://www.drupal.org/files/issues/2022-05-23/3281977-2.patch"
},
"drupal/date_ap_style": {
"All Day Setting hides time display (3272760)": "https://www.drupal.org/files/issues/2022-03-31/3272760-7.patch"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AzCasAdminSettingsTest extends QuickstartFunctionalTestBase {
*
* @var string
*/
protected $defaultTheme = 'seven';
protected $defaultTheme = 'claro';

/**
* The admin user.
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/az_cas/tests/src/Functional/AzCasTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AzCasTest extends QuickstartFunctionalTestBase {
/**
* @var string
*/
protected $defaultTheme = 'seven';
protected $defaultTheme = 'claro';

/**
* The created user.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ public function settingsSummary() {
*/
public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {

$this->required = $element['#required'] ?? FALSE;
$this->multiple = $this->fieldDefinition->getFieldStorageDefinition()->isMultiple();
$this->has_value = isset($items[0]->{$this->column});

// Initial form.
$element += [
'#type' => 'details',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ClearCacheTest extends QuickstartFunctionalTestBase {
/**
* @var string
*/
protected $defaultTheme = 'seven';
protected $defaultTheme = 'claro';

/**
* Tests the clear cache button on the Quickstart settings page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ protected function batchOperations(array $migrations, $operation, array $options
/**
* {@inheritdoc}
*/

/**
* @phpstan-ignore-next-line */
public static function batchProcessImport($migration_id, array $options, &$context): void {
if (empty($context['sandbox'])) {
$context['finished'] = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ServerException;
use Psr\Http\Message\ResponseInterface;

/**
* Retrieve data over an HTTP connection for migration. Retry if necessary.
Expand Down Expand Up @@ -36,7 +37,7 @@ class RetryHttp extends Http {
/**
* {@inheritdoc}
*/
public function getResponse($url) {
public function getResponse($url): ResponseInterface {
// Schedule sometimes returns 500 during outages.
for ($i = 0; $i < self::MAX_REQUESTS; $i++) {
try {
Expand Down
7 changes: 3 additions & 4 deletions modules/custom/az_event/js/az_calendar_filter.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
*/

(($, Drupal, drupalSettings) => {
(($, Drupal, drupalSettings, once) => {
Drupal.behaviors.azCalendarFilter = {
attach(context, settings) {
const filterInformation = drupalSettings.azCalendarFilter;
Expand Down Expand Up @@ -35,8 +35,7 @@
$('.az-calendar-filter-calendar').datepicker('refresh');

// Initialize calendar widget wrapper if needed.
$('.az-calendar-filter-wrapper', context)
.once('azCalendarFilter')
$(once('azCalendarFilter', '.az-calendar-filter-wrapper', context))
// eslint-disable-next-line func-names
.each(function () {
const $wrapper = $(this);
Expand Down Expand Up @@ -231,4 +230,4 @@
});
},
};
})(jQuery, Drupal, drupalSettings);
})(jQuery, Drupal, drupalSettings, once);
6 changes: 3 additions & 3 deletions modules/custom/az_event/js/az_calendar_filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* https://www.drupal.org/node/2815083
* @preserve
**/
(function ($, Drupal, drupalSettings) {
(function ($, Drupal, drupalSettings, once) {
Drupal.behaviors.azCalendarFilter = {
attach: function attach(context, settings) {
var filterInformation = drupalSettings.azCalendarFilter;
Expand All @@ -23,7 +23,7 @@
}
});
$('.az-calendar-filter-calendar').datepicker('refresh');
$('.az-calendar-filter-wrapper', context).once('azCalendarFilter').each(function () {
$(once('azCalendarFilter', '.az-calendar-filter-wrapper', context)).each(function () {
var $wrapper = $(this);
var rangeKey = $wrapper.data('az-calendar-filter');
var rangeStart = null;
Expand Down Expand Up @@ -147,4 +147,4 @@
});
}
};
})(jQuery, Drupal, drupalSettings);
})(jQuery, Drupal, drupalSettings, once);
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/az_migration/migrations/az_node_event.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/az_migration/migrations/az_node_news.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ process:
source: alias
regex: true
search: /.$/
replace: 0
replace: '0'
- plugin: default_value
source: alias
default_value: 1
Expand Down
2 changes: 2 additions & 0 deletions modules/custom/az_publication/az_publication.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ bootstrap-datepicker:
js:
/libraries/bootstrap-datepicker/dist/js/bootstrap-datepicker.js: {}
dependencies:
- core/drupal
- core/jquery
- core/once
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
* Default date values.
*/

(($, Drupal) => {
(($, Drupal, once) => {
Drupal.behaviors.datetimeTweaksDefaultDate = {
attach() {
$('.az-publication-date-picker input')
.once('az-publication-processed')
attach(context) {
$(once('azpublicationdate', '.az-publication-date-picker input', context))
// eslint-disable-next-line func-names
.each(function () {
// Fetch field date settings.
Expand Down Expand Up @@ -41,4 +40,4 @@
});
},
};
})(jQuery, Drupal);
})(jQuery, Drupal, once);
Loading