ApplicationExtension: option 'scanFilter' changed to pattern, default…

… is '*Presenter'
nette · Dec 31, 2020 · 00dc017 · 00dc017
1 parent 0e7442d
commit 00dc017
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -63,7 +63,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 				false
 			)->default($this->scanDirs),
 			'scanComposer' => Expect::bool(class_exists(ClassLoader::class)),
-			'scanFilter' => Expect::string('Presenter'),
+			'scanFilter' => Expect::string('*Presenter'),
 			'silentLinks' => Expect::bool(),
 		]);
 	}
@@ -159,7 +159,7 @@ private function findPresenters(): array
 			}
 			$robot = new Nette\Loaders\RobotLoader;
 			$robot->addDirectory(...$config->scanDirs);
-			$robot->acceptFiles = ['*' . $config->scanFilter . '*.php'];
+			$robot->acceptFiles = [$config->scanFilter . '.php'];
 			if ($this->tempDir) {
 				$robot->setTempDirectory($this->tempDir);
 				$robot->refresh();
@@ -191,7 +191,7 @@ private function findPresenters(): array
 		$presenters = [];
 		foreach (array_unique($classes) as $class) {
 			if (
-				strpos($class, $config->scanFilter) !== false
+				fnmatch($config->scanFilter, $class)
 				&& class_exists($class)
 				&& ($rc = new \ReflectionClass($class))
 				&& $rc->implementsInterface(Nette\Application\IPresenter::class)

diff --git a/tests/Bridges.DI/ApplicationExtension.scan.phpt b/tests/Bridges.DI/ApplicationExtension.scan.phpt
@@ -40,6 +40,7 @@ test('', function () {
 	$code = $compiler->addConfig([
 		'application' => [
 			'scanDirs' => [__DIR__ . '/files'],
+			'scanFilter' => '*Presenter*',
 		],
 	])->setClassName('Container2')->compile();
 	eval($code);
@@ -61,6 +62,9 @@ test('', function () {
 	$builder->addDefinition('myHttpResponse')->setFactory(Nette\Http\Response::class);
 	$loader = new DI\Config\Loader;
 	$config = $loader->load(Tester\FileMock::create('
+	application:
+		scanFilter: *Presenter*
+
 	services:
 		-
 			factory: Presenter1