PresenterFactory: added possibility to configure mapping via array; thanks @achse [Closes #101][Closes #119]

Author: dg

src/Application/PresenterFactory.php

@@ -96,10 +96,16 @@ public function getPresenterClass(& $name)
 	public function setMapping(array $mapping)
 	{
 		foreach ($mapping as $module => $mask) {
-			if (!preg_match('#^\\\\?([\w\\\\]*\\\\)?(\w*\*\w*?\\\\)?([\w\\\\]*\*\w*)\z#', $mask, $m)) {
-				throw new Nette\InvalidStateException("Invalid mapping mask '$mask'.");
+			if (is_string($mask)) {
+				if (!preg_match('#^\\\\?([\w\\\\]*\\\\)?(\w*\*\w*?\\\\)?([\w\\\\]*\*\w*)\z#', $mask, $m)) {
+					throw new Nette\InvalidStateException("Invalid mapping mask '$mask'.");
+				}
+				$this->mapping[$module] = [$m[1], $m[2] ?: '*Module\\', $m[3]];
+			} elseif (is_array($mask) && count($mask) === 3) {
+				$this->mapping[$module] = [$mask[0] ? $mask[0] . '\\' : '', $mask[1] . '\\', $mask[2]];
+			} else {
+				throw new Nette\InvalidStateException("Invalid mapping mask for module $module.");
 			}
-			$this->mapping[$module] = [$m[1], $m[2] ?: '*Module\\', $m[3]];
 		}
 		return $this;
 	}

tests/Application/PresenterFactory.formatPresenterClass.phpt

@@ -49,3 +49,34 @@ test(function () {
 	Assert::same('My\App\BarPresenter', $factory->formatPresenterClass('Foo3:Bar'));
 	Assert::same('My\App\BarModule\BazPresenter', $factory->formatPresenterClass('Foo3:Bar:Baz'));
 });
+
+
+test(function () {
+	$factory = new PresenterFactory;
+	$factory->setMapping([
+		'*' => ['App', 'Module\*', 'Presenter\*'],
+	]);
+	Assert::same('App\Module\Foo\Presenter\Bar', $factory->formatPresenterClass('Foo:Bar'));
+	Assert::same('App\Module\Universe\Module\Foo\Presenter\Bar', $factory->formatPresenterClass('Universe:Foo:Bar'));
+});
+
+
+test(function () {
+	$factory = new PresenterFactory;
+	$factory->setMapping([
+		'*' => ['', '*', '*'],
+	]);
+	Assert::same('Module\Foo\Bar', $factory->formatPresenterClass('Module:Foo:Bar'));
+});
+
+
+Assert::exception(
+	function () {
+		$factory = new PresenterFactory;
+		$factory->setMapping([
+			'*' => ['*', '*'],
+		]);
+	},
+	Nette\InvalidStateException::class,
+	'Invalid mapping mask for module *.'
+);