move AbstractRegistry and CommandRegistry to "Plugin" namespace

Author: Machometec

src/Commands/AbstractRegistry.php src/Plugin/AbstractRegistry.phpsrc/Commands/AbstractRegistry.php renamed to src/Plugin/AbstractRegistry.php

@@ -7,7 +7,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\CLI\Commands;
+namespace DevNet\CLI\Plugin;
 
 use DevNet\System\Collections\Enumerator;
 use DevNet\System\Collections\IEnumerable;
@@ -29,12 +29,14 @@ public function __construct(string $type)
     /**
      * @param object|string $service object or class name of the injected service
      */
-    public function set(string $name, $service): void
+    public function set(string $name, string|object $service): void
     {
         if (is_string($service)) {
-            $this->classes[$name] = $service;
+            if (is_subclass_of($service, $this->type->Name) || $service == $this->type->Name) {
+                $this->classes[$name] = $service;
+            }
         } else if (is_object($service)) {
-            if ($this->type->isTypeOf($service)) {
+            if (is_subclass_of($service, $this->type->Name) || $service::class == $this->type->Name) {
                 $this->objects[$name] = $service;
             }
         }
@@ -50,10 +52,8 @@ public function get(string $name): ?object
         $class = $this->classes[$name] ?? '';
         if (class_exists($class)) {
             $object = new $class();
-            if ($this->type->isTypeOf($object)) {
-                $this->objects[$name] = $object;
-                return $object;
-            }
+            $this->objects[$name] = $object;
+            return $object;
         }
 
         return null;

src/Plugin/CodeGeneratorRegistry.php

@@ -9,8 +9,6 @@
 
 namespace DevNet\CLI\Plugin;
 
-use DevNet\CLI\Commands\AbstractRegistry;
-
 class CodeGeneratorRegistry extends AbstractRegistry
 {
     private static ?CodeGeneratorRegistry $instance = null;

src/Commands/CommandRegistry.php src/Plugin/CommandRegistry.phpsrc/Commands/CommandRegistry.php renamed to src/Plugin/CommandRegistry.php

@@ -7,7 +7,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\CLI\Commands;
+namespace DevNet\CLI\Plugin;
 
 use DevNet\System\Command\CommandLine;
 

src/Plugin/TemplateRegistry.php

@@ -9,8 +9,6 @@
 
 namespace DevNet\CLI\Plugin;
 
-use DevNet\CLI\Commands\AbstractRegistry;
-
 class TemplateRegistry extends AbstractRegistry
 {
     private static ?TemplateRegistry $instance = null;

src/Program.php

@@ -12,7 +12,7 @@
 use DevNet\CLI\Commands\AddCommand;
 use DevNet\CLI\Commands\NewCommand;
 use DevNet\CLI\Commands\RunCommand;
-use DevNet\CLI\Commands\CommandRegistry;
+use DevNet\CLI\Plugin\CommandRegistry;
 use DevNet\System\Command\CommandEventArgs;
 use DevNet\System\Command\CommandLine;
 use DevNet\System\IO\ConsoleColor;