Merge branch '2.0.x'

Author: andresgutierrez

.gitignore

@@ -197,3 +197,7 @@ build/install-gentoo
 build/safe/tests/
 ext/phalcon/mvc/view/engine/volt/lemon
 ext/phalcon/mvc/view/engine/volt/parser.out
+ext/phalcon/annotations/lemon
+ext/phalcon/annotations/lemon.dSYM/
+ext/phalcon/annotations/parser.out
+ext/phalcon/mvc/model/query/lemon

.travis.yml

@@ -20,10 +20,6 @@ before_install:
  - ./unit-tests/ci/install_prereqs.sh
  - ./unit-tests/ci/setup_dbs.sh
 
-#install:
-# - composer --prefer-source install
-# - composer require phalcon/zephir:dev-master
-
 before_script:
  - git submodule --quiet update --init --recursive
  - (cd php-tests/library/Mustache; git checkout master)
@@ -45,3 +41,4 @@ notifications:
     - andres@phalconphp.com
     - eduar@phalconphp.com
     - nikos@phalconphp.com
+

CHANGELOG

@@ -1,3 +1,23 @@
+2.0.1
+ - Added missing Phalcon\Debug::listenLowSeverity
+ - Added new theme in Phalcon\Debug
+ - Allow to count and iterate Phalcon\Session\Bag as in 1.3.x
+ - Renamed getEventsManager to getInternalEventsManager in Phalcon\Di to avoid collision
+   with existing services
+ - Added constants FILTER_* to Phalcon\Filter for filters names
+ - Fixed multibyte characters in cssmin/jsmin
+ - Added Phalcon\Security::destroyToken() to remove current token key and value from session
+ - Changed Phalcon\Security::isLegacyHash() to return TRUE if passwordHash is not a valid bcrypt hash (instead of false), 
+   removed first argument (password), since it's not used in the function
+ - Restored alternative hash algorithms in Phalcon\Security that were available in 1.3.x
+ - Fixed bug that makes instances returned in Model::findFirst to be not completely initialized
+ - Added support for general SELECT ALL/SELECT DISTINCT in PHQL
+ - Added support for "not in" test in Volt
+ - Phalcon\Debug\Dump
+ -- Renamed method var() to variable()
+ -- Renamed method vars() to variables()
+ - Phalcon\Mvc\Model::findFirst() now allows hydration (#10259).
+
 2.0.0
  - Full rewrite of most components in Zephir
  - Added Phalcon\Mvc\Micro::error for better handling of exceptions

CONTRIBUTING.md

@@ -4,26 +4,26 @@ Phalcon is an open source project and a volunteer effort. Phalcon welcomes contr
 
 ## Contributions
 
-Contributions to Phalcon should be made in the form of GitHub pull requests. 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. All contributions should follow this format, even those from core contributors.
-*We only accept bug reports, new feature requests and pull requests in GitHub*.
+Contributions to Phalcon should be made in the form of GitHub pull requests. 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.
+*We only accept bug reports, new feature requests and pull requests in GitHub*. For questions regarding the usage of the framework or support requests please visit the [official forums](http://forum.phalconphp.com/).
 
 ## Pull Request Checklist
 
-- Don't submit your pull requests to master. Branch from the required branch and,
+- 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 in your pull request unless they are to landed
   commits.
 
-- Add tests relevant to the fixed bug or new feature. See our testing
-  guide for more information.
+- Add tests relevant to the fixed bug or new feature. See our [testing
+  guide](https://github.com/phalcon/cphalcon/blob/master/unit-tests/README.md) for more information.
 
 - Phalcon 2 is written in [Zephir](http://zephir-lang.com/), please do not submit
   commits that modify C generated files directly or those whose functionality/fixes
-  is implemented in C language
+  are implemented in the C programming language
 
-- Remove any change to ext/kernel / *.zep.c / *.zep.h files before submit the pull request
+- Remove any change to ext/kernel / *.zep.c / *.zep.h files before submitting the pull request
 
 ## Getting Support
 

README.md

@@ -6,7 +6,7 @@ Phalcon is an open source web framework delivered as a C extension for the PHP l
 Get Started
 -----------
 
-Phalcon is written in Zephir/C with platform independence in mind. As a result, Phalcon is available on Microsoft Windows, GNU/Linux, and Mac OS X. You can either download a binary package for the system of your choice or build it from sources.
+Phalcon is written in Zephir/C with platform independence in mind. As a result, Phalcon is available on Microsoft Windows, GNU/Linux, and Mac OS X. You can either download a binary package for the system of your choice or build it from source.
 
 ### Windows