Use latest Zephir from the 0.10.x branch [skip appveyor]

Closes: - #13288 - #12176 - #12385 - #12648 - #12705 - #12648
phalcon · Nov 20, 2018 · 126e6a9 · 126e6a9
1 parent bcd2e73
commit 126e6a9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: 'master'
-    - php: '7.3'
 
 cache:
   apt: true
@@ -48,7 +47,7 @@ services:
 env:
   global:
     - CC="gcc"
-    - ZEPHIR_VERSION="0.10.12"
+    - ZEPHIR_VERSION="0.10.14"
     - RE2C_VERSION="1.1.1"
     - REPORT_EXIT_STATUS=1
     - NO_INTERACTION=1

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
@@ -1,15 +1,22 @@
 # [3.4.2](https://github.com/phalcon/cphalcon/releases/tag/v3.4.2) (2018-XX-XX)
 - 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. `Phalcon\Db\Adapter::fetchAll` to use PDO's fetchAll
+- 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\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 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 object binding and placeholder creation in `Phalcon\Db\Adapter::insert` and `Phalcon\Db\Adapter::update` [#13058](https://github.com/phalcon/cphalcon/issues/13058)
+- 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)
 
 # [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

diff --git a/phalcon/mvc/view.zep b/phalcon/mvc/view.zep
@@ -851,9 +851,7 @@ class View extends Injectable implements ViewInterface
 		 * Create a virtual symbol table.
 		 * Variables are shared across symbol tables in PHP5
 		 */
-		if PHP_MAJOR_VERSION == 5 {
-			create_symbol_table();
-		}
+		create_symbol_table();
 
 		/**
 		 * Call beforeRender if there is an events manager

diff --git a/tests/_ci/install-prereqs-7.sh b/tests/_ci/install-prereqs-7.sh
@@ -11,11 +11,11 @@ PROJECT_ROOT=$(readlink -enq "$(dirname $0)/../../")
 
 source ${PROJECT_ROOT}/tests/_ci/ci-tools.sh
 
-printf "\n" | pecl install --force apcu_bc &> /dev/null
-printf "\n" | pecl install --force igbinary &> /dev/null
-printf "\n" | pecl install --force imagick &> /dev/null
-printf "\n" | pecl install --force psr &> /dev/null
-printf "\n" | pecl install --force yaml-2.0.3 &> /dev/null
+printf "\n" | pecl install --force apcu_bc 1> /dev/null
+printf "\n" | pecl install --force igbinary 1> /dev/null
+printf "\n" | pecl install --force imagick 1> /dev/null
+printf "\n" | pecl install --force psr 1> /dev/null
+printf "\n" | pecl install --force yaml-2.0.3 1> /dev/null
 
 # See https://pear.php.net/bugs/bug.php?id=21007
 sed -i '1s/^/extension="apcu.so"\n/' "$(phpenv root)/versions/$(phpenv version-name)/etc/php.ini"

diff --git a/tests/unit/Cache/Backend/RedisCest.php b/tests/unit/Cache/Backend/RedisCest.php
@@ -328,12 +328,6 @@ function () use ($cache) {
 
     public function output(UnitTester $I)
     {
-        if (PHP_VERSION_ID >= 70300) {
-            throw new SkippedTestError(
-                'Skipped due unstable PHP version'
-            );
-        }
-
         $I->wantTo('Cache output fragments by using Redis as cache backend');
 
         $time = date('H:i:s');

diff --git a/tests/unit/Mvc/ViewTest.php b/tests/unit/Mvc/ViewTest.php
@@ -649,6 +649,7 @@ function () {
      * Tests params view scope
      *
      * @issue  https://github.com/phalcon/cphalcon/issues/12648
+     * @issue  https://github.com/phalcon/cphalcon/pull/13288
      * @author Wojciech Ślawski <[email protected]>
      * @since  2017-03-17
      */
@@ -668,6 +669,7 @@ function () {
                 expect($content)->equals("<html>lol<p>test</p></html>\n");
                 try {
                     echo $a_cool_var;
+                    $this->fail('Variable a_cool_var is defined and is set to "' . $a_cool_var . '"');
                 } catch (\PHPUnit_Framework_Exception $e) {
                     expect($e->getMessage())->contains("Undefined variable: a_cool_var");
                 }