Merge pull request #1507 from Ultimater/fix-1506-cannot-create-contro…

…llers Fix #1506 config file locating issue
phalcon · Jul 5, 2021 · d31bc7c · d31bc7c
2 parents ffb6537 + fa16acc
commit d31bc7c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/scripts/Phalcon/Builder/AllModels.php b/scripts/Phalcon/Builder/AllModels.php
@@ -56,7 +56,7 @@ public function __construct(array $options = [])
 
     public function build()
     {
-        if ($this->options->offsetExists('directory')) {
+        if ($this->options->offsetExists('directory') && $this->options->get('directory') !== null) {
             $this->path->setRootPath($this->options->get('directory'));
         }
 

diff --git a/scripts/Phalcon/Builder/Controller.php b/scripts/Phalcon/Builder/Controller.php
@@ -58,7 +58,7 @@ public function __construct(array $options = [])
      */
     public function build()
     {
-        if ($this->options->offsetExists('directory')) {
+        if ($this->options->offsetExists('directory') && $this->options->get('directory') !== null) {
             $this->path->setRootPath($this->options->get('directory'));
         }
 

diff --git a/scripts/Phalcon/Builder/Module.php b/scripts/Phalcon/Builder/Module.php
@@ -74,7 +74,7 @@ public function build()
                 . 'templates' . DIRECTORY_SEPARATOR . 'module';
         }
 
-        if ($this->options->offsetExists('directory')) {
+        if ($this->options->offsetExists('directory') && $this->options->get('directory') !== null) {
             $this->path->setRootPath($this->options->get('directory'));
         }
 

diff --git a/scripts/Phalcon/Builder/Project.php b/scripts/Phalcon/Builder/Project.php
@@ -66,7 +66,7 @@ class Project extends Component
      */
     public function build()
     {
-        if ($this->options->offsetExists('directory')) {
+        if ($this->options->offsetExists('directory') && $this->options->get('directory') !== null) {
             $this->path->setRootPath($this->options->get('directory'));
         }