This repository has been archived by the owner on Dec 3, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Florian Lorétan
committed
Jun 20, 2016
0 parents
commit cca38d8
Showing
31 changed files
with
8,626 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Ignore directories generated by Composer | ||
drush/contrib | ||
vendor | ||
web/core | ||
web/modules/contrib | ||
web/themes/contrib | ||
web/profiles/contrib | ||
|
||
# Ignore Drupal's file directory | ||
web/sites/*/files | ||
|
||
# Ignore files generated by PhpStorm | ||
.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
language: php | ||
php: | ||
- 5.5 | ||
- 5.6 | ||
- 7.0 | ||
|
||
sudo: false | ||
|
||
env: | ||
global: | ||
- SIMPLETEST_DB=sqlite://tmp/site.sqlite | ||
- SIMPLETEST_BASE_URL="http://127.0.0.1:8080" | ||
matrix: | ||
- RELEASE=stable | ||
- RELEASE=dev | ||
|
||
before_install: | ||
- echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini | ||
- phpenv config-rm xdebug.ini | ||
- composer --verbose self-update | ||
- composer --version | ||
|
||
install: | ||
- composer --verbose install | ||
|
||
script: | ||
- if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.1.x-dev; fi; | ||
- if [[ $RELEASE = dev ]]; then composer --verbose update; fi; | ||
- cd $TRAVIS_BUILD_DIR/web | ||
- ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite | ||
- ./../vendor/bin/drush runserver http://127.0.0.1:8080 & | ||
- sleep 3 | ||
# Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json | ||
- ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer | ||
- ./../vendor/bin/drush | ||
- ./../vendor/bin/drupal |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
# Composer template for Drupal projects | ||
|
||
[](https://travis-ci.org/drupal-composer/drupal-project) | ||
|
||
This project template should provide a kickstart for managing your site | ||
dependencies with [Composer](https://getcomposer.org/). | ||
|
||
If you want to know how to use it as replacement for | ||
[Drush Make](https://github.com/drush-ops/drush/blob/master/docs/make.md) visit | ||
the [Documentation on drupal.org](https://www.drupal.org/node/2471553). | ||
|
||
## Usage | ||
|
||
First you need to [install composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx). | ||
|
||
> Note: The instructions below refer to the [global composer installation](https://getcomposer.org/doc/00-intro.md#globally). | ||
You might need to replace `composer` with `php composer.phar` (or similar) | ||
for your setup. | ||
|
||
After that you can create the project: | ||
|
||
``` | ||
composer create-project drupal-composer/drupal-project:8.x-dev some-dir --stability dev --no-interaction | ||
``` | ||
|
||
With `composer require ...` you can download new dependencies to your | ||
installation. | ||
|
||
``` | ||
cd some-dir | ||
composer require drupal/devel:8.* | ||
``` | ||
|
||
The `composer create-project` command passes ownership of all files to the | ||
project that is created. You should create a new git repository, and commit | ||
all files not excluded by the .gitignore file. | ||
|
||
## What does the template do? | ||
|
||
When installing the given `composer.json` some tasks are taken care of: | ||
|
||
* Drupal will be installed in the `web`-directory. | ||
* Autoloader is implemented to use the generated composer autoloader in `vendor/autoload.php`, | ||
instead of the one provided by Drupal (`web/vendor/autoload.php`). | ||
* Modules (packages of type `drupal-module`) will be placed in `web/modules/contrib/` | ||
* 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. | ||
* 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`. | ||
|
||
## Updating Drupal Core | ||
|
||
This project will attempt to keep all of your Drupal Core files up-to-date; the | ||
project [drupal-composer/drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold) | ||
is used to ensure that your scaffold files are updated every time drupal/core is | ||
updated. If you customize any of the "scaffolding" files (commonly .htaccess), | ||
you may need to merge conflicts if any of your modfied files are updated in a | ||
new release of Drupal core. | ||
|
||
Follow the steps below to update your core files. | ||
|
||
1. Run `composer update drupal/core`. | ||
1. Run `git diff` to determine if any of the scaffolding files have changed. | ||
Review the files for any changes and restore any customizations to | ||
`.htaccess` or `robots.txt`. | ||
1. Commit everything all together in a single commit, so `web` will remain in | ||
sync with the `core` when checking out branches or running `git bisect`. | ||
1. In the event that there are non-trivial conflicts in step 2, you may wish | ||
to perform these steps on a branch, and use `git merge` to combine the | ||
updated core files with your customized files. This facilitates the use | ||
of a [three-way merge tool such as kdiff3](http://www.gitshah.com/2010/12/how-to-setup-kdiff-as-diff-tool-for-git.html). This setup is not necessary if your changes are simple; | ||
keeping all of your modifications at the beginning or end of the file is a | ||
good strategy to keep merges easy. | ||
|
||
## Generate composer.json from existing project | ||
|
||
With using [the "Composer Generate" drush extension](https://www.drupal.org/project/composer_generate) | ||
you can now generate a basic `composer.json` file from an existing project. Note | ||
that the generated `composer.json` might differ from this project's file. | ||
|
||
|
||
## FAQ | ||
|
||
### Should I commit the contrib modules I download | ||
|
||
Composer recommends **no**. They provide [argumentation against but also | ||
workrounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md). | ||
|
||
### How can I apply patches to downloaded modules? | ||
|
||
If you need to apply patches (depending on the project being modified, a pull | ||
request is often a better solution), you can do so with the | ||
[composer-patches](https://github.com/cweagans/composer-patches) plugin. | ||
|
||
To add a patch to drupal module foobar insert the patches section in the extra | ||
section of composer.json: | ||
```json | ||
"extra": { | ||
"patches": { | ||
"drupal/foobar": { | ||
"Patch description": "URL to patch" | ||
} | ||
} | ||
} | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
{ | ||
"name": "drupal-composer/drupal-project", | ||
"description": "Project template for Drupal 8 projects with composer", | ||
"type": "project", | ||
"license": "GPL-2.0+", | ||
"authors": [ | ||
{ | ||
"name": "", | ||
"role": "" | ||
} | ||
], | ||
"repositories": [ | ||
{ | ||
"type": "composer", | ||
"url": "https://packagist.drupal-composer.org" | ||
} | ||
], | ||
"require": { | ||
"composer/installers": "^1.0.20", | ||
"drupal-composer/drupal-scaffold": "^2.0.1", | ||
"cweagans/composer-patches": "~1.0", | ||
"drupal/core": "~8.0", | ||
"drush/drush": "~8.0", | ||
"drupal/console": "~0.10" | ||
}, | ||
"require-dev": { | ||
"behat/mink": "~1.7", | ||
"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", | ||
"symfony/css-selector": "~2.8" | ||
}, | ||
"conflict": { | ||
"drupal/drupal": "*" | ||
}, | ||
"minimum-stability": "dev", | ||
"prefer-stable": true, | ||
"autoload": { | ||
"classmap": [ | ||
"scripts/composer/ScriptHandler.php" | ||
] | ||
}, | ||
"scripts": { | ||
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", | ||
"post-install-cmd": [ | ||
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles" | ||
], | ||
"post-update-cmd": [ | ||
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles" | ||
] | ||
}, | ||
"extra": { | ||
"installer-paths": { | ||
"web/core": ["type:drupal-core"], | ||
"web/modules/contrib/{$name}": ["type:drupal-module"], | ||
"web/profiles/contrib/{$name}": ["type:drupal-profile"], | ||
"web/themes/contrib/{$name}": ["type:drupal-theme"], | ||
"drush/contrib/{$name}": ["type:drupal-drush"] | ||
} | ||
} | ||
} |
Oops, something went wrong.