Merge pull request phalcon#13116 from phalcon/3.2.x

3.2.3

.travis.yml

@@ -1,11 +1,7 @@
 language: php
 
-# TODO To use `sudo: false` you have to use `precise` until this issue is fixed:
-# https://github.com/travis-ci/travis-ci/issues/5837
-dist: precise
+dist: trusty
 sudo: false
-# dist: trusty
-# sudo: required
 
 php:
   - 5.5
@@ -29,23 +25,17 @@ cache:
   timeout: 691200
   directories:
     - .temp
-    # Use ZEPHIR_PARSER_VERSION here
-    - $HOME/zephir-parser-v1.0.3
     - $HOME/beanstalk
     - $HOME/.ccache
     - $HOME/.composer/cache
     - $HOME/pear
+    - $HOME/.local/lib
 
 services:
-  # Use only for `trusty`
-  # - beanstalkd
+  - beanstalkd
   - mongodb
-  - memcached
   - redis-server
   - postgresql
-  # Not needed on `precise`
-  # start: Job is already running: mysql
-  # - mysql
 
 env:
   global:
@@ -79,7 +69,7 @@ env:
     - CC="ccache gcc"
     - PATH="$PATH:~/bin"
     - BEANSTALKD_VERSION="1.10"
-    - ZEPHIR_PARSER_VERSION="v1.0.3"
+    - ZEPHIR_PARSER_VERSION="v1.1.0"
     # Uncomment for debug
     #- ZEND_DONT_UNLOAD_MODULES=1
 
@@ -90,33 +80,33 @@ before_install:
   - bash tests/_ci/setup_dbs.sh
 
 install:
-  - travis_retry composer install --quiet --no-interaction --no-ansi --no-progress --optimize-autoloader --dev --prefer-dist --no-suggest --ignore-platform-reqs
+  - travis_retry composer install --quiet --no-interaction --no-ansi --no-progress --dev --prefer-source --no-suggest --ignore-platform-reqs
   - bash tests/_ci/install_prereqs_$PHP_MAJOR.sh
   - bash tests/_ci/install_zephir_parser.sh
   - bash tests/_ci/install_zephir.sh
-  # Use only for `precise`
-  - bash tests/_ci/install_beanstalkd.sh
   - zephir generate
   - (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)
+  # Use -O0 for debug purposes
   - (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall"; $(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)
-  # Uncomment for debug
-  # - (cd ext; export CFLAGS="-g3 -O0 -std=gnu90 -Wall"; $(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 tests/_ci/phalcon.ini
   - phpenv config-add tests/_ci/ci.ini
-  - beanstalkd -l ${TEST_BT_HOST} -p ${TEST_BT_PORT} & # start queue listener
+  - ls -al `$(phpenv which php-config) --extension-dir`
+  - php -m
 
 before_script:
   # Uncomment for debug
   # - ulimit -c unlimited -S || true
   # - 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)
 
 script:
   - vendor/bin/phpcs
   - vendor/bin/phpunit --bootstrap tests/_ci/phpunit.php --debug unit-tests/
   - vendor/bin/codecept build
   - vendor/bin/codecept run -v -n tests/integration/
   - vendor/bin/codecept run -v -n tests/unit/
-  # Legacy tests
+  # Legacy tests. Only PHP 5
   - phpenv config-rm xdebug.ini
   - if [[ "$PHP_MAJOR" == 5 ]]; then vendor/bin/codecept run -v -n tests/unit5x/; fi;
 
@@ -135,11 +125,6 @@ addons:
     apt:
         packages:
             - re2c
-            # Use only for `trusty`
-            # - beanstalkd
+            - beanstalkd
             # Uncomment for debug
             # - gdb
-            # Uncomment for `trusty`
-            # - mysql-server-5.6
-            # - mysql-server-core-5.6
-            # - mysql-client-5.6

CHANGELOG-3.2.md

@@ -1,3 +1,12 @@
+# [3.2.3](https://github.com/phalcon/cphalcon/releases/tag/v3.2.3) (2017-10-12)
+- Fixed `Phalcon\Mvc\Model\Query::_executeSelect` threw RuntimeException, if db:beforeQuery() returned false
+- Internal cookies property is now always an array [#12978](https://github.com/phalcon/cphalcon/issues/12978)
+- Fixed `Phalcon\Validation\Validator\File::validate` to work properly with parameter 'message' [#12947](https://github.com/phalcon/cphalcon/issues/12947)
+- Fixed `Phalcon\Mvc\View::render` to render a view with params [#13046](https://github.com/phalcon/cphalcon/issues/13046)
+- Fixed `Phalcon\Mvc\Model\Manager::getRelationRecords` to work properly with provided columns [#12972](https://github.com/phalcon/cphalcon/issues/12972)
+- Mark as deprecated no longer used `Phalcon\Mvc\Model\Query\Builder::$_with` parameter [#13023](https://github.com/phalcon/cphalcon/issues/13023)
+- Fixed `Phalcon\Dispatcher::dispatch` to ensure proper flow for all forward/exception/dispatch event hooks [#12931](https://github.com/phalcon/cphalcon/issues/12931)
+
 # [3.2.2](https://github.com/phalcon/cphalcon/releases/tag/v3.2.2) (2017-08-14)
 - Fixed `Phalcon\Db\Adapter\Pdo\Postgresql::describeColumns` to work properly with `DOUBLE PRECISION` and `REAL` data types [#12842](https://github.com/phalcon/cphalcon/issues/12842)
 - Fixed `Phalcon\Paginator\Adapter\QueryBuilder::getPaginate` to use the db connection service of the model [#12957](https://github.com/phalcon/cphalcon/issues/12957)

README.md

@@ -69,6 +69,17 @@ CentOS/Fedora/RHEL
 sudo yum install php-devel pcre-devel gcc make re2c
 ```
 
+macOS(Sierra / El Capitan / Yosemite):
+
+Using [Homebrew](https://brew.sh/)
+
+```bash
+# brew install php<version>-phalcon
+# available versions 56, 70, 71
+
+brew install php71-phalcon
+```
+
 ## Compilation
 
 Follow these instructions to generate a binary extension for your platform:

appveyor.yml

@@ -3,7 +3,7 @@
 #---------------------------------#
 
 # version format
-version: 3.2.2-{build}
+version: 3.2.3-{build}
 
 # to disable automatic builds
 build: off
@@ -31,8 +31,8 @@ clone_folder: c:\projects\phalcon
 init:
     - SET ANSICON=121x90 (121x90)
     - SET COMPOSER_NO_INTERACTION=1
-    - SET PARSER_RELEASE=1.0.3
-    - SET PARSER_VERSION=1.0.3-258
+    - SET PARSER_VERSION=1.1.0
+    - SET PARSER_RELEASE=261
 
 # build cache to preserve files/folders between builds
 cache:
@@ -64,7 +64,7 @@ install:
         $versions = type sha1sum.txt | where { $_ -match "php-(${env:PHP_TARGET}\.\d+)-src" } | foreach { $matches[1] }
         $version = $versions.Split(' ')[-1]
         $env:PHP_VERSION=${version}
-    - ps: $env:PARSER_DOWNLOAD_URL="https://github.com/phalcon/php-zephir-parser/releases/download/v${env:PARSER_RELEASE}/zephir_parser_${env:PLATFORM}_vc${env:PHP_VC}_php${env:PHP_TARGET}_${env:PARSER_VERSION}.zip"
+    - ps: $env:PARSER_DOWNLOAD_URL="https://github.com/phalcon/php-zephir-parser/releases/download/v${env:PARSER_VERSION}/zephir_parser_${env:PLATFORM}_vc${env:PHP_VC}_php${env:PHP_TARGET}_${env:PARSER_VERSION}-${env:PARSER_RELEASE}.zip"
     # ==================================================
     - echo Initializing Build...
     # ==================================================
@@ -84,9 +84,18 @@ install:
     - '7z.exe x ..\php-sdk.zip | FIND /V "ing  "'
     - cd ..
     # ==================================================
-    - echo Downloading PHP-Devel-Pack
+    - echo Install PHP Dev pack
     # ==================================================
-    - ps: (new-object net.webclient).DownloadFile('http://windows.php.net/downloads/releases/php-devel-pack-' + ${env:PHP_VERSION} + '-Win32-VC' + ${env:PHP_VC} + '-' + ${env:PLATFORM} + '.zip', ${env:APPVEYOR_BUILD_FOLDER} + '\..\php-dev.zip')
+    - ps: >-
+        If ($env:PHP_TYPE -Match "nts-Win32") {
+            $env:DEVEL_PACK_VERSION="${env:PHP_VERSION}-nts-Win32-VC${env:PHP_VC}-${env:PLATFORM}"
+        } Else {
+            $env:DEVEL_PACK_VERSION="${env:PHP_VERSION}-Win32-VC${env:PHP_VC}-${env:PLATFORM}"
+        }
+    # ==================================================
+    - echo Downloading PHP Dev pack source code [http://windows.php.net/downloads/releases/php-devel-pack-%DEVEL_PACK_VERSION%.zip]
+    # ==================================================
+    - ps: (new-object net.webclient).DownloadFile('http://windows.php.net/downloads/releases/php-devel-pack-' + ${env:DEVEL_PACK_VERSION} + '.zip', ${env:APPVEYOR_BUILD_FOLDER} + '\..\php-dev.zip')
     - 7z.exe x php-dev.zip | FIND /V "ing  "
     - mv php-%PHP_VERSION%-devel-VC11-%PLATFORM% php-devpack
     # ==================================================