more readable exception strings

Author: dg

src/DI/Compiler.php

@@ -253,7 +253,7 @@ public static function parseService(ServiceDefinition $definition, $config)
 
 		$known = array('class', 'create', 'arguments', 'setup', 'autowired', 'inject', 'parameters', 'implement', 'run', 'tags');
 		if ($error = array_diff(array_keys($config), $known)) {
-			throw new Nette\InvalidStateException("Unknown or deprecated key '" . implode("', '", $error) . "' in definition of service.");
+			throw new Nette\InvalidStateException(sprintf("Unknown or deprecated key '%s' in definition of service.", implode("', '", $error)));
 		}
 
 		$arguments = array();

src/DI/Config/Adapters/IniAdapter.php

@@ -135,7 +135,7 @@ private static function build($input, & $output, $prefix)
 				$output[] = "$prefix$key = \"$val\"";
 
 			} else {
-				throw new Nette\InvalidArgumentException("The '$prefix$key' item must be scalar or array, " . gettype($val) ." given.");
+				throw new Nette\InvalidArgumentException(sprintf("The '%s' item must be scalar or array, %s given.", $prefix . $key, gettype($val)));
 			}
 		}
 	}

src/DI/Container.php

@@ -60,18 +60,18 @@ public function addService($name, $service)
 			throw new Nette\DeprecatedException('Parameter $meta has been removed.');
 
 		} elseif (!is_string($name) || !$name) {
-			throw new Nette\InvalidArgumentException('Service name must be a non-empty string, ' . gettype($name) . ' given.');
+			throw new Nette\InvalidArgumentException(sprintf('Service name must be a non-empty string, %s given.', gettype($name)));
 
 		} elseif (isset($this->registry[$name])) {
 			throw new Nette\InvalidStateException("Service '$name' already exists.");
 
 		} elseif (is_string($service) || is_array($service) || $service instanceof \Closure || $service instanceof Nette\Callback) {
-			trigger_error('Passing factories to ' . __METHOD__ . '() is deprecated; pass the object itself.', E_USER_DEPRECATED);
+			trigger_error(sprintf('Passing factories to %s() is deprecated; pass the object itself.', __METHOD__), E_USER_DEPRECATED);
 			$service = is_string($service) && !preg_match('#\x00|:#', $service) ? new $service : call_user_func($service, $this);
 		}
 
 		if (!is_object($service)) {
-			throw new Nette\InvalidArgumentException('Service must be a object, ' . gettype($service) . ' given.');
+			throw new Nette\InvalidArgumentException(sprintf('Service must be a object, %s given.', gettype($service)));
 		}
 
 		$this->registry[$name] = $service;
@@ -141,8 +141,7 @@ public function createService($name, array $args = array())
 	{
 		$method = Container::getMethodName($name);
 		if (isset($this->creating[$name])) {
-			throw new Nette\InvalidStateException("Circular reference detected for services: "
-				. implode(', ', array_keys($this->creating)) . ".");
+			throw new Nette\InvalidStateException(sprintf('Circular reference detected for services: %s.', implode(', ', array_keys($this->creating))));
 
 		} elseif (!method_exists($this, $method) || $this->getReflection()->getMethod($method)->getName() !== $method) {
 			throw new MissingServiceException("Service '$name' not found.");
@@ -244,7 +243,7 @@ public function createInstance($class, array $args = array())
 	public function callInjects($service)
 	{
 		if (!is_object($service)) {
-			throw new Nette\InvalidArgumentException('Service must be object, ' . gettype($service) . ' given.');
+			throw new Nette\InvalidArgumentException(sprintf('Service must be object, %s given.', gettype($service)));
 		}
 
 		foreach (array_reverse(get_class_methods($service)) as $method) {

src/DI/ContainerBuilder.php

@@ -53,7 +53,7 @@ class ContainerBuilder extends Nette\Object
 	public function addDefinition($name, ServiceDefinition $definition = NULL)
 	{
 		if (!is_string($name) || !$name) { // builder is not ready for falsy names such as '0'
-			throw new Nette\InvalidArgumentException("Service name must be a non-empty string, " . gettype($name) . " given.");
+			throw new Nette\InvalidArgumentException(sprintf('Service name must be a non-empty string, %s given.', gettype($name)));
 
 		} elseif (isset($this->definitions[$name])) {
 			throw new Nette\InvalidStateException("Service '$name' has already been added.");
@@ -295,7 +295,7 @@ public function prepareClassList()
 	private function resolveClass($name, $recursive = array())
 	{
 		if (isset($recursive[$name])) {
-			throw new ServiceCreationException('Circular reference detected for services: ' . implode(', ', array_keys($recursive)) . '.');
+			throw new ServiceCreationException(sprintf('Circular reference detected for services: %s.', implode(', ', array_keys($recursive))));
 		}
 		$recursive[$name] = TRUE;
 
@@ -320,12 +320,12 @@ private function resolveClass($name, $recursive = array())
 				}
 			}
 			if (!is_callable($factory)) {
-				throw new ServiceCreationException("Factory '" . Nette\Utils\Callback::toString($factory) . "' is not callable.");
+				throw new ServiceCreationException(sprintf("Factory '%s' is not callable.", Nette\Utils\Callback::toString($factory)));
 			}
 			try {
 				$reflection = Nette\Utils\Callback::toReflection($factory);
 			} catch (\ReflectionException $e) {
-				throw new ServiceCreationException("Missing factory '" . Nette\Utils\Callback::toString($factory) . "'.");
+				throw new ServiceCreationException(sprintf("Missing factory '%s'.", Nette\Utils\Callback::toString($factory)));
 			}
 			$def->class = preg_replace('#[|\s].*#', '', $reflection->getAnnotation('return'));
 			if ($def->class && $reflection instanceof \ReflectionMethod) {
@@ -413,7 +413,7 @@ public function generateClasses($className = 'Container', $parentName = 'Nette\D
 					throw new ServiceCreationException('Name contains invalid characters.');
 				}
 				$containerClass->addMethod($methodName)
-					->addDocument("@return " . ($def->implement ?: $def->class))
+					->addDocument('@return ' . ($def->implement ?: $def->class))
 					->setBody($name === self::THIS_CONTAINER ? 'return $this;' : $this->generateService($name))
 					->setParameters($def->implement ? array() : $this->convertParameters($def->parameters));
 			} catch (\Exception $e) {
@@ -564,7 +564,7 @@ public function formatStatement(Statement $statement)
 			return $this->formatPhp("new $entity" . ($arguments ? '(?*)' : ''), array($arguments));
 
 		} elseif (!Nette\Utils\Arrays::isList($entity) || count($entity) !== 2) {
-			throw new ServiceCreationException("Expected class, method or property, " . PhpHelpers::dump($entity) . " given.");
+			throw new ServiceCreationException(sprintf('Expected class, method or property, %s given.', PhpHelpers::dump($entity)));
 
 		} elseif ($entity[0] === '') { // globalFunc
 			return $this->formatPhp("$entity[1](?*)", array($arguments));

src/DI/Helpers.php

@@ -56,7 +56,7 @@ public static function expand($var, array $params, $recursive = FALSE)
 				$res .= '%';
 
 			} elseif (isset($recursive[$part])) {
-				throw new Nette\InvalidArgumentException('Circular reference detected for variables: ' . implode(', ', array_keys($recursive)) . '.');
+				throw new Nette\InvalidArgumentException(sprintf('Circular reference detected for variables: %s.', implode(', ', array_keys($recursive))));
 
 			} else {
 				try {