Update to Drupal 8.8.1 (#34)

* Honor .env files and suggest usage (drupal-composer#351) * Remove extra whitespace (drupal-composer#371) * Updated argument name * Bump minimal version * Bump minimal version to 8.5.3 * Fix installer path for drush commandfiles. * Update drupal-composer/drupal-scaffold drupal-composer/drupal-scaffold is a full featured plugin and provides its own command. * Fix tests on Travis CI (drupal-composer#405) * Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404) * Remove "drupal-scaffold" from scripts (drupal-composer#275) * Fix typo in README.md * Remove unused use statement. (drupal-composer#406) * Adjust default core patch level to -p2. (drupal-composer#418) * Bump minimum required composer-patches version to support default patch level (drupal-composer#410) * Update composer.json to require latest stable version of Drupal (drupal-composer#424) * Require zaporylie/composer-drupal-optimizations (drupal-composer#442) * Issue drupal-composer#408: Bump minimum PHP version to 5.6 * Removing redundant "--stability dev" from installation command (drupal-composer#450) Fixes drupal-composer#449. * Added "composer-exit-on-patch-failure": true option to composer.json (drupal-composer#420) * Sync new lines at the end of the files (drupal-composer#453) * Quote wildcards to avoid issues in some shells (drupal-composer#456) * Add PHP 7.3 to Travis CI (drupal-composer#476) * Change createRequiredFiles messages to reflect what occured (drupal-composer#467) * Drop PHP 5.6 testing (drupal-composer#489) * Bump minimum version to 8.7.0 (drupal-composer#488) * Update .travis.yml * Deprecate PHP 7.0 and 7.1 (drupal-composer#518) * Revert "Deprecate PHP 7.1" (drupal-composer#521) This reverts commit 5085410. * Issue drupal-composer#518: Bump minimum php version to 7.0.8 * Update CI to Ubuntu 18.04 (drupal-composer#520) * Revert "Update CI to Ubuntu 18.04" (drupal-composer#526) This reverts commit ee5bf36. * Add 'contrib' to Drush commandfile installer path (drupal-composer#525) * Prefer usage of && operator instead of "and" (drupal-composer#530) * update to drupal 8.8.0 * replace webflo/drupal-core-require-dev with drupal/core-dev * Use scaffold plugin and composer packages from Drupal core 8.8.0 (drupal-composer#522) * Issue drupal-composer#539: Remove deprecated CONFIG_SYNC_DIRECTORY * update to 8.8.1 Co-authored-by: Moshe Weitzman <weitzman@tejasa.com> Co-authored-by: Jakub Piasecki <jakub@piaseccy.pl> Co-authored-by: Markus Orenstrat <markus.orenstrat@reinblau.de> Co-authored-by: Florian Weber <florian@webflo.org> Co-authored-by: Rodrigo <hi@rodrigoaguilera.net> Co-authored-by: Norman Kämper-Leymann <leymannx@users.noreply.github.com> Co-authored-by: Alex Milkovskyi <a.milkovsky@gmail.com> Co-authored-by: Dezső BICZÓ <mxr576@users.noreply.github.com> Co-authored-by: Matthew Grasmick <matthew.grasmick@acquia.com> Co-authored-by: Andy Postnikov <apostnikov@gmail.com> Co-authored-by: Hans Fredrik Nordhaug <hansfn@gmail.com> Co-authored-by: Maarten Segers <MPParsley@users.noreply.github.com> Co-authored-by: Peter Kokot <peterkokot@gmail.com> Co-authored-by: Simon Perdrisat <perdrisat@gmail.com> Co-authored-by: Charles Tanton <charlietnt@gmail.com> Co-authored-by: Greg Anderson <greg.1.anderson@greenknowe.org> Co-authored-by: Paul <1727604+paulvandenburg@users.noreply.github.com>
islandora-deprecated · Jan 2, 2020 · b802bb3 · b802bb3
1 parent 1428793
commit b802bb3
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 8,187 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,15 +34,12 @@ 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.8.x-dev webflo/drupal-core-require-dev:8.8.x-dev; fi;
+  - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.8.x-dev; composer --verbose require --no-update --dev drupal/core-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
-  - ./../vendor/bin/drush runserver $SIMPLETEST_BASE_URL &
+  - ./vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
+  - ./vendor/bin/drush runserver $SIMPLETEST_BASE_URL &
   - until curl -s $SIMPLETEST_BASE_URL; do true; done > /dev/null
-  # Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json
-  # Ignore PageCache group temporarily, @see https://www.drupal.org/node/2770673
-  # Ignore Setup group temporarily, @see https://www.drupal.org/node/2962157
-  - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer,DependencyInjection,PageCache,Setup
-  - ./../vendor/bin/drush
-  - if [[ $RELEASE = stable ]]; then ./../vendor/bin/drupal; fi;
+  # Run a single unit test to verfiy the testing setup.
+  - ./vendor/bin/phpunit -c ./web/core ./web/core/modules/system/tests/src/Unit/SystemRequirementsTest.php
+  - ./vendor/bin/drush
+  - if [[ $RELEASE = stable ]]; then ./vendor/bin/drupal; fi;
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 [![LICENSE](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](./LICENSE)
 
 ## Introduction
+This project template provides a starter kit for managing your site
+dependencies with [Composer](https://getcomposer.org/).
 
 Fork of [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) used to pin down Drupal core versions
 for [islandora-playbook](https://github.com/Islandora-Devops/islandora-playbook).
@@ -46,3 +48,133 @@ We recommend using the [islandora-playbook](https://github.com/Islandora-Devops/
 ## License
 
 [GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt)
+> 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 --no-interaction
+```
+
+With `composer require ...` you can download new dependencies to your
+installation.
+
+```
+cd some-dir
+composer require drupal/devel:~1.0
+```
+
+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 `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`.
+* Creates environment variables based on your .env file. See [.env.example](.env.example).
+
+## Updating Drupal Core
+
+This project will attempt to keep all of your Drupal Core files up-to-date; the
+project [drupal/core-composer-scaffold](https://github.com/drupal/core-composer-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 modified 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 drupal/core-dev --with-dependencies` to update Drupal Core and its dependencies.
+2. 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).
+
+### Should I commit the scaffolding files?
+
+The [Drupal Composer Scaffold](https://github.com/drupal/core-composer-scaffold) plugin can download the scaffold files (like
+index.php, update.php, …) to the web/ directory of your project. If you have not customized those files you could choose
+to not check them into your version control system (e.g. git). If that is the case for your project it might be
+convenient to automatically run the drupal-scaffold plugin after every install or update of your project. You can
+achieve that by registering `@composer drupal:scaffold` as post-install and post-update command in your composer.json:
+
+```json
+"scripts": {
+    "post-install-cmd": [
+        "@composer drupal:scaffold",
+        "..."
+    ],
+    "post-update-cmd": [
+        "@composer drupal:scaffold",
+        "..."
+    ]
+},
+```
+### 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 or local path to patch"
+        }
+    }
+}
+```
+### How do I switch from packagist.drupal-composer.org to packages.drupal.org?
+
+Follow the instructions in the [documentation on drupal.org](https://www.drupal.org/docs/develop/using-composer/using-packagesdrupalorg).
+
+### How do I specify a PHP version ?
+
+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+.
+
+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": "7.0.33"
+    }
+},
+```
diff --git a/composer.json b/composer.json
@@ -17,20 +17,19 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.0.8",
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal-composer/drupal-scaffold": "^2.5",
         "drupal/console": "^1.0.2",
-        "drupal/core": "^8.7.0",
-        "drush/drush": "^9.0.0",
-        "vlucas/phpdotenv": "^2.4",
+        "drupal/core": "^8.8.1",
+        "drupal/core-composer-scaffold": "^8.8.0",
+        "drush/drush": "^9.7.1 | ^10.0.0",
+        "vlucas/phpdotenv": "^4.0",
         "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3",
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "require-dev": {
-        "webflo/drupal-core-require-dev": "^8.7.0"
+        "drupal/core-dev": "^8.8.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -67,19 +66,18 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "web/"
+            }
+        },
         "installer-paths": {
             "web/core": ["type:drupal-core"],
             "web/libraries/{$name}": ["type:drupal-library"],
             "web/modules/contrib/{$name}": ["type:drupal-module"],
             "web/profiles/contrib/{$name}": ["type:drupal-profile"],
             "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/Commands/{$name}": ["type:drupal-drush"]
-        },
-        "drupal-scaffold": {
-            "initial": {
-                ".editorconfig": "../.editorconfig",
-                ".gitattributes": "../.gitattributes"
-            }
+            "drush/Commands/contrib/{$name}": ["type:drupal-drush"]
         }
     }
 }