Merge pull request #1124 from phalcon/3.2.x

3.2.7

Author: sergeyklay

.travis.yml

@@ -52,6 +52,7 @@ env:
 
 before_install:
   - export PHP_VERSION=$(php-config --version)
+  - export PHP_MAJOR="$(echo $TRAVIS_PHP_VERSION | cut -d '.' -f 1)"
   - export PHP_EXTENSION_DIR=$(php-config --extension-dir)
   - phpenv config-rm xdebug.ini || true
   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com $GH_TOKEN; fi;
@@ -67,12 +68,14 @@ install:
 
 before_script:
   - ln -s $PWD/phalcon.php ~/bin/phalcon
+  - '[[ "$PHP_MAJOR" == "5" ]] || composer require --dev phpstan/phpstan'
 
 script:
   - vendor/bin/codecept build
   - vendor/bin/codecept run unit -v
   - vendor/bin/codecept run functional -v
   - vendor/bin/codecept run console -v
+  - '[[ "$PHP_MAJOR" == "5" ]] || vendor/bin/phpstan analyse -l 1 -c phpstan.neon scripts -vvv'
 
 notifications:
   email:

README.md

@@ -114,7 +114,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (3.2.0)
+Phalcon DevTools (3.2.7)
 
 Help:
   Lists the commands available in Phalcon devtools

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+    bootstrap: %rootDir%/../../../tests/phpstan.php
+
+    excludes_analyse:
+        - %rootDir%/../../../scripts/Phalcon/Generator/*

scripts/Phalcon/Access/Policy/Ip.php

@@ -27,6 +27,7 @@
 /**
  * \Phalcon\Access\Policy\Ip
  *
+ * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request
  * @package Phalcon\Access\Policy
  */
 class Ip extends Injectable implements PolicyInterface

scripts/Phalcon/Bootstrap.php

@@ -28,6 +28,8 @@
 /**
  * \Phalcon\Web\Tools\Library\Bootstrap
  *
+ * @method mixed getShared($name, $parameters=null)
+ * @method mixed get($name, $parameters=null)
  * @package Phalcon\Web\Tools\Library
  */
 class Bootstrap

scripts/Phalcon/Builder/Model.php

@@ -29,6 +29,7 @@
 use Phalcon\Db\ReferenceInterface;
 use Phalcon\Validation\Validator\Email as EmailValidator;
 use Phalcon\Text;
+use \Phalcon\Db\Adapter\Pdo;
 
 
 /**
@@ -241,15 +242,9 @@ public function build()
         if (!$db->tableExists($table, $schema)) {
             throw new BuilderException(sprintf('Table "%s" does not exist.', $table));
         }
-        $fields = $db->describeColumns($table, $schema);
 
-        if (!$this->options->contains('referenceList')) {
-            foreach ($db->listTables($schema) as $name) {
-                $referenceList[$name] = $db->describeReferences($name, $schema);;
-            }
-        } else {
-            $referenceList = $this->options->get('referenceList');
-        }
+        $fields = $db->describeColumns($table, $schema);
+        $referenceList = $this->getReferenceList($schema, $db);
 
         foreach ($referenceList as $tableName => $references) {
             foreach ($references as $reference) {
@@ -536,4 +531,25 @@ protected function getEntityClassName(ReferenceInterface $reference, $namespace)
 
         return $fqcn;
     }
+
+    /**
+     * Get reference list from option
+     *
+     * @param string $schema
+     * @param Pdo $db
+     * @return array
+     */
+    protected function getReferenceList($schema, Pdo $db)
+    {
+        if ($this->options->contains('referenceList')) {
+            return $this->options->get('referenceList');
+        }
+
+        $referenceList = [];
+        foreach ($db->listTables($schema) as $name) {
+            $referenceList[$name] = $db->describeReferences($name, $schema);;
+        }
+
+        return $referenceList;
+    }
 }

scripts/Phalcon/Commands/Builtin/Model.php

@@ -26,6 +26,8 @@
 use Phalcon\Script\Color;
 use Phalcon\Commands\Command;
 use Phalcon\Builder\Model as ModelBuilder;
+use Phalcon\Config;
+use Phalcon\Config\Adapter\Ini as ConfigIni;
 
 /**
  * Model Command

scripts/Phalcon/Commands/DotPhalconMissingException.php

@@ -38,6 +38,8 @@ public function __construct (string $message = self::DEFAULT_MESSAGE , $code = 0
     {
         $this->message = $message;
         $this->code = $code;
+        
+        parent::__construct();
     }
 
     public function scanPathMessage()

scripts/Phalcon/Console/OptionParserTrait.php

@@ -19,6 +19,11 @@
 
 namespace Phalcon\Console;
 
+use Phalcon\Version\IncrementalItem as IncrementalVersion;
+use Phalcon\Version\ItemCollection as VersionCollection;
+use Phalcon\Mvc\Model\Migration as ModelMigration;
+use InvalidArgumentException;
+
 /**
  * \Phalcon\Utils\OptionParserTrait
  *
@@ -46,4 +51,45 @@ public function getPrefixOption($prefix, $prefixEnd = '*')
 
         return substr($prefix, 0, -1);
     }
+
+    /**
+     * Get version name to generate migration
+     *
+     * @return IncrementalVersion
+     */
+    public function getVersionNameGeneratingMigration()
+    {
+        if (empty($this->options)) {
+            throw new InvalidArgumentException('Options were not defined yet');
+        }
+
+        // Use timestamped version if description is provided
+        if ($this->options['descr']) {
+            $this->options['version'] = (string)(int)(microtime(true) * pow(10, 6));
+            VersionCollection::setType(VersionCollection::TYPE_TIMESTAMPED);
+            $versionItem = VersionCollection::createItem($this->options['version'] . '_' . $this->options['descr']);
+
+            // Elsewhere use old-style incremental versioning
+            // The version is specified
+        } elseif ($this->options['version']) {
+            VersionCollection::setType(VersionCollection::TYPE_INCREMENTAL);
+            $versionItem = VersionCollection::createItem($this->options['version']);
+
+            // The version is guessed automatically
+        } else {
+            VersionCollection::setType(VersionCollection::TYPE_INCREMENTAL);
+            $versionItems = ModelMigration::scanForVersions($this->options['migrationsDir']);
+
+            if (!isset($versionItems[0])) {
+                $versionItem = VersionCollection::createItem('1.0.0');
+
+            } else {
+                /** @var IncrementalVersion $versionItem */
+                $versionItem = VersionCollection::maximum($versionItems);
+                $versionItem = $versionItem->addMinor(1);
+            }
+        }
+
+        return $versionItem;
+    }
 }

scripts/Phalcon/Devtools/Version.php

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