Skip to content

Commit d70e6e9

Browse files
authored
Merge pull request #16 from dennisinteractive/POL-45-fix-composer-json
[POL-45] Fix composer.json
2 parents 8a0c1a4 + 6f823f7 commit d70e6e9

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
- run:
2424
name: Run tests
2525
command: |
26-
cd /var/www/polaris/web
27-
./vendor/bin/phpunit
26+
cd /var/www/polaris && sudo -u www-data ./vendor/bin/phpunit
2827
2928
- store_artifacts:
3029
path: /var/www/polaris/web/sites/default/files/simpletest

composer.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,17 @@
2727
"drupal/drupal": "*"
2828
},
2929
"config": {
30-
"sort-packages": true
30+
"sort-packages": true,
31+
"allow-plugins": {
32+
"composer/installers": true,
33+
"cweagans/composer-patches": true,
34+
"dealerdirect/phpcodesniffer-composer-installer": true,
35+
"drupal/console-extend-plugin": true,
36+
"oomphinc/composer-installers-extender": true,
37+
"zaporylie/composer-drupal-optimizations": true,
38+
"wikimedia/composer-merge-plugin": true,
39+
"drupal/core-composer-scaffold": true
40+
}
3141
},
3242
"autoload": {
3343
"classmap": [
@@ -38,7 +48,6 @@
3848
]
3949
},
4050
"scripts": {
41-
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
4251
"pre-install-cmd": [
4352
"DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
4453
],
@@ -50,7 +59,6 @@
5059
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
5160
],
5261
"post-update-cmd": [
53-
"@drupal-scaffold",
5462
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles",
5563
"echo # drush cim -y",
5664
"echo # drush updb -y",

0 commit comments

Comments
 (0)