Skip to content

Feature/alternative include #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Feature/alternative include #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a00839
Add Other include method for index and update.
bbrala Jan 19, 2022
bc8f2d6
Add symlink for default site and add index and update.php to scaffolding
bbrala Jan 19, 2022
3b7d90a
Update symlink to link to correct directory
bbrala Jan 19, 2022
7ca8113
Allow scaffolding from this package
bbrala Jan 19, 2022
e9cf136
Cleanup of some tries
bbrala Jan 19, 2022
d667be7
Remove comment line
bbrala Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,24 @@
],
"require": {
"composer/installers": "^1.9",
"drupal/core-composer-scaffold": "*",
"drupal/drupal": "*",
"drupal/core": "*",
"drupal/core-composer-scaffold": "*",
"drupal/core-dev": "*",
"drupal/drupal": "*",
"drush/drush": "^10.3.6 || ^11.x-dev",
"phpspec/prophecy-phpunit": "*",
"symfony/var-dumper": "^4.4 | ^5.1"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
"drupal/core-vendor-hardening": true,
"drupal/core-project-message": true,
"drupal/core-composer-scaffold": true
}
},
"scripts": {
"post-root-package-install": [
Expand All @@ -60,6 +66,10 @@
"drupal-scaffold": {
"locations": {
"web-root": "web/"
},
"file-mapping": {
"[web-root]/index.php": "scaffold/web/index.php",
"[web-root]/update.php": "scaffold/web/update.php"
}
},
"installer-paths": {
Expand Down
3 changes: 3 additions & 0 deletions scaffold/web/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php

chdir(__DIR__ . '/../repos/drupal') && include __DIR__ . '/../repos/drupal/index.php';
3 changes: 3 additions & 0 deletions scaffold/web/update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php

chdir(__DIR__ . '/../repos/drupal') && include __DIR__ . '/../repos/drupal/update.php';
4 changes: 1 addition & 3 deletions src/ComposerScripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ public static function postDrupalScaffold() {
// See https://www.drupal.org/project/drupal/issues/3188703
// See https://www.drupal.org/project/drupal/issues/1792310
chdir('web');
shell_exec('patch -p1 <../scaffold/scaffold-patch-index-php.patch');
shell_exec('patch -p1 <../scaffold/scaffold-patch-update-php.patch');

// Symlink the top-level vendor folder into the Drupal core git repo.
chdir('..');
Expand All @@ -64,9 +62,9 @@ public static function postDrupalScaffold() {
if (!file_exists('web/sites/simpletest/browser_output')) {
mkdir('web/sites/simpletest/browser_output', 0777, TRUE);
}

// Symlink the simpletest folder into the Drupal core git repo.
static::makeSymlink('../../../web/sites/simpletest', 'repos/drupal/sites/simpletest');
static::makeSymlink( '../../../repos/drupal/sites/default/files', 'web/sites/default/files');
}

/**
Expand Down