diff --git a/composer.json b/composer.json index 4a5d2b1632..d0067dae41 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ "drupal/core-composer-scaffold": "^10", "drupal/core-project-message": "^10", "drupal/core-recommended": "^10", - "drupal/search_api": "1.29", - "drush/drush": "^11", + "drupal/search_api": "^1.31", + "drush/drush": "^12", "egulias/email-validator": "4.0.1 as 3.2.6", "oomphinc/composer-installers-extender": "^2.0", "vlucas/phpdotenv": "^5.1", diff --git a/composer.lock b/composer.lock index 950683fff8..81aa7ad717 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f994b8b1314a70aa075d43a78edb82f2", + "content-hash": "c1b1ba950e0ba3caee0fc98955369a90", "packages": [ { "name": "asm89/stack-cors", @@ -20725,12 +20725,12 @@ "version": "3.7.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, @@ -20775,6 +20775,20 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], "time": "2023-02-22T23:07:41+00:00" }, { diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php index 00f8a26ca0..c0b18427ae 100644 --- a/web/sites/default/default.settings.php +++ b/web/sites/default/default.settings.php @@ -812,11 +812,11 @@ * site. * - migrate_file_public_path - The location of the source Drupal 6 or Drupal 7 * public files. This can be a local file directory containing the source - * Drupal 6 or Drupal 7 site (e.g /var/www/web), or the site address + * Drupal 6 or Drupal 7 site (e.g /var/www/docroot), or the site address * (e.g http://example.com). * - migrate_file_private_path - The location of the source Drupal 7 private * files. This can be a local file directory containing the source Drupal 7 - * site (e.g /var/www/web), or empty to use the same value as Public + * site (e.g /var/www/docroot), or empty to use the same value as Public * files directory. * * Sample configuration for a drupal 6 source site with the source files in a