Merge pull request #125 from scoutapp/add-php-8-2-support

Add PHP 8.2 support
scoutapp · Dec 9, 2022 · e83b3c4 · e83b3c4
2 parents 6cc69c7 + 5803d25
commit e83b3c4
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 55 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -39,10 +39,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-2019, windows-2022 ]
-        php: [ "8.1", "8.0", "7.4", "7.3", "7.2", "7.1" ]
+        php: [ "8.2", "8.1", "8.0", "7.4", "7.3", "7.2", "7.1" ]
         arch: [ x64, x86 ]
         ts: [ ts, nts ]
         exclude:
+          - { os: windows-2019, php: "8.2" }
           - { os: windows-2019, php: "8.1" }
           - { os: windows-2019, php: "8.0" }
           - { os: windows-2019, php: "7.4" }
@@ -54,7 +55,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup PHP SDK
         id: setup-php
-        uses: cmb69/setup-php-sdk@v0.5
+        uses: cmb69/setup-php-sdk@master
         with:
           version: ${{matrix.php}}
           arch: ${{matrix.arch}}
@@ -127,7 +128,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
+          - ubuntu-22.04
         php-version:
           - 7.1.9
           - 7.1.33
@@ -136,17 +138,29 @@ jobs:
           - 7.3.0
           - 7.3.33
           - 7.4.0
-          - 7.4.27
+          - 7.4.33
           - 8.0.0
-          - 8.0.14
+          - 8.0.26
           - 8.1.0
-          - 8.1.1
+          - 8.1.13
+          - 8.2.0
         zts-mode:
           - zts
           - nts
         php-options:
           - "--with-curl"
           - ""
+        exclude:
+          - { os: ubuntu-22.04, php-version: 7.1.9 }
+          - { os: ubuntu-22.04, php-version: 7.1.33 }
+          - { os: ubuntu-22.04, php-version: 7.2.0 }
+          - { os: ubuntu-22.04, php-version: 7.2.34 }
+          - { os: ubuntu-22.04, php-version: 7.3.0 }
+          - { os: ubuntu-22.04, php-version: 7.3.33 }
+          - { os: ubuntu-22.04, php-version: 7.4.0 }
+          - { os: ubuntu-22.04, php-version: 7.4.33 }
+          - { os: ubuntu-22.04, php-version: 8.0.0 }
+          - { os: ubuntu-22.04, php-version: 8.0.26 }
     steps:
       - uses: actions/checkout@v3
 
@@ -160,17 +174,19 @@ jobs:
         if: ${{ matrix.zts-mode == 'nts' }}
         run: echo "zts_flag=" >> $GITHUB_ENV
 
+      - name: "Set php-src download URL"
+        run: echo "php_src_download_url=https://www.php.net/distributions/php-${{ matrix.php-version }}.tar.gz" >> $GITHUB_ENV
+
       - name: "Install PHP ${{ matrix.php-version }} (${{ env.zts_flag}} ${{ matrix.php-options }})"
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common build-essential autoconf libxml2-dev libsqlite3-dev libcurl4-openssl-dev
           cd /tmp
-          FINAL_DOWNLOAD_URL="https://www.php.net/distributions/php-${{ matrix.php-version }}.tar.gz"
-          echo "Downloading release from $FINAL_DOWNLOAD_URL ..."
-          wget $FINAL_DOWNLOAD_URL
+          echo "Downloading release from ${{ env.php_src_download_url }} ..."
+          wget ${{ env.php_src_download_url }}
           tar zxf php-${{ matrix.php-version }}.tar.gz
           cd php-${{ matrix.php-version }}
-          ./configure --enable-debug --with-openssl ${{ env.zts_flag}} ${{ matrix.php-options }}
+          ./configure --enable-debug --with-openssl ${{ env.zts_flag }} ${{ matrix.php-options }}
           make -j$(nproc)
           sudo make install
           cd $GITHUB_WORKSPACE
@@ -207,7 +223,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
     steps:
       - uses: actions/checkout@v3
       - name: Setup PHP with PECL extension

diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,7 @@ shtool
 /config.nice.bat
 /configure.bat
 /configure.js
+/configure~
 
 # phpize
 /run-tests.php

diff --git a/config.m4 b/config.m4
@@ -40,43 +40,7 @@ if test "$PHP_SCOUTAPM" != "no"; then
   fi
 
   if test "$PHP_SCOUTAPM_DEV" = "yes"; then
-    AX_CHECK_COMPILE_FLAG(-Wbool-conversion,                _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion")
-    AX_CHECK_COMPILE_FLAG(-Wdeclaration-after-statement,    _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdeclaration-after-statement")
-    AX_CHECK_COMPILE_FLAG(-Wdiscarded-qualifiers,           _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdiscarded-qualifiers")
-    AX_CHECK_COMPILE_FLAG(-Wduplicate-enum,                 _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wduplicate-enum")
-    AX_CHECK_COMPILE_FLAG(-Wempty-body,                     _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wempty-body")
-    AX_CHECK_COMPILE_FLAG(-Wenum-compare,                   _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wenum-compare")
-    AX_CHECK_COMPILE_FLAG(-Werror,                          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
-    AX_CHECK_COMPILE_FLAG(-Wextra,                          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wextra")
-    AX_CHECK_COMPILE_FLAG(-Wformat-nonliteral,              _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-nonliteral")
-    AX_CHECK_COMPILE_FLAG(-Wformat-security,                _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-security")
-    AX_CHECK_COMPILE_FLAG(-Wheader-guard,                   _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wheader-guard")
-    AX_CHECK_COMPILE_FLAG(-Wincompatible-pointer-types-discards-qualifiers, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wincompatible-pointer-types-discards-qualifiers")
-    AX_CHECK_COMPILE_FLAG(-Wimplicit-fallthrough,           _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wimplicit-fallthrough")
-    AX_CHECK_COMPILE_FLAG(-Winit-self,                      _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Winit-self")
-    AX_CHECK_COMPILE_FLAG(-Wlogical-not-parentheses,        _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-not-parentheses")
-    AX_CHECK_COMPILE_FLAG(-Wlogical-op,                     _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op")
-    AX_CHECK_COMPILE_FLAG(-Wlogical-op-parentheses,         _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op-parentheses")
-    AX_CHECK_COMPILE_FLAG(-Wloop-analysis,                  _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wloop-analysis")
-    AX_CHECK_COMPILE_FLAG(-Wmaybe-uninitialized,            _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wmaybe-uninitialized")
-    AX_CHECK_COMPILE_FLAG(-Wmissing-format-attribute,       _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wmissing-format-attribute")
-    AX_CHECK_COMPILE_FLAG(-Wno-missing-field-initializers,  _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-missing-field-initializers")
-    AX_CHECK_COMPILE_FLAG(-Wno-sign-compare,                _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-sign-compare")
-    AX_CHECK_COMPILE_FLAG(-Wno-unused-but-set-variable,     _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-unused-but-set-variable")
-    AX_CHECK_COMPILE_FLAG(-Wno-unused-parameter,            _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-unused-parameter")
-    AX_CHECK_COMPILE_FLAG(-Wno-variadic-macros,             _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-variadic-macros")
-    AX_CHECK_COMPILE_FLAG(-Wparentheses,                    _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wparentheses")
-    AX_CHECK_COMPILE_FLAG(-Wpointer-bool-conversion,        _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wpointer-bool-conversion")
-    AX_CHECK_COMPILE_FLAG(-Wsizeof-array-argument,          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wsizeof-array-argument")
-    AX_CHECK_COMPILE_FLAG(-Wstring-conversion,              _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wstring-conversion")
-    AX_CHECK_COMPILE_FLAG(-Wwrite-strings,                  _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wwrite-strings")
-    AX_CHECK_COMPILE_FLAG(-fdiagnostics-show-option,        _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fdiagnostics-show-option")
-    AX_CHECK_COMPILE_FLAG(-fno-exceptions,                  _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-exceptions")
-    AX_CHECK_COMPILE_FLAG(-fno-omit-frame-pointer,          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-omit-frame-pointer")
-    AX_CHECK_COMPILE_FLAG(-fno-optimize-sibling-calls,      _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-optimize-sibling-calls")
-    AX_CHECK_COMPILE_FLAG(-fsanitize-address,               _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fsanitize-address")
-    AX_CHECK_COMPILE_FLAG(-fstack-protector,                _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fstack-protector")
-    MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS"
+    MAINTAINER_CFLAGS="-std=gnu99"
     STD_CFLAGS="-g -O0 -Wall"
   fi
 

diff --git a/package.xml b/package.xml
@@ -25,19 +25,19 @@
     </lead>
 
     <!-- Current Release -->
-    <date>2022-10-18</date>
-    <time>07:30:00</time>
+    <date>2022-12-09</date>
+    <time>11:00:00</time>
     <version>
-        <release>1.8.3</release>
-        <api>1.8.3</api>
+        <release>1.9.0</release>
+        <api>1.9.0</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="https://opensource.org/licenses/MIT">MIT</license>
     <notes>
-        - Improved MINFO output for curl availability (#126)
+        - Add PHP 8.2 support (#125)
     </notes>
     <!-- End Current Release -->
 
@@ -104,7 +104,7 @@
         <required>
             <php>
                 <min>7.1.0</min>
-                <max>8.1.99</max>
+                <max>8.2.99</max>
             </php>
             <pearinstaller>
                 <min>1.9.1</min>
@@ -115,6 +115,22 @@
     <zendextsrcrelease />
 
     <changelog>
+        <release>
+            <date>2022-10-18</date>
+            <time>07:30:00</time>
+            <version>
+                <release>1.8.3</release>
+                <api>1.8.3</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="https://opensource.org/licenses/MIT">MIT</license>
+            <notes>
+                - Improved MINFO output for curl availability (#126)
+            </notes>
+        </release>
         <release>
             <date>2022-08-26</date>
             <time>10:30:00</time>

diff --git a/zend_scoutapm.h b/zend_scoutapm.h
@@ -23,7 +23,7 @@
 #include "scout_execute_ex.h"
 
 #define PHP_SCOUTAPM_NAME "scoutapm"
-#define PHP_SCOUTAPM_VERSION "1.8.3"
+#define PHP_SCOUTAPM_VERSION "1.9.0"
 
 /* Extreme amounts of debugging, set to 1 to enable it and `make clean && make` (tests will fail...) */
 #define SCOUT_APM_EXT_DEBUGGING 0