Merge pull request #950 from phalcon/3.0.x

3.0.4

Author: sergeyklay

.travis.yml

@@ -0,0 +1,54 @@
+language: php
+
+sudo: required
+dist: trusty
+
+php:
+  - 5.5
+  - 5.6
+
+matrix:
+  include:
+    - php: 7.0
+      env: ZEND_BACKEND="--backend=ZendEngine3"
+
+git:
+  depth: 1
+
+cache:
+  apt: true
+  ccache: true
+  timeout: 691200
+  directories:
+    - .temp
+    - vendor
+    - $HOME/.ccache
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - ZEND_DONT_UNLOAD_MODULES=1
+    - CC="ccache gcc"
+    - PATH="$PATH:~/bin"
+    - DISPLAY=":99.0"
+    - PHALCON_VERSION="v3.0.2"
+
+script:
+  - tests/lint.sh --lint ${TRAVIS_BUILD_DIR}/ide/stubs
+
+notifications:
+  email:
+    recipients:
+      - [email protected]
+    on_success: change
+    on_failure: always
+
+addons:
+  apt:
+    packages:
+      - gdb
+      - re2c
+      - beanstalkd
+      - mysql-server-5.6
+      - mysql-client-core-5.6
+      - mysql-client-5.6

README.md

@@ -4,6 +4,7 @@
 [![Software License](https://img.shields.io/badge/license-BSD--3-brightgreen.svg?style=flat-square)][:license:]
 [![Total Downloads](https://img.shields.io/packagist/dt/phalcon/devtools.svg?style=flat-square)][:packagist:]
 [![Daily Downloads](https://img.shields.io/packagist/dd/phalcon/devtools.svg?style=flat-square)][:packagist:]
+[![Build Status](https://travis-ci.org/phalcon/phalcon-devtools.svg?branch=master)][:travis:]
 
 ![Phalcon WebTools](https://cloud.githubusercontent.com/assets/1256298/18617851/b7d31558-7de2-11e6-83e0-30e5902af714.png)
 
@@ -34,8 +35,8 @@ Create the composer.json file as follows:
 
 ```json
 {
-    "require": {
-        "phalcon/devtools": "~3.0.2"
+    "require-dev": {
+        "phalcon/devtools": "~3.0.3"
     }
 }
 ```
@@ -44,7 +45,7 @@ If you are still using Phalcon 2.0.x, create a `composer.json` with the followin
 
 ```json
 {
-    "require": {
+    "require-dev": {
         "phalcon/devtools": "^2.0"
     }
 }
@@ -112,6 +113,7 @@ Help:
   Lists the commands available in Phalcon devtools
 
 Available commands:
+  info             (alias of: i)
   commands         (alias of: list, enumerate)
   controller       (alias of: create-controller)
   module           (alias of: create-module)
@@ -147,3 +149,4 @@ Phalcon Developer Tools is open source software licensed under the [New BSD Lice
 [:packagist:]: https://packagist.org/packages/phalcon/devtools
 [:devtools:]: https://github.com/phalcon/phalcon-devtools
 [:license:]: https://github.com/phalcon/phalcon-devtools/blob/master/LICENSE.txt
+[:travis:]: https://travis-ci.org/phalcon/phalcon-devtools

bootstrap/autoload.php

@@ -37,7 +37,7 @@
 /**
  * @const DEVTOOLS_START_MEMORY The memory usage at the start of the application. Used for profiling.
  */
-defined('DEVTOOLS_START_TIME') || define('DEVTOOLS_START_MEMORY', memory_get_usage());
+defined('DEVTOOLS_START_MEMORY') || define('DEVTOOLS_START_MEMORY', memory_get_usage());
 
 /**
  * @const PTOOLSPATH The path to the Phalcon Developers Tools.
@@ -127,8 +127,8 @@
 /**
  * Register the custom loader (if any)
  */
-if (file_exists(PTOOLSPATH . DS . '.phalcon' . DS . 'autoload.php')) {
-    require_once PTOOLSPATH . DS .  '.phalcon' . DS . 'autoload.php';
+if (file_exists('.phalcon' . DS . 'autoload.php')) {
+    require_once '.phalcon' . DS . 'autoload.php';
 }
 
 if (Version::getId() < COMPATIBLE_VERSION) {

ide/stubs/Phalcon/Config.php

@@ -166,7 +166,6 @@ public static function __set_state(array $data) {}
     /**
      * Helper method for merge configs (forwarding nested config instance)
      *
-     *
      * @param Config instance = null
      *
      * @param Config $config

ide/stubs/Phalcon/Crypt.php

@@ -92,7 +92,6 @@ public function getKey() {}
     /**
      * Pads texts before encryption
      *
-     *
      * @see http://www.di-mgt.com.au/cryptopad.html
      * @param string $text
      * @param string $mode
@@ -105,7 +104,6 @@ protected function _cryptPadText($text, $mode, $blockSize, $paddingType) {}
      * Removes padding @a padding_type from @a text
      * If the function detects that the text was not padded, it will return it unmodified
      *
-     *
      * @param string $text Message to be unpadded
      * @param string $mode Encryption mode; unpadding is applied only in CBC or ECB mode
      * @param int $blockSize Cipher block size

ide/stubs/Phalcon/Di.php

@@ -59,7 +59,6 @@ class Di implements \Phalcon\DiInterface
     /**
      * Events Manager
      *
-     *
      * @var \Phalcon\Events\ManagerInterface
      */
     protected $_eventsManager;
@@ -166,7 +165,6 @@ public function get($name, $parameters = null) {}
      * Resolves a service, the resolved service is stored in the DI, subsequent
      * requests for this service will return the same instance
      *
-     *
      * @param string $name
      * @param array $parameters
      * @return mixed

ide/stubs/Phalcon/DiInterface.php

@@ -13,7 +13,6 @@ interface DiInterface extends \ArrayAccess
     /**
      * Registers a service in the services container
      *
-     *
      * @param string $name
      * @param mixed $definition
      * @param boolean $shared
@@ -24,7 +23,6 @@ public function set($name, $definition, $shared = false);
     /**
      * Registers an "always shared" service in the services container
      *
-     *
      * @param string $name
      * @param mixed $definition
      * @return \Phalcon\Di\ServiceInterface
@@ -43,7 +41,6 @@ public function remove($name);
      * Only is successful if a service hasn't been registered previously
      * with the same name
      *
-     *
      * @param string $name
      * @param mixed $definition
      * @param boolean $shared
@@ -54,7 +51,6 @@ public function attempt($name, $definition, $shared = false);
     /**
      * Resolves the service based on its configuration
      *
-     *
      * @param string $name
      * @param array $parameters
      * @return mixed
@@ -64,7 +60,6 @@ public function get($name, $parameters = null);
     /**
      * Returns a shared service based on their configuration
      *
-     *
      * @param string $name
      * @param array $parameters
      * @return mixed
@@ -83,7 +78,6 @@ public function setRaw($name, \Phalcon\Di\ServiceInterface $rawDefinition);
     /**
      * Returns a service definition without resolving
      *
-     *
      * @param string $name
      * @return mixed
      */
@@ -115,7 +109,6 @@ public function wasFreshInstance();
     /**
      * Return the services registered in the DI
      *
-     *
      * @return \Phalcon\Di\ServiceInterface[]
      */
     public function getServices();

ide/stubs/Phalcon/Dispatcher.php

@@ -200,7 +200,6 @@ public function getActionName() {}
     /**
      * Sets action params to be dispatched
      *
-     *
      * @param array $params
      */
     public function setParams($params) {}
@@ -215,7 +214,6 @@ public function getParams() {}
     /**
      * Set a param by its name or numeric index
      *
-     *
      * @param mixed $param
      * @param mixed $value
      */
@@ -224,7 +222,6 @@ public function setParam($param, $value) {}
     /**
      * Gets a param by its name or numeric index
      *
-     *
      * @param mixed $param
      * @param string|array $filters
      * @param mixed $defaultValue
@@ -235,7 +232,6 @@ public function getParam($param, $filters = null, $defaultValue = null) {}
     /**
      * Check if a param exists
      *
-     *
      * @param mixed $param
      * @return bool
      */
@@ -258,39 +254,34 @@ public function isFinished() {}
     /**
      * Sets the latest returned value by an action manually
      *
-     *
      * @param mixed $value
      */
     public function setReturnedValue($value) {}
 
     /**
      * Returns value returned by the latest dispatched action
      *
-     *
      * @return mixed
      */
     public function getReturnedValue() {}
 
     /**
      * Enable/Disable model binding during dispatch
      *
-     *
      * @param boolean $value
      */
     public function setModelBinding($value) {}
 
     /**
      * Dispatches a handle action taking into account the routing parameters
      *
-     *
      * @return object
      */
     public function dispatch() {}
 
     /**
      * Dispatches a handle action taking into account the routing parameters
      *
-     *
      * @return object
      */
     protected function _dispatch() {}
@@ -308,7 +299,6 @@ protected function _dispatch() {}
      * );
      * </code>
      *
-     *
      * @param array $forward
      */
     public function forward($forward) {}

ide/stubs/Phalcon/DispatcherInterface.php

@@ -69,7 +69,6 @@ public function getActionName();
     /**
      * Sets action params to be dispatched
      *
-     *
      * @param array $params
      */
     public function setParams($params);
@@ -84,7 +83,6 @@ public function getParams();
     /**
      * Set a param by its name or numeric index
      *
-     *
      * @param mixed $param
      * @param mixed $value
      */
@@ -93,7 +91,6 @@ public function setParam($param, $value);
     /**
      * Gets a param by its name or numeric index
      *
-     *
      * @param mixed $param
      * @param string|array $filters
      * @return mixed
@@ -103,7 +100,6 @@ public function getParam($param, $filters = null);
     /**
      * Check if a param exists
      *
-     *
      * @param mixed $param
      * @return bool
      */
@@ -119,23 +115,20 @@ public function isFinished();
     /**
      * Returns value returned by the latest dispatched action
      *
-     *
      * @return mixed
      */
     public function getReturnedValue();
 
     /**
      * Dispatches a handle action taking into account the routing parameters
      *
-     *
      * @return object
      */
     public function dispatch();
 
     /**
      * Forwards the execution flow to another controller/action
      *
-     *
      * @param array $forward
      */
     public function forward($forward);