From d35b962f95e2d7007a231807bbf617f03e15b2d1 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Wed, 8 Jun 2022 11:11:16 +0300 Subject: [PATCH 1/6] feat: Drupal core 9.4 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8b7ce90f20..baea1bc700 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/config_update": "^1.6", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", - "drupal/core-recommended": ">=9.2, <9.4, !=9.3.x-dev", + "drupal/core-recommended": ">=9.3, <9.5, !=9.4.x-dev", "drupal/crop": "^2", "drupal/css_editor": "^1.3 || ^2", "drupal/ctools": "3.0 || ^3.4", @@ -142,7 +142,7 @@ "symfony/console": "^4.4.30 || ^5" }, "require-dev": { - "consolidation/robo": "^1.1.5", + "consolidation/robo": "^1.1.5 || ^2", "drush/drush": "^10.5.0 || ^11", "open-y-subprojects/openy_docs": "dev-main" }, From 3791f02aef158587d256544d9efcb378eb3cf853 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Wed, 8 Jun 2022 11:18:06 +0300 Subject: [PATCH 2/6] feat: allow beta1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index baea1bc700..93fe2e8c9a 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/config_update": "^1.6", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", - "drupal/core-recommended": ">=9.3, <9.5, !=9.4.x-dev", + "drupal/core-recommended": ">=9.3, 9.4.0-beta1@beta, <9.5, !=9.4.x-dev", "drupal/crop": "^2", "drupal/css_editor": "^1.3 || ^2", "drupal/ctools": "3.0 || ^3.4", From 45f87a192bc8b22fa7e1971bec5c92d5d110af42 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Wed, 8 Jun 2022 11:26:00 +0300 Subject: [PATCH 3/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93fe2e8c9a..848e2dac76 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/config_update": "^1.6", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", - "drupal/core-recommended": ">=9.3, 9.4.0-beta1@beta, <9.5, !=9.4.x-dev", + "drupal/core-recommended": "9.4.0-beta1@beta", "drupal/crop": "^2", "drupal/css_editor": "^1.3 || ^2", "drupal/ctools": "3.0 || ^3.4", From c225864aa55a1d390c33ce1bd86588effa5a89d4 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Wed, 8 Jun 2022 15:36:04 +0300 Subject: [PATCH 4/6] fix: remove applied patch --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 848e2dac76..aff1628e0d 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "drupal/domain_theme_switch": "^1.5", "drupal/draggableviews": "^1", "drupal/dropzonejs": "2.1 || ^2.5", - "drupal/easy_breadcrumb": "^1 || ^2", + "drupal/easy_breadcrumb": "^2 || ^2.0.3", "drupal/editor_advanced_link": "^1", "drupal/embed": "^1", "drupal/entity": "^1", @@ -222,9 +222,6 @@ }, "drupal/video_embed_field": { "Issue #3215817: Presentational attributes such as 'border', 'align', or 'bgcolor' are used. CSS should be used for styling instead.": "https://git.drupalcode.org/project/video_embed_field/-/merge_requests/3.diff" - }, - "drupal/easy_breadcrumb": { - "Fix PHP 8.1 deprecations": "https://git.drupalcode.org/project/easy_breadcrumb/-/merge_requests/42.patch" } } }, From 9fac68dc95f11c75910ab66936acf1f34ed7653f Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Fri, 17 Jun 2022 10:18:18 +0300 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aff1628e0d..295ed8a374 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/config_update": "^1.6", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", - "drupal/core-recommended": "9.4.0-beta1@beta", + "drupal/core-recommended": "^9.3 || ^ 9.4", "drupal/crop": "^2", "drupal/css_editor": "^1.3 || ^2", "drupal/ctools": "3.0 || ^3.4", From 7faa102353f1823a3f5015dd8f27c5d6c35a67b0 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Fri, 17 Jun 2022 10:24:43 +0300 Subject: [PATCH 6/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 295ed8a374..8e7ab1b1c0 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/config_update": "^1.6", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", - "drupal/core-recommended": "^9.3 || ^ 9.4", + "drupal/core-recommended": "^9.3 || ^9.4", "drupal/crop": "^2", "drupal/css_editor": "^1.3 || ^2", "drupal/ctools": "3.0 || ^3.4",