Merge pull request #1496 from BeMySlaveDarlin/fix/issue-1467-fix-empt…

…y-namespace-generation ISSUE-1467: Fixed empty namespace generating
phalcon · Mar 22, 2021 · fa9bfbe · fa9bfbe
2 parents 5799835 + 0ef84da
commit fa9bfbe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Added trailing semicolon to scaffolding crud views getters [#1477](https://github.com/phalcon/phalcon-devtools/issues/1477)
 - Fixed optional options (namespace, abstract) checks on model create [#1491](https://github.com/phalcon/phalcon-devtools/issues/1491)
 - Fixed wrong request filtering [#1468](https://github.com/phalcon/phalcon-devtools/issues/1468)
+- Fixed empty namespace generation [#1467](https://github.com/phalcon/phalcon-devtools/issues/1467)
 
 # [4.0.5](https://github.com/phalcon/cphalcon/releases/tag/v4.0.5) (2021-03-14)
 ## Fixed

diff --git a/src/Builder/Component/Controller.php b/src/Builder/Component/Controller.php
@@ -103,12 +103,14 @@ public function build()
      */
     protected function constructNamespace(): string
     {
-        $namespace = $this->options->get('namespace');
+        $namespace = $this->options->has('namespace')
+            ? (string) $this->options->get('namespace') : null;
+
         if ($namespace === null) {
             return '';
         }
 
-        if ($this->checkNamespace((string)$namespace)) {
+        if ($this->checkNamespace($namespace) && !empty(trim($namespace))) {
             return 'namespace ' . $this->options->get('namespace') . ';' . PHP_EOL . PHP_EOL;
         }
 

diff --git a/src/Builder/Component/Model.php b/src/Builder/Component/Model.php
@@ -111,9 +111,10 @@ public function build(): void
             require_once $config->devtools->loader;
         }
 
-        $namespace = '';
-        if ($this->modelOptions->hasOption('namespace') &&
-            $this->checkNamespace((string)$this->modelOptions->getOption('namespace'))) {
+        $namespace = $this->modelOptions->hasOption('namespace')
+            ? (string) $this->modelOptions->getOption('namespace') : '';
+
+        if ($this->checkNamespace($namespace) && !empty(trim($namespace))) {
             $namespace = 'namespace ' . $this->modelOptions->getOption('namespace') . ';' . PHP_EOL . PHP_EOL;
         }
 

diff --git a/src/Builder/Component/Scaffold.php b/src/Builder/Component/Scaffold.php
@@ -459,14 +459,13 @@ private function makeController(): void
         $code = file_get_contents($this->options->get('templatePath') . '/scaffold/no-forms/Controller.php');
         $usesNamespaces = false;
 
-        $controllerNamespace = (string)$this->options->get('controllersNamespace');
-        if ($this->options->has('controllersNamespace') &&
-            $controllerNamespace &&
-            $this->checkNamespace($controllerNamespace)
-        ) {
+        $controllerNamespace = $this->options->has('controllersNamespace')
+            ? (string) $this->options->get('controllersNamespace') : '';
+
+        if (!empty(trim($controllerNamespace)) && $this->checkNamespace($controllerNamespace)) {
             $code = str_replace(
                 '$namespace$',
-                'namespace ' . $this->options->get('controllersNamespace').';' . PHP_EOL,
+                'namespace ' . $controllerNamespace.';' . PHP_EOL,
                 $code
             );
             $usesNamespaces = true;