From 834f0b49e5f7ef42113d069e7dea1a6e9bfbca34 Mon Sep 17 00:00:00 2001 From: deguif Date: Wed, 6 Mar 2013 18:08:55 +0100 Subject: [PATCH] Improved error messages in ArrayLoader Added package name to exception message when an error occurred in source or dist keys --- src/Composer/Package/Loader/ArrayLoader.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Composer/Package/Loader/ArrayLoader.php b/src/Composer/Package/Loader/ArrayLoader.php index f5676705f..13bb14037 100644 --- a/src/Composer/Package/Loader/ArrayLoader.php +++ b/src/Composer/Package/Loader/ArrayLoader.php @@ -74,7 +74,8 @@ class ArrayLoader implements LoaderInterface if (isset($config['source'])) { if (!isset($config['source']['type']) || !isset($config['source']['url'])) { throw new \UnexpectedValueException(sprintf( - "package source should be specified as {\"type\": ..., \"url\": ...},\n%s given", + "Package %s's source key should be specified as {\"type\": ..., \"url\": ...},\n%s given.", + $config['name'], json_encode($config['source']) )); } @@ -87,8 +88,9 @@ class ArrayLoader implements LoaderInterface if (!isset($config['dist']['type']) || !isset($config['dist']['url'])) { throw new \UnexpectedValueException(sprintf( - "package dist should be specified as ". - "{\"type\": ..., \"url\": ..., \"reference\": ..., \"shasum\": ...},\n%s given", + "Package %s's dist key should be specified as ". + "{\"type\": ..., \"url\": ..., \"reference\": ..., \"shasum\": ...},\n%s given.", + $config['name'], json_encode($config['dist']) )); }