Merge pull request #715 from phalcon/3.0.x

Bump version

Author: sergeyklay

README.md

@@ -1,11 +1,11 @@
+# Phalcon Devtools
+
 [![Latest Version](https://img.shields.io/packagist/v/phalcon/devtools.svg?style=flat-square)](https://github.com/phalcon/incubator/devtools)
 [![Software License](https://img.shields.io/badge/license-BSD--3-brightgreen.svg?style=flat-square)][1]
 [![Total Downloads](https://img.shields.io/packagist/dt/phalcon/devtools.svg?style=flat-square)](https://packagist.org/packages/phalcon/devtools)
 [![Daily Downloads](https://img.shields.io/packagist/dd/phalcon/devtools.svg?style=flat-square)](https://packagist.org/packages/phalcon/devtools)
 
-# Phalcon Devtools
-
-![Webtools](http://static.phalconphp.com/img/webtools.png)
+![Phalcon WebTools](http://i.imgur.com/v3MzIDn.png?1)
 
 ## What's Phalcon?
 
@@ -18,8 +18,8 @@ with Phalcon framework.
 
 ## Requirements
 
-* PHP >= 5.3.9
-* Phalcon >= 2.0.0
+* PHP >= 5.5
+* Phalcon >= 3.0.0
 
 ## Installing via Composer
 
@@ -34,7 +34,7 @@ Create the composer.json file as follows:
 ```json
 {
     "require": {
-        "phalcon/devtools": "^2.0"
+        "phalcon/devtools": "dev-master"
     }
 }
 ```
@@ -105,7 +105,7 @@ This command should display something similar to:
 ```sh
 $ phalcon list ?
 
-Phalcon DevTools (2.0.11)
+Phalcon DevTools (3.0.0)
 
 Help:
   Lists the commands available in Phalcon devtools

composer.json

@@ -8,12 +8,22 @@
     "authors": [
         {
             "name": "Phalcon Team",
-            "email": "team@phalconphp.com"
+            "email": "team@phalconphp.com",
+            "homepage": "https://phalconphp.com/en/team"
+        },
+        {
+            "name": "Contributors",
+            "homepage": "https://github.com/phalcon/phalcon-devtools/graphs/contributors"
         }
     ],
+    "support": {
+        "issues": "https://github.com/phalcon/phalcon-devtools/issues",
+        "source": "https://github.com/phalcon/phalcon-devtools",
+        "forum": "https://forum.phalconphp.com/"
+    },
     "require": {
-        "php": ">=5.3.9",
-        "ext-phalcon": "^2.0"
+        "php": ">=5.5",
+        "ext-phalcon": "^3.0"
     },
     "require-dev": {
         "kherge/box": "^2.7"
@@ -25,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     },
     "bin": ["phalcon.php"]

ide/stubs/Phalcon/Acl.php

@@ -8,18 +8,22 @@
  * of permissions attached to an object. An ACL specifies which users or system processes
  * are granted access to objects, as well as what operations are allowed on given objects.
  * <code>
- * $acl = new \Phalcon\Acl\Adapter\Memory();
+ * use Phalcon\Acl;
+ * use Phalcon\Acl\Role;
+ * use Phalcon\Acl\Resource;
+ * use Phalcon\Acl\Adapter\Memory;
+ * $acl = new Memory();
  * //Default action is deny access
- * $acl->setDefaultAction(\Phalcon\Acl::DENY);
+ * $acl->setDefaultAction(Acl::DENY);
  * //Create some roles
- * $roleAdmins = new \Phalcon\Acl\Role('Administrators', 'Super-User role');
- * $roleGuests = new \Phalcon\Acl\Role('Guests');
+ * $roleAdmins = new Role('Administrators', 'Super-User role');
+ * $roleGuests = new Role('Guests');
  * //Add "Guests" role to acl
  * $acl->addRole($roleGuests);
  * //Add "Designers" role to acl
  * $acl->addRole('Designers');
  * //Define the "Customers" resource
- * $customersResource = new \Phalcon\Acl\Resource('Customers', 'Customers management');
+ * $customersResource = new Resource('Customers', 'Customers management');
  * //Add "customers" resource with a couple of operations
  * $acl->addResource($customersResource, 'search');
  * $acl->addResource($customersResource, array('create', 'update'));

ide/stubs/Phalcon/Application.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Phalcon;
+
+/**
+ * Phalcon\Application
+ * Base class for Phalcon\Cli\Console and Phalcon\Mvc\Application.
+ */
+abstract class Application extends \Phalcon\Di\Injectable implements \Phalcon\Events\EventsAwareInterface
+{
+
+    protected $_eventsManager;
+
+
+    protected $_dependencyInjector;
+
+    /**
+     * @var string
+     */
+    protected $_defaultModule;
+
+    /**
+     * @var array
+     */
+    protected $_modules = array();
+
+
+    /**
+     * Phalcon\Application
+     *
+     * @param mixed $dependencyInjector 
+     */
+    public function __construct(\Phalcon\DiInterface $dependencyInjector = null) {}
+
+    /**
+     * Sets the events manager
+     *
+     * @param mixed $eventsManager 
+     * @return Application 
+     */
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) {}
+
+    /**
+     * Returns the internal event manager
+     *
+     * @return \Phalcon\Events\ManagerInterface 
+     */
+    public function getEventsManager() {}
+
+    /**
+     * Register an array of modules present in the application
+     * <code>
+     * $this->registerModules(
+     * [
+     * 'frontend' => [
+     * 'className' => 'Multiple\Frontend\Module',
+     * 'path'      => '../apps/frontend/Module.php'
+     * ],
+     * 'backend' => [
+     * 'className' => 'Multiple\Backend\Module',
+     * 'path'      => '../apps/backend/Module.php'
+     * ]
+     * ]
+     * );
+     * </code>
+     *
+     * @param array $modules 
+     * @param bool $merge 
+     * @return Application 
+     */
+    public function registerModules(array $modules, $merge = false) {}
+
+    /**
+     * Return the modules registered in the application
+     *
+     * @return array 
+     */
+    public function getModules() {}
+
+    /**
+     * Gets the module definition registered in the application via module name
+     *
+     * @param string $name 
+     * @return array|object 
+     */
+    public function getModule($name) {}
+
+    /**
+     * Sets the module name to be used if the router doesn't return a valid module
+     *
+     * @param string $defaultModule 
+     * @return Application 
+     */
+    public function setDefaultModule($defaultModule) {}
+
+    /**
+     * Returns the default module name
+     *
+     * @return string 
+     */
+    public function getDefaultModule() {}
+
+    /**
+     * Handles a request
+     */
+    abstract public function handle();
+
+}

ide/stubs/Phalcon/Config.php

@@ -32,7 +32,7 @@ class Config implements \ArrayAccess, \Countable
      *
      * @param array $arrayConfig 
      */
-    public function __construct($arrayConfig = null) {}
+    public function __construct(array $arrayConfig = null) {}
 
     /**
      * Allows to check whether an attribute is defined using the array-syntax
@@ -132,7 +132,7 @@ public function count() {}
      * @param array $data 
      * @return Config 
      */
-    public static function __set_state($data) {}
+    public static function __set_state(array $data) {}
 
     /**
      * Helper method for merge configs (forwarding nested config instance)

ide/stubs/Phalcon/Crypt.php

@@ -43,10 +43,7 @@ class Crypt implements \Phalcon\CryptInterface
     protected $_padding = 0;
 
 
-    protected $_mode = "cbc";
-
-
-    protected $_cipher = "rijndael-256";
+    protected $_cipher = "aes-256-cfb";
 
 
     /**
@@ -72,21 +69,6 @@ public function setCipher($cipher) {}
      */
     public function getCipher() {}
 
-    /**
-     * Sets the encrypt/decrypt mode
-     *
-     * @param string $mode 
-     * @return Crypt 
-     */
-    public function setMode($mode) {}
-
-    /**
-     * Returns the current encryption mode
-     *
-     * @return string 
-     */
-    public function getMode() {}
-
     /**
      * Sets the encryption key
      *
@@ -105,24 +87,22 @@ public function getKey() {}
     /**
      * Pads texts before encryption
      *
-     * @link http://www.di-mgt.com.au/cryptopad.html
+     * @see http://www.di-mgt.com.au/cryptopad.html
      * @param string $text 
      * @param string $mode 
      * @param int $blockSize 
      * @param int $paddingType 
-     * @return string 
      */
     protected function _cryptPadText($text, $mode, $blockSize, $paddingType) {}
 
     /**
-     * Removes $paddingType padding from text
-     * If the method detects that the text was not padded, it will return it unmodified
+     * 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
      * @param int $paddingType Padding scheme
-     * @return string 
      */
     protected function _cryptUnpadText($text, $mode, $blockSize, $paddingType) {}
 
@@ -171,17 +151,10 @@ public function encryptBase64($text, $key = null, $safe = false) {}
     public function decryptBase64($text, $key = null, $safe = false) {}
 
     /**
-     * Returns a list of available cyphers
+     * Returns a list of available ciphers
      *
      * @return array 
      */
     public function getAvailableCiphers() {}
 
-    /**
-     * Returns a list of available modes
-     *
-     * @return array 
-     */
-    public function getAvailableModes() {}
-
 }

ide/stubs/Phalcon/CryptInterface.php

@@ -24,21 +24,6 @@ public function setCipher($cipher);
      */
     public function getCipher();
 
-    /**
-     * Sets the encrypt/decrypt mode
-     *
-     * @param string $mode 
-     * @return CryptInterface 
-     */
-    public function setMode($mode);
-
-    /**
-     * Returns the current encryption mode
-     *
-     * @return string 
-     */
-    public function getMode();
-
     /**
      * Sets the encryption key
      *
@@ -97,11 +82,4 @@ public function decryptBase64($text, $key = null);
      */
     public function getAvailableCiphers();
 
-    /**
-     * Returns a list of available modes
-     *
-     * @return array 
-     */
-    public function getAvailableModes();
-
 }

ide/stubs/Phalcon/Db.php

@@ -91,6 +91,6 @@ abstract class Db
      *
      * @param array $options 
      */
-    public static function setup($options) {}
+    public static function setup(array $options) {}
 
 }

ide/stubs/Phalcon/Debug.php

@@ -9,7 +9,7 @@
 class Debug
 {
 
-    protected $_uri = "//static.phalconphp.com/www/debug/2.0.0/";
+    protected $_uri = "//static.phalconphp.com/www/debug/3.0.x/";
 
 
     protected $_theme = "default";
@@ -125,7 +125,7 @@ protected function _escapeString($value) {}
      * @param mixed $n 
      * @return string|null 
      */
-    protected function _getArrayDump($argument, $n = 0) {}
+    protected function _getArrayDump(array $argument, $n = 0) {}
 
     /**
      * Produces an string representation of a variable
@@ -169,7 +169,7 @@ public function getJsSources() {}
      * @param int $n 
      * @param array $trace 
      */
-    protected final function showTraceItem($n, $trace) {}
+    protected final function showTraceItem($n, array $trace) {}
 
     /**
      * Throws an exception when a notice or warning is raised