Test in appveyor with php 8.0.0rc1

Update config.w32 to allow building in php 8
igbinary · Oct 7, 2020 · 417285b · 417285b
1 parent 6a9eea5
commit 417285b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 33 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -33,6 +33,16 @@ cache:
 environment:
         BIN_SDK_VER: 2.2.0
         matrix:
+                - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+                  ARCH: x86
+                  VC: vs16
+                  PHP_VER: 8.0.0rc1
+                  TS: 1
+                - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+                  ARCH: x64
+                  VC: vs16
+                  PHP_VER: 8.0.0rc1
+                  TS: 0
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
                   ARCH: x64
                   VC: vc14
@@ -66,44 +76,33 @@ environment:
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x64
                   VC: vc15
-                  PHP_VER: 7.2.32
+                  PHP_VER: 7.2.34
                   TS: 1
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x86
                   VC: vc15
-                  PHP_VER: 7.2.32
+                  PHP_VER: 7.2.34
                   TS: 0
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x86
                   VC: vc15
-                  PHP_VER: 7.3.20
+                  PHP_VER: 7.3.23
                   TS: 0
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x64
                   VC: vc15
-                  PHP_VER: 7.3.20
+                  PHP_VER: 7.3.23
                   TS: 1
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x64
                   VC: vc15
-                  PHP_VER: 7.4.9
+                  PHP_VER: 7.4.11
                   TS: 1
                 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
                   ARCH: x86
                   VC: vc15
-                  PHP_VER: 7.4.9
+                  PHP_VER: 7.4.11
                   TS: 0
-                # https://windows.php.net/download/ has no release for 8.0. but this is what I'd assume the versions would be.
-                # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-                #   ARCH: x86
-                #   VC: vc16
-                #   PHP_VER: 8.0.0beta2
-                #   TS: 1
-                # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-                #   ARCH: x64
-                #   VC: vc16
-                #   PHP_VER: 8.0.0beta2
-                #   TS: 0
 
 build_script:
         ps: |
@@ -112,9 +111,12 @@ build_script:
                 if ('0' -eq $env:TS) { $ts_part = '-nts' }
                 $bname = 'php-devel-pack-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
                 if (-not (Test-Path c:\build-cache\$bname)) {
-                        Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
+                        Invoke-WebRequest "https://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
                         if (-not (Test-Path c:\build-cache\$bname)) {
-                                Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
+                                Invoke-WebRequest "https://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
+                                if (-not (Test-Path c:\build-cache\$bname)) {
+                                        Invoke-WebRequest "https://windows.php.net/downloads/qa/$bname" -OutFile "c:\build-cache\$bname"
+                                }
                         }
                 }
                 $dname0 = 'php-' + $env:PHP_VER + '-devel-' + $env:VC.toUpper() + '-' + $env:ARCH
@@ -129,9 +131,12 @@ build_script:
                 # Install the php binary
                 $bname = 'php-' + $env:PHP_VER + $ts_part + '-Win32-' + $env:VC.toUpper() + '-' + $env:ARCH + '.zip'
                 if (-not (Test-Path c:\build-cache\$bname)) {
-                        Invoke-WebRequest "http://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
+                        Invoke-WebRequest "https://windows.php.net/downloads/releases/archives/$bname" -OutFile "c:\build-cache\$bname"
                         if (-not (Test-Path c:\build-cache\$bname)) {
-                                Invoke-WebRequest "http://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
+                                Invoke-WebRequest "https://windows.php.net/downloads/releases/$bname" -OutFile "c:\build-cache\$bname"
+                                if (-not (Test-Path c:\build-cache\$bname)) {
+                                        Invoke-WebRequest "https://windows.php.net/downloads/qa/$bname" -OutFile "c:\build-cache\$bname"
+                                }
                         }
                 }
                 $dname = 'php-' + $env:PHP_VER + $ts_part + '-' + $env:VC.toUpper() + '-' + $env:ARCH

diff --git a/.editorconfig b/.editorconfig
@@ -9,3 +9,11 @@ indent_style = space
 [*.xml]
 indent_size = 1
 indent_style = space
+[*.yml]
+indent_size = 8
+indend_style = space
+[*.w32]
+charset = utf-8
+end_of_line = crlf
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.swp
 *.lo
 *.la
+*.tgz
 .deps
 .libs
 Makefile

diff --git a/config.w32 b/config.w32
@@ -5,7 +5,8 @@ ARG_ENABLE("igbinary", "whether to enable igbinary support", "no");
 if (PHP_IGBINARY == "yes") {
   var dll = get_define('PHPDLL');
   var is_php5 = null != dll.match(/^php5/);
-  var is_php7 = !is_php5 && null != dll.match(/^php7/)
+  // php 8.x also uses src/php7
+  var is_php7 = !is_php5 && null != dll.match(/^php[78]/)
 
   if (CHECK_HEADER_ADD_INCLUDE("apc_serializer.h", "CFLAGS_IGBINARY", "..\\pecl\\apcu;ext\\apcu")) {
     AC_DEFINE('HAVE_APCU_SUPPORT', 1, "Whether to enable apcu support");

diff --git a/src/php7/hash_si_ptr.c b/src/php7/hash_si_ptr.c
@@ -9,11 +9,7 @@
   +----------------------------------------------------------------------+
 */
 
-#ifdef PHP_WIN32
-# include "win32/php_stdint.h"
-#else
-# include <stdint.h>
-#endif
+#include <stdint.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/php7/ig_win32.h b/src/php7/ig_win32.h
@@ -2,10 +2,11 @@
 #define _IG_WIN32_H
 
 #if PHP_WIN32
-# include "win32/php_stdint.h"
 # if defined(_MSC_VER) && _MSC_VER >= 1800
 #  include <stdbool.h>
+#  include <stdint.h>
 # else
+#  include "win32/php_stdint.h"
 #  ifndef inline
 #  define inline __inline
 #  endif

diff --git a/src/php7/igbinary.h b/src/php7/igbinary.h
@@ -9,11 +9,7 @@
 
 #ifndef IGBINARY_H
 #define IGBINARY_H
-#ifdef PHP_WIN32
-# include "win32/php_stdint.h"
-#else
-# include <stdint.h>
-#endif
+#include <stdint.h>
 
 /* Forward declarations. */
 struct zval;