From 6f6db17a3a7c11cbd7a2f080ff57f6e1efe6ba62 Mon Sep 17 00:00:00 2001 From: Mayur Gondhkar Date: Mon, 19 Sep 2022 19:15:43 +1000 Subject: [PATCH 1/5] [SRM-512] Upgrade drupal to 9.4.x --- composer.dev.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.dev.json b/composer.dev.json index 0f9727a..e16293f 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -6,7 +6,7 @@ "composer/installers": "^1.9", "cweagans/composer-patches": "^1.6.0", "drupal/core-composer-scaffold": "^8.9", - "drupal/core": "9.2.x", + "drupal/core": "9.4.x", "drush/drush": "^10", "vlucas/phpdotenv": "^4.1", "webflo/drupal-finder": "^1.0" From f18440960b445f80e115b26f4383d5061aaa7521 Mon Sep 17 00:00:00 2001 From: Mayur Gondhkar Date: Mon, 19 Sep 2022 19:16:17 +1000 Subject: [PATCH 2/5] Fix composer dependency conflict for ckeditor --- composer.dev.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.dev.json b/composer.dev.json index e16293f..5bca6db 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -30,6 +30,9 @@ "phpspec/prophecy-phpunit":"^2", "weitzman/drupal-test-traits": "^1.5" }, + "provide": { + "drupal/ckeditor": "*" + }, "autoload": { "classmap": [ "scripts/composer/" From 960eba39ed9543b17654dbd5e06f3a2ab2b1fb4b Mon Sep 17 00:00:00 2001 From: Mayur Gondhkar Date: Mon, 19 Sep 2022 19:17:09 +1000 Subject: [PATCH 3/5] Use Tide Core Alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d97ddd4..c4e5664 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "dpc-sdp/tide_core": "^3.1.0" + "dpc-sdp/tide_core": "dev-feature/SRM-512_update_drupal_to_9.4 as 3.1.11" }, "suggest": { "dpc-sdp/tide_media:^3.0.0": "Media and related configuration for Tide Drupal 8 distribution" From c3e9e80d83369c54553f99688c08fa22ddbadb4d Mon Sep 17 00:00:00 2001 From: Nadim Hossain Date: Thu, 6 Oct 2022 17:53:01 +1100 Subject: [PATCH 4/5] Updated ubirak/rest-api-behat-extension. --- composer.dev.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index 5bca6db..5e2fdfc 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -22,7 +22,7 @@ "drevops/behat-screenshot": "^1.0", "drevops/behat-steps": "^1.2.0", "phpcompatibility/php-compatibility": "^9.1", - "ubirak/rest-api-behat-extension": "dev-rename_ambiguous_match as 8.1.0", + "ubirak/rest-api-behat-extension": "^8.2.0", "symfony/filesystem": "^4.4", "php-http/curl-client": "*", "phpunit/phpunit": "^8.5.14 || ^9", @@ -433,11 +433,6 @@ } } }, - "ubirak/rest-api-behat-extension": { - "type": "vcs", - "no-api": true, - "url": "https://github.com/dpc-sdp/rest-api-behat-extension.git" - }, "drupal/token_conditions": { "type": "vcs", "no-api": true, From d700f5e37da2437f2187de3e0e17774b0757be68 Mon Sep 17 00:00:00 2001 From: Nadim Hossain Date: Thu, 6 Oct 2022 19:06:38 +1100 Subject: [PATCH 5/5] Added changes. --- composer.dev.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index 5e2fdfc..7aa7d2a 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -22,11 +22,11 @@ "drevops/behat-screenshot": "^1.0", "drevops/behat-steps": "^1.2.0", "phpcompatibility/php-compatibility": "^9.1", - "ubirak/rest-api-behat-extension": "^8.2.0", + "ubirak/rest-api-behat-extension": "dev-rename_ambiguous_match as 8.2.0", "symfony/filesystem": "^4.4", "php-http/curl-client": "*", "phpunit/phpunit": "^8.5.14 || ^9", - "drupal/core-dev":"9.2.x", + "drupal/core-dev":"9.4.x", "phpspec/prophecy-phpunit":"^2", "weitzman/drupal-test-traits": "^1.5" }, @@ -433,6 +433,11 @@ } } }, + "ubirak/rest-api-behat-extension": { + "type": "vcs", + "no-api": true, + "url": "https://github.com/dpc-sdp/rest-api-behat-extension.git" + }, "drupal/token_conditions": { "type": "vcs", "no-api": true,