Merge pull request #1129 from phalcon/3.2.x

3.2.8

Author: sergeyklay

.travis.yml

@@ -75,7 +75,7 @@ script:
   - 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'
+  - '[[ "$PHP_MAJOR" == "5" ]] || vendor/bin/phpstan analyse -l 5 -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.7)
+Phalcon DevTools (3.2.8)
 
 Help:
   Lists the commands available in Phalcon devtools

scripts/Phalcon/Builder/Controller.php

@@ -71,11 +71,11 @@ public function build()
 
         if (!$controllersDir = $this->options->get('controllersDir')) {
             $config = $this->getConfig();
-            if (!isset($config->application->controllersDir)) {
+            if (empty($config->path('application.controllersDir'))) {
                 throw new BuilderException('Please specify a controller directory.');
             }
 
-            $controllersDir = $config->application->controllersDir;
+            $controllersDir = $config->path('application.controllersDir');
         }
 
         if (!$this->options->contains('name')) {

scripts/Phalcon/Builder/Project.php

@@ -43,7 +43,7 @@ class Project extends Component
 
     /**
      * Current Project Type
-     * @var null
+     * @var string
      */
     private $currentType = self::TYPE_SIMPLE;
 

scripts/Phalcon/Builder/Scaffold.php

@@ -422,7 +422,7 @@ public function getOption($option, $filters = null, $defaultValue = null)
     /**
      * Indicates whether the script was a particular option.
      *
-     * @param  string  $option
+     * @param  string | string[]  $option
      * @return boolean
      */
     public function isReceivedOption($option)
@@ -458,7 +458,7 @@ protected function filter($paramValue, $filters)
     /**
      * Gets the last parameter is not associated with any parameter name.
      *
-     * @return string
+     * @return string | bool
      */
     public function getLastUnNamedParam()
     {

scripts/Phalcon/Commands/Command.php

@@ -37,7 +37,7 @@ class PostgresqlExtended extends Postgresql
      *
      * @param string $table
      * @param string $schema
-     * @return Reference
+     * @return ReferenceInterface[]
      *
      */
     public function describeReferences($table, $schema = NULL)

scripts/Phalcon/Db/Adapter/Pdo/PostgresqlExtended.php

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

scripts/Phalcon/Devtools/Version.php

@@ -144,7 +144,7 @@ public function handle(AppError $error)
      * Maps error code to a string.
      *
      * @param  integer $code
-     * @return string
+     * @return mixed
      */
     public function mapErrors($code)
     {

scripts/Phalcon/Error/ErrorHandler.php

@@ -689,7 +689,7 @@ function () {
                 /** @noinspection PhpIncludeInspection */
                 $menu = new SidebarMenu(include $menuItems);
 
-                $menu->setDI($this);
+                $menu->setDI($this->di);
 
                 return $menu;
             }