Merge branch '4.0.x' into feature/ip-validator-4.0.x

.editorconfig

@@ -10,7 +10,7 @@ insert_final_newline     = true
 indent_style             = space
 indent_size              = 4
 
-[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re}]
+[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re,psm1,sh}]
 charset                  = utf-8
 end_of_line              = lf
 indent_size              = 4
@@ -19,7 +19,7 @@ tab_width                = 4
 trim_trailing_whitespace = true
 insert_final_newline     = true
 
-[*.{yml,m4,sh,json,xml}]
+[*.{yml,m4,json,xml}]
 charset                  = utf-8
 end_of_line              = lf
 indent_size              = 2

.github/stale.yml

@@ -9,6 +9,9 @@ daysUntilClose: 1
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - "Bug - Low"
+  - "Bug - Medium"
+  - "Bug - High"
   - WIP
   - Locked
 

.gitignore

@@ -43,12 +43,16 @@ ext/run-tests.php
 lemon
 
 .libs/
-.temp/
 autom4te.cache/
 /vendor
 /ide/
 
+.zephir/
+boxfile.yml
 composer.lock
 php_test_results_*.txt
 docker-compose.yml
 build/gccarch
+tests/_cache
+.zephir/
+.temp/

.travis.yml

@@ -1,149 +1,105 @@
-language: php
-
-dist: trusty
 sudo: false
 
+language: php
 php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - nightly
+  - 'master'
+  - '7.3'
+  - '7.2'
+
+git:
+  depth: 1
+
+# TODO - Remove this when we go deploy this
+#branches:
+#  only:
+#    - master
+#    - /^(4|5)\.\d+\.(\d+|x)$/
+
+addons:
+  apt:
+    sources:
+      - mysql-5.7-trusty
+    packages:
+      - beanstalkd
+      - gdb
+      - lcov
+      - mysql-server
+      - mysql-client
+  postgresql: "9.4"
 
 matrix:
   fast_finish: true
   allow_failures:
-    - php: nightly
-
-git:
-  depth: 1
+    - php: 'master'
 
 cache:
   apt: true
-  ccache: true
   timeout: 604800
   directories:
-    - .temp
-    - $HOME/beanstalk
-    - $HOME/.ccache
-    - $HOME/.composer/cache
-    - $HOME/pear
-    - $HOME/.local/opt/re2c
-    - $HOME/.cache/re2c
-    - $HOME/.cache/composer
+    - ${HOME}/beanstalk
+    - ${HOME}/.composer/cache
+    - ${HOME}/pear
+    - ${HOME}/.local/opt
 
 services:
+  - mysql
   - beanstalkd
   - mongodb
   - redis-server
   - postgresql
 
 env:
   global:
-    - CC="ccache gcc"
-    - PATH="$PATH:$HOME/bin"
-    - ZEPHIR_PARSER_VERSION="v1.1.2"
-    - RE2C_VERSION="1.0.3"
+    - secure: "eL8spffzdRIDAjdxG+OPJPeUCdpc/jVz6PEVYcs3z4nOnjsKDURm8cmBmGeyHMxvkdHZ6g0PO/srIKAYufZkjDCeK0vl7OBv6kNlGEuO3M7SUCAVX+J2OSg+hNlK467woxsPeMB19/vkC1HmytgpdAefFGtFp4+zsMT41YVupuA="
+    - CC="gcc"
+    - ZEPHIR_VERSION="0.11.8"
+    - RE2C_VERSION="1.1.1"
     - REPORT_EXIT_STATUS=1
+    - REPORT_COVERAGE=1
     - NO_INTERACTION=1
     - TEST_PHP_ARGS="--show-diff"
-    # Generating a valgrind log
-    # For more see: https://bugs.php.net/bugs-getting-valgrind-log.php
-    #
-    # Uncomment to correctly show the stack frames for extensions compiled as shared libraries
-    # - ZEND_DONT_UNLOAD_MODULES=1
-    # Uncomment to disable Zend memory manager before running PHP with valgrind
-    # - USE_ZEND_ALLOC=0
+    - PATH="${HOME}/bin:${HOME}/.composer/vendor/bin:${PATH}"
+    - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest"
 
 before_install:
-  - if [[ ! -z "${GH_TOKEN}" ]]; then composer config github-oauth.github.com ${GH_TOKEN}; echo "Configured Github token"; fi;
-  - bash tests/_ci/pear_setup.sh
-  - bash tests/_ci/setup_dbs.sh
-  # Setting up test the environment
-  - source $TRAVIS_BUILD_DIR/tests/_ci/environment
-  - export $(cut -d= -f1 $TRAVIS_BUILD_DIR/tests/_ci/environment)
-  # Use `-g -O0' for debug purposes
-  - export CFLAGS="-g3 -O1 -std=gnu90 -Wall"
+  - if [ ! -z "${GITHUB_TOKEN}" ]; then composer config github-oauth.github.com ${GITHUB_TOKEN}; echo "Add Github token"; fi
+  - export PHP_MAJOR="$(php -r 'echo phpversion();' | cut -d '.' -f 1)"
+  - export PHP_MINOR="$(php -r 'echo phpversion();' | cut -d '.' -f 2)"
+  - export PHP_VERNUM="$(php-config --vernum)"
+  - tests/_ci/pear-setup.sh
+  - tests/_ci/setup-dbs.sh
+  - source tests/_ci/environment
+  - export $(cut -d= -f1 tests/_ci/environment)
+  - wget --no-clobber -O $HOME/bin/zephir https://github.com/phalcon/zephir/releases/download/${ZEPHIR_VERSION}/zephir.phar
+  - chmod +x $HOME/bin/zephir
 
 install:
-  - bash tests/_ci/install_prereqs.sh
-  - bash tests/_ci/install-re2c $RE2C_VERSION
-  - bash tests/_ci/install_zephir_parser.sh
-  # Install PHP dependencies
-  - if [[ -d "$HOME/.cache/composer/vendor" ]]; then cp -R $HOME/.cache/composer/vendor $TRAVIS_BUILD_DIR/vendor; fi;
-  - composer install --no-ansi --no-progress --no-suggest
-  # Improve performance
-  - rm -rf $HOME/.cache/composer
-  - mkdir -p $HOME/.cache/composer/vendor
-  - cp -R $TRAVIS_BUILD_DIR/vendor $HOME/.cache/composer/vendor
-  # Install Zephir
-  - bash tests/_ci/install_zephir.sh
-  # Generate C-code
-  - zephir generate --backend=ZendEngine3
-  # Creating precompiled headers.
-  # If a `*.gch' file is not found then the normal header files will be used.
-  # For more see: http://en.wikipedia.org/wiki/Precompiled_header
-  - cd ${TRAVIS_BUILD_DIR}/ext
-  - |
-      for file in `find kernel -name "*.h"`; do
-          echo -e "Creating a precompiled header: ext/${file} => ext/${file}.ghc ...";
-          $CC "$file" -I. $(php-config --includes) -o "$file.ghc";
-      done
-  # You may need to remove all `&> /dev/null' and `--silent' for debug purposes
-  - $(phpenv which phpize) &> /dev/null
-  - ./configure --silent --with-php-config=$(phpenv which php-config) --enable-phalcon &> /dev/null
-  - make --silent -j"$(getconf _NPROCESSORS_ONLN)" &> /dev/null
-  - make --silent install
-  - phpenv config-add $TRAVIS_BUILD_DIR/tests/_ci/phalcon.ini
-  # We use this file as our custom PHP config
-  - phpenv config-add $TRAVIS_BUILD_DIR/tests/_ci/ci.ini
-  # Some debug info is located here
-  - ls -al `$(phpenv which php-config) --extension-dir`
-  - $(phpenv which php) -v
-  - $(phpenv which php) -m
-  - $(phpenv which php) --ri phalcon
-  - $(phpenv which php) --ri psr
+  - tests/_ci/install-prereqs.sh
+  - tests/_ci/install-re2c.sh
+  - travis_retry composer install ${DEFAULT_COMPOSER_FLAGS}
+  - travis_retry composer global require ${DEFAULT_COMPOSER_FLAGS} "phalcon/zephir:${ZEPHIR_VERSION}"
+  - tests/_ci/build.sh
 
 before_script:
   - ulimit -c unlimited -S || true
-  # Uncomment for debug purposes
-  # - echo '/tmp/core_%e.%p' | sudo tee /proc/sys/kernel/core_pattern &> /dev/null
-  # attempt to workaroung "ptrace: Operation not permitted"
-  # - sudo chmod +s $(which gdb)
+  - phpenv config-add tests/_ci/999-default.ini
 
 script:
-  - cd $TRAVIS_BUILD_DIR
-  # To avoud this:
-  # sh: 1: /home/travis/build/phalcon/cphalcon/libtool: not found
-  - ln -s $TRAVIS_BUILD_DIR/ext/libtool $TRAVIS_BUILD_DIR/libtool
-  # Syntax recognize tests
-  - |
-      $(phpenv which php) $TRAVIS_BUILD_DIR/ext/run-tests.php \
-          -p $(phpenv which php) \
-          -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" \
-          --offline \
-          --show-diff \
-          --set-timeout 120
-  # Run code style tests
   - vendor/bin/phpcs
-  # TODO: Refacto legacy unit tests from the "unit-tests" directory
-  - vendor/bin/codecept build --no-ansi
+  - vendor/bin/codecept build
   # TODO: Add `cli' suite and refactor current cli-tests
-  - vendor/bin/codecept run --no-ansi -v -n tests/integration/
-  - vendor/bin/codecept run --no-ansi -v -n tests/unit/
+#  - vendor/bin/codecept run -v
+  - vendor/bin/codecept run -v -n tests/cli/
+  - vendor/bin/codecept run -v -n tests/integration/
+  - vendor/bin/codecept run -v -n tests/unit/
+  - phpenv config-rm xdebug.ini || true
+  - tests/_ci/volt-tests.sh
 
-# Uncomment for debug purposes
-# after_failure:
-#  - bash tests/_ci/after_failure.sh
+after_failure:
+  - tests/_ci/after-failure.sh
 
-notifications:
-    # Stop spam me. I already live on Travis CI and GitHub
-    email:
-        on_success: never
-        on_failure: never
+after_success:
+  - tests/_ci/after-success.sh
 
-addons:
-    apt:
-        packages:
-            - beanstalkd
-            # Uncomment for debug
-            # - gdb
+notifications:
+  email: false