Merge pull request #1031 from phalcon/3.2.x

3.2.0

Author: sergeyklay

.travis.yml

@@ -34,7 +34,7 @@ env:
     - PHALCON_VERSION="v3.0.4"
 
 script:
-  - tests/lint.sh --lint ${TRAVIS_BUILD_DIR}/ide/stubs
+  - true
 
 notifications:
   email:

LICENSE.txt

@@ -1,7 +1,6 @@
 New BSD License
----------------
 
-Copyright (c) 2011-2016, Phalcon Team
+Copyright (c) 2011-2017, Phalcon Framework Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,14 +10,14 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the Phalcon Team nor the
+    * Neither the name of the Phalcon nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL "PHALCON TEAM" BE LIABLE FOR ANY
+DISCLAIMED. IN NO EVENT SHALL PHALCON FRAMEWORK TEAM BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

README.md

@@ -21,7 +21,7 @@ with Phalcon framework.
 ## Requirements
 
 * PHP >= 5.5
-* Phalcon >= 3.1.0
+* Phalcon >= 3.2.0
 
 ## Installing via Composer
 
@@ -36,7 +36,7 @@ Create the composer.json file as follows:
 ```json
 {
     "require-dev": {
-        "phalcon/devtools": "~3.1"
+        "phalcon/devtools": "~3.2"
     }
 }
 ```
@@ -46,7 +46,7 @@ If you are still using Phalcon 2.0.x, create a `composer.json` with the followin
 ```json
 {
     "require-dev": {
-        "phalcon/devtools": "^3.0"
+        "phalcon/devtools": "^2.0"
     }
 }
 ```
@@ -90,7 +90,8 @@ the `phalcon.php` to a directory in your `PATH`, so you can issue phalcon comman
 where a phalcon project resides.
 
 ```bash
-ln -s ~/phalcon-devtools/phalcon.php /usr/bin/phalcon
+cd phalcon-devtools
+ln -s $(pwd)/phalcon.php /usr/bin/phalcon
 chmod ugo+x /usr/bin/phalcon
 ```
 
@@ -113,7 +114,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (3.1.1)
+Phalcon DevTools (3.2.0)
 
 Help:
   Lists the commands available in Phalcon devtools
@@ -129,6 +130,7 @@ Available commands:
   scaffold         (alias of: create-scaffold)
   migration        (alias of: create-migration)
   webtools         (alias of: create-webtools)
+  console          (alias of: shell, psysh)
 ```
 
 ## Database adapter

bootstrap/autoload.php

@@ -103,7 +103,7 @@
 defined('ADMIN_LTE_VERSION') || define('ADMIN_LTE_VERSION', '2.3.6');
 
 /** @const COMPATIBLE_VERSION The compatible Phalcon version. */
-define('COMPATIBLE_VERSION', 3000040);
+defined('COMPATIBLE_VERSION') || define('COMPATIBLE_VERSION', 3020040);
 
 /**
  * Register Devtools classes.

composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "php": ">=5.5",
-        "ext-phalcon": "^3.0",
+        "ext-phalcon": "~3.1",
         "psy/psysh": "@stable"
     },
     "require-dev": {