Merge branch 'master' into dev

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,25 @@
+name: Psalm PHP Code Security Scan
+on:
+  push:
+    branches: [ master, main ]
+  pull_request:
+    branches: [ master, main ]
+jobs:
+  analyze:
+    runs-on: [ubuntu-latest]
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+       - name: Checkout code
+         uses: actions/checkout@v4
+       - name: Psalm
+         uses: docker://ghcr.io/psalm/psalm-github-actions
+         with:
+           security_analysis: true
+           report_file: results.sarif
+       - name: Upload Security Analysis results to GitHub
+         uses: github/codeql-action/upload-sarif@v3
+         with:
+           sarif_file: results.sarif

.gitignore

@@ -5,7 +5,6 @@
 .phpunit.result.cache
 .travis.yml
 bin/
-composer.json
 composer.lock
 phpunit.xml.dist
 tests/

composer.json

@@ -0,0 +1,9 @@
+{
+    "require": {
+        "wp-cli/wp-cli-bundle": "^2.9"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8",
+        "yoast/phpunit-polyfills": "^2.0"
+    }
+}

ecwid-shopping-cart.php

@@ -3074,4 +3074,4 @@ function ecwid_get_shortcode_regex() {
     // phpcs:enable
 }
 
-?>
+?>