Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drupal 8.7 #27

Merged
merged 30 commits into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1665375
Honor .env files and suggest usage (#351)
weitzman Mar 16, 2018
6be94f4
Remove extra whitespace (#371)
zaporylie Mar 27, 2018
9e90e4f
Updated argument name
Mar 28, 2018
9167252
Bump minimal version
webflo Mar 28, 2018
7b0f5c5
Merge pull request #376 from morenstrat/patch-1
weitzman Mar 28, 2018
24ab11d
Bump minimal version to 8.5.3
webflo Apr 26, 2018
4a35beb
Fix installer path for drush commandfiles.
weitzman May 25, 2018
f28a782
Merge pull request #394 from drupal-composer/commandfiles
weitzman May 26, 2018
04138e3
Update drupal-composer/drupal-scaffold
webflo May 29, 2018
dc7e438
Fix tests on Travis CI (#405)
webflo Jun 26, 2018
3be2be5
Copy the editor config and gitattributes from drupal to the root. (#404)
rodrigoaguilera Jun 26, 2018
b0c4ce8
Remove "drupal-scaffold" from scripts (#275)
webflo Jun 26, 2018
2b9d84a
Fix typo in README.md
webflo Jun 26, 2018
24f29be
Remove unused use statement. (#406)
Jun 28, 2018
96f02b3
Adjust default core patch level to -p2. (#418)
milkovsky Aug 16, 2018
970d307
Bump minimum required composer-patches version to support default pat…
mxr576 Aug 16, 2018
c1e2b6e
Update composer.json to require latest stable version of Drupal (#424)
grasmash Sep 6, 2018
21698cf
Require zaporylie/composer-drupal-optimizations (#442)
andypost Jan 26, 2019
4a664d2
Issue #408: Bump minimum PHP version to 5.6
webflo Jan 26, 2019
4eb9750
Removing redundant "--stability dev" from installation command (#450)
hansfn Jan 26, 2019
f2b83dc
Added "composer-exit-on-patch-failure": true option to composer.json …
MPParsley Jan 26, 2019
4229ace
Sync new lines at the end of the files (#453)
petk Jan 31, 2019
85d302e
Quote wildcards to avoid issues in some shells (#456)
gagarine Mar 13, 2019
d8ee4b4
Add PHP 7.3 to Travis CI (#476)
petk Apr 8, 2019
9e036f0
Change createRequiredFiles messages to reflect what occured (#467)
foxtrotcharlie Apr 9, 2019
e55e401
Drop PHP 5.6 testing (#489)
webflo May 2, 2019
0bc7270
Bump minimum version to 8.7.0 (#488)
webflo May 2, 2019
ec0f411
Update .travis.yml
webflo May 2, 2019
f3eda7c
Merge remote-tracking branch 'upstream/8.x' into drupal_87
Natkeeran May 23, 2019
f86a2e3
update composer.lock
Natkeeran May 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:

script:
- if [[ $RELEASE = dev ]]; then composer --verbose remove --no-update drupal/console; fi;
- if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.7.x-dev webflo/drupal-core-require-dev:8.7.x-dev; fi;
- if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.8.x-dev webflo/drupal-core-require-dev:8.8.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
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ 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
composer create-project drupal-composer/drupal-project:8.x-dev some-dir --no-interaction
```

With `composer require ...` you can download new dependencies to your
Expand Down Expand Up @@ -62,7 +62,7 @@ new release of Drupal core.

Follow the steps below to update your core files.

1. Run `composer update drupal/core webflo/drupal-core-require-dev symfony/* --with-dependencies` to update Drupal Core and its dependencies.
1. Run `composer update drupal/core webflo/drupal-core-require-dev "symfony/*" --with-dependencies` to update Drupal Core and its dependencies.
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`.
Expand Down Expand Up @@ -132,12 +132,14 @@ Follow the instructions in the [documentation on drupal.org](https://www.drupal.

### How do I specify a PHP version ?

Currently Drupal 8 supports PHP 5.5.9 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+.
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+.

To prevent this you can add this code to specify the PHP version you want to use in the `config` section of `composer.json`:
```json
"config": {
"sort-packages": true,
"platform": {"php": "5.5.9"}
"platform": {
"php": "5.6.40"
}
},
```
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@
}
],
"require": {
"php": ">=5.6",
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"drupal-composer/drupal-scaffold": "^2.5",
"drupal/console": "^1.0.2",
"drupal/core": "^8.6.0",
"drupal/core": "^8.7.0",
"drush/drush": "^9.0.0",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3"
"webmozart/path-util": "^2.3",
"zaporylie/composer-drupal-optimizations": "^1.0"
},
"require-dev": {
"webflo/drupal-core-require-dev": "^8.6.0"
"webflo/drupal-core-require-dev": "^8.7.0"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -61,6 +63,7 @@
]
},
"extra": {
"composer-exit-on-patch-failure": true,
"patchLevel": {
"drupal/core": "-p2"
},
Expand Down
Loading