prepare v2.2.0

Author: m6w6

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   old-matrix-0:
-    name: old-matrix-0
+    name: php-7.0-debug-zts
     env:
       PHP: "7.0"
       enable_debug: "yes"
@@ -36,7 +36,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-1:
-    name: old-matrix-1
+    name: php-7.1-debug-zts
     env:
       PHP: "7.1"
       enable_debug: "yes"
@@ -64,7 +64,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-2:
-    name: old-matrix-2
+    name: php-7.2-debug-zts
     env:
       PHP: "7.2"
       enable_debug: "yes"
@@ -92,7 +92,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-3:
-    name: old-matrix-3
+    name: php-7.3-debug-zts
     env:
       PHP: "7.3"
       enable_debug: "yes"
@@ -120,7 +120,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-4:
-    name: old-matrix-4
+    name: php-7.4-debug-zts
     env:
       PHP: "7.4"
       enable_debug: "yes"
@@ -148,7 +148,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   master-0:
-    name: master-0
+    name: php-master-debug-nozts
     continue-on-error: true
     env:
       PHP: "master"
@@ -176,10 +176,66 @@ jobs:
         run: |
           make -f scripts/ci/Makefile test
 
-  cur-none-0:
-    name: cur-none-0
+  cur-matrix-0:
+    name: php-8.0-debug-zts
     env:
       PHP: "8.0"
+      enable_debug: "yes"
+      enable_zts: "yes"
+      enable_session: "yes"
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Install
+        run: |
+          sudo apt-get install -y \
+            php-cli \
+            php-pear \
+            re2c
+      - name: Prepare
+        run: |
+          make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
+      - name: Build
+        run: |
+          make -f scripts/ci/Makefile ext PECL=msgpack
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
+  cur-matrix-1:
+    name: php-8.1-debug-zts
+    env:
+      PHP: "8.1"
+      enable_debug: "yes"
+      enable_zts: "yes"
+      enable_session: "yes"
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Install
+        run: |
+          sudo apt-get install -y \
+            php-cli \
+            php-pear \
+            re2c
+      - name: Prepare
+        run: |
+          make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
+      - name: Build
+        run: |
+          make -f scripts/ci/Makefile ext PECL=msgpack
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
+  cur-none-0:
+    name: php-8.2-nodebug-nozts
+    env:
+      PHP: "8.2"
       enable_session: "no"
     runs-on: ubuntu-20.04
     steps:
@@ -203,9 +259,9 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-0:
-    name: cur-dbg-zts-0
+    name: php-8.2-debug-zts
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_zts: "yes"
       enable_session: "yes"
@@ -231,9 +287,9 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-1:
-    name: cur-dbg-zts-1
+    name: php-8.2-debug-zts
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "no"
       enable_zts: "yes"
       enable_session: "yes"
@@ -259,9 +315,9 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-2:
-    name: cur-dbg-zts-2
+    name: php-8.2-debug-zts
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_zts: "no"
       enable_session: "yes"
@@ -287,9 +343,9 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-3:
-    name: cur-dbg-zts-3
+    name: php-8.2-debug-zts
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "no"
       enable_zts: "no"
       enable_session: "yes"
@@ -315,11 +371,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-cov-0:
-    name: cur-cov-0
+    name: php-8.2-nodebug-nozts
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "8.0"
+      PHP: "8.2"
       enable_session: "yes"
     runs-on: ubuntu-20.04
     steps:

README.md

@@ -1,7 +1,7 @@
 # Msgpack for PHP
 [![Build Status](https://github.com/msgpack/msgpack-php/workflows/ci/badge.svg?branch=master)](https://github.com/msgpack/msgpack-php/actions?query=workflow%3Aci+branch%3Amaster)
 
-This extension provides an API for communicating with MessagePack serialization. 
+This extension provides an API for communicating with MessagePack serialization.
 
 MessagePack is a binary-based efficient object serialization library.
 It enables to exchange structured objects between many languages just like JSON.
@@ -13,7 +13,7 @@ But unlike JSON, it is very fast and small.
 ## Install
 
 ### Install from PECL
-Msgpack is an PECL extension, thus you can simply install it by:
+Msgpack is a PECL extension, thus you can simply install it by:
 
 ```shell
 pecl install msgpack
@@ -72,9 +72,9 @@ $buffer .= $packed2;
 while(true) {
    if($unpacker->execute($buffer, $nread)) {
        $msg = $unpacker->data();
-       
+
        var_dump($msg);
-       
+
        $unpacker->reset();
        $buffer = substr($buffer, $nread);
        $nread = 0;

package.xml

@@ -22,20 +22,23 @@
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2022-10-07</date>
+ <date>2023-06-02</date>
  <version>
-  <release>2.2.0RC2</release>
+  <release>2.2.0</release>
   <api>2.2.0</api>
  </version>
  <stability>
-  <release>beta</release>
+  <release>stable</release>
   <api>stable</api>
  </stability>
  <license filesource="LICENSE">3-Clause-BSD</license>
  <notes><![CDATA[
-* Fixed PHP-8.2 compatibility (see gh issue #165)
-* Fixed PHP-8.1 compatibility (see gh issues #161, #157, and #156)
-* Added support for ZEND_ACC_NOT_SERIALIZABLE and magic __{,un}serialize
+No changes from RC2.
+* RC2:
+  * Fix PHP-8.2 compatibility (see gh issue #165)
+* RC1:
+  * Fix PHP-8.1 compatibility (see gh issues #161, #157, and #156)
+  * Add support for ZEND_ACC_NOT_SERIALIZABLE and magic __{,un}serialize
  ]]></notes>
  <contents>
   <dir name="/">

php_msgpack.h

@@ -3,7 +3,7 @@
 
 #include "Zend/zend_smart_str.h" /* for smart_string */
 
-#define PHP_MSGPACK_VERSION "2.2.0RC2"
+#define PHP_MSGPACK_VERSION "2.2.0"
 
 extern zend_module_entry msgpack_module_entry;
 #define phpext_msgpack_ptr &msgpack_module_entry

scripts/gen_github_workflow_ci.php

@@ -9,9 +9,22 @@
 
 jobs:
 <?php
-
+function yesno(array $env, string $key) : string {
+    if (version_compare($env["PHP"], "8.0", "<") && $key === "zts") {
+        $check = "maintainer_zts";
+    } else {
+        $check = $key;
+    }
+    if ($env["enable_$check"] ?? null === "yes") {
+        return $key;
+    }
+    return "no$key";
+}
+function jobname(string $id, array $env) : string {
+    return sprintf("php-%s-%s-%s", $env["PHP"], yesno($env, "debug"), yesno($env, "zts"));
+}
 $gen = include __DIR__ . "/ci/gen-matrix.php";
-$cur = "8.0";
+$cur = "8.2";
 $job = $gen->github([
 "old-matrix" => [
 // most useful for all additional versions except current
@@ -27,6 +40,13 @@
     "enable_zts" => "yes",
     "enable_session" => "yes",
 ], 
+"cur-matrix" => [
+// most useful for all additional versions except current
+	"PHP" => ["8.0", "8.1"],
+	"enable_debug" => "yes",
+	"enable_zts" => "yes",
+	"enable_session" => "yes",
+],
 "cur-none" => [
 // everything disabled for current
     "PHP" => $cur,
@@ -48,7 +68,7 @@
 ]]);
 foreach ($job as $id => $env) {
     printf("  %s:\n", $id);
-    printf("    name: %s\n", $id);
+    printf("    name: %s\n", jobname($id, $env));
     if ($env["PHP"] == "master") {
         printf("    continue-on-error: true\n");
     }