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

dg · dg · commit ea78a08cd343 · 2016-04-06T12:25:14.000+02:00
diff --git a/src/Application/PresenterFactory.php b/src/Application/PresenterFactory.php
@@ -99,10 +99,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] = array($m[1], $m[2] ?: '*Module\\', $m[3]);
+			} elseif (is_array($mask) && count($mask) === 3) {
+				$this->mapping[$module] = array($mask[0] ? $mask[0] . '\\' : '', $mask[1] . '\\', $mask[2]);
+			} else {
+				throw new Nette\InvalidStateException("Invalid mapping mask for module $module.");
 			}
-			$this->mapping[$module] = array($m[1], $m[2] ?: '*Module\\', $m[3]);
 		}
 		return $this;
 	}
diff --git a/tests/Application/PresenterFactory.formatPresenterClass.phpt b/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(array(
+		'*' => array('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(array(
+		'*' => array('', '*', '*'),
+	));
+	Assert::same('Module\Foo\Bar', $factory->formatPresenterClass('Module:Foo:Bar'));
+});
+
+
+Assert::exception(
+	function () {
+		$factory = new PresenterFactory;
+		$factory->setMapping(array(
+			'*' => array('*', '*'),
+		));
+	},
+	'Nette\InvalidStateException',
+	'Invalid mapping mask for module *.'
+);

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,16 @@ public function getPresenterClass(& $name)`
`99`	`99`	`public function setMapping(array $mapping)`
`100`	`100`	`{`
`101`	`101`	`foreach ($mapping as $module => $mask) {`
`102`		`- if (!preg_match('#^\\\\?([\w\\\\]\\\\)?(\w\\w?\\\\)?([\w\\\\]\\w*)\z#', $mask, $m)) {`
`103`		`- throw new Nette\InvalidStateException("Invalid mapping mask '$mask'.");`
	`102`	`+ if (is_string($mask)) {`
	`103`	`+ if (!preg_match('#^\\\\?([\w\\\\]\\\\)?(\w\\w?\\\\)?([\w\\\\]\\w*)\z#', $mask, $m)) {`
	`104`	`+ throw new Nette\InvalidStateException("Invalid mapping mask '$mask'.");`
	`105`	`+ }`
	`106`	`+ $this->mapping[$module] = array($m[1], $m[2] ?: '*Module\\', $m[3]);`
	`107`	`+ } elseif (is_array($mask) && count($mask) === 3) {`
	`108`	`+ $this->mapping[$module] = array($mask[0] ? $mask[0] . '\\' : '', $mask[1] . '\\', $mask[2]);`
	`109`	`+ } else {`
	`110`	`+ throw new Nette\InvalidStateException("Invalid mapping mask for module $module.");`
`104`	`111`	`}`
`105`		`- $this->mapping[$module] = array($m[1], $m[2] ?: '*Module\\', $m[3]);`
`106`	`112`	`}`
`107`	`113`	`return $this;`
`108`	`114`	`}`