Merge pull request #1 from phalcon/master

update

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "php-tests/library/Mustache"]
+        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

@@ -2,18 +2,49 @@ language: php
 
 php:
   - 5.3
+  - 5.3.3
+  - 5.4
+
+services:
+  - mongodb
+
+before_install:
+ - chmod +x unit-tests/ci/install_memcached
+ - chmod +x unit-tests/ci/install_apc
+ - chmod +x unit-tests/ci/install_mongo
+ - ./unit-tests/ci/install_memcached
+ - ./unit-tests/ci/install_apc
+ - ./unit-tests/ci/install_mongo
 
 before_script:
- - cd dev/
+ - 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
+ - git clone git://github.com/fabpot/Twig.git
+ - cd ../..
+ - cd ext/
+ - export CFLAGS="-g -O2 -fno-delete-null-pointer-checks"
  - sh -c "phpize && ./configure --enable-phalcon && make && sudo make install"
  - echo "extension=phalcon.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- - cd .. 
+ - cd ..
  - mysql -uroot -e 'create database phalcon_test charset=utf8 collate=utf8_unicode_ci;'
  - mysql -uroot phalcon_test < unit-tests/schemas/mysql/phalcon_test.sql
+ - psql -c 'create database phalcon_test;' -U postgres
+ - psql -U postgres phalcon_test -q -f unit-tests/schemas/postgresql/phalcon_test.sql
+ - sqlite3 /tmp/phalcon_test.sqlite < unit-tests/schemas/sqlite/phalcon_test.sql
+ - chmod +x unit-tests/ci/run_script.sh
 
-script: phpunit --debug -c unit-tests/phpunit.xml
+script: ./unit-tests/ci/run_script.sh
 
 notifications:
   email:
     - [email protected]
-    - eduar@phalconphp.com
+    - nikos@phalconphp.com

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

README.md

@@ -1,23 +1,26 @@
 Phalcon PHP Framework
 =====================
 
-Phalcon PHP is a web framework delivered as a C extension providing high performance and lower resource consumption
+Phalcon PHP 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.
+
 ### Windows
 
-For use phalcon on windows you only should to download a DLL library. Edit your php.ini file and then add:
+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:
 
-     extension=php_phalcon.dll
+```bash
+extension=php_phalcon.dll
+```
 
 Finally restart your webserver.
 
-### GNU/Linux
+### Linux/Unix/Mac
 
-On GNU/Linux platform you can easily compile and install the extension from source code.
+On a Unix based platform you can easily compile and install the extension from sources.
 
 #### Requirements
 We need some packages previously installed.
@@ -27,35 +30,50 @@ We need some packages previously installed.
 
 Ubuntu:
 
-    sudo apt-get install php5-dev php5-mysql gcc
+```bash
+sudo apt-get install php5-dev php5-mysql gcc make
+```
 
 Suse:
 
-    yast2 -i php5-pear php5-dev php5-mysql gcc
+```bash
+yast2 -i php5-pear php5-devel libmysqlclient gcc make autoconf2.13
+```
 
 Compilation
 -----------
 
-We need to compile a shared library from C source to generate phalcon.so extension:
+Follow these instructions to generate a binary extension for your platform:
+
+```bash
+git clone git://github.com/phalcon/cphalcon.git
+cd cphalcon/build
+sudo ./install
+```
 
-     # git clone git://github.com/phalcon/cphalcon.git
-     # cd cphalcon/target/release
-     # phpize
-     # ./configure --enable-phalcon
-     # make
-     # sudo make install
-
 Add extension to your php.ini
 
-     extension=phalcon.so
+```bash
+extension=phalcon.so
+```
 
 Finally restart the webserver
 
+External Links
+--------------
+
+* [Documentation](http://docs.phalconphp.com/)
+* [Support](http://phalconphp.com/support)
+* [Blog](http://blog.phalconphp.com)
+* [Twitter](http://twitter.com/phalconphp)
+
 Current Build Status
 --------------------
 
-Phalcon PHP Framework is built under Travis CI service. Every commit pushed up to this repository
-will queue a build into the continuos 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 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:
 
 [![Build Status](https://secure.travis-ci.org/phalcon/cphalcon.png?branch=master)](http://travis-ci.org/phalcon/cphalcon)
+
+License
+-------
+Phalcon is open-sourced software licensed under the New BSD License. See the docs/LICENSE.txt file for more information.

release/config.m4 → build/32bits/config.m4

@@ -4,3 +4,4 @@ if test "$PHP_PHALCON" = "yes"; then
   AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon Framework])
   PHP_NEW_EXTENSION(phalcon, phalcon.c, $ext_shared)
 fi
+

release/config.w32 → build/32bits/config.w32

@@ -2,4 +2,4 @@ ARG_ENABLE("phalcon", "enable phalcon framework", "no", "-Iext/phalcon");
 
 if (PHP_PHALCON != "no") {
   EXTENSION("phalcon", "phalcon.c");
-}
+}