Commit da288643 authored by alexpott's avatar alexpott

Issue #1975220 by davidwbarratt, tstoeckler, mradcliffe, RobLoach, Mile23,...

Issue #1975220 by davidwbarratt, tstoeckler, mradcliffe, RobLoach, Mile23, hussainweb: Allow a Composer user to manage Drupal, modules, and PHP dependencies with a custom root composer.json
parent 33066b7e
{ {
"name": "drupal/drupal", "name": "drupal/drupal",
"description": "Drupal is an open source content management platform powering millions of websites and applications.", "description": "Drupal is an open source content management platform powering millions of websites and applications.",
"type": "drupal-core", "type": "project",
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"php": ">=5.4.5", "drupal/core": "~8.0"
"sdboyer/gliph": "0.1.*",
"symfony/class-loader": "2.6.*",
"symfony/css-selector": "2.6.*",
"symfony/dependency-injection": "2.6.*",
"symfony/event-dispatcher": "2.6.*",
"symfony/http-foundation": "2.6.*",
"symfony/http-kernel": "2.6.*",
"symfony/routing": "2.6.*",
"symfony/serializer": "2.6.*",
"symfony/validator": "2.6.*",
"symfony/process": "2.6.*",
"symfony/yaml": "2.6.*",
"twig/twig": "1.16.*",
"doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
"doctrine/annotations": "1.2.*",
"guzzlehttp/guzzle": "~5.0",
"symfony-cmf/routing": "1.3.*",
"easyrdf/easyrdf": "0.9.*",
"phpunit/phpunit": "4.1.*",
"phpunit/phpunit-mock-objects": "dev-master#e60bb929c50ae4237aaf680a4f6773f4ee17f0a2",
"zendframework/zend-feed": "2.3.*",
"mikey179/vfsStream": "1.*",
"stack/builder": "1.0.*",
"egulias/email-validator": "1.2.*"
},
"autoload": {
"psr-4": {
"Drupal\\Core\\": "core/lib/Drupal/Core",
"Drupal\\Component\\": "core/lib/Drupal/Component",
"Drupal\\Driver\\": "drivers/lib/Drupal/Driver"
},
"files": [
"core/lib/Drupal.php"
]
}, },
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [],
"config": { "config": {
"vendor-dir": "core/vendor",
"preferred-install": "dist", "preferred-install": "dist",
"autoloader-suffix": "Drupal8" "autoloader-suffix": "Drupal8"
},
"extra": {
"_readme": [
"This is an example file to show how a Drupal website can be managed via",
"Composer. It does not work out of the box but requires a Git subtree",
"split of the core directory to be added to the repositories",
"section above."
]
} }
} }
...@@ -58,8 +58,9 @@ following the instructions in the INTRODUCTION section at the top of this file: ...@@ -58,8 +58,9 @@ following the instructions in the INTRODUCTION section at the top of this file:
3. Remove all old core files and directories, except for the 'sites' directory 3. Remove all old core files and directories, except for the 'sites' directory
and any custom files you added elsewhere. and any custom files you added elsewhere.
If you made modifications to files like .htaccess or robots.txt, you will If you made modifications to files like .htaccess, composer.json, or
need to re-apply them from your backup, after the new files are in place. robots.txt you will need to re-apply them from your backup, after the new
files are in place.
Sometimes an update includes changes to default.settings.php (this will be Sometimes an update includes changes to default.settings.php (this will be
noted in the release notes). If that's the case, follow these steps: noted in the release notes). If that's the case, follow these steps:
...@@ -93,7 +94,8 @@ following the instructions in the INTRODUCTION section at the top of this file: ...@@ -93,7 +94,8 @@ following the instructions in the INTRODUCTION section at the top of this file:
from http://drupal.org using your web browser, extract it, and then use an from http://drupal.org using your web browser, extract it, and then use an
FTP client to upload the files to your web root. FTP client to upload the files to your web root.
5. Re-apply any modifications to files such as .htaccess or robots.txt. 5. Re-apply any modifications to files such as .htaccess, composer.json, or
robots.txt.
6. Run update.php by visiting http://www.example.com/update.php (replace 6. Run update.php by visiting http://www.example.com/update.php (replace
www.example.com with your domain name). This will update the core database www.example.com with your domain name). This will update the core database
......
{
"name": "drupal/core",
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"type": "drupal-core",
"license": "GPL-2.0+",
"require": {
"php": ">=5.4.5",
"sdboyer/gliph": "0.1.*",
"symfony/class-loader": "2.6.*",
"symfony/css-selector": "2.6.*",
"symfony/dependency-injection": "2.6.*",
"symfony/event-dispatcher": "2.6.*",
"symfony/http-foundation": "2.6.*",
"symfony/http-kernel": "2.6.*",
"symfony/routing": "2.6.*",
"symfony/serializer": "2.6.*",
"symfony/validator": "2.6.*",
"symfony/process": "2.6.*",
"symfony/yaml": "2.6.*",
"twig/twig": "1.16.*",
"doctrine/common": "dev-master#a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
"doctrine/annotations": "1.2.*",
"guzzlehttp/guzzle": "~5.0",
"symfony-cmf/routing": "1.3.*",
"easyrdf/easyrdf": "0.9.*",
"phpunit/phpunit": "4.1.*",
"phpunit/phpunit-mock-objects": "dev-master#e60bb929c50ae4237aaf680a4f6773f4ee17f0a2",
"zendframework/zend-feed": "2.3.*",
"mikey179/vfsStream": "1.*",
"stack/builder": "1.0.*",
"egulias/email-validator": "1.2.*"
},
"autoload": {
"psr-4": {
"Drupal\\Core\\": "lib/Drupal/Core",
"Drupal\\Component\\": "lib/Drupal/Component",
"Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
},
"files": [
"lib/Drupal.php"
]
},
"config": {
"preferred-install": "dist",
"autoloader-suffix": "Drupal8"
}
}
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// autoload_classmap.php @generated by Composer // autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__)); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname($vendorDir);
return array( return array(
'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator.php', 'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator.php',
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
// autoload_files.php @generated by Composer // autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__)); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname($vendorDir);
return array( return array(
$vendorDir . '/react/promise/src/functions.php', $vendorDir . '/react/promise/src/functions.php',
$baseDir . '/core/lib/Drupal.php', $baseDir . '/lib/Drupal.php',
); );
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// autoload_namespaces.php @generated by Composer // autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__)); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname($vendorDir);
return array( return array(
'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'), 'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// autoload_psr4.php @generated by Composer // autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__)); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname($vendorDir);
return array( return array(
'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'), 'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'), 'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'), 'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'), 'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver'), 'Drupal\\Driver\\' => array($baseDir . '/../drivers/lib/Drupal/Driver'),
'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core'), 'Drupal\\Core\\' => array($baseDir . '/lib/Drupal/Core'),
'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component'), 'Drupal\\Component\\' => array($baseDir . '/lib/Drupal/Component'),
); );
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// include_paths.php @generated by Composer // include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__)); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname($vendorDir);
return array( return array(
$vendorDir . '/phpunit/php-text-template', $vendorDir . '/phpunit/php-text-template',
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
# Because .gitignore can be specific to your site, this file has a different # Because .gitignore can be specific to your site, this file has a different
# name; updating Drupal core will not override your custom .gitignore file. # name; updating Drupal core will not override your custom .gitignore file.
# Ignore core and vendor when managing dependencies with Composer.
# core
# vendor
# Ignore configuration files that may contain sensitive information. # Ignore configuration files that may contain sensitive information.
sites/*/settings*.php sites/*/settings*.php
sites/*/services*.yml sites/*/services*.yml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment