Merge branch '3.0.x'

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,25 @@
+> Questions should go to https://forum.phalconphp.com
+
+### Expected and Actual Behavior
+
+> **Describe what you are trying to achieve and what goes wrong.**
+
+> Provide output if related. Provide coredump if any. Use https://github.com/phalcon/cphalcon/wiki/Generating-a-backtrace as reference
+
+```php
+// paste output here
+```
+> Provide minimal script to reproduce the issue
+
+```php
+// paste code
+```
+### Details
+
+* Phalcon version: (`php --ri phalcon`)
+* PHP Version: (`php -v`)
+* Operating System:
+* Installation type: Compiling from source || installing via package manager
+* Zephir version (if any):
+* Server: Nginx | Apache | Other
+* Other related info (Database, table schema): 

.gitignore

@@ -4,37 +4,7 @@
 .project
 ext/ltmain.sh
 unit-tests/engines/*
-unit-tests/logs/*
-build/.deps
-build/.libs/
-build/Makefile
-build/Makefile.fragments
-build/Makefile.global
-build/Makefile.objects
-build/acinclude.m4
-build/aclocal.m4
-build/autom4te.cache/
-build/build/
-build/config.guess
-build/config.h
-build/config.h.in
-build/config.log
-build/config.nice
-build/config.status
-build/config.sub
-build/configure
-build/configure.in
-build/install-sh
-build/libtool
-build/ltmain.sh
-build/missing
-build/mkinstalldirs
-build/modules/
-build/phalcon.la
-build/phalcon.lo
-build/run-tests.php
 ext/.deps
-ext/.libs/
 ext/Makefile
 ext/Makefile.fragments
 ext/Makefile.global
@@ -46,157 +16,56 @@ ext/build/
 ext/config.guess
 ext/config.h
 ext/config.h.in
-ext/config.lo
-ext/config.log
 ext/config.nice
 ext/config.status
 ext/config.sub
 ext/config/.libs/
 ext/config/adapter/.libs/
-ext/config/adapter/ini.lo
-ext/config/exception.lo
 ext/configure
 ext/configure.in
 ext/install-sh
-ext/kernel/.libs/
-ext/kernel/array.lo
-ext/kernel/assert.lo
-ext/kernel/concat.lo
-ext/kernel/debug.lo
-ext/kernel/exception.lo
-ext/kernel/fcall.lo
-ext/kernel/main.lo
-ext/kernel/memory.lo
-ext/kernel/object.lo
-ext/kernel/operators.lo
-ext/kernel/require.lo
 ext/libtool
 ext/missing
 ext/mkinstalldirs
 ext/modules/
 ext/phalcon.la
-ext/phalcon.lo
 ext/run-tests.php
 unit-tests/views/test10/children.extends.volt.php
 unit-tests/views/test10/children2.volt.php
 unit-tests/views/test10/children.volt.php
-build/gccarch
-build/32bits/.deps
-build/32bits/.libs/
-build/32bits/Makefile
-build/32bits/Makefile.fragments
-build/32bits/Makefile.global
-build/32bits/Makefile.objects
-build/32bits/acinclude.m4
-build/32bits/aclocal.m4
-build/32bits/autom4te.cache/
-build/32bits/build/
-build/32bits/config.guess
-build/32bits/config.h
-build/32bits/config.h.in
-build/32bits/config.log
-build/32bits/config.nice
-build/32bits/config.status
-build/32bits/config.sub
-build/32bits/configure
-build/32bits/configure.in
-build/32bits/install-sh
-build/32bits/libtool
-build/32bits/ltmain.sh
-build/32bits/missing
-build/32bits/mkinstalldirs
-build/32bits/modules/
-build/32bits/phalcon.la
-build/32bits/phalcon.lo
-build/32bits/run-tests.php
-build/phalcon.o
-build/64bits/.deps
-build/64bits/.libs/
-build/64bits/Makefile
-build/64bits/Makefile.fragments
-build/64bits/Makefile.global
-build/64bits/Makefile.objects
-build/64bits/acinclude.m4
-build/64bits/aclocal.m4
-build/64bits/autom4te.cache/
-build/64bits/build/
-build/64bits/config.guess
-build/64bits/config.h
-build/64bits/config.h.in
-build/64bits/config.log
-build/64bits/config.nice
-build/64bits/config.status
-build/64bits/config.sub
-build/64bits/configure
-build/64bits/configure.in
-build/64bits/install-sh
-build/64bits/libtool
-build/64bits/ltmain.sh
-build/64bits/missing
-build/64bits/mkinstalldirs
-build/64bits/modules/
-build/64bits/phalcon.la
-build/64bits/phalcon.lo
-build/64bits/run-tests.php
-build/safe/.deps
-build/safe/.libs/
-build/safe/Makefile
-build/safe/Makefile.fragments
-build/safe/Makefile.global
-build/safe/Makefile.objects
-build/safe/acinclude.m4
-build/safe/aclocal.m4
-build/safe/autom4te.cache/
-build/safe/build/
-build/safe/config.guess
-build/safe/config.h
-build/safe/config.h.in
-build/safe/config.log
-build/safe/config.nice
-build/safe/config.status
-build/safe/config.sub
-build/safe/configure
-build/safe/configure.in
-build/safe/install-sh
-build/safe/libtool
-build/safe/ltmain.sh
-build/safe/missing
-build/safe/mkinstalldirs
-build/safe/modules/
-build/safe/phalcon.la
-build/safe/phalcon.lo
-build/safe/run-tests.php
-unit-tests/annotations/cache/*.php
+
 *.o
 *.lo
+*.log
 *.loT
 *.gch
-.libs
-build/t.dSYM/
-build/install2
+/.libs
+/ext/.libs
 *~
 .DS_Store
-ext/.DS_Store
 .temp/
 composer.lock
 composer.phar
-php-tests/tests/var/logs/*.log
-compile-errors.log
-compile.log
 .vagrant
 Vagrantfile
-tests/_output/*
-build/.gitignore
-build/32bits/tests/
-build/64bits/tests/
-build/README.md
-build/install-gentoo
-build/safe/tests/
 ext/phalcon/mvc/view/engine/volt/lemon
+ext/phalcon/mvc/view/engine/volt/lemon.dSYM/
 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
 ext/phalcon/mvc/model/query/parser.out
-vendor/
+/vendor/
+/ide/
+ext/phalcon/annotations/parser.php5.out
+ext/phalcon/annotations/parser.php7.out
+ext/phalcon/mvc/view/engine/volt/parser.php5.out
+ext/phalcon/mvc/view/engine/volt/parser.php7.out
+ext/phalcon/mvc/model/query/parser.php5.out
+ext/phalcon/mvc/model/query/parser.php7.out
+ext/phalcon/mvc/model/query/.libs/
+
+build/gccarch
+*.ghc
+*.phc

.travis.yml

@@ -1,41 +1,85 @@
 language: php
 
-sudo: false
+sudo: required
+dist: precise
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7.0
+
+git:
+  depth: 1
 
 cache:
-    - apt
+  apt: true
+  ccache: true
+  timeout: 691200
+  directories:
+    - .temp
+    #- vendor
+    - $HOME/.ccache
+    - $HOME/.composer/cache
 
 services:
   - mongodb
   - memcached
   - redis-server
-  - mysql
+  - postgresql
+
+env:
+  global:
+    - TEST_BT_HOST="127.0.0.1"
+    - TEST_BT_PORT="11300"
+    - TEST_MC_HOST="127.0.0.1"
+    - TEST_MC_PORT="11211"
+    - TEST_DB_MYSQL_HOST="127.0.0.1"
+    - TEST_DB_MYSQL_PORT="3306"
+    - TEST_DB_MYSQL_USER="root"
+    - TEST_DB_MYSQL_PASSWD=""
+    - TEST_DB_MYSQL_NAME="phalcon_test"
+    - TEST_DB_MYSQL_CHARSET="utf8"
+    - TEST_DB_MYSQL_DSN="mysql:host=127.0.0.1;dbname=phalcon_test"
+    - TEST_DB_MONGO_HOST="127.0.0.1"
+    - TEST_DB_MONGO_PORT="27017"
+    - TEST_DB_MONGO_USER="admin"
+    - TEST_DB_MONGO_PASSWD=""
+    - TEST_DB_MONGO_NAME="phalcon_test"
+    - TEST_RS_HOST="127.0.0.1"
+    - TEST_RS_PORT="6379"
+    - ZEND_DONT_UNLOAD_MODULES=1
+    - CC="ccache gcc"
+    - PHPIZE_BIN="$(which phpize 2> /dev/null || which phpize5 2> /dev/null)"
 
 before_install:
- - composer --prefer-source install
- - composer require phalcon/zephir:0.9.2
- - ./unit-tests/ci/install_prereqs.sh
- - ./unit-tests/ci/setup_dbs.sh
+  - export PATH=$PATH:~/bin;
+  - composer self-update -q
+  - travis_retry composer --prefer-source install
+  - bash tests/_ci/install_prereqs.sh
+  - bash tests/_ci/setup_dbs.sh
+  - bash tests/_ci/install_zephir.sh
+  - bash tests/_ci/install_beanstalkd.sh
+  - '[[ "$TRAVIS_PHP_VERSION" == "7.0" ]] || ( zephir fullclean && zephir generate )'
+  - '[[ "$TRAVIS_PHP_VERSION" != "7.0" ]] || ( zephir fullclean && zephir generate --backend=ZendEngine3 )'
 
 before_script:
- - git submodule --quiet update --init --recursive
- - (cd php-tests/library/Mustache; git checkout master)
- - (cd php-tests/library/Twig; git checkout master)
- - (./unit-tests/ci/install_zephir.sh)
- - (export PATH=$PATH:~/bin; zephir generate)
- - (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -DZEPHIR_RELEASE=1"; phpize && ./configure --enable-phalcon && make --silent -j4 && make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini)
- - ulimit -c unlimited || true
+  - (export PRE_PHP_INCLUDES=`php-config --includes`; cd ext/; for file in `find kernel -name "*.h"`; do $CC "$file" -I. $PRE_PHP_INCLUDES -o "$file.ghc"; done)
+  - (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall -DZEPHIR_RELEASE=1"; $PHPIZE_BIN &> /dev/null && ./configure --silent --enable-phalcon &> /dev/null && make --silent -j4 &> /dev/null && make --silent install)
+  - phpenv config-add tests/_ci/phalcon.ini
+  - php --ri phalcon
+  - phpenv config-add tests/_ci/redis.ini
+  - php -m
+  - pecl list
+  - ulimit -c unlimited -S || true
+  - echo '/tmp/core_%e.%p' | sudo tee /proc/sys/kernel/core_pattern &> /dev/null
 
 script:
- - ./run-tests.sh
+  - vendor/bin/phpunit --bootstrap tests/_ci/phpunit.php --debug unit-tests/
+  - vendor/bin/codecept build
+  - vendor/bin/codecept run -v
 
 after_failure:
- - ./unit-tests/ci/after_failure.sh
+  - bash tests/_ci/after_failure.sh
 
 notifications:
   email: