Skip to content

Commit

Permalink
Fix composer.json and patches needed to support to recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
omarlopesino committed Dec 10, 2024
1 parent 3e27a20 commit 2acd47a
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
6 changes: 4 additions & 2 deletions aljibe-kickstart/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"require-dev": {
"metadrop/drupal-dev": "^2.0.0",
"ewcomposer/unpack": "dev-master",
"ewcomposer/unpack": "dev-master"
},
"conflict": {
"drupal/drupal": "*"
Expand All @@ -67,7 +67,9 @@
"liborm85/composer-vendor-cleaner": true,
"metadrop/composer-comments": true,
"php-http/discovery": true,
"liborm85/composer-vendor-cleaner": true
"tbachert/spi": true,
"mxr576/ddqg-composer-audit": true,
"ewcomposer/unpack": true
}
},
"scripts": {
Expand Down
13 changes: 13 additions & 0 deletions aljibe-kickstart/patches/drupal-core-3315694-1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/core/lib/Drupal/Core/Recipe/RecipeCommand.php b/core/lib/Drupal/Core/Recipe/RecipeCommand.php
index 3040e40960..6d6f496ada 100644
--- a/core/lib/Drupal/Core/Recipe/RecipeCommand.php
+++ b/core/lib/Drupal/Core/Recipe/RecipeCommand.php
@@ -192,7 +192,7 @@ private function rollBackToCheckpoint(Checkpoint $checkpoint): void {
* Exception thrown if kernel does not boot.
*/
protected function boot() {
- $kernel = new DrupalKernel('prod', $this->classLoader);
+ $kernel = new DrupalKernel('prod', $this->classLoader, FALSE);
$kernel::bootEnvironment();
$kernel->setSitePath($this->getSitePath());
Settings::initialize($kernel->getAppRoot(), $kernel->getSitePath(), $this->classLoader);
13 changes: 13 additions & 0 deletions aljibe-kickstart/patches/drupal-core-3416735-1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index 1c08700dc69109ee3d9d6a3cfdbd2227b07cef34..93b7419d93fe718b711fabf2b12d785cb57b3e7c 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -162,6 +162,8 @@ public function addStreamWrapper($service_id, $class, $scheme) {
'type' => $class::getType(),
'service_id' => $service_id,
];
+
+ $this->registerWrapper($scheme, $class, $class::getType());
}

/**

0 comments on commit 2acd47a

Please sign in to comment.