fix: Compatibility tweaks

.github/workflows/release.yml

@@ -1,25 +1,39 @@
-name: Release
+name: CI
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
+      - 1.x
+
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.OBLAK_BOT_TOKEN }}
-      - name: Publish a composer package
-        uses: better-php-actions/publish-composer-package@v1
+          token: ${{ secrets.OBLAKBOT_PAT }}
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        id: gpg
         with:
-          package_slug: "woocommerce-utils"
-          package_name: "WooCommerce Utils"
-          with_gpg: true
-          gpg_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          release_token: ${{ secrets.OBLAK_BOT_TOKEN }}
+          gpg_private_key: ${{ secrets.OBLAKBOT_GPG_KEY }}
+          passphrase: ${{ secrets.OBLAKBOT_GPG_PASS }}
+          git_config_global: true
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+          git_push_gpgsign: false
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v4
+        with:
+          extra_plugins: |
+            @semantic-release/github
+            @semantic-release/exec
+        env:
+          GIT_AUTHOR_NAME: ${{ steps.gpg.outputs.name}}
+          GIT_AUTHOR_EMAIL: ${{ steps.gpg.outputs.email}}
+          GIT_COMMITTER_NAME: ${{ steps.gpg.outputs.name}}
+          GIT_COMMITTER_EMAIL: ${{ steps.gpg.outputs.email}}
+          GITHUB_TOKEN: ${{ secrets.OBLAKBOT_PAT }}

.releaserc

@@ -0,0 +1,28 @@
+{
+  "branches": [
+    "master",
+    "1.x"
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "zip -qr '/tmp/release.zip' ./src README.md composer.json"
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "/tmp/release.zip",
+            "name": "woocommerce-utils.${nextRelease.version}.zip",
+            "label": "WooCommerce Utils v${nextRelease.version}"
+          }
+        ]
+      }
+    ]
+  ]
+}

composer.json

@@ -11,7 +11,8 @@
   ],
   "require": {
     "php": ">= 8.0",
-    "oblak/wp-polyfills": "^1.1"
+    "x-wp/helper-functions": "^1.9",
+    "x-wp/helper-traits": "^1.9"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.31",

src/Product/Base_Product_Type_Extender.php

@@ -154,7 +154,6 @@ public function add_custom_product_options( $options ) {
         $options = \array_merge(
             $options,
             \wp_array_flatmap(
-                \array_values( $this->get_product_options() ),
                 static fn( $opt ) => array(
                     $opt['key'] => array(
                         'default'       => \wc_bool_to_string( $opt['default'] ?? false ),
@@ -167,10 +166,11 @@ public function add_custom_product_options( $options ) {
                         ),
                     ),
                 ),
+                \array_values( $this->get_product_options() ),
             ),
         );
 
-        return \wp_array_diff_assoc( $options, $this->options_to_remove );
+        return \xwp_array_diff_assoc( $options, ...$this->options_to_remove );
     }
 
     /**
@@ -183,7 +183,6 @@ public function add_product_type_data_tabs( $tabs ) {
         return \array_merge(
             $tabs,
             \wp_array_flatmap(
-                $this->get_product_tabs(),
                 static fn( $tab ) => array(
 					( $tab['key'] ?? $tab['id'] ) => array(
                         'class'    => \array_map( static fn( $t ) => "show_if_{$t}", $tab['for'] ),
@@ -192,6 +191,7 @@ public function add_product_type_data_tabs( $tabs ) {
                         'target'   => "{$tab['id']}_product_data",
 					),
                 ),
+                $this->get_product_tabs(),
             ),
         );
     }
@@ -221,16 +221,12 @@ public function add_product_type_data_panels() {
     public function set_custom_options_status( $product ) {
         foreach ( $this->get_product_options() as $slug => $option ) {
 
-            //phpcs:disable WordPress.Security.NonceVerification.Missing
-            $option_status = \wc_bool_to_string(
-                'on' === \wc_clean( \wp_unslash( $_POST[ "_{$slug}" ] ?? 'no' ) ),
-            );
-            //phpcs:enable
+            $status = \wc_bool_to_string( 'on' === \xwp_fetch_post_var( "_{$slug}", 'no' ) );
 
             if ( ( $option['is_prop'] ?? false ) || \is_callable( array( $product, "set_{$slug}" ) ) ) {
-                $product->{"set_{$slug}"}( $option_status );
+                $product->{"set_{$slug}"}( $status );
             } else {
-                $product->update_meta_data( "_{$slug}", $option_status );
+                $product->update_meta_data( "_{$slug}", $status );
             }
         }