Skip to content

Commit 131819c

Browse files
webfloshrop
authored andcommitted
Issue drupal-composer#518: Bump minimum php version to 7.0.8
1 parent 993cbec commit 131819c

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ the [Documentation on drupal.org](https://www.drupal.org/node/2471553).
1414
First you need to [install composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx).
1515

1616
> Note: The instructions below refer to the [global composer installation](https://getcomposer.org/doc/00-intro.md#globally).
17-
You might need to replace `composer` with `php composer.phar` (or similar)
17+
You might need to replace `composer` with `php composer.phar` (or similar)
1818
for your setup.
1919

2020
After that you can create the project:
@@ -23,16 +23,16 @@ After that you can create the project:
2323
composer create-project drupal-composer/drupal-project:8.x-dev some-dir --no-interaction
2424
```
2525

26-
With `composer require ...` you can download new dependencies to your
26+
With `composer require ...` you can download new dependencies to your
2727
installation.
2828

2929
```
3030
cd some-dir
3131
composer require drupal/devel:~1.0
3232
```
3333

34-
The `composer create-project` command passes ownership of all files to the
35-
project that is created. You should create a new git repository, and commit
34+
The `composer create-project` command passes ownership of all files to the
35+
project that is created. You should create a new git repository, and commit
3636
all files not excluded by the .gitignore file.
3737

3838
## What does the template do?
@@ -53,26 +53,26 @@ When installing the given `composer.json` some tasks are taken care of:
5353

5454
## Updating Drupal Core
5555

56-
This project will attempt to keep all of your Drupal Core files up-to-date; the
57-
project [drupal-composer/drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold)
58-
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
56+
This project will attempt to keep all of your Drupal Core files up-to-date; the
57+
project [drupal-composer/drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold)
58+
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
6161
new release of Drupal core.
6262

6363
Follow the steps below to update your core files.
6464

6565
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
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
6868
`.htaccess` or `robots.txt`.
6969
1. Commit everything all together in a single commit, so `web` will remain in
7070
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
7676
good strategy to keep merges easy.
7777

7878
## Generate composer.json from existing project
@@ -86,7 +86,7 @@ that the generated `composer.json` might differ from this project's file.
8686

8787
### Should I commit the contrib modules I download?
8888

89-
Composer recommends **no**. They provide [argumentation against but also
89+
Composer recommends **no**. They provide [argumentation against but also
9090
workrounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md).
9191

9292
### Should I commit the scaffolding files?
@@ -111,11 +111,11 @@ achieve that by registering `@composer drupal:scaffold` as post-install and post
111111
```
112112
### How can I apply patches to downloaded modules?
113113

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
116116
[composer-patches](https://github.com/cweagans/composer-patches) plugin.
117117

118-
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
119119
section of composer.json:
120120
```json
121121
"extra": {
@@ -132,14 +132,14 @@ Follow the instructions in the [documentation on drupal.org](https://www.drupal.
132132

133133
### How do I specify a PHP version ?
134134

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+.
136136

137137
To prevent this you can add this code to specify the PHP version you want to use in the `config` section of `composer.json`:
138138
```json
139139
"config": {
140140
"sort-packages": true,
141141
"platform": {
142-
"php": "5.6.40"
142+
"php": "7.0.33"
143143
}
144144
},
145145
```

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.6",
19+
"php": ">=7.0.8",
2020
"composer/installers": "^1.2",
2121
"cweagans/composer-patches": "^1.6.5",
2222
"drupal-composer/drupal-scaffold": "^2.5",

0 commit comments

Comments
 (0)