From 8424235fac3ea7ceaf5f855ffed23351c21a91ca Mon Sep 17 00:00:00 2001 From: Mathias Brodala Date: Mon, 18 Dec 2017 10:46:07 +0100 Subject: [PATCH] Rename to "scripts-descriptions" --- doc/articles/scripts.md | 2 +- res/composer-schema.json | 2 +- src/Composer/Console/Application.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/articles/scripts.md b/doc/articles/scripts.md index fda45f22d..00eae08b4 100644 --- a/doc/articles/scripts.md +++ b/doc/articles/scripts.md @@ -282,7 +282,7 @@ You can set custom script descriptions with the following in your `composer.json ```json { - "scripts-description": { + "scripts-descriptions": { "test": "Run all tests!" } } diff --git a/res/composer-schema.json b/res/composer-schema.json index d5946f64b..558f54d5c 100644 --- a/res/composer-schema.json +++ b/res/composer-schema.json @@ -447,7 +447,7 @@ } } }, - "scripts-description": { + "scripts-descriptions": { "type": ["object"], "description": "Descriptions for scripts listeners, shown in console help.", "additionalProperties": { diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 20975a10a..9e120abdf 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -230,10 +230,10 @@ class Application extends BaseApplication } else { $description = null; - if (isset($composer['scripts-description'][$script])) { - $description = $composer['scripts-description'][$script]; + if (isset($composer['scripts-descriptions'][$script])) { + $description = $composer['scripts-descriptions'][$script]; } elseif (isset($composer['extra']['scripts-description'][$script])) { - $io->writeError('You are using "scripts-description" in "extra" which is deprecated. Move "scripts-description" to the topmost level next to "scripts" instead.'); + $io->writeError('You are using "scripts-description" in "extra" which is deprecated. Use "scripts-descriptions" on the topmost level next to "scripts" instead.'); $description = $composer['extra']['scripts-description'][$script]; }