Merge pull request #1344 from phalcon/3.4.x

3.4.5

Author: Jeckerson

.travis.yml

@@ -70,10 +70,3 @@ script:
   - vendor/bin/codecept run functional -v
   - vendor/bin/codecept run console -v
   - '[[ "$PHP_MAJOR" == "5" ]] || vendor/bin/phpstan analyse -l 5 -c phpstan.neon scripts -v'
-
-notifications:
-  email:
-    recipients:
-      - [email protected]
-    on_success: change
-    on_failure: always

phalcon.bat

@@ -1,4 +1,4 @@
 @echo off
 
 set PTOOLSPATH=%~dp0
-php %PTOOLSPATH%phalcon.php %*
+php %PTOOLSPATH%phalcon %*

scripts/Phalcon/Commands/Builtin/Project.php

@@ -63,7 +63,7 @@ public function run(array $parameters)
     {
         $projectName    = $this->getOption(['name', 1], null, 'default');
         $projectType    = $this->getOption(['type', 2], null, 'simple');
-        $projectPath    = $this->getOption(['directory', 3]);
+        $projectPath    = $this->getOption(['directory', 3], null, ".");
         $templatePath   = $this->getOption(['template-path'], null, TEMPLATE_PATH);
         $enableWebtools = $this->getOption(['enable-webtools', 4], null, false);
         $useConfigIni   = $this->getOption('use-config-ini');

scripts/Phalcon/Devtools/Version.php

@@ -39,6 +39,6 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 4, 0, 4, 0];
+        return [3, 4, 5, 0, 0];
     }
 }

tests/_data/console/app/projects/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/console/GenerateProjectCept.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @var Codeception\Scenario $scenario
+ */
+
+$I = new ConsoleTester($scenario);
+$I->wantToTest('Generating project');
+
+$output=<<<OUT
+Success: Project was successfully created.
+OUT;
+
+$projectsFolder = 'projects';
+chmod(app_path($projectsFolder), 0777);
+
+$I->amInPath(app_path($projectsFolder));
+
+/**
+ * Case 1 - default path
+ */
+$projectName1 = 'project-tests1';
+$path1 = $projectsFolder . '/' . $projectName1;
+
+$I->dontSeeFileFound(app_path($path1));
+$I->runShellCommand('phalcon project ' . $projectName1);
+$I->seeFileFound(app_path($path1));
+$I->deleteDir(app_path($path1));
+
+/**
+ * Case 2 - custom path
+ */
+$projectName2 = 'project-tests2';
+$projectPath2 = 'project-tests2-custom';
+$path2 = $projectsFolder . '/' . $projectPath2;
+
+$I->dontSeeFileFound(app_path($path2));
+$I->runShellCommand("phalcon project $projectName2 simple $projectPath2");
+$I->seeFileFound(app_path($path2));
+$I->deleteDir(app_path($path2));