typo

src/LeanMapperExtension.php

@@ -160,12 +160,12 @@ protected function processEntityProviders(ServiceDefinition $mapper, array $conf
 					$mappings = $extension->getEntityMappings();
 
 					if (!is_array($mappings) && !is_null($mappings)) {
-						throw new \InvalidArgumentException('Mappings must be array or NULL, '. gettype($mapping) . ' given.');
+						throw new \InvalidArgumentException('Mappings must be array or NULL, '. gettype($mappings) . ' given.');
 					}
 
 					if (is_array($mappings)) {
 						foreach ($mappings as $mapping) {
-							if (!is_array($mappings) && !is_null($mappings)) {
+							if (!is_array($mapping) && !is_null($mapping)) {
 								throw new \InvalidArgumentException('Entity mapping must be array or NULL, '. gettype($mapping) . ' given.');
 							}
 							$this->registerInMapper($mapper, $mapping);

tests/LeanMapperExtension/Extension.entityProviders.phpt

@@ -33,6 +33,28 @@ namespace Foo\DI {
 			);
 		}
 	}
+
+
+	class FooBrokenExtension extends CompilerExtension implements IEntityProvider
+	{
+		// from IEntityProvider
+		function getEntityMappings()
+		{
+			return 'broken';
+		}
+	}
+
+
+	class FooBrokenMappingExtension extends CompilerExtension implements IEntityProvider
+	{
+		// from IEntityProvider
+		function getEntityMappings()
+		{
+			return array(
+				'broken',
+			);
+		}
+	}
 }
 
 namespace {
@@ -55,4 +77,18 @@ namespace {
 		Assert::same('foo_articles', $mapper->getTable('Foo\Model\Article'));
 		Assert::same('article_id', $mapper->getPrimaryKey('foo_articles'));
 	});
+
+
+	test(function () {
+		Assert::exception(function () {
+			$container = createContainer('addons.broken');
+		}, 'InvalidArgumentException', 'Mappings must be array or NULL, string given.');
+	});
+
+
+	test(function () {
+		Assert::exception(function () {
+			$container = createContainer('addons.broken-mapping');
+		}, 'InvalidArgumentException', 'Entity mapping must be array or NULL, string given.');
+	});
 }

tests/LeanMapperExtension/config/addons.broken-mapping.neon

@@ -0,0 +1,11 @@
+
+extensions:
+	foo: Foo\DI\FooBrokenMappingExtension
+
+leanmapper:
+	# database connection
+	user: foo
+	password: bar
+	database: foobar
+
+	driver: fakeMysql

tests/LeanMapperExtension/config/addons.broken.neon

@@ -0,0 +1,11 @@
+
+extensions:
+	foo: Foo\DI\FooBrokenExtension
+
+leanmapper:
+	# database connection
+	user: foo
+	password: bar
+	database: foobar
+
+	driver: fakeMysql