From 430c581104bc31fb52e2546575f1e4afbef3beed Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 27 Nov 2024 13:24:19 +0100
Subject: [PATCH] Add patch to project_browser
---
defaults/curated.json | 3 +--
patches/d10-3.json | 3 +++
patches/d10-4.json | 3 +++
patches/d10/3490176.diff | 32 ++++++++++++++++++++++++++++++++
patches/d11.json | 3 +++
5 files changed, 42 insertions(+), 2 deletions(-)
create mode 100644 patches/d10/3490176.diff
diff --git a/defaults/curated.json b/defaults/curated.json
index 6fbbf3d..2393a28 100644
--- a/defaults/curated.json
+++ b/defaults/curated.json
@@ -40,7 +40,7 @@
"DDQG-unsupported-drupal-openid_connect-3.0.0.0-alpha3",
"DDQG-unsupported-drupal-peertube-2.0.0.0-beta2",
"DDQG-unsupported-drupal-phone_number-2.0.0.0-alpha7",
- "DDQG-unsupported-drupal-project_browser-2.0.0.0-alpha4",
+ "DDQG-unsupported-drupal-project_browser-2.0.0.0-alpha5",
"DDQG-unsupported-drupal-reader-1.0.0.0-beta2",
"DDQG-unsupported-drupal-readmehelp-2.0.0.0-beta1",
"DDQG-unsupported-drupal-schema_diff-1.0.0.0-alpha2",
@@ -63,6 +63,5 @@
"DDQG-unsupported-drupal-views_tree-2.0.0.0-RC1",
"DDQG-unsupported-drupal-xls_serialization-0.0.0.0-dev",
"DDQG-unsupported-drupal-xnumber-2.0.0.0-beta2",
- "DDQG-unsupported-drupal-zoom_video-1.3.2.0",
"GHSA-mg8j-w93w-xjgc"
]
diff --git a/patches/d10-3.json b/patches/d10-3.json
index 2853492..05a09e6 100644
--- a/patches/d10-3.json
+++ b/patches/d10-3.json
@@ -161,6 +161,9 @@
"drupal/profile": {
"#2899744 Multi-lingual": "https://www.drupal.org/files/issues/2022-04-17/2899744-54.patch"
},
+ "drupal/project_browser": {
+ "#3490176 Extend source plugins": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3490176.diff"
+ },
"drupal/prompt": {
"#3449733 ECA 2": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3449733.diff"
},
diff --git a/patches/d10-4.json b/patches/d10-4.json
index 348441d..6a02337 100644
--- a/patches/d10-4.json
+++ b/patches/d10-4.json
@@ -161,6 +161,9 @@
"drupal/profile": {
"#2899744 Multi-lingual": "https://www.drupal.org/files/issues/2022-04-17/2899744-54.patch"
},
+ "drupal/project_browser": {
+ "#3490176 Extend source plugins": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3490176.diff"
+ },
"drupal/prompt": {
"#3449733 ECA 2": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3449733.diff"
},
diff --git a/patches/d10/3490176.diff b/patches/d10/3490176.diff
new file mode 100644
index 0000000..d09d60b
--- /dev/null
+++ b/patches/d10/3490176.diff
@@ -0,0 +1,32 @@
+diff --git a/src/Plugin/ProjectBrowserSource/Recipes.php b/src/Plugin/ProjectBrowserSource/Recipes.php
+index 40d8410e51ab8006cd88975d79dff01ebdea6f4b..8269158ebd44b8452ecd9a033d8c158cd6b04bf4 100644
+--- a/src/Plugin/ProjectBrowserSource/Recipes.php
++++ b/src/Plugin/ProjectBrowserSource/Recipes.php
+@@ -28,12 +28,12 @@ use Symfony\Component\Finder\Finder;
+ class Recipes extends ProjectBrowserSourceBase {
+
+ public function __construct(
+- private readonly FileSystemInterface $fileSystem,
+- private readonly CacheBackendInterface $cacheBin,
+- private readonly ModuleExtensionList $moduleList,
+- private readonly FileUrlGeneratorInterface $fileUrlGenerator,
+- private readonly ConfigFactoryInterface $configFactory,
+- private readonly string $appRoot,
++ protected readonly FileSystemInterface $fileSystem,
++ protected readonly CacheBackendInterface $cacheBin,
++ protected readonly ModuleExtensionList $moduleList,
++ protected readonly FileUrlGeneratorInterface $fileUrlGenerator,
++ protected readonly ConfigFactoryInterface $configFactory,
++ protected readonly string $appRoot,
+ mixed ...$arguments,
+ ) {
+ parent::__construct(...$arguments);
+@@ -165,7 +165,7 @@ class Recipes extends ProjectBrowserSourceBase {
+ * @return \Symfony\Component\Finder\Finder
+ * A Symfony Finder object, configured to find locally installed recipes.
+ */
+- private function getFinder(): Finder {
++ protected function getFinder(): Finder {
+ $search_in = [$this->appRoot . '/core/recipes'];
+
+ // If any recipes have been installed by Composer, also search there. The
diff --git a/patches/d11.json b/patches/d11.json
index 5791151..6d3ac7c 100644
--- a/patches/d11.json
+++ b/patches/d11.json
@@ -158,6 +158,9 @@
"drupal/profile": {
"#2899744 Multi-lingual": "https://www.drupal.org/files/issues/2022-04-17/2899744-54.patch"
},
+ "drupal/project_browser": {
+ "#3490176 Extend source plugins": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3490176.diff"
+ },
"drupal/prompt": {
"#3449733 ECA 2": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3449733.diff"
},
--
GitLab