PHP 8 compile test

.ci/run-tests.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <team@phalcon.io>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter unit
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter cli
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter integration
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database -g common
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite
+php -d extension=ext/modules/phalcon.so vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql

.github/workflows/build-and-test.yml

@@ -22,14 +22,14 @@ 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.13.0-alpha-1" >> $GITHUB_ENV
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           extensions: mbstring, intl, json, psr
-          tools: pecl, prestissimo
+          tools: pecl
 
       - name: Common Settings
         run: |
@@ -73,14 +73,14 @@ jobs:
           $HOME/bin/zephir generate
           (cd build && php gen-build.php)
 
-      - name: Create Pecl Package
+      - name: Create Pecl Package (PHP 8)
         id: pecl_create
         run: |
-          cp build/php7/safe/config.w32 config.w32
-          cp build/php7/safe/phalcon.zep.c phalcon.zep.c
-          cp build/php7/safe/config.m4 config.m4
-          cp build/php7/safe/php_phalcon.h php_phalcon.h
-          cp build/php7/safe/phalcon.zep.h phalcon.zep.h
+          cp build/php8/safe/config.w32 config.w32
+          cp build/php8/safe/phalcon.zep.c phalcon.zep.c
+          cp build/php8/safe/config.m4 config.m4
+          cp build/php8/safe/php_phalcon.h php_phalcon.h
+          cp build/php8/safe/phalcon.zep.h phalcon.zep.h
           pecl package
           phalcon_package="`ls | grep phalcon-*tgz`"
           mv $phalcon_package phalcon-pecl.tgz
@@ -131,7 +131,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
@@ -166,7 +166,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           ini-values: apc.enable_cli=on, session.save_path=/tmp
-          tools: pecl, prestissimo
+          tools: pecl
           extensions: mbstring, intl, json, imagick
 
       - name: Download Phalcon Pecl Package
@@ -192,22 +192,26 @@ jobs:
           vendor/bin/codecept build
 
       - name: Run Unit Tests
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter unit
 
       - name: Run CLI Tests
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter cli
 
       - name: Run Integration Tests
         env:
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter integration
 
       - name: Run Database Tests (Common)
         env:
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
           DATA_MYSQL_USER: root
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter database -g common
 
       - name: Run Database Tests (MySQL)
@@ -216,12 +220,14 @@ jobs:
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
           DATA_MYSQL_USER: root
-        run: vendor/bin/codecept run database --env mysql -g mysql
+        if: always()
+        run: vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql
 
       - name: Run Database Tests (Sqlite)
         env:
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter database --env sqlite -g sqlite
 
       - name: Run Database Tests (Postgres)
@@ -230,6 +236,7 @@ jobs:
           DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
+        if: always()
         run: vendor/bin/codecept run --ext DotReporter database --env pgsql -g pgsql
 
       # - name: Run Database Tests (SQL Server)
@@ -251,7 +258,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [macos-latest]
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
@@ -361,14 +368,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [windows-2016]
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
         ts: [ts, nts]
         include:
-          - php-versions: '7.2'
+          - php-versions: '7.3'
             vc_num: '15'
             arch: x64
             build_type: Win32
-          - php-versions: '7.3'
+          - php-versions: '7.4'
             vc_num: '15'
             arch: x64
             build_type: Win32
@@ -391,7 +398,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           ini-values: apc.enable_cli=on, session.save_path=C:\temp
-          tools: pecl, prestissimo
+          tools: pecl
           extensions: mbstring, intl, json, yaml, apcu, psr, imagick, gd, redis, igbinary, sqlite3, msgpack
         env:
           PHPTS: ${{ matrix.ts }}

.gitignore

@@ -58,7 +58,6 @@ zephir-*.phar
 boxfile.yml
 composer.lock
 php_test_results_*.txt
-docker-compose.yml
 build/gccarch
 tests/_data/phalcon_test*
 tests/_output/*

build/_resource/Phalcon/Build/Generator/File/PhalconC.php

@@ -122,11 +122,8 @@ protected function addLicense($fileHandler)
      */
     protected function addStandardHeader($fileHandler)
     {
-        if (PHP_MAJOR_VERSION == 5) {
-            $header = require $this->configDir . '/php5/phalcon_c_header.php';
-        } else {
-            $header = require $this->configDir . '/php7/phalcon_c_header.php';
-        }
+        $header = require $this->configDir . '/php' . PHP_MAJOR_VERSION . '/phalcon_c_header.php';
+
         fwrite($fileHandler, PHP_EOL . $header . PHP_EOL);
     }
 

build/_resource/Phalcon/Build/Generator/Optimized.php

@@ -115,19 +115,19 @@ protected function getFilters()
 
         // Pre-compute hash key for method checking
         $result[] = array(
-            'regexp' => '/zephir_method_exists_ex\(([a-zA-Z0-9\_]+), SS\("([a-zA-Z\_\-]+)"\) TSRMLS_CC\)/',
+            'regexp' => '/zephir_method_exists_ex\(([a-zA-Z0-9\_]+), SS\("([a-zA-Z\_\-]+)"\)\)/',
             'func' => function ($line, $matches, $hashFunc) {
                 $hash = $hashFunc($matches[2]);
-                return str_replace($matches[0], 'zephir_method_quick_exists_ex('.$matches[1].', SS("'.$matches[2].'"), '.$hash.' TSRMLS_CC)', $line);
+                return str_replace($matches[0], 'zephir_method_quick_exists_ex('.$matches[1].', SS("'.$matches[2].'"), '.$hash.')', $line);
             }
         );
 
         // Pre-compute hash key for function checking
         $result[] = array(
-            'regexp' => '/zephir_function_exists_ex\(SS\("([a-zA-Z\_\-]+)"\) TSRMLS_CC\)/',
+            'regexp' => '/zephir_function_exists_ex\(SS\("([a-zA-Z\_\-]+)"\)\)/',
             'func' => function ($line, $matches, $hashFunc) {
                 $hash = $hashFunc($matches[1]);
-                return str_replace($matches[0], 'zephir_function_quick_exists_ex(SS("'.$matches[1].'"), '.$hash.' TSRMLS_CC)', $line);
+                return str_replace($matches[0], 'zephir_function_quick_exists_ex(SS("'.$matches[1].'"), '.$hash.')', $line);
             }
         );
 
@@ -140,10 +140,10 @@ protected function getFilters()
         );
 
         $result[] = array(
-            'regexp' => '/zephir_update_property_this\(this_ptr, SL\("([a-zA-Z0-9\_]+)"\), ([a-zA-Z0-9\_]+) TSRMLS_CC\)/',
+            'regexp' => '/zephir_update_property_this\(this_ptr, SL\("([a-zA-Z0-9\_]+)"\), ([a-zA-Z0-9\_]+)\)/',
             'func' => function ($line, $matches, $hashFunc) {
                 $key = $hashFunc($matches[1]);
-                return str_replace($matches[0], 'zephir_update_property_this_quick(this_ptr, SL("'.$matches[1].'"), '.$matches[2].', '.$key.' TSRMLS_CC)', $line);
+                return str_replace($matches[0], 'zephir_update_property_this_quick(this_ptr, SL("'.$matches[1].'"), '.$matches[2].', '.$key.')', $line);
             }
         );
 

build/_resource/config/phalcon_c_priority_files.php

@@ -1,7 +1,7 @@
 <?php
 // These are priority files, their contents must be put into phalcon.c before any other source files
 
-$files = [
+return [
     'phalcon/annotations/scanner.h',
     'phalcon/annotations/annot.h',
     'phalcon/mvc/model/orm.h',
@@ -61,5 +61,3 @@
     'kernel/time.c',
     'kernel/exit.c',
 ];
-
-return $files;

build/_resource/config/phalcon_c_skip_files.php

@@ -1,8 +1,7 @@
 <?php
 // These are the files that must not be added to phalcon.c
-//
 
-$skipFiles = array(
+return [
     // Included by phalcon.c header - see phalcon_c_header.php
     'config.h',
     'ext_config.h',
@@ -26,18 +25,19 @@
     'phalcon/annotations/lemon.c',
     'phalcon/annotations/parser.php5.c',
     'phalcon/annotations/parser.php7.c',
+    'phalcon/annotations/parser.php8.c',
 
     'phalcon/mvc/view/engine/volt/base.c',
     'phalcon/mvc/view/engine/volt/lempar.c',
     'phalcon/mvc/view/engine/volt/lemon.c',
     'phalcon/mvc/view/engine/volt/parser.php5.c',
     'phalcon/mvc/view/engine/volt/parser.php7.c',
+    'phalcon/mvc/view/engine/volt/parser.php8.c',
 
     'phalcon/mvc/model/query/base.c',
     'phalcon/mvc/model/query/lempar.c',
     'phalcon/mvc/model/query/lemon.c',
     'phalcon/mvc/model/query/parser.php5.c',
     'phalcon/mvc/model/query/parser.php7.c',
-);
-
-return $skipFiles;
+    'phalcon/mvc/model/query/parser.php8.c',
+];

build/_resource/config/php8/phalcon_c_header.php

@@ -0,0 +1,69 @@
+<?php
+// This is the header, which will be added to the start of generated phalcon.c file
+
+return <<<HEADER
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include <main/php.h>
+
+#define ZEPHIR_RELEASE 1
+#define PHALCON_RELEASE 1
+
+#include "php_phalcon.h"
+#include "phalcon.zep.h"
+
+#include <main/php_main.h>
+#include <main/php_variables.h>
+#include <main/php_streams.h>
+#include <main/php_output.h>
+#include <main/php_ini.h>
+#include <main/SAPI.h>
+#include <ext/standard/php_string.h>
+#include <ext/standard/php_smart_string.h>
+#include <ext/standard/info.h>
+#include <ext/pdo/php_pdo_driver.h>
+#include <ext/standard/file.h>
+#include <ext/standard/php_filestat.h>
+#include <ext/standard/php_rand.h>
+#include <ext/standard/php_lcg.h>
+#include <ext/standard/php_math.h>
+#include <ext/standard/php_array.h>
+#include <ext/standard/php_var.h>
+#include <ext/standard/php_http.h>
+#include <ext/standard/php_versioning.h>
+#include <ext/standard/html.h>
+#include <ext/standard/base64.h>
+#include <ext/standard/md5.h>
+#include <ext/standard/head.h>
+#include <ext/standard/url.h>
+#include <ext/standard/crc32.h>
+#include <ext/hash/php_hash.h>
+#include <ext/spl/spl_heap.h>
+#include <ext/spl/spl_exceptions.h>
+#include <ext/spl/spl_directory.h>
+#include <ext/spl/spl_iterators.h>
+#include <ext/date/php_date.h>
+#include <ext/json/php_json.h>
+
+#include <Zend/zend_API.h>
+#include <Zend/zend_operators.h>
+#include <Zend/zend_exceptions.h>
+#include <Zend/zend_interfaces.h>
+#include <Zend/zend_execute.h>
+#include <Zend/zend_extensions.h>
+#include <Zend/zend_builtin_functions.h>
+#include <Zend/zend_closures.h>
+#include <Zend/zend_multiply.h>
+#include <Zend/zend_generators.h>
+
+HEADER;

build/php8/32bits/config.m4

@@ -0,0 +1,54 @@
+
+PHP_ARG_ENABLE(phalcon, whether to enable phalcon, [ --enable-phalcon   Enable Phalcon])
+
+if test "$PHP_PHALCON" = "yes"; then
+
+	if ! test "x" = "x"; then
+		PHP_EVAL_LIBLINE(, PHALCON_SHARED_LIBADD)
+	fi
+
+	AC_DEFINE(HAVE_PHALCON, 1, [Whether you have Phalcon])
+	PHP_NEW_EXTENSION(phalcon, phalcon.zep.c, $ext_shared)
+	PHP_SUBST(PHALCON_SHARED_LIBADD)
+
+	old_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $INCLUDES"
+
+	AC_CHECK_DECL(
+		[HAVE_BUNDLED_PCRE],
+		[
+			AC_CHECK_HEADERS(
+				[ext/pcre/php_pcre.h],
+				[
+					PHP_ADD_EXTENSION_DEP([phalcon], [pcre])
+					AC_DEFINE([ZEPHIR_USE_PHP_PCRE], [1], [Whether PHP pcre extension is present at compile time])
+				],
+				,
+				[[#include "main/php.h"]]
+			)
+		],
+		,
+		[[#include "php_config.h"]]
+	)
+
+	AC_CHECK_DECL(
+		[HAVE_JSON],
+		[
+			AC_CHECK_HEADERS(
+				[ext/json/php_json.h],
+				[
+					PHP_ADD_EXTENSION_DEP([phalcon], [json])
+					AC_DEFINE([ZEPHIR_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
+				],
+				,
+				[[#include "main/php.h"]]
+			)
+		],
+		,
+		[[#include "php_config.h"]]
+	)
+
+	CPPFLAGS=$old_CPPFLAGS
+
+	PHP_INSTALL_HEADERS([ext/phalcon], [php_phalcon.h])
+fi