Upstream (drupal-composer#11)

* Ignore web/sites/*/settings.php and web/sites/*/settings.local.php by default (drupal-composer#178)

* Prefix paths with a slash (drupal-composer#245)

* Update dev dependencies (SA-CORE-2017-001)

https://www.drupal.org/SA-2017-001

* Fix typo in README.md

Fixes drupal-composer#251

* Adding Islandora dependencies (drupal-composer#2)

* Adding Islandora dependencies

Part of Islandora/documentation#474

* Adding the github for claw-jsonld

* Removing requirement on islandora/islandora

islandora/islandora_collection requires it already.

* Removes repository/vcs entries from composer.json and adds requirements (drupal-composer#3)

* Removes repository/vcs entries from composer.json and adds requirements

* Removes islandora and claw-jsonld from composer.json requirements

* Revert to drupal/rdf_ui 1.x-dev version (drupal-composer#4)

* ISSUE-513

Fixes Drupal 8.1.x compatibility issue with drupal/rdf_ui by setting
version fixed to 1.x-dev

* Lock package versions to stuff we know work

* Adding Islandora dependencies (drupal-composer#2)

* Adding Islandora dependencies

Part of Islandora/documentation#474

* Adding the github for claw-jsonld

* Removing requirement on islandora/islandora

islandora/islandora_collection requires it already.

* Removes repository/vcs entries from composer.json and adds requirements (drupal-composer#3)

* Removes repository/vcs entries from composer.json and adds requirements

* Removes islandora and claw-jsonld from composer.json requirements

* Remove and ignore composer.lock; Resolves Islandora/documentation#530

* Pull Request Template (drupal-composer#8)

* address Islandora/documentation#537 (drupal-composer#9)

Author: ruebot

.gitignore

@@ -7,11 +7,15 @@
 /web/profiles/contrib/
 /web/libraries/
 
+# Ignore sensitive information
+/web/sites/*/settings.php
+/web/sites/*/settings.local.php
+
 # Ignore Drupal's file directory
 /web/sites/*/files/
 
 # Ignore SimpleTest multi-site environment.
-web/sites/simpletest
+/web/sites/simpletest
 
 # Ignore files generated by PhpStorm
 /.idea/

README.md

@@ -46,7 +46,7 @@ When installing the given `composer.json` some tasks are taken care of:
 * Theme (packages of type `drupal-theme`) will be placed in `web/themes/contrib/`
 * Profiles (packages of type `drupal-profile`) will be placed in `web/profiles/contrib/`
 * Creates default writable versions of `settings.php` and `services.yml`.
-* Creates `sites/default/files`-directory.
+* Creates `web/sites/default/files`-directory.
 * Latest version of drush is installed locally for use at `vendor/bin/drush`.
 * Latest version of DrupalConsole is installed locally for use at `vendor/bin/drupal`.
 

composer.json

@@ -36,8 +36,8 @@
         "behat/mink-goutte-driver": "~1.2",
         "jcalderonzumba/gastonjs": "~1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-        "mikey179/vfsStream": "~1.2",
-        "phpunit/phpunit": "~4.8",
+        "mikey179/vfsstream": "~1.2",
+        "phpunit/phpunit": ">=4.8.28 <5",
         "symfony/css-selector": "~2.8"
     },
     "conflict": {