Merge pull request #1407 from sjinks/master

1.2.4 => master

.travis.yml

@@ -21,10 +21,11 @@ before_script:
  - (cd php-tests/library/Mustache; git checkout master )
  - (cd php-tests/library/Twig; git checkout master )
  - (cd unit-tests/engines/; git clone -q git://github.com/bobthecow/mustache.php.git & git clone -q git://github.com/fabpot/Twig.git & wait)
- - (cd ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j2 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
+ - (cd ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
  - ulimit -c unlimited || true
 
 script:
+ - (cd ext; NO_INTERACTION=1 make test)
  - $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml
 
 after_failure:
@@ -35,4 +36,5 @@ notifications:
   email:
     - andres@phalconphp.com
     - eduar@phalconphp.com
-    - nikos@phalconphp.com
+    - nikos@phalconphp.com
+    - vladimir@phalconphp.com

CHANGELOG

@@ -1,3 +1,36 @@
+1.2.4
+ - Fixed broken ACL inheritance (#905)
+ - Fixed crash while rendering element's label (#1210)
+ - Fixed XSS vulnerabilities (#1216, #1190)
+ - Added support for APCu 4.0.2+ (#1234)
+ - Fixed chaining of CSS/JS filters (#1198)
+ - Fixed notices and warnings with complex PHQL queries (#1222)
+ - Memory allocation optimizations (#1220)
+ - Fixed regular expression in \Phalcon\Mvc\Model\Validator\Email (#1243)
+ - Documentation bug fixes
+ - Phalcon\Mvc\Model::hasOne/hasMany/belongsTo/hasManyToMany/addBehavior() are now public methods (#1166)
+ - Added support for MySQL DOUBLE type (#1128)
+ - Added support for UTF-8 characters in jsmin
+ - Added support for UTF-8 to \Phalcon\Debug (#1099)
+ - Fixed regression in \Phalcon\Http\Request::getRawBody() (#1091)
+ - Implemented \Phalcon\Cache\Backend\Memory::queryKeys() (#1093)
+ - Redirects use status descriptions from RFC 2616 (#1175)
+ - \Phalcon\Config::merge now works with derived classes (#1024)
+ - \Phalcon\Security::checkHash() allows to restrict the length of the password to avoid attacks like https://www.djangoproject.com/weblog/2013/sep/15/security/
+ - \Phalcon\Config can now be cloned (#1277)
+ - \Phalcon\Mvc\Query\Builder::__construct() ignores joins (#1327)
+ - Bug with a custom Events Manager in Phalcon\Mvc\Models (#1314)
+ - Micro Collections return Phalcon\Mvc\Micro\CollectionInterface (#1130)
+ - \Phalcon\Forms\Form::getMessages() does not generate a fatal error if the form is valid (#1349)
+ - Fixed memory leaks (#1345)
+ - Fixed invalid memory reads/writes across the code (#1340)
+ - Fixed HAVING handling in Phalcon\Mvc\QueryBuilder (#1396)
+ - Bug fixes in \Phalcon\Logger\{Adapter,Formatter}\FirePhp (#1333)
+ - Other bug fixes (#947, #1131, #1040, #1275, #1392, #1396, #1399, backported patches from 1.3.0 etc)
+
+1.2.3
+ - Security fixes (#1144)
+
 1.2.2
  - Phalcon\Mvc\Model\Query\Builder may now use both integer and string placeholders (#701)
  - Fixed invalid memory reads when GC is on (#469, #927)

README.md

@@ -1,12 +1,12 @@
-Phalcon PHP Framework
-=====================
+Phalcon Framework
+=================
 
-Phalcon PHP is a web framework delivered as a C extension providing high performance and lower resource consumption.
+Phalcon is a web framework delivered as a C extension providing high performance and lower resource consumption.
 
 Get Started
 -----------
 
-Phalcon PHP is written in C with platform independence in mind. As a result, Phalcon PHP is available on Microsoft Windows, GNU/Linux, 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 C with platform independence in mind. As a result, Phalcon is available on Microsoft Windows, GNU/Linux, Mac OS X, You can either download a binary package for the system of your choice or build it from sources.
 
 ### Windows
 
@@ -70,7 +70,7 @@ External Links
 Current Build Status
 --------------------
 
-Phalcon PHP Framework is built under Travis CI service. Every commit pushed to this repository will queue a build into the continuous integration service and will run all PHPUnit tests to ensure that everything is going well and the project is stable. The current build status is:
+Phalcon Framework is built under Travis CI service. Every commit pushed to this repository will queue a build into the continuous integration service and will run all PHPUnit tests to ensure that everything is going well and the project is stable. The current build status is:
 
 [![Build Status](https://secure.travis-ci.org/phalcon/cphalcon.png?branch=master)](http://travis-ci.org/phalcon/cphalcon)