You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
is used to ensure that your scaffold files are updated every time drupal/core is
59
+
updated. If you customize any of the "scaffolding" files (commonly .htaccess),
60
+
you may need to merge conflicts if any of your modified files are updated in a
61
61
new release of Drupal core.
62
62
63
63
Follow the steps below to update your core files.
64
64
65
-
1. Run `composer update drupal/core webflo/drupal-core-require-dev "symfony/*" --with-dependencies` to update Drupal Core and its dependencies.
66
-
1. Run `git diff` to determine if any of the scaffolding files have changed.
67
-
Review the files for any changes and restore any customizations to
65
+
1. Run `composer update drupal/core drupal/core-dev --with-dependencies` to update Drupal Core and its dependencies.
66
+
2. Run `git diff` to determine if any of the scaffolding files have changed.
67
+
Review the files for any changes and restore any customizations to
68
68
`.htaccess` or `robots.txt`.
69
69
1. Commit everything all together in a single commit, so `web` will remain in
70
70
sync with the `core` when checking out branches or running `git bisect`.
71
-
1. In the event that there are non-trivial conflicts in step 2, you may wish
72
-
to perform these steps on a branch, and use `git merge` to combine the
73
-
updated core files with your customized files. This facilitates the use
74
-
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;
75
-
keeping all of your modifications at the beginning or end of the file is a
71
+
1. In the event that there are non-trivial conflicts in step 2, you may wish
72
+
to perform these steps on a branch, and use `git merge` to combine the
73
+
updated core files with your customized files. This facilitates the use
74
+
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;
75
+
keeping all of your modifications at the beginning or end of the file is a
76
76
good strategy to keep merges easy.
77
77
78
78
## Generate composer.json from existing project
@@ -86,12 +86,12 @@ that the generated `composer.json` might differ from this project's file.
86
86
87
87
### Should I commit the contrib modules I download?
88
88
89
-
Composer recommends **no**. They provide [argumentation against but also
89
+
Composer recommends **no**. They provide [argumentation against but also
90
90
workrounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md).
91
91
92
92
### Should I commit the scaffolding files?
93
93
94
-
The [drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold) plugin can download the scaffold files (like
94
+
The [Drupal Composer Scaffold](https://github.com/drupal/core-composer-scaffold) plugin can download the scaffold files (like
95
95
index.php, update.php, …) to the web/ directory of your project. If you have not customized those files you could choose
96
96
to not check them into your version control system (e.g. git). If that is the case for your project it might be
97
97
convenient to automatically run the drupal-scaffold plugin after every install or update of your project. You can
@@ -111,11 +111,11 @@ achieve that by registering `@composer drupal:scaffold` as post-install and post
111
111
```
112
112
### How can I apply patches to downloaded modules?
113
113
114
-
If you need to apply patches (depending on the project being modified, a pull
115
-
request is often a better solution), you can do so with the
114
+
If you need to apply patches (depending on the project being modified, a pull
115
+
request is often a better solution), you can do so with the
To add a patch to drupal module foobar insert the patches section in the extra
118
+
To add a patch to drupal module foobar insert the patches section in the extra
119
119
section of composer.json:
120
120
```json
121
121
"extra": {
@@ -132,14 +132,14 @@ Follow the instructions in the [documentation on drupal.org](https://www.drupal.
132
132
133
133
### How do I specify a PHP version ?
134
134
135
-
This project supports PHP 5.6 as minimum version (see [Drupal 8 PHP requirements](https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements)), however it's possible that a `composer update` will upgrade some package that will then require PHP 7+.
135
+
This project supports PHP 7.0 as minimum version (see [Drupal 8 PHP requirements](https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements)), however it's possible that a `composer update` will upgrade some package that will then require PHP 7+.
136
136
137
137
To prevent this you can add this code to specify the PHP version you want to use in the `config` section of `composer.json`:
0 commit comments