Merge pull request #135 from scoutapp/add-php-8-3-support

Add PHP 8.3 support
scoutapp · Dec 1, 2023 · 4c729a2 · 4c729a2
2 parents 74f8676 + d923628
commit 4c729a2
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 18 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.2", "8.1", "8.0", "7.4", "7.3", "7.2", "7.1" ]
+        php: [ "8.3", "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.3" }
           - { os: windows-2019, php: "8.2" }
           - { os: windows-2019, php: "8.1" }
           - { os: windows-2019, php: "8.0" }
@@ -55,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup PHP SDK
         id: setup-php
-        uses: cmb69/setup-php-sdk@master
+        uses: php/setup-php-sdk@v0.8
         with:
           version: ${{matrix.php}}
           arch: ${{matrix.arch}}
@@ -140,10 +141,12 @@ jobs:
           - 7.4.0
           - 7.4.33
           - 8.0.0
-          - 8.0.26
+          - 8.0.30
           - 8.1.0
-          - 8.1.13
+          - 8.1.24
           - 8.2.0
+          - 8.2.11
+          - 8.3.0
         zts-mode:
           - zts
           - nts
@@ -160,7 +163,7 @@ jobs:
           - { 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 }
+          - { os: ubuntu-22.04, php-version: 8.0.30 }
     steps:
       - name: "Purge built-in PHP version"
         run: |
@@ -185,12 +188,17 @@ jobs:
       - 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
+          sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common build-essential autoconf libxml2-dev libsqlite3-dev libcurl4-openssl-dev re2c
+          mkdir -p /tmp/php
+          cd /tmp/php
           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 }}
+          wget -O php.tgz ${{ env.php_src_download_url }}
+          tar zxf php.tgz
+          rm php.tgz
+          ls -l
+          cd *
+          ls -l
+          ./buildconf --force
           ./configure --with-pear --enable-debug --with-openssl ${{ env.zts_flag }} ${{ matrix.php-options }}
           make -j$(nproc)
           sudo make install
@@ -233,7 +241,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
     steps:
       - uses: actions/checkout@v3
       - name: Setup PHP with PECL extension

diff --git a/package.xml b/package.xml
@@ -25,19 +25,21 @@
     </lead>
 
     <!-- Current Release -->
-    <date>2022-12-14</date>
-    <time>09:50:00</time>
+    <date>2023-12-01</date>
+    <time>19:55:00</time>
     <version>
-        <release>1.9.1</release>
-        <api>1.9.1</api>
+        <release>1.10.0</release>
+        <api>1.10.0</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="https://opensource.org/licenses/MIT">MIT</license>
     <notes>
-        - Fix missing PHP 8.2 assets for Windows (#130)
+        - Add support for PHP 8.3 (#135)
+        - Fix CI build matrix (#137)
+        - Add help for installing the ext in a Dockerfile (#136)
     </notes>
     <!-- End Current Release -->
 
@@ -104,7 +106,7 @@
         <required>
             <php>
                 <min>7.1.0</min>
-                <max>8.2.99</max>
+                <max>8.3.99</max>
             </php>
             <pearinstaller>
                 <min>1.9.1</min>
@@ -115,6 +117,22 @@
     <zendextsrcrelease />
 
     <changelog>
+        <release>
+            <date>2022-12-14</date>
+            <time>09:50:00</time>
+            <version>
+                <release>1.9.1</release>
+                <api>1.9.1</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="https://opensource.org/licenses/MIT">MIT</license>
+            <notes>
+                - Fix missing PHP 8.2 assets for Windows (#130)
+            </notes>
+        </release>
         <release>
             <date>2022-12-09</date>
             <time>11:00: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.9.1"
+#define PHP_SCOUTAPM_VERSION "1.10.0"
 
 /* Extreme amounts of debugging, set to 1 to enable it and `make clean && make` (tests will fail...) */
 #define SCOUT_APM_EXT_DEBUGGING 0