Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -265,6 +265,7 @@ ext/escaper/exception.lo
 ext/kernel/string.lo
 ext/mvc/model/metadata/files.lo
 unit-tests/cache/unit-tests.views.test10.index.volt.compiled
+unit-tests/cache/meta-robots-robots.php
 unit-tests/cache/meta-robots.php
 unit-tests/cache/map-robots.php
 unit-tests/views/test10/children.extends.volt.php

.gitmodules

@@ -1,6 +1,8 @@
 [submodule "php-tests/library/Mustache"]
-	path = php-tests/library/Mustache
-	url = git://github.com/bobthecow/mustache.php.git
+        path = php-tests/library/Mustache
+        url = git://github.com/bobthecow/mustache.php.git
+
 [submodule "php-tests/library/Twig"]
 	path = php-tests/library/Twig
 	url = git://github.com/fabpot/Twig.git
+

.travis.yml

@@ -6,20 +6,25 @@ php:
   - 5.4
 
 services:
-  - memcached
   - mongodb
 
 before_install:
- - sudo apt-get install sqlite3
  - chmod +x unit-tests/ci/install_memcached
  - chmod +x unit-tests/ci/install_apc
  - chmod +x unit-tests/ci/install_mongo
- - sudo ./unit-tests/ci/install_memcached
- - sudo ./unit-tests/ci/install_apc
- - sudo ./unit-tests/ci/install_mongo
+ - ./unit-tests/ci/install_memcached
+ - ./unit-tests/ci/install_apc
+ - ./unit-tests/ci/install_mongo
 
 before_script:
+ - git submodule init
  - git submodule update
+ - cd php-tests/library/Mustache
+ - git checkout master
+ - cd ../../..
+ - cd php-tests/library/Twig
+ - git checkout master
+ - cd ../../..
  - mkdir -p unit-tests/engines
  - cd unit-tests/engines/
  - git clone https://github.com/bobthecow/mustache.php.git
@@ -37,9 +42,9 @@ before_script:
  - sqlite3 /tmp/phalcon_test.sqlite < unit-tests/schemas/sqlite/phalcon_test.sql
  - chmod +x unit-tests/ci/run_script.sh
 
-script: sudo ./unit-tests/ci/run_script.sh
+script: ./unit-tests/ci/run_script.sh
 
 notifications:
   email:
     - [email protected]
-    - nikos@niden.net
+    - nikos@phalconphp.com

CHANGELOG

@@ -1,11 +1,53 @@
+1.0.1
+ - Paths aren't correctly normalized in Phalcon\Mvc\Model\MetaData\Files
+ - Added extra class prefix to schema.table in Phalcon\Mvc\Model\MetaData to avoid multiple-database collisions
+ - Now Phalcon\Mvc\Router ignores numeric paths in controller, namespace, module and action, avoiding that those will be passed to the dispatcher
+ - Added Phalcon\Forms\Form::remove to remove an element from the form and Phalcon\Forms\Form::has to check if a form has an element
+
+1.0.0b2
+ - Added Phalcon\Mvc\Router::setUriSource to set if the URI source must be $_GET['_url'] or $_SERVER['REQUEST_URI']
+ - Added a white-list parameter to Phalcon\Mvc\Model::save(), Phalcon\Mvc\Model::create() and
+ Phalcon\Mvc\Model::update() to avoid possible mass-assigment attacks
+ - Added leftJoin/rightJoin to QueryBuilder
+
+1.0.0b1
+ - Fixed bug with missing blocks in multiple inheritance in Volt
+ - Support for ternary operator in Volt
+ - Support for 'forelse' in Volt
+ - Added support for loop variable context in Volt
+ - Added whitespace control delimiters {%- -%} and {{- -}} to Volt
+ - Suport for 'in' and 'not in' operators in Volt
+ - Added Phalcon\Mvc\Model::assign to assign an array of values to a model instance
+ - Added Phalcon\Mvc\Model::refresh to refresh the state of a model
+ - Added Phalcon\Logger\Adapter::setLogLevel to filter messages with greater or less priority
+ - Removed constructor from Phalcon\Cache\BackendInterface
+ - Added Phalcon\Cache\Multiple, this backend writes to several backends, and reads data according to the order in which backends were registered.
+ - Now a model can use a separate connection to read and another to write, this makes horizontal sharding easy
+ - Now, a model could implement a method selectReadConnection to dynamically return the correct database according to the current query conditions
+ - Added Phalcon\Cache\Backend\Memory to cache data in the current request
+ - Added Phalcon\Validation, this component allows the validate a set of data based on pre-defined rules
+ - Added Phalcon\Forms, this component acts as a forms builder binding request data to entities, aiding in the validation of data, helping in the errors/messages generated in the validation process
+ - Phalcon\Db is now case-folding independent
+ - Phalcon\Mvc\Model uses column names keeping the case-folding as they were defined
+ - Added Phalcon\Mvc\Router::notFound to define the paths the router must use if any route is matched
+ - Improved \Phalcon\Mvc\Router\Annotations to work better with controllers in namespaces and modules
+ - A model can be marked to keep record snapshots allowing to check what fields have been changed
+ - The _source and _schema properties have been moved from Phalcon\Mvc\Model to Phalcon\Mvc\Model\Manager. This allow set source/schema in the model initializer
+ - Added Phalcon\Session\Bag::remove to remove an specific variable from a session bag
+ - Added support for complex expressions in PHQL ORDER BY clause
+ - Added support for complex expressions in PHQL GROUP BY clause
+ - Added support for $_SERVER['REQUEST_URI'] if $_GET['_url'] is not available in Phalcon\Mvc\Router
+ - Added an option to set up specific models with dynamic update instead of all-fields update, every field is checked if it was changed to dynamically create a UPDATE SQL column only with those fields that changed
+ - Added a minimalist client for the Beanstalk queue server
+
 0.9.0b2
- - Support for reusable records. A relation can be marked to cache in memory the records to speedup getting related records
+ - Support for reusable records. A relation can be marked to cache queried records in memory to speedup getting related records
  - Added 'elseif' statement to Volt
  - Changed static key in Volt's 'cache' to any valid expression
  - Added Phalcon\Logger\Adapter\Syslog and Phalcon\Logger\Adapter\Stream to Phalcon\Logger
  - Added Phalcon\Logger\Multiple to send logs to multiples adapters
  - Added formatters abstraction to Phalcon\Logger, now including: Phalcon\Logger\Formatter\Line, Phalcon\Logger\Formatter\Json and Phalcon\Logger\Formatter\Syslog
- - Added Phalcon\Annotations\Adapter\Files to Phalcon\Annotations, this adapter stores the annotations in PHP files
+ - Added Phalcon\Annotations\Adapter\Files to Phalcon\Annotations, this adapter stores annotations in PHP files
 
 0.9.0b1
  - Added Phalcon\Annotations, a general purpose component to read annotations from docblocks

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+Phalcon is an open source project and a volunteer effort.
+
+*We only accept bug reports, new feature requests and pull requests in GitHub*.
+
+If you have a question about how to use Phalcon, please see the [support page](http://phalconphp.com/support).
+
+If you have a change or new feature in mind, please fill an [NFR](https://github.com/phalcon/cphalcon/wiki/New-Feature-Request---NFR).
+
+Thanks! <br />
+Phalcon Team