class names are case sensitive (BC break)

dg · dg · commit 994fa922517b · 2015-02-05T19:14:50.000+01:00
diff --git a/src/DI/Container.php b/src/DI/Container.php
@@ -197,7 +197,7 @@ public function getByType($class, $need = TRUE)
 	 */
 	public function findByType($class, $autowired = TRUE)
 	{
-		$class = ltrim(strtolower($class), '\\');
+		$class = ltrim($class, '\\');
 		$meta = & $this->meta[self::TYPES];
 		return array_merge(
 			isset($meta[$class][TRUE]) ? $meta[$class][TRUE] : array(),
diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -164,15 +164,16 @@ public function getByType($class)
 			return $this->currentService;
 		}
 
-		$lower = ltrim(strtolower($class), '\\');
-		if (!isset($this->classes[$lower][TRUE])) {
+		$class = ltrim($class, '\\');
+		if (!isset($this->classes[$class][TRUE])) {
+			self::checkCase($class);
 			return;
 
-		} elseif (count($this->classes[$lower][TRUE]) === 1) {
-			return $this->classes[$lower][TRUE][0];
+		} elseif (count($this->classes[$class][TRUE]) === 1) {
+			return $this->classes[$class][TRUE][0];
 
 		} else {
-			throw new ServiceCreationException("Multiple services of type $class found: " . implode(', ', $this->classes[$lower][TRUE]));
+			throw new ServiceCreationException("Multiple services of type $class found: " . implode(', ', $this->classes[$class][TRUE]));
 		}
 	}
 
@@ -184,7 +185,8 @@ public function getByType($class)
 	 */
 	public function findByType($class, $autowired = TRUE)
 	{
-		$class = ltrim(strtolower($class), '\\');
+		$class = ltrim($class, '\\');
+		self::checkCase($class);
 		return array_merge(
 			isset($this->classes[$class][TRUE]) ? $this->classes[$class][TRUE] : array(),
 			!$autowired && isset($this->classes[$class][FALSE]) ? $this->classes[$class][FALSE] : array()
@@ -282,14 +284,14 @@ public function prepareClassList()
 		//  build auto-wiring list
 		$excludedClasses = array();
 		foreach ($this->excludedClasses as $class) {
-			$excludedClasses += array_change_key_case(class_parents($class) + class_implements($class) + array($class => $class));
+			self::checkCase($class);
+			$excludedClasses += class_parents($class) + class_implements($class) + array($class => $class);
 		}
 
 		$this->classes = array();
 		foreach ($this->definitions as $name => $def) {
 			if ($class = $def->getImplement() ?: $def->getClass()) {
 				foreach (class_parents($class) + class_implements($class) + array($class) as $parent) {
-					$parent = strtolower($parent);
 					$this->classes[$parent][$def->isAutowired() && empty($excludedClasses[$parent])][] = (string) $name;
 				}
 			}
@@ -303,16 +305,16 @@ public function prepareClassList()
 
 	private function resolveImplement(ServiceDefinition $def, $name)
 	{
-		$implement = $def->getImplement();
-		if (!interface_exists($implement)) {
-			throw new ServiceCreationException("Interface $implement used in service '$name' not found.");
+		$interface = $def->getImplement();
+		if (!interface_exists($interface)) {
+			throw new ServiceCreationException("Interface $interface used in service '$name' not found.");
 		}
-		$rc = Reflection\ClassType::from($implement);
+		self::checkCase($interface);
+		$rc = Reflection\ClassType::from($interface);
 		$method = $rc->hasMethod('create') ? $rc->getMethod('create') : ($rc->hasMethod('get') ? $rc->getMethod('get') : NULL);
 		if (count($rc->getMethods()) !== 1 || !$method || $method->isStatic()) {
-			throw new ServiceCreationException("Interface $implement used in service '$name' must have just one non-static method create() or get().");
+			throw new ServiceCreationException("Interface $interface used in service '$name' must have just one non-static method create() or get().");
 		}
-		$def->setImplement($rc->getName());
 		$def->setImplementType($rc->hasMethod('create') ? 'create' : 'get');
 
 		if (!$def->getClass() && !$def->getEntity()) {
@@ -386,7 +388,7 @@ private function resolveServiceClass($name, $recursive = array())
 			if (!class_exists($class) && !interface_exists($class)) {
 				throw new ServiceCreationException("Class or interface $class used in service '$name' not found.");
 			}
-			$def->setClass(Reflection\ClassType::from($class)->getName());
+			self::checkCase($class);
 
 		} elseif ($def->isAutowired()) {
 			trigger_error("Type of service '$name' is unknown.", E_USER_NOTICE);
@@ -424,14 +426,14 @@ private function resolveEntityClass($entity, $recursive = array())
 			}
 
 			$class = preg_replace('#[|\s].*#', '', $reflection->getAnnotation('return'));
-			if ($class && $refClass) {
-				$class = Reflection\AnnotationsParser::expandClassName($class, $refClass);
+			if ($class) {
+				$class = $refClass ? Reflection\AnnotationsParser::expandClassName($class, $refClass) : ltrim($class, '\\');
 			}
 			return $class;
 
 		} elseif ($service = $this->getServiceName($entity)) { // alias or factory
 			if (Strings::contains($service, '\\')) { // @\Class
-				return $service;
+				return ltrim($service, '\\');
 			}
 			return $this->definitions[$service]->getImplement() ?: $this->resolveServiceClass($service, $recursive);
 
@@ -440,7 +442,15 @@ private function resolveEntityClass($entity, $recursive = array())
 				$name = array_slice(array_keys($recursive), -1);
 				throw new ServiceCreationException("Class $entity used in service '$name[0]' not found or is not instantiable.");
 			}
-			return $entity;
+			return ltrim($entity, '\\');
+		}
+	}
+
+
+	private function checkCase($class)
+	{
+		if (class_exists($class) && ($rc = new \ReflectionClass($class)) && $class !== $rc->getName()) {
+			throw new ServiceCreationException("Case mismatch on class name '$class', correct name is '{$rc->getName()}'.");
 		}
 	}
 
diff --git a/tests/DI/Compiler.services.factory.phpt b/tests/DI/Compiler.services.factory.phpt
@@ -87,7 +87,7 @@ Assert::same( $container->getService('one'), $container->getService('calledServi
 Assert::type( 'Ipsum', $container->getService('calledServiceWithArgs') );
 Assert::notSame( $container->getService('one'), $container->getService('calledServiceWithArgs') );
 
-Assert::type( 'stdClass', $container->getByType('stdClass') );
+Assert::type( 'stdClass', $container->getByType('\stdClass') );
 
 
 Assert::type( 'Ipsum', $container->getService('serviceAsParam') );
diff --git a/tests/DI/Compiler.services.tags.phpt b/tests/DI/Compiler.services.tags.phpt
@@ -28,9 +28,9 @@ $prop->setAccessible(TRUE);
 
 Assert::same(array(
 	'types' => array(
-		'stdclass' => array(1 => array('lorem')),
-		'nette\\object' => array(1 => array('container')),
-		'nette\\di\\container' => array(1 => array('container')),
+		'stdClass' => array(1 => array('lorem')),
+		'Nette\\Object' => array(1 => array('container')),
+		'Nette\\DI\\Container' => array(1 => array('container')),
 	),
 	'services' => array('container' => 'Nette\\DI\\Container', 'lorem' => 'stdClass'),
 	'tags' => array(
diff --git a/tests/DI/ContainerBuilder.accessor.phpt b/tests/DI/ContainerBuilder.accessor.phpt
@@ -42,14 +42,14 @@ $builder->addDefinition('service2')
 	->setFactory('stdClass');
 
 $builder->addDefinition('one')
-	->setImplement('stdClassAccessor')
+	->setImplement('StdClassAccessor')
 	->setClass('stdClass');
 
 $builder->addDefinition('two')
 	->setImplement('AnnotatedAccessor');
 
 $builder->addDefinition('three')
-	->setImplement('stdClassAccessor')
+	->setImplement('StdClassAccessor')
 	->setAutowired(FALSE)
 	->setFactory('@service2');
 
diff --git a/tests/DI/ContainerBuilder.error.phpt b/tests/DI/ContainerBuilder.error.phpt
@@ -19,3 +19,13 @@ $builder->addDefinition('one')
 Assert::exception(function() use ($builder) {
 	$builder->generateClasses();
 }, 'Nette\InvalidStateException', "Service 'one': Expected function, method or property name, '1234' given.");
+
+
+
+$builder = new DI\ContainerBuilder;
+$builder->addDefinition('one')
+	->setClass('stdclass');
+
+Assert::exception(function() use ($builder) {
+	$builder->generateClasses();
+}, 'Nette\InvalidStateException', "Case mismatch on class name 'stdclass', correct name is 'stdClass'.");
diff --git a/tests/DI/ContainerBuilder.factory.params.phpt b/tests/DI/ContainerBuilder.factory.params.phpt
@@ -19,13 +19,13 @@ interface StdClassFactory
 
 $builder = new DI\ContainerBuilder;
 $builder->addDefinition('one')
-	->setImplement('stdClassFactory')
+	->setImplement('StdClassFactory')
 	->setFactory('stdClass')
 	->addSetup('$a', array($builder::literal('$a')));
 
 $builder->addDefinition('two')
 	->setParameters(array('stdClass foo', 'array bar', 'foobar' => NULL))
-	->setImplement('stdClassFactory')
+	->setImplement('StdClassFactory')
 	->setFactory('stdClass')
 	->addSetup('$a', array($builder::literal('$foo')));
 
diff --git a/tests/DI/ContainerBuilder.factory.phpt b/tests/DI/ContainerBuilder.factory.phpt
@@ -31,7 +31,7 @@ class FactoryReceiver
 
 $builder = new DI\ContainerBuilder;
 $builder->addDefinition('one')
-	->setImplement('stdClassFactory')
+	->setImplement('StdClassFactory')
 	->setFactory('stdClass');
 
 $builder->addDefinition('two')
diff --git a/tests/DI/ContainerBuilder.getByType.phpt b/tests/DI/ContainerBuilder.getByType.phpt
@@ -33,14 +33,14 @@ $builder->addDefinition('three')
 // compile-time
 $builder->prepareClassList();
 
-Assert::same( array('one'), $builder->findByType('service') );
-Assert::same( array('one'), $builder->findByType('service', FALSE) );
-Assert::same( array('two'), $builder->findByType('service2') );
-Assert::same( array('two', 'three'), $builder->findByType('service2', FALSE) );
+Assert::same( array('one'), $builder->findByType('\Service') );
+Assert::same( array('one'), $builder->findByType('Service', FALSE) );
+Assert::same( array('two'), $builder->findByType('Service2') );
+Assert::same( array('two', 'three'), $builder->findByType('Service2', FALSE) );
 Assert::same( array(), $builder->findByType('unknown') );
 Assert::same( array(), $builder->findByType('unknown', FALSE) );
 
-Assert::same( 'one', $builder->getByType('service') );
+Assert::same( 'one', $builder->getByType('\Service') );
 Assert::null( $builder->getByType('unknown') );
 Assert::exception(function() use ($builder) {
 	$builder->getByType('Nette\Object');
@@ -49,13 +49,13 @@ Assert::exception(function() use ($builder) {
 
 $container = createContainer($builder);
 
-Assert::type( 'Service', $container->getByType('service') );
+Assert::type( 'Service', $container->getByType('Service') );
 Assert::null( $container->getByType('unknown', FALSE) );
 
-Assert::same( array('one'), $container->findByType('service') );
-Assert::same( array('one'), $container->findByType('service', FALSE) );
-Assert::same( array('two'), $container->findByType('service2') );
-Assert::same( array('two', 'three'), $container->findByType('service2', FALSE) );
+Assert::same( array('one'), $container->findByType('Service') );
+Assert::same( array('one'), $container->findByType('Service', FALSE) );
+Assert::same( array('two'), $container->findByType('Service2') );
+Assert::same( array('two', 'three'), $container->findByType('Service2', FALSE) );
 Assert::same( array(), $container->findByType('unknown') );
 Assert::same( array(), $container->findByType('unknown', FALSE) );
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function getByType($class, $need = TRUE)`
`197`	`197`	`*/`
`198`	`198`	`public function findByType($class, $autowired = TRUE)`
`199`	`199`	`{`
`200`		`- $class = ltrim(strtolower($class), '\\');`
	`200`	`+ $class = ltrim($class, '\\');`
`201`	`201`	`$meta = & $this->meta[self::TYPES];`
`202`	`202`	`return array_merge(`
`203`	`203`	`isset($meta[$class][TRUE]) ? $meta[$class][TRUE] : array(),`