ResourceExtension: fix searching bug

contributte · Sep 5, 2023 · 49d6b93 · 49d6b93
1 parent 2857d07
commit 49d6b93
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Extension/ResourceExtension.php b/src/Extension/ResourceExtension.php
@@ -69,6 +69,7 @@ public function beforeCompile(): void
 
 		foreach ($this->map as $config) {
 			$classes = $config['classes'];
+			sort($classes);
 			$resource = $config['resource'];
 			$namespace = $config['namespace'];
 
@@ -78,7 +79,7 @@ public function beforeCompile(): void
 			foreach ($classes as $class) {
 				// Check already registered classes
 				if ($builder->getByType($class) !== null) {
-					return;
+					continue;
 				}
 
 				$def = $builder->addDefinition($this->prefix($name . '.' . $counter++))

diff --git a/tests/Cases/Extension/ResourceExtension.phpt b/tests/Cases/Extension/ResourceExtension.phpt
@@ -19,7 +19,9 @@ use Tests\Fixtures\Baz\Nested\NestedBazService;
 use Tests\Fixtures\Decorator\InjectService;
 use Tests\Fixtures\Foo\FooBarService;
 use Tests\Fixtures\Foo\FooService;
+use Tests\Fixtures\Scalar\Scalar2Service;
 use Tests\Fixtures\Scalar\ScalarService;
+use Tests\Fixtures\Scalar\ZScalarService;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
@@ -245,9 +247,12 @@ test(static function (): void {
 	/** @var Container $container */
 	$container = new $class();
 
+	Assert::type(ScalarService::class, $container->getByType(ScalarService::class));
+	Assert::type(Scalar2Service::class, $container->getByType(Scalar2Service::class));
+	Assert::type(ZScalarService::class, $container->getByType(ZScalarService::class));
+
 	/** @var ScalarService $service */
 	$service = $container->getService('scalar');
-
 	Assert::equal('foobar', $service->text);
 });
 
@@ -268,7 +273,7 @@ test(static function (): void {
 	}, ServiceCreationException::class, '~Service \'autoload\._Tests_Fixtures_Scalar_\.\d+\' \(type of Tests\\\\Fixtures\\\\Scalar\\\\ScalarService\): Parameter \$text in ScalarService::__construct\(\) has no class type or default value, so its value must be specified\.~');
 });
 
-// Register services manually (exception)
+// Register services manually
 test(static function (): void {
 	$loader = new ContainerLoader(TEMP_DIR, true);
 	$class = $loader->load(static function (Compiler $compiler): void {

diff --git a/tests/Fixtures/Scalar/ZScalarService.php b/tests/Fixtures/Scalar/ZScalarService.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures\Scalar;
+
+final class ZScalarService
+{
+
+}