Merge pull request #15834 from phalcon/#15598-php8.1

#15598 - Add PHP8.1 support
phalcon · May 30, 2022 · 453bffd · 453bffd
2 parents c3fef64 + 6ad8dd5
commit 453bffd
Show file tree

Hide file tree

Showing 173 changed files with 7,828 additions and 13,979 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0' ]
+        php: [ '7.4', '8.0', '8.1' ]
 
     name: Build Dockerfile PHP ${{ matrix.php }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Build Dockerfile
         run: docker build docker/${{ matrix.php }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,10 +19,9 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.0.0beta3
+  PHALCON_VERSION: 5.0.0RC1
   ZEPHIR_PARSER_VERSION: 1.5.0
   ZEPHIR_VERSION: 0.16.0
-  PSR_VERSION: 1.2.0
 
   # For tests
   LANG: en_US.UTF-8
@@ -66,7 +65,7 @@ jobs:
 
   generate:
     needs: setup_workflow
-    uses: zephir-lang/templates/.github/workflows/phalcon-pecl.yml@main
+    uses: zephir-lang/templates/.github/workflows/phalcon-pecl-8.1.yml@main
     with:
       extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }}
     secrets:
@@ -79,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0' ]
+        php: [ '7.4', '8.0', '8.1' ]
         ts: [ 'nts', 'ts' ]
         arch: [ 'x64' ]
 
@@ -99,9 +98,11 @@ jobs:
           - { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
           - { php: '8.0', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
+          - { php: '8.1', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
+          - { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup platform specific environment
         shell: pwsh
@@ -229,7 +230,7 @@ jobs:
       mysql:
         image: mysql:5.7
         ports:
-          - 3306
+          - "3306:3306"
         env:
           MYSQL_ROOT_PASSWORD: secret
           MYSQL_USER: phalcon
@@ -238,26 +239,32 @@ jobs:
       postgres:
         image: postgres:12-alpine
         ports:
-          - 5432
+          - "5432:5432"
         env:
+          POSTGRES_USER: phalcon
           POSTGRES_PASSWORD: secret
           POSTGRES_DB: phalcon
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       redis:
         image: redis:5-alpine
         ports:
-          - 6379
+          - "6379:6379"
       memcached:
         image: memcached:1.5-alpine
         ports:
-          - 11211
+          - "11211:11211"
 
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0' ]
+        php: [ '7.4', '8.0', '8.1' ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -346,7 +353,8 @@ jobs:
 
       - name: Run Database Tests (Postgres)
         env:
-          DATA_POSTGRES_USER: postgres
+          DATA_POSTGRES_USER: phalcon
+          DATA_POSTGRES_PASS: secret
           DATA_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
           DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
           DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
@@ -367,7 +375,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get the release version
         id: get-version

diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ ext/run-tests.php
 *.la
 *.log
 *.loT
+*.dep
 *.gch
 *.h.ghc
 *.phc

diff --git a/build/config/config.w32 b/build/config/config.w32
@@ -10,5 +10,4 @@ if (PHP_PHALCON != "no") {
   EXTENSION("phalcon", "phalcon.zep.c", null, "-I"+configure_module_dirname);
   ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL");
   ADD_FLAG("LDFLAGS", "/LTCG");
-  ADD_EXTENSION_DEP("phalcon", "psr");
 }
diff --git a/build/phalcon/config.w32 b/build/phalcon/config.w32
@@ -10,5 +10,4 @@ if (PHP_PHALCON != "no") {
   EXTENSION("phalcon", "phalcon.zep.c", null, "-I"+configure_module_dirname);
   ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL");
   ADD_FLAG("LDFLAGS", "/LTCG");
-  ADD_EXTENSION_DEP("phalcon", "psr");
 }