Merge pull request #13626 from phalcon/3.4.x

3.4.2

Author: sergeyklay

.editorconfig

@@ -11,7 +11,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,sh}]
 charset                  = utf-8
 end_of_line              = lf
 indent_size              = 4
@@ -20,7 +20,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
 

.travis.yml

@@ -1,38 +1,40 @@
 language: php
+php:
+  - 'master'
+  - '7.3'
+  - '7.2'
+  - '7.1'
+  - '7.0'
+  - '5.6'
 
-dist: trusty
-sudo: false
+git:
+  depth: 1
 
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - nightly
+branches:
+  only:
+    - master
+    - /^(3|4)\.\d+\.(\d+|x)$/
+
+addons:
+  apt:
+    packages:
+      - beanstalkd
+      - gdb
+      - lcov
 
 matrix:
   fast_finish: true
   allow_failures:
-    - php: nightly
-
-git:
-  depth: 1
+    - php: 'master'
 
 cache:
-  # See: https://github.com/travis-ci/travis-ci/issues/8714
-  edge: true
   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}/beanstalk
+    - ${HOME}/.composer/cache
+    - ${HOME}/pear
+    - ${HOME}/.local/opt
 
 services:
   - beanstalkd
@@ -42,130 +44,75 @@ services:
 
 env:
   global:
-    - CC="ccache gcc"
-    - PATH="$PATH:$HOME/bin"
-    - ZEPHIR_PARSER_VERSION="v1.1.2"
-    - RE2C_VERSION="1.0.3"
+    - CC="gcc"
+    - ZEPHIR_VERSION="0.10.14"
+    - RE2C_VERSION="1.1.1"
     - REPORT_EXIT_STATUS=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
+    - CFLAGS="-g -O0 -Wall -std=gnu90"
+    - BACKEND="ZendEngine3"
+    - 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;
+  - '[[ -z "${GH_TOKEN}" ]] || composer config github-oauth.github.com ${GH_TOKEN}; echo "Configured Github token"'
   - export PHP_MAJOR="$(`phpenv which php` -r 'echo phpversion();' | cut -d '.' -f 1)"
   - export PHP_MINOR="$(`phpenv which php` -r 'echo phpversion();' | cut -d '.' -f 2)"
-  - 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)
+  - export PHP_VERNUM="$(`phpenv which php-config` --vernum)"
+  - '[[ "${PHP_MAJOR}" == "7" ]] || export BACKEND="ZendEngine2"'
+  - ./tests/_ci/pear-setup.sh
+  - ./tests/_ci/setup-dbs.sh
+  - source ./tests/_ci/environment
+  - export $(cut -d= -f1 ./tests/_ci/environment)
 
 install:
-  - composer install -q -n --no-ansi --no-progress --dev --prefer-dist --no-suggest #--ignore-platform-reqs
-  # We'll do this in future for the all 7.x series
-  - |
-      if [ "${PHP_MAJOR}.${PHP_MINOR}" = "7.3" ]; then
-          composer remove -q -n --no-ansi --no-progress --dev doctrine/instantiator
-          composer remove -q -n --no-ansi --no-progress --dev phpdocumentor/reflection-docblock
-          composer remove -q -n --no-ansi --no-progress --dev phpunit/phpunit
-          composer require -q -n --no-ansi --no-progress --dev --prefer-source --no-suggest  phpunit/phpunit:^6.4
-      fi
-  - bash tests/_ci/install_prereqs_$PHP_MAJOR.sh
-  - bash tests/_ci/install-re2c $RE2C_VERSION
-  - bash tests/_ci/install_zephir_parser.sh
-  - bash tests/_ci/install_zephir.sh
-  # We still need this until end of support of PHP 5.x
+  - ./tests/_ci/install-prereqs-$PHP_MAJOR.sh
+  - ./tests/_ci/install-re2c.sh
+  - travis_retry composer install ${DEFAULT_COMPOSER_FLAGS}
+  - travis_retry composer global require "phalcon/zephir:${ZEPHIR_VERSION}"
+  - ( cd ${HOME}/.composer/vendor/phalcon/zephir; ./install-nosudo )
+  - zephir generate --backend=${BACKEND}
+  - ./tests/_ci/precompile-headers.sh
   - |
-      if [ "${PHP_MAJOR}" = "7" ]; then
-          zephir generate --backend=ZendEngine3
-      else
-          zephir generate --backend=ZendEngine2
-      fi
-  # Use `-g -O0' for debug purposes
-  - export CFLAGS="-g3 -O1 -std=gnu90 -Wall"
-  - cd ${TRAVIS_BUILD_DIR}/ext
-  # 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
-  - |
-      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
+      cd ext
+      phpize
+      ./configure --with-php-config=$(phpenv which php-config) --enable-phalcon
+      make -j"$(getconf _NPROCESSORS_ONLN)" > ../compile.log 2> ../compile-errors.log
+      make install
+      cd ..
+  - phpenv config-add ./tests/_ci/phalcon.ini
+  - phpenv config-add ./tests/_ci/ci.ini
 
 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)
+  # see: https://github.com/sebastianbergmann/phpunit/pull/3359
+  - '[[ "${PHP_VERNUM}" -lt 70300 ]] || export USE_ZEND_ALLOC=1'
 
 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
+  - ln -s ${TRAVIS_BUILD_DIR}/ext/libtool ${TRAVIS_BUILD_DIR}/libtool
   # Syntax recognize tests
   - |
-      $(phpenv which php) $TRAVIS_BUILD_DIR/ext/run-tests.php \
+      $(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
-  # Legacy unit tests
   # We'll drop or rewrite them for Phalcon 4.x
-  - |
-      if [ "${PHP_MAJOR}.${PHP_MINOR}" != "7.2" ] && [ "${PHP_MAJOR}.${PHP_MINOR}" != "7.3" ]; then
-          vendor/bin/phpunit --bootstrap tests/_ci/phpunit.php --debug unit-tests/
-      fi
+  - '[[ "${PHP_VERNUM}" -lt 70200 ]] || vendor/bin/phpunit --bootstrap tests/_ci/phpunit.php unit-tests/'
   - vendor/bin/codecept build
   # TODO: Add `cli' suite and refactor current cli-tests
   - vendor/bin/codecept run -v -n tests/integration/
   - vendor/bin/codecept run -v -n tests/unit/
-  # Legacy tests (PHP 5.x) only.
-  # We'll drop them for Phalcon 4.x
-  - |
-      if [ "$PHP_MAJOR" == 5 ]; then
-          phpenv config-rm xdebug.ini || true;
-          vendor/bin/codecept run -v -n tests/unit5x/;
-      fi
 
-# 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
+    email: false
+
 
-addons:
-    apt:
-        packages:
-            - beanstalkd
-            # Uncomment for debug
-            # - gdb

CHANGELOG-3.4.md

@@ -1,3 +1,23 @@
+# [3.4.2](https://github.com/phalcon/cphalcon/releases/tag/v3.4.2) (2018-12-02)
+- Added missing Volt tags to array helper in `Phalcon\Mvc\View\Engine\Volt\Compiler::functionCall` [#13447](https://github.com/phalcon/cphalcon/issues/13447)
+- Added the ability to explicitly define nullable columns (especially timestamp ones) [#13099](https://github.com/phalcon/cphalcon/issues/13099)
+- Refactored `Phalcon\Db\Adapter\Pdo::query` to use PDO's `prepare` and `execute` and `Phalcon\Db\Adapter::fetchAll` to use PDO's `fetchAll`
+- Fixed `Phalcon\Validation\Validator\Numericality` to accept float numbers on locales with comma decimal point [#13450](https://github.com/phalcon/cphalcon/issues/13450)
+- Fixed `Phalcon\Tag` so it unsets `parameters` before passing options array to `self::renderAttributes`
+- Fixed `Phalcon\Http\Response::setFileToSend` filename; when file downloaded it had an extra `_`
+- Fixed `Phalcon\Mvc\Model\Query::execute` to properly bind parameters to sub queries [#11605](https://github.com/phalcon/cphalcon/issues/11605)
+- Fixed `Phalcon\Http\Request::getJsonRawBody` [#13501](https://github.com/phalcon/cphalcon/issues/13501). It will now return false when the body content is empty, as well as when it encounters an error whilst decoding the JSON content
+- Fixed `Phalcon\Validation::preChecking` to allow use `Phalcon\Db\RawValue` as an empty container for `isAllowEmpty` option [#13549](https://github.com/phalcon/cphalcon/pull/13549), [#13573](https://github.com/phalcon/cphalcon/issues/13573), [#12519](https://github.com/phalcon/cphalcon/pull/12519)
+- Fixed object binding and placeholder creation in `Phalcon\Db\Adapter::insert` and `Phalcon\Db\Adapter::update` [#13058](https://github.com/phalcon/cphalcon/issues/13058)
+- Fixed `Phalcon\Config\Adapter\Ini` not building config objects properly for numerical keys [#12725](https://github.com/phalcon/cphalcon/issues/12725), [#13604](https://github.com/phalcon/cphalcon/issues/13604)
+- Fixed incorrect scope of view variables
+  [#12176](https://github.com/phalcon/cphalcon/issues/12176),
+  [#12385](https://github.com/phalcon/cphalcon/issues/12385),
+  [#12648](https://github.com/phalcon/cphalcon/issues/12648),
+  [#12705](https://github.com/phalcon/cphalcon/issues/12705),
+  [#13288](https://github.com/phalcon/cphalcon/pull/13288)
+- Fixed `Phalcon\Config::_merge` not merging config with numeric properties properly [#13351](https://github.com/phalcon/cphalcon/issues/13351).
+
 # [3.4.1](https://github.com/phalcon/cphalcon/releases/tag/v3.4.1) (2018-08-04)
 - Changed `Phalcon\Cache\Backend\Redis` to support connection timeout parameter
 - Fixed `Phalcon\Validaiton\Validator\Uniqueness::isUniquenessModel` to properly get value of primary key when it has different name in column map [#13398](https://github.com/phalcon/cphalcon/issues/13398)

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq