Merge pull request #15425 from phalcon/4.1.1-release

4.1.1 release
phalcon · Apr 21, 2021 · dcb2be7 · dcb2be7
2 parents db38cbb + b5dd2d2
commit dcb2be7
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Environment Variables
         run: |
           echo "ZEPHIR_PARSER_VERSION=v1.3.6" >> $GITHUB_ENV
-          echo "ZEPHIR_VERSION=0.12.19" >> $GITHUB_ENV
+          echo "ZEPHIR_VERSION=0.12.21" >> $GITHUB_ENV
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Setup Environment Variables
         run: |
           echo "ZEPHIR_PARSER_VERSION=v1.3.6" >> $GITHUB_ENV
-          echo "ZEPHIR_VERSION=0.12.19" >> $GITHUB_ENV
+          echo "ZEPHIR_VERSION=0.12.21" >> $GITHUB_ENV
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ services:
 env:
   global:
     - CC="gcc"
-    - ZEPHIR_VERSION="0.12.19"
+    - ZEPHIR_VERSION="0.12.21"
     - ZEPHIR_PARSER_VERSION="v1.3.6"
     - REPORT_COVERAGE=0
     - PATH="${HOME}/.composer/vendor/bin:${PATH}"

diff --git a/appveyor.yml b/appveyor.yml
@@ -44,7 +44,7 @@ environment:
   PHP_SDK_VERSION: 2.1.9
   ZEPHIR_PARSER_VERSION: 1.3.4
   ZEPHIR_PARSER_RELEASE: 526
-  ZEPHIR_VERSION: 0.12.19
+  ZEPHIR_VERSION: 0.12.21
 
   TEST_PHP_EXECUTABLE: C:\php\php.exe
   NO_INTERACTION: 1

diff --git a/boxfile.7.4.yml b/boxfile.7.4.yml
@@ -140,7 +140,7 @@ run.config:
     - echo -e 'apc.enable_cli=1' >> "/data/etc/php/dev_php.ini"
     #===========================================================================
     # Get the Zephir phar
-    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.19/zephir.phar
+    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.21/zephir.phar
     - chmod +x /data/bin/zephir
 
 data.memcached:

diff --git a/build/php7/32bits/php_phalcon.h b/build/php7/32bits/php_phalcon.h
@@ -111,7 +111,7 @@ typedef zend_function zephir_fcall_cache_entry;
 #define PHP_PHALCON_VERSION     "4.1.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.12.19-4345593"
+#define PHP_PHALCON_ZEPVERSION  "0.12.21-8a412a1"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

diff --git a/build/php7/64bits/php_phalcon.h b/build/php7/64bits/php_phalcon.h
@@ -111,7 +111,7 @@ typedef zend_function zephir_fcall_cache_entry;
 #define PHP_PHALCON_VERSION     "4.1.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.12.19-4345593"
+#define PHP_PHALCON_ZEPVERSION  "0.12.21-8a412a1"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

diff --git a/build/php7/safe/php_phalcon.h b/build/php7/safe/php_phalcon.h
@@ -111,7 +111,7 @@ typedef zend_function zephir_fcall_cache_entry;
 #define PHP_PHALCON_VERSION     "4.1.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.12.19-4345593"
+#define PHP_PHALCON_ZEPVERSION  "0.12.21-8a412a1"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

diff --git a/ext/config.m4 b/ext/config.m4
@@ -561,6 +561,8 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/mvc/view/engine/volt/scanner.c
 	phalcon/url/utils.c"
 	PHP_NEW_EXTENSION(phalcon, $phalcon_sources, $ext_shared,, )
+	PHP_ADD_BUILD_DIR([$ext_builddir/kernel/])
+	PHP_ADD_BUILD_DIR([$ext_builddir/phalcon/])
 	PHP_SUBST(PHALCON_SHARED_LIBADD)
 
 	old_CPPFLAGS=$CPPFLAGS

diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
@@ -14,7 +14,7 @@
 #define PHP_PHALCON_VERSION     "4.1.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.12.19-4345593"
+#define PHP_PHALCON_ZEPVERSION  "0.12.21-8a412a1"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

diff --git a/tests/_ci/nanobox/boxfile.7.2.yml b/tests/_ci/nanobox/boxfile.7.2.yml
@@ -121,7 +121,7 @@ run.config:
     - echo -e 'apc.enable_cli=1' >> "/data/etc/php/dev_php.ini"
     #===========================================================================
     # Get the Zephir phar
-    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.19/zephir.phar
+    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.21/zephir.phar
     - chmod +x /data/bin/zephir
 
 data.memcached:

diff --git a/tests/_ci/nanobox/boxfile.7.3.yml b/tests/_ci/nanobox/boxfile.7.3.yml
@@ -140,7 +140,7 @@ run.config:
     - echo -e 'apc.enable_cli=1' >> "/data/etc/php/dev_php.ini"
     #===========================================================================
     # Get the Zephir phar
-    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.19/zephir.phar
+    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.21/zephir.phar
     - chmod +x /data/bin/zephir
 
 data.memcached:

diff --git a/tests/_ci/nanobox/boxfile.7.4.yml b/tests/_ci/nanobox/boxfile.7.4.yml
@@ -140,7 +140,7 @@ run.config:
     - echo -e 'apc.enable_cli=1' >> "/data/etc/php/dev_php.ini"
     #===========================================================================
     # Get the Zephir phar
-    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.19/zephir.phar
+    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.21/zephir.phar
     - chmod +x /data/bin/zephir
 
 data.memcached:

diff --git a/tests/unit/Acl/Adapter/Memory/AllowCest.php b/tests/unit/Acl/Adapter/Memory/AllowCest.php
@@ -22,6 +22,7 @@
 use Phalcon\Test\Fixtures\Acl\TestComponentAware;
 use Phalcon\Test\Fixtures\Acl\TestRoleAware;
 use UnitTester;
+
 use function str_replace;
 
 class AllowCest
@@ -279,7 +280,7 @@ public function aclAdapterMemoryAllowFunctionException(UnitTester $I)
     {
         $errorMessage = "You did not provide any parameters when 'Guests' can " .
             "'update' 'Post'. We will use default action when no arguments. " .
-            "at tests/unit/Acl/Adapter/Memory/AllowCest.php:332";
+            "at tests/unit/Acl/Adapter/Memory/AllowCest.php:334";
 
         if (PHP_OS_FAMILY === 'Windows') {
             $errorMessage = str_replace('/', '\\', $errorMessage);

diff --git a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
@@ -24,6 +24,7 @@
 use Phalcon\Test\Fixtures\Acl\TestRoleComponentAware;
 use stdClass;
 use UnitTester;
+
 use function str_replace;
 
 class IsAllowedCest
@@ -206,7 +207,7 @@ public function aclAdapterMemoryIsAllowedFunctionMoreParameters(UnitTester $I)
         $errorMessage = 'Number of parameters in array is higher than the ' .
             'number of parameters in defined function when checking if ' .
             "'Members' can 'update' 'Post'. Extra parameters will be ignored. " .
-            "at tests/unit/Acl/Adapter/Memory/IsAllowedCest.php:242";
+            "at tests/unit/Acl/Adapter/Memory/IsAllowedCest.php:244";
 
         if (PHP_OS_FAMILY === 'Windows') {
             $errorMessage = str_replace('/', '\\', $errorMessage);