Merge pull request #1308 from phalcon/3.4.x

3.4.2

Author: Jeckerson

.travis.yml

@@ -60,7 +60,7 @@ install:
   - if [ "$PHP_MAJOR" == "7" ]; then composer require --dev phpstan/phpstan:^0.9; fi;
 
 before_script:
-  - ln -s $PWD/phalcon.php ~/bin/phalcon
+  - ln -s $PWD/phalcon ~/bin/phalcon
 
 script:
   - vendor/bin/phpcs

README.md

@@ -86,19 +86,19 @@ cd phalcon-devtools
 ```
 
 This method requires a little bit more of setup. Probably the best way would be to symlink
-the `phalcon.php` to a directory in your `PATH`, so you can issue phalcon commands in each directory
+the `phalcon` file to a directory in your `PATH`, so you can issue phalcon commands in each directory
 where a phalcon project resides.
 
 ```bash
 cd phalcon-devtools
-ln -s $(pwd)/phalcon.php /usr/bin/phalcon
+ln -s $(pwd)/phalcon /usr/bin/phalcon
 chmod ugo+x /usr/bin/phalcon
 ```
 
 If you get a `"phalcon: command not found"` message while creating the symlink, make an alias.
 
 ```bash
-alias phalcon=/home/[USERNAME]/phalcon-devtools/phalcon.php
+alias phalcon=/home/[USERNAME]/phalcon-devtools/phalcon
 ```
 
 ## Usage

box.json

@@ -1,5 +1,5 @@
 {
-  "main": "phalcon.php",
+  "main": "phalcon",
   "output": "phalcon.phar",
   "chmod": "0755",
   "directories": [

composer.json

@@ -22,7 +22,7 @@
         "forum": "https://forum.phalconphp.com/"
     },
     "require": {
-        "php": ">=5.5",
+        "php": ">=5.5 < 7.3.2 || >7.3.3",
         "ext-phalcon": "~3.3",
         "psy/psysh": "~0.9",
         "nikic/php-parser": "^3.1"
@@ -52,5 +52,5 @@
             "tests/_support/helpers.php"
         ]
     },
-    "bin": ["phalcon.php"]
+    "bin": ["phalcon"]
 }

ide/gen-stubs.php

@@ -3,21 +3,44 @@
 /**
  * This scripts generates the stubs to be used on IDEs
  *
- * Change the CPHALCON_DIR constant to point to the dev/ directory in the Phalcon source code
+ * Specify CPHALCON_DIR env variable to point to the dev/ directory in the Phalcon source code
  *
- * php ide/gen-stubs.php
+ * *nix:    CPHALCON_DIR=/path/to/cphalcon/ext/ php ide/gen-stubs.php
+ *  Win:    set CPHALCON_DIR=C:\Path\To\cphalcon\ext\ php ide/gen-stubs.php
+ *
+ * Alternative stubs generation
+ *
+ * cd cphalcon
+ * zephir stubs
  */
 
 if (!extension_loaded('phalcon')) {
 	throw new Exception("phalcon extension isn't installed");
 }
 
-define('CPHALCON_DIR' , '/Users/micate/Code/cphalcon/ext/');
+if (getenv('CPHALCON_DIR') === false) {
+    throw new Exception(<<<TEXT
+
+
+Specify CPHALCON_DIR env variable
+
+*nix:    CPHALCON_DIR=/path/to/cphalcon/ext/ php ide/gen-stubs.php
+Win:     set CPHALCON_DIR=C:\Path\To\cphalcon\ext\ php ide/gen-stubs.php
+
 
-if (!file_exists(CPHALCON_DIR)) {
+TEXT
+);
+}
+
+if (!file_exists(getenv('CPHALCON_DIR'))) {
 	throw new Exception("CPHALCON directory does not exist");
 }
 
+/**
+ * Class Stubs_Generator
+ *
+ * @deprecated In version 4.x current class will be removed
+ */
 class Stubs_Generator
 {
 
@@ -123,7 +146,7 @@ public function getClassDocs()
 $versionPieces = explode(' ', $version);
 $genVersion = $versionPieces[0];
 
-$api = new Stubs_Generator(CPHALCON_DIR);
+$api = new Stubs_Generator(getenv('CPHALCON_DIR'));
 
 $classDocs = $api->getClassDocs();
 $docs = $api->getDocs();

ide/phpstorm/phalcon.bat

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

ide/phpstorm/phalcon.sh

@@ -37,7 +37,7 @@ if [ -z "$PTOOLSPATH" ]; then
 fi
 
 if [ ! -z "$PTOOLSPATH" ]; then
-	php "$PTOOLSPATH/phalcon.php" $*
+	php "$PTOOLSPATH/phalcon" $*
 else
 	if [ -n "$ZSH_VERSION" ]; then
 		echo "Error: Add environment variable PTOOLSPATH to your $HOME/.zsh"

phalcon.php renamed to phalcon

@@ -96,7 +96,7 @@ check_install(){
 	if [ -z "$PTOOLSPATH" ]; then
 		printf "\n${YELLOW}Phalcon Developer Tools Installer${NC}"
 		printf "\n"
-		printf "\n${PURPLE}Make sure phalcon.sh is in the same dir as phalcon.php${NC}"
+		printf "\n${PURPLE}Make sure phalcon.sh is in the same dir as phalcon file${NC}"
 		printf "\n${PURPLE}and that you are running this with sudo or as root.${NC}"
 		printf "\n"
 		printf "\nInstalling Devtools..."
@@ -147,5 +147,5 @@ init
 
 if check_install; then
 	devtools=${PTOOLSPATH%/}
-	php "$devtools/phalcon.php" $*
+	php "$devtools/phalcon" $*
 fi