Merge pull request #671 from phalcon/3.0.x

3.0.2
phalcon · Nov 27, 2016 · e35352e · e35352e
2 parents 82aa8c7 + 0fcc322
commit e35352e
Show file tree

Hide file tree

Showing 169 changed files with 976 additions and 679 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+> Questions should go to https://forum.phalconphp.com
+> Documentation issues should go to https://github.com/phalcon/docs/issues
+
+### Expected and Actual Behavior
+
+> **Describe what you are trying to achieve and what goes wrong.**
+
+> Provide output if related
+
+```php
+// paste output here
+```
+> Provide minimal script to reproduce the issue
+
+```php
+// paste code
+```
+
+### Details
+
+* Phalcon Framework version: (`php --ri phalcon`)
+* Phalcon Incubator version: (branch, composer version)
+* PHP Version: (`php -v`)
+* Operating System:
+* Server: Nginx | Apache | Other
+* Other related info (Database, table schema): 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+Hello!
+
+* Type: bug fix | new feature | code quality | documentation
+* Link to issue:
+
+This pull request affects the following components: **(please check boxes)**
+
+* [ ] Library
+* [ ] Code Style
+* [ ] Documentation
+* [ ] Testing
+
+**In raising this pull request, I confirm the following (please check boxes):**
+
+- [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/incubator/blob/master/CONTRIBUTING.md)?
+- [ ] I have checked that another pull request for this purpose does not exist.
+- [ ] I wrote some tests for this PR.
+
+Small description of change:
+
+Thanks
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,10 @@ dist: trusty
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION="1.7.0" PHALCON_SRC_PATH="${TRAVIS_BUILD_DIR}/cphalcon"
+    - DOCKER_COMPOSE_VERSION="1.8.1" PHALCON_SRC_PATH="${TRAVIS_BUILD_DIR}/cphalcon"
   matrix:
     - PHALCON_VERSION="3.0.x"
-    - PHALCON_VERSION="v3.0.0"
-    - PHALCON_VERSION="v3.0.1"
+    - PHALCON_VERSION="v3.0.2"
 
 before_install:
   - sudo service memcached stop
@@ -25,27 +24,29 @@ before_install:
   - phpenv config-rm xdebug.ini
 
 install:
-  - git clone --depth=1 --branch=${PHALCON_VERSION} https://github.com/phalcon/cphalcon.git ${PHALCON_SRC_PATH}
+  - git clone --depth=1 -q --branch=${PHALCON_VERSION} https://github.com/phalcon/cphalcon.git ${PHALCON_SRC_PATH}
   # Install Docker
   - sudo apt-get update -qq
   - sudo apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y --force-yes docker-engine
   - sudo service docker restart
   # Install Docker Compose
   - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -s -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
   # Install Dependencies
   - composer self-update
   - travis_retry composer install --ignore-platform-reqs --prefer-source --no-interaction
-  - travis_retry composer require --ignore-platform-reqs "duncan3dc/fork-helper:*"
+  - travis_retry composer require --ignore-platform-reqs duncan3dc/fork-helper:$(if [[ "${TRAVIS_PHP_VERSION:0:1}" = "7" ]]; then echo "^2.0"; else echo "^1.0"; fi)
   # Pull images
   - docker pull phalconphp/php:${TRAVIS_PHP_VERSION}
   - docker pull phalconphp/zephir:${TRAVIS_PHP_VERSION}
 
 before_script:
   - stty cols 160
   - docker-compose -p incubator up -d
+  - docker-compose -p incubator ps
+  - docker logs incubator_aerospike
   - sleep 1
 
 script:
@@ -54,6 +55,6 @@ script:
 notifications:
   email:
     recipients:
-      - serghei@phalconphp.com
+      - build@phalconphp.com
     on_success: change
     on_failure: always
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,75 @@
+# Contributing to Phalcon Incubator
+
+Phalcon Incubator is an open source project and a volunteer effort.
+Phalcon Incubator welcomes contribution from everyone.
+
+## Contributions
+
+Contributions to Phalcon Incubator should be made in the form of [GitHub pull requests][pr].
+Each pull request will be reviewed by a core contributor (someone with permission to land patches) and either landed in
+the main tree or given feedback for changes that would be required before it can be merged. All contributions should
+follow this format, even those from core contributors.
+
+## Not All Commits Need CI Builds
+
+Sometimes all you are changing is the `README.md`, some documentation or other things which have no effect on the tests.
+In this case, you may not want a build to be created for that commit. To do this, all you need to do is to add `[ci skip]`
+somewhere in the commit message.
+
+Commits that have `[ci skip]` anywhere in the commit messages will be ignored. `[ci skip]` does not have to appear on the
+first line, so it is possible to use it without polluting your project's history.
+
+Alternatively, you can also use `[skip ci]`.
+
+## Questions & Support
+
+*We only accept bug reports, new feature requests and pull requests in GitHub*.
+For questions regarding the usage of the Phalcon Developer Tools or support requests please visit the
+[official forums][forum]. IDE stubs must not be modified manually, if you want to improve them please submit a PR
+to [Phalcon Framework][cphalcon].
+
+## Bug Report Checklist
+
+- Make sure you are using the latest released version of Phalcon Framework and Phalcon Developer Tools
+  before submitting a bug report. Bugs in versions older than the latest released one will not be addressed by the
+  core team
+
+- If you have found a bug it is important to add relevant reproducibility information to your issue to allow us 
+  to reproduce the bug and fix it quicker. Add a script, small program or repository providing the necessary code to 
+  make everyone reproduce the issue reported easily. If a bug cannot be reproduced by the development it would be
+  difficult provide corrections and solutions. [Submit Reproducible Test][srt] for more information.
+
+- Be sure that information such as OS, Phalcon Framework and Phalcon Developer Tools versions and PHP version are
+  part of the bug report
+
+- If you're submitting a Segmentation Fault error, we would require a backtrace, please see [Generating a Backtrace][gb]
+
+## Pull Request Checklist
+
+- Don't submit your pull requests to the `master` branch. Branch from the required branch and,
+  if needed, rebase to the proper branch before submitting your pull request.
+  If it doesn't merge cleanly with master you may be asked to rebase your changes
+
+- Don't put submodule updates, composer.lock, etc in your pull request unless they are to landed commits
+
+- Make sure that the code you write fits with the general style and coding standards of the [Accepted PHP Standards][psr]
+
+## Getting Support
+
+If you have a question about how to use Phalcon, please see the [support page][support].
+
+## Requesting Features
+
+If you have a change or new feature in mind, please fill an [NFR][nfr].
+
+Thanks! <br />
+Phalcon Team
+
+[pr]: https://help.github.com/articles/using-pull-requests/
+[forum]: https://forum.phalconphp.com/
+[cphalcon]: https://github.com/phalcon/cphalcon
+[srt]: https://github.com/phalcon/cphalcon/wiki/Submit-Reproducible-Test
+[gb]: https://github.com/phalcon/cphalcon/wiki/Generating-a-backtrace
+[support]: https://phalconphp.com/support
+[nfr]: https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR
+[psr]: http://www.php-fig.org/psr/
diff --git a/docs/LICENSE.txt → LICENSE.txt b/docs/LICENSE.txt → LICENSE.txt
diff --git a/Library/Phalcon/Acl/Adapter/Database.php b/Library/Phalcon/Acl/Adapter/Database.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Acl/Adapter/Mongo.php b/Library/Phalcon/Acl/Adapter/Mongo.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Acl/Adapter/Redis.php b/Library/Phalcon/Acl/Adapter/Redis.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |
@@ -19,17 +20,17 @@
 
 namespace Phalcon\Acl\Adapter;
 
-use Phalcon\Db;
+use Phalcon\Acl;
+use Phalcon\Acl\Role;
 use Phalcon\Acl\Adapter;
 use Phalcon\Acl\Exception;
 use Phalcon\Acl\Resource;
-use Phalcon\Acl;
-use Phalcon\Acl\Role;
 use Phalcon\Acl\RoleInterface;
 
 /**
- * Phalcon\Acl\Adapter\Database
- * Manages ACL lists in memory
+ * \Phalcon\Acl\Adapter\Redis
+ *
+ * Manages ACL lists in Redis Database
  */
 class Redis extends Adapter
 {
@@ -347,7 +348,6 @@ protected function rolePermission($resource, $access, $allowOrDeny)
      * @param  string $resourceName
      * @param  array|string $access
      * @param  mixed $func
-     * @return boolean
      */
     public function deny($role, $resource, $access, $func = null)
     {

diff --git a/Library/Phalcon/Acl/Factory/Memory.php b/Library/Phalcon/Acl/Factory/Memory.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Annotations/Adapter/Aerospike.php b/Library/Phalcon/Annotations/Adapter/Aerospike.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Annotations/Adapter/Base.php b/Library/Phalcon/Annotations/Adapter/Base.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Annotations/Adapter/Memcached.php b/Library/Phalcon/Annotations/Adapter/Memcached.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Annotations/Adapter/Redis.php b/Library/Phalcon/Annotations/Adapter/Redis.php
@@ -1,12 +1,13 @@
 <?php
+
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
-  | with this package in the file docs/LICENSE.txt.                        |
+  | with this package in the file LICENSE.txt.                             |
   |                                                                        |
   | If you did not receive a copy of the license and are unable to         |
   | obtain it through the world-wide-web, please send an email             |

diff --git a/Library/Phalcon/Avatar/Avatarable.php b/Library/Phalcon/Avatar/Avatarable.php
@@ -1,21 +1,21 @@
 <?php
 
 /*
- +------------------------------------------------------------------------+
- | Phalcon Framework                                                      |
- +------------------------------------------------------------------------+
- | Copyright (c) 2011-2016 Phalcon Team (http://www.phalconphp.com)       |
- +------------------------------------------------------------------------+
- | This source file is subject to the New BSD License that is bundled     |
- | with this package in the file docs/LICENSE.txt.                        |
- |                                                                        |
- | If you did not receive a copy of the license and are unable to         |
- | obtain it through the world-wide-web, please send an email             |
- | to license@phalconphp.com so we can send you a copy immediately.       |
- +------------------------------------------------------------------------+
- | Authors: Serghei Iakovlev <serghei@phalconphp.com>                     |
- +------------------------------------------------------------------------+
- */
+  +------------------------------------------------------------------------+
+  | Phalcon Framework                                                      |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2011-2016 Phalcon Team (https://www.phalconphp.com)      |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file LICENSE.txt.                             |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to license@phalconphp.com so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+  | Authors: Serghei Iakovlev <serghei@phalconphp.com>                     |
+  +------------------------------------------------------------------------+
+*/
 
 namespace Phalcon\Avatar;