From 7da92b577513ead89fb2d1418acc480a26ee8727 Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Tue, 2 Feb 2016 15:10:10 +0900 Subject: [PATCH] Issue #2654894 by felribeiro, webflo: Use an indent of 4 spaces for composer.json --- .editorconfig | 3 + composer.json | 82 ++--- core/composer.json | 314 +++++++++--------- .../lib/Drupal/Component/Bridge/composer.json | 24 +- .../DependencyInjection/composer.json | 30 +- .../Drupal/Component/Gettext/composer.json | 26 +- .../Component/ProxyBuilder/composer.json | 28 +- .../Drupal/Component/Utility/composer.json | 26 +- 8 files changed, 268 insertions(+), 265 deletions(-) diff --git a/.editorconfig b/.editorconfig index ccc6a281e51..242859d822f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,3 +12,6 @@ indent_size = 2 charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[composer.json] +indent_size = 4 diff --git a/composer.json b/composer.json index 7f170ce71d7..e02dcb95732 100644 --- a/composer.json +++ b/composer.json @@ -1,44 +1,44 @@ { - "name": "drupal/drupal", - "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "type": "project", - "license": "GPL-2.0+", - "require": { - "composer/installers": "^1.0.21", - "wikimedia/composer-merge-plugin": "~1.3" - }, - "replace": { - "drupal/core": "~8.0" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "config": { - "preferred-install": "dist", - "autoloader-suffix": "Drupal8" - }, - "extra": { - "_readme": [ - "By default Drupal loads the autoloader from ./vendor/autoload.php.", - "To change the autoloader you can edit ./autoload.php." - ], - "merge-plugin": { - "include": [ - "core/composer.json" - ], - "recurse": false, - "replace": false, - "merge-extra": false + "name": "drupal/drupal", + "description": "Drupal is an open source content management platform powering millions of websites and applications.", + "type": "project", + "license": "GPL-2.0+", + "require": { + "composer/installers": "^1.0.21", + "wikimedia/composer-merge-plugin": "~1.3" + }, + "replace": { + "drupal/core": "~8.0" + }, + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "preferred-install": "dist", + "autoloader-suffix": "Drupal8" + }, + "extra": { + "_readme": [ + "By default Drupal loads the autoloader from ./vendor/autoload.php.", + "To change the autoloader you can edit ./autoload.php." + ], + "merge-plugin": { + "include": [ + "core/composer.json" + ], + "recurse": false, + "replace": false, + "merge-extra": false + } + }, + "autoload": { + "psr-4": { + "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer" + } + }, + "scripts": { + "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump", + "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess", + "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup", + "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup" } - }, - "autoload": { - "psr-4": { - "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer" - } - }, - "scripts": { - "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump", - "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess", - "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup", - "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup" - } } diff --git a/core/composer.json b/core/composer.json index 272b3cf4d3e..4ee693d12fb 100644 --- a/core/composer.json +++ b/core/composer.json @@ -1,160 +1,160 @@ { - "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.5.9", - "symfony/class-loader": "2.7.*", - "symfony/console": "2.7.*", - "symfony/dependency-injection": "2.7.*", - "symfony/event-dispatcher": "2.7.*", - "symfony/http-foundation": "~2.7.2", - "symfony/http-kernel": "2.7.*", - "symfony/routing": "2.7.*", - "symfony/serializer": "2.7.*", - "symfony/translation": "2.7.*", - "symfony/validator": "2.7.*", - "symfony/process": "2.7.*", - "symfony/yaml": "2.7.*", - "twig/twig": "^1.23.1", - "doctrine/common": "2.5.*", - "doctrine/annotations": "1.2.*", - "guzzlehttp/guzzle": "~6.1", - "symfony-cmf/routing": "1.3.*", - "easyrdf/easyrdf": "0.9.*", - "zendframework/zend-feed": "~2.4", - "stack/builder": "1.0.*", - "egulias/email-validator": "1.2.*", - "masterminds/html5": "~2.1", - "symfony/psr-http-message-bridge": "v0.2", - "zendframework/zend-diactoros": "~1.1", - "composer/semver": "~1.0", - "paragonie/random_compat": "~1.0" - }, - "require-dev": { - "behat/mink": "~1.6", - "behat/mink-goutte-driver": "~1.2", - "jcalderonzumba/gastonjs": "^1.1@dev", - "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", - "mikey179/vfsStream": "~1.2", - "phpunit/phpunit": "~4.8", - "symfony/css-selector": "2.7.*" - }, - "replace": { - "drupal/action": "self.version", - "drupal/aggregator": "self.version", - "drupal/automated_cron": "self.version", - "drupal/bartik": "self.version", - "drupal/ban": "self.version", - "drupal/basic_auth": "self.version", - "drupal/block": "self.version", - "drupal/block_content": "self.version", - "drupal/book": "self.version", - "drupal/breakpoint": "self.version", - "drupal/ckeditor": "self.version", - "drupal/classy": "self.version", - "drupal/color": "self.version", - "drupal/comment": "self.version", - "drupal/config": "self.version", - "drupal/config_translation": "self.version", - "drupal/contact": "self.version", - "drupal/content_translation": "self.version", - "drupal/contextual": "self.version", - "drupal/core-annotation": "self.version", - "drupal/core-bridge": "self.version", - "drupal/core-datetime": "self.version", - "drupal/core-diff": "self.version", - "drupal/core-discovery": "self.version", - "drupal/core-event-dispatcher": "self.version", - "drupal/core-file-cache": "self.version", - "drupal/core-gettext": "self.version", - "drupal/core-graph": "self.version", - "drupal/core-php-storage": "self.version", - "drupal/core-plugin": "self.version", - "drupal/core-proxy-builder": "self.version", - "drupal/core-serialization": "self.version", - "drupal/core-transliteration": "self.version", - "drupal/core-utility": "self.version", - "drupal/core-uuid": "self.version", - "drupal/datetime": "self.version", - "drupal/dblog": "self.version", - "drupal/dynamic_page_cache": "self.version", - "drupal/editor": "self.version", - "drupal/entity_reference": "self.version", - "drupal/field": "self.version", - "drupal/field_ui": "self.version", - "drupal/file": "self.version", - "drupal/filter": "self.version", - "drupal/forum": "self.version", - "drupal/hal": "self.version", - "drupal/help": "self.version", - "drupal/history": "self.version", - "drupal/image": "self.version", - "drupal/inline_form_errors": "self.version", - "drupal/language": "self.version", - "drupal/link": "self.version", - "drupal/locale": "self.version", - "drupal/minimal": "self.version", - "drupal/menu_link_content": "self.version", - "drupal/menu_ui": "self.version", - "drupal/migrate": "self.version", - "drupal/migrate_drupal": "self.version", - "drupal/node": "self.version", - "drupal/options": "self.version", - "drupal/page_cache": "self.version", - "drupal/path": "self.version", - "drupal/quickedit": "self.version", - "drupal/rdf": "self.version", - "drupal/responsive_image": "self.version", - "drupal/rest": "self.version", - "drupal/search": "self.version", - "drupal/serialization": "self.version", - "drupal/seven": "self.version", - "drupal/shortcut": "self.version", - "drupal/simpletest": "self.version", - "drupal/standard": "self.version", - "drupal/stark": "self.version", - "drupal/statistics": "self.version", - "drupal/syslog": "self.version", - "drupal/system": "self.version", - "drupal/taxonomy": "self.version", - "drupal/telephone": "self.version", - "drupal/text": "self.version", - "drupal/toolbar": "self.version", - "drupal/tour": "self.version", - "drupal/tracker": "self.version", - "drupal/update": "self.version", - "drupal/user": "self.version", - "drupal/views": "self.version", - "drupal/views_ui": "self.version" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "autoload": { - "psr-4": { - "Drupal\\Core\\": "lib/Drupal/Core", - "Drupal\\Component\\": "lib/Drupal/Component", - "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver" + "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.5.9", + "symfony/class-loader": "2.7.*", + "symfony/console": "2.7.*", + "symfony/dependency-injection": "2.7.*", + "symfony/event-dispatcher": "2.7.*", + "symfony/http-foundation": "~2.7.2", + "symfony/http-kernel": "2.7.*", + "symfony/routing": "2.7.*", + "symfony/serializer": "2.7.*", + "symfony/translation": "2.7.*", + "symfony/validator": "2.7.*", + "symfony/process": "2.7.*", + "symfony/yaml": "2.7.*", + "twig/twig": "^1.23.1", + "doctrine/common": "2.5.*", + "doctrine/annotations": "1.2.*", + "guzzlehttp/guzzle": "~6.1", + "symfony-cmf/routing": "1.3.*", + "easyrdf/easyrdf": "0.9.*", + "zendframework/zend-feed": "~2.4", + "stack/builder": "1.0.*", + "egulias/email-validator": "1.2.*", + "masterminds/html5": "~2.1", + "symfony/psr-http-message-bridge": "v0.2", + "zendframework/zend-diactoros": "~1.1", + "composer/semver": "~1.0", + "paragonie/random_compat": "~1.0" }, - "files": [ - "lib/Drupal.php" - ], - "classmap": [ - "lib/Drupal/Component/Utility/Timer.php", - "lib/Drupal/Component/Utility/Unicode.php", - "lib/Drupal/Core/Database/Database.php", - "lib/Drupal/Core/DrupalKernel.php", - "lib/Drupal/Core/DrupalKernelInterface.php", - "lib/Drupal/Core/Site/Settings.php" - ] - }, - "config": { - "preferred-install": "dist", - "autoloader-suffix": "Drupal8" - }, - "scripts": { - "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump", - "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess" - } + "require-dev": { + "behat/mink": "~1.6", + "behat/mink-goutte-driver": "~1.2", + "jcalderonzumba/gastonjs": "^1.1@dev", + "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", + "mikey179/vfsStream": "~1.2", + "phpunit/phpunit": "~4.8", + "symfony/css-selector": "2.7.*" + }, + "replace": { + "drupal/action": "self.version", + "drupal/aggregator": "self.version", + "drupal/automated_cron": "self.version", + "drupal/bartik": "self.version", + "drupal/ban": "self.version", + "drupal/basic_auth": "self.version", + "drupal/block": "self.version", + "drupal/block_content": "self.version", + "drupal/book": "self.version", + "drupal/breakpoint": "self.version", + "drupal/ckeditor": "self.version", + "drupal/classy": "self.version", + "drupal/color": "self.version", + "drupal/comment": "self.version", + "drupal/config": "self.version", + "drupal/config_translation": "self.version", + "drupal/contact": "self.version", + "drupal/content_translation": "self.version", + "drupal/contextual": "self.version", + "drupal/core-annotation": "self.version", + "drupal/core-bridge": "self.version", + "drupal/core-datetime": "self.version", + "drupal/core-diff": "self.version", + "drupal/core-discovery": "self.version", + "drupal/core-event-dispatcher": "self.version", + "drupal/core-file-cache": "self.version", + "drupal/core-gettext": "self.version", + "drupal/core-graph": "self.version", + "drupal/core-php-storage": "self.version", + "drupal/core-plugin": "self.version", + "drupal/core-proxy-builder": "self.version", + "drupal/core-serialization": "self.version", + "drupal/core-transliteration": "self.version", + "drupal/core-utility": "self.version", + "drupal/core-uuid": "self.version", + "drupal/datetime": "self.version", + "drupal/dblog": "self.version", + "drupal/dynamic_page_cache": "self.version", + "drupal/editor": "self.version", + "drupal/entity_reference": "self.version", + "drupal/field": "self.version", + "drupal/field_ui": "self.version", + "drupal/file": "self.version", + "drupal/filter": "self.version", + "drupal/forum": "self.version", + "drupal/hal": "self.version", + "drupal/help": "self.version", + "drupal/history": "self.version", + "drupal/image": "self.version", + "drupal/inline_form_errors": "self.version", + "drupal/language": "self.version", + "drupal/link": "self.version", + "drupal/locale": "self.version", + "drupal/minimal": "self.version", + "drupal/menu_link_content": "self.version", + "drupal/menu_ui": "self.version", + "drupal/migrate": "self.version", + "drupal/migrate_drupal": "self.version", + "drupal/node": "self.version", + "drupal/options": "self.version", + "drupal/page_cache": "self.version", + "drupal/path": "self.version", + "drupal/quickedit": "self.version", + "drupal/rdf": "self.version", + "drupal/responsive_image": "self.version", + "drupal/rest": "self.version", + "drupal/search": "self.version", + "drupal/serialization": "self.version", + "drupal/seven": "self.version", + "drupal/shortcut": "self.version", + "drupal/simpletest": "self.version", + "drupal/standard": "self.version", + "drupal/stark": "self.version", + "drupal/statistics": "self.version", + "drupal/syslog": "self.version", + "drupal/system": "self.version", + "drupal/taxonomy": "self.version", + "drupal/telephone": "self.version", + "drupal/text": "self.version", + "drupal/toolbar": "self.version", + "drupal/tour": "self.version", + "drupal/tracker": "self.version", + "drupal/update": "self.version", + "drupal/user": "self.version", + "drupal/views": "self.version", + "drupal/views_ui": "self.version" + }, + "minimum-stability": "dev", + "prefer-stable": true, + "autoload": { + "psr-4": { + "Drupal\\Core\\": "lib/Drupal/Core", + "Drupal\\Component\\": "lib/Drupal/Component", + "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver" + }, + "files": [ + "lib/Drupal.php" + ], + "classmap": [ + "lib/Drupal/Component/Utility/Timer.php", + "lib/Drupal/Component/Utility/Unicode.php", + "lib/Drupal/Core/Database/Database.php", + "lib/Drupal/Core/DrupalKernel.php", + "lib/Drupal/Core/DrupalKernelInterface.php", + "lib/Drupal/Core/Site/Settings.php" + ] + }, + "config": { + "preferred-install": "dist", + "autoloader-suffix": "Drupal8" + }, + "scripts": { + "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump", + "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess" + } } diff --git a/core/lib/Drupal/Component/Bridge/composer.json b/core/lib/Drupal/Component/Bridge/composer.json index 679def655b8..75cd7eda1be 100644 --- a/core/lib/Drupal/Component/Bridge/composer.json +++ b/core/lib/Drupal/Component/Bridge/composer.json @@ -1,15 +1,15 @@ { - "name": "drupal/core-bridge", - "description": "Bridge.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0+", - "require": { - "php": ">=5.5.9" - }, - "autoload": { - "psr-0": { - "Drupal\\Component\\Bridge\\": "" + "name": "drupal/core-bridge", + "description": "Bridge.", + "keywords": ["drupal"], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0+", + "require": { + "php": ">=5.5.9" + }, + "autoload": { + "psr-0": { + "Drupal\\Component\\Bridge\\": "" + } } - } } diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json index 7e5e66617ca..d3bcd588171 100644 --- a/core/lib/Drupal/Component/DependencyInjection/composer.json +++ b/core/lib/Drupal/Component/DependencyInjection/composer.json @@ -1,18 +1,18 @@ { - "name": "drupal/core-dependency-injection", - "description": "Dependency Injection container optimized for Drupal's needs.", - "keywords": ["drupal", "dependency injection"], - "type": "library", - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0+", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\DependencyInjection\\": "" + "name": "drupal/core-dependency-injection", + "description": "Dependency Injection container optimized for Drupal's needs.", + "keywords": ["drupal", "dependency injection"], + "type": "library", + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0+", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\DependencyInjection\\": "" + } } - } } diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json index a95be566e47..4df12deb392 100644 --- a/core/lib/Drupal/Component/Gettext/composer.json +++ b/core/lib/Drupal/Component/Gettext/composer.json @@ -1,16 +1,16 @@ { - "name": "drupal/core-gettext", - "description": "PHP library for reading PO files.", - "type": "library", - "license": "GPL-2.0+", - "support": { - "issues": "https://www.drupal.org/project/issues/drupal", - "irc": "irc://irc.freenode.net/drupal-contribute", - "source": "https://www.drupal.org/project/drupal/git-instructions" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\Gettext\\": "" + "name": "drupal/core-gettext", + "description": "PHP library for reading PO files.", + "type": "library", + "license": "GPL-2.0+", + "support": { + "issues": "https://www.drupal.org/project/issues/drupal", + "irc": "irc://irc.freenode.net/drupal-contribute", + "source": "https://www.drupal.org/project/drupal/git-instructions" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\Gettext\\": "" + } } - } } diff --git a/core/lib/Drupal/Component/ProxyBuilder/composer.json b/core/lib/Drupal/Component/ProxyBuilder/composer.json index 126c1a339c7..aaf08166123 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/composer.json +++ b/core/lib/Drupal/Component/ProxyBuilder/composer.json @@ -1,16 +1,16 @@ { - "name": "drupal/core-proxy-builder", - "description": "Provides a lightweight mechanism to provide lazy loaded proxies.", - "keywords": ["drupal", "proxy"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0+", - "require": { - "php": ">=5.5.9", - "symfony/dependency-injection": "~2.6" - }, - "autoload": { - "psr-4": { - "Drupal\\Component\\ProxyBuilder\\": "" + "name": "drupal/core-proxy-builder", + "description": "Provides a lightweight mechanism to provide lazy loaded proxies.", + "keywords": ["drupal", "proxy"], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0+", + "require": { + "php": ">=5.5.9", + "symfony/dependency-injection": "~2.6" + }, + "autoload": { + "psr-4": { + "Drupal\\Component\\ProxyBuilder\\": "" + } } - } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Component/Utility/composer.json b/core/lib/Drupal/Component/Utility/composer.json index 7ee745a76f2..93ae73aa905 100644 --- a/core/lib/Drupal/Component/Utility/composer.json +++ b/core/lib/Drupal/Component/Utility/composer.json @@ -1,16 +1,16 @@ { - "name": "drupal/core-utility", - "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.", - "keywords": ["drupal"], - "homepage": "https://www.drupal.org/project/drupal", - "license": "GPL-2.0+", - "require": { - "php": ">=5.5.9", - "paragonie/random_compat": "~1.0" - }, - "autoload": { - "psr-0": { - "Drupal\\Component\\Utility\\": "" + "name": "drupal/core-utility", + "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.", + "keywords": ["drupal"], + "homepage": "https://www.drupal.org/project/drupal", + "license": "GPL-2.0+", + "require": { + "php": ">=5.5.9", + "paragonie/random_compat": "~1.0" + }, + "autoload": { + "psr-0": { + "Drupal\\Component\\Utility\\": "" + } } - } }