SearchExtension: also searches for accessors

nette · Dec 20, 2023 · c84fb97 · c84fb97
1 parent 6c422d0
commit c84fb97
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 4 deletions.
diff --git a/src/DI/Extensions/SearchExtension.php b/src/DI/Extensions/SearchExtension.php
@@ -107,7 +107,7 @@ public function findClasses(\stdClass $config): array
 					||
 					($rc->isInterface()
 					&& count($methods = $rc->getMethods()) === 1
-					&& $methods[0]->name === 'create')
+					&& in_array($methods[0]->name, ['get', 'create'], true))
 				)
 				&& (!$acceptRE || preg_match($acceptRE, $rc->name))
 				&& (!$rejectRE || !preg_match($rejectRE, $rc->name))
@@ -133,9 +133,13 @@ public function beforeCompile()
 		}
 
 		foreach ($this->classes as $class => $tags) {
-			$def = class_exists($class)
-				? $builder->addDefinition(null)->setType($class)
-				: $builder->addFactoryDefinition(null)->setImplement($class);
+			if (class_exists($class)) {
+				$def = $builder->addDefinition(null)->setType($class);
+			} elseif (method_exists($class, 'create')) {
+				$def = $builder->addFactoryDefinition(null)->setImplement($class);
+			} else {
+				$def = $builder->addAccessorDefinition(null)->setImplement($class);
+			}
 			$def->setTags(Arrays::normalize($tags, true));
 		}
 	}

diff --git a/tests/SearchExtension/all.phpt b/tests/SearchExtension/all.phpt
@@ -21,6 +21,7 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 

diff --git a/tests/SearchExtension/batches.phpt b/tests/SearchExtension/batches.phpt
@@ -36,4 +36,5 @@ Assert::same([
 	'Foo\\Bar\\ClassBar' => ['foo' => true],
 	'Foo\\ClassBar' => ['foo' => true],
 	'InterfaceOk1' => ['ok' => true],
+	'InterfaceOk2' => ['ok' => true],
 ], $services);
diff --git a/tests/SearchExtension/classes.phpt b/tests/SearchExtension/classes.phpt
@@ -22,6 +22,7 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 
@@ -51,6 +52,7 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 
@@ -99,4 +101,5 @@ Assert::same([
 	'CountableClass',
 	'ExtendsStdClass',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
diff --git a/tests/SearchExtension/duplicates.phpt b/tests/SearchExtension/duplicates.phpt
@@ -27,4 +27,5 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
diff --git a/tests/SearchExtension/files.phpt b/tests/SearchExtension/files.phpt
@@ -22,6 +22,7 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 
@@ -39,6 +40,7 @@ Assert::same([
 	'CountableClass',
 	'ExtendsStdClass',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 
@@ -60,4 +62,5 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
diff --git a/tests/SearchExtension/fixtures/OkI2.php b/tests/SearchExtension/fixtures/OkI2.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+interface InterfaceOk2
+{
+	function get(): InterfaceOk1;
+}
diff --git a/tests/SearchExtension/parents.phpt b/tests/SearchExtension/parents.phpt
@@ -22,6 +22,7 @@ Assert::same([
 	'Foo\\Bar\\ClassBar',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
 
 
@@ -95,4 +96,5 @@ Assert::same([
 	'CountableClass',
 	'Foo\\ClassBar',
 	'InterfaceOk1',
+	'InterfaceOk2',
 ], array_keys($services));
diff --git a/tests/SearchExtension/tags.phpt b/tests/SearchExtension/tags.phpt
@@ -23,6 +23,7 @@ Assert::same([
 	'CountableClass' => ['a' => 1, 'b' => 2],
 	'ExtendsStdClass' => ['a' => 1, 'b' => 2],
 	'InterfaceOk1' => ['a' => 1, 'b' => 2],
+	'InterfaceOk2' => ['a' => 1, 'b' => 2],
 ], $services);
 
 
@@ -41,4 +42,5 @@ Assert::same([
 	'CountableClass' => [],
 	'ExtendsStdClass' => [],
 	'InterfaceOk1' => [],
+	'InterfaceOk2' => [],
 ], $services);