Merge pull request #1347 from phalcon/3.4.x

3.4.6
phalcon · Oct 30, 2019 · 0afdc50 · 0afdc50
2 parents d979d35 + 705552a
commit 0afdc50
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/scripts/Phalcon/Builder/Project/Cli.php b/scripts/Phalcon/Builder/Project/Cli.php
@@ -51,7 +51,7 @@ class Cli extends ProjectBuilder
      */
     private function createConfig()
     {
-        $type = $this->options->offsetExists('useConfigIni') ? 'ini' : 'php';
+        $type = $this->options->get('useConfigIni') ? 'ini' : 'php';
 
         $getFile = $this->options->get('templatePath') . '/project/cli/config.' . $type;
         $putFile = $this->options->get('projectPath') . 'app/config/config.' . $type;

diff --git a/scripts/Phalcon/Builder/Project/Micro.php b/scripts/Phalcon/Builder/Project/Micro.php
@@ -107,7 +107,7 @@ private function createIndexViewFiles()
      */
     private function createConfig()
     {
-        $type = $this->options->offsetExists('useConfigIni') ? 'ini' : 'php';
+        $type = $this->options->get('useConfigIni') ? 'ini' : 'php';
 
         $getFile = $this->options->get('templatePath') . '/project/micro/config.' . $type;
         $putFile = $this->options->get('projectPath') . 'app/config/config.' . $type;

diff --git a/scripts/Phalcon/Builder/Project/Modules.php b/scripts/Phalcon/Builder/Project/Modules.php
@@ -168,7 +168,7 @@ private function createIndexViewFiles()
      */
     private function createConfig()
     {
-        $type = $this->options->offsetExists('useConfigIni') ? 'ini' : 'php';
+        $type = $this->options->get('useConfigIni') ? 'ini' : 'php';
 
         $getFile = $this->options->get('templatePath') . '/project/modules/config.' . $type;
         $putFile = $this->options->get('projectPath') . 'app/config/config.' . $type;

diff --git a/scripts/Phalcon/Builder/Project/Simple.php b/scripts/Phalcon/Builder/Project/Simple.php
@@ -137,7 +137,7 @@ private function createIndexViewFiles()
      */
     private function createConfig()
     {
-        $type = $this->options->offsetExists('useConfigIni') ? 'ini' : 'php';
+        $type = $this->options->get('useConfigIni') ? 'ini' : 'php';
 
         $getFile = $this->options->get('templatePath') . '/project/simple/config.' . $type;
         $putFile = $this->options->get('projectPath') . 'app/config/config.' . $type;

diff --git a/scripts/Phalcon/Devtools/Version.php b/scripts/Phalcon/Devtools/Version.php
@@ -39,6 +39,6 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 4, 5, 0, 0];
+        return [3, 4, 6, 0, 0];
     }
 }
diff --git a/tests/console/GenerateProjectCept.php b/tests/console/GenerateProjectCept.php
@@ -25,6 +25,7 @@
 $I->dontSeeFileFound(app_path($path1));
 $I->runShellCommand('phalcon project ' . $projectName1);
 $I->seeFileFound(app_path($path1));
+$I->seeFileFound(app_path($path1 . '/app/config/config.php'));
 $I->deleteDir(app_path($path1));
 
 /**
@@ -37,4 +38,17 @@
 $I->dontSeeFileFound(app_path($path2));
 $I->runShellCommand("phalcon project $projectName2 simple $projectPath2");
 $I->seeFileFound(app_path($path2));
+$I->seeFileFound(app_path($projectsFolder . '/' . $projectPath2 . '/' . $projectName2 . '/app/config/config.php'));
 $I->deleteDir(app_path($path2));
+
+/**
+ * Case 3 - ini config file
+ */
+$projectName3 = 'project-tests3';
+$path3 = $projectsFolder . '/' . $projectName3;
+
+$I->dontSeeFileFound(app_path($path3));
+$I->runShellCommand('phalcon project ' . $projectName3 . ' --use-config-ini');
+$I->seeFileFound(app_path($path3));
+$I->seeFileFound(app_path($path3 . '/app/config/config.ini'));
+$I->deleteDir(app_path($path3));