Add generic method to get the module name from a namespace

sumocoders · Jul 24, 2018 · d5fb4e0 · d5fb4e0
1 parent 72c138f
commit d5fb4e0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/CLI/Console/Generate/Domain/Repository.php b/src/CLI/Console/Generate/Domain/Repository.php
@@ -32,16 +32,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->getTargetPhpVersion()
         );
 
-        $matches = [];
-        preg_match(
-            '|^Backend\\\\Modules\\\\(.*)\\\\Domain\\\\|',
-            $repositoryClass->getClassName()->getNamespace(),
-            $matches
-        );
-        if (\count($matches) === 2) {
+        $moduleName = $this->extractModuleName($repositoryClass->getClassName()->getNamespace());
+        if ($moduleName instanceof ModuleName) {
             $this->generateService->generateFile(
                 new Repositories(
-                    new ModuleName($matches[1]),
+                    $moduleName,
                     [$repositoryClass->getClassName()->getForUseStatement()],
                     true
                 ),

diff --git a/src/CLI/Console/GenerateCommand.php b/src/CLI/Console/GenerateCommand.php
@@ -3,6 +3,8 @@
 namespace ModuleGenerator\CLI\Console;
 
 use ModuleGenerator\CLI\Service\Generate\Generate;
+use ModuleGenerator\PhpGenerator\ModuleName\ModuleName;
+use ModuleGenerator\PhpGenerator\PhpNamespace\PhpNamespace;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -59,4 +61,20 @@ public static function getOutput()
     {
         return self::$output;
     }
+
+    public function extractModuleName(PhpNamespace $namespace): ?ModuleName
+    {
+        $matches = [];
+        preg_match(
+            '|^Backend\\\\Modules\\\\(.*?)\\\\|',
+            $namespace,
+            $matches
+        );
+
+        if (\count($matches) === 2) {
+            return new ModuleName($matches[1]);
+        }
+
+        return null;
+    }
 }