Merge pull request #1812 from phalcon/1.2.5

1.2.5

.gitignore

@@ -481,3 +481,4 @@ ext/mvc/model/query/lemon
 ext/mvc/model/query/parser.out
 ext/mvc/view/engine/volt/lemon
 ext/mvc/view/engine/volt/parser.out
+*.d

.gitmodules

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

.travis.yml

@@ -17,9 +17,8 @@ before_install:
  - ./unit-tests/ci/setup_dbs.sh
 
 before_script:
- - git submodule --quiet update --init --recursive
- - (cd php-tests/library/Mustache; git checkout master )
- - (cd php-tests/library/Twig; git checkout master )
+ - mkdir -p php-tests/library/
+ - git submodule update --init --recursive
  - (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 -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
  - ulimit -c unlimited || true

CHANGELOG

@@ -1,3 +1,31 @@
+1.2.5
+ - Http\Cookie::__toString() will not throw exceptions (#1427)
+ - Phalcon\Http\Cookie::__toString() will return a string value (#1428)
+ - Camelize does not ignore the last character of a string anymore (#1436)
+ - APC tests do not run under CLI when apc.enable_cli is 0 (#1449)
+ - Phalcon\Debug::uri now supports both http and https (#987)
+ - Fixed inconsistency in Tag::stylesheetLink/javascriptInclude w.r.t. local URLs (#1486)
+ - Fixed bug in Phalcon\Queue\Beanstalk::read() (#1348, #1612)
+ - Phalcon\Flash\Session::getMessages() incorrectly removed all messages (#1575)
+ - Fixed bug in phalcon_fix_path() (#1601)
+ - Added Phalcon\Mvc\Model\Row::toArray() method (#1506)
+ - Added support for POINT type in MySQL (#1536)
+ - Phalcon\Mvc\Model\Validator::getOption() returns NULL if the option does not exist (#1530)
+ - Fixed parsing of annotations containing / (#1480)
+ - Make sure that 'persistent' is resolved only when accessed for the first time (#1637)
+ - Fix Phalcon\Session\Bag::remove() (#1637)
+ - Bug fixes in beanstalkd protocol implementation
+ - Phalcon\Paginator\Adapter\Model returns correct results even when page number is incorrect (#1654)
+ - Bug fix: no arguments were passed to beforeMatch handler in Phalcon\Mvc\Router (#1556)
+ - Phalcon\Logger\Adapter::setLogLevel() is honored by transactions (#1716)
+ - Bug fixes in Phalcon\Db\Adapter\Pdo::describeColumns() (#1562)
+ - Phalcon\Session\Adapter::__destruct() now calls session_write_close() (#1624)
+ - Volt: fixed bug in email_filed() (#1723)
+ - Fixed PHP Notices in Phalcon\Debug::onUncaughtException() (#1683)
+ - Phalcon\Logger\Adapter::commit() clears the queue (#1748)
+ - Constant-time string comparison in Phalcon\Security::checkHash() (#1755)
+ - Fix phalcon_escape_multi() to generate valid UTF-8 (#1681)
+
 1.2.4
  - Fixed broken ACL inheritance (#905)
  - Fixed crash while rendering element's label (#1210)

README.md

@@ -10,13 +10,15 @@ Phalcon is written in C with platform independence in mind. As a result, Phalcon
 
 ### Windows
 
-For use Phalcon on windows you only should to download a DLL library (http://phalconphp.com/download). Edit your php.ini file and then add:
+For use Phalcon on Windows, you only should to [download a DLL library](http://phalconphp.com/en/download/windows), place it in your `/php/ext` folder and then append at the last line (or whatever line you wish) of your `php.ini`:
 
 ```bash
 extension=php_phalcon.dll
 ```
 
-Finally restart your webserver.
+Finally, just restart your webserver and voilà!
+
+**Hint:** To ensure that your Phalcon's installation was successful, debug with `<?php phpinfo(); ?>` and search for the a section mentioning the Phalcon extension.
 
 ### Linux/Unix/Mac
 
@@ -74,6 +76,13 @@ Phalcon Framework is built under Travis CI service. Every commit pushed to this
 
 [![Build Status](https://secure.travis-ci.org/phalcon/cphalcon.png?branch=master)](http://travis-ci.org/phalcon/cphalcon)
 
+Meet the Incubator
+-----------
+Our community is developing amazing extra features for Phalcon everyday via [Incubator](https://github.com/phalcon/incubator). There are resources to enhance your experience with the framework and that enlarge the main features.
+
+Just give a try and help us improve more & more our PHP's stronghold.
+
+
 License
 -------
 Phalcon is open-sourced software licensed under the New BSD License. See the docs/LICENSE.txt file for more information.