From 919dc4309a9d8386a1aadf3068071f4431a8a9d8 Mon Sep 17 00:00:00 2001
From: Rubens Panfili <rubens.panfili@gmail.com>
Date: Fri, 10 Jan 2025 12:37:42 +0100
Subject: [PATCH] fix: incorrectly merged composer.json

---
 src/composer.json |  5 ++++
 src/composer.lock | 68 +++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/src/composer.json b/src/composer.json
index 723d074372..6b16f91ba5 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -43,5 +43,10 @@
   },
   "require": {
     "deliciousbrains/wp-background-processing": "^1.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "cweagans/composer-patches": false
+    }
   }
 }
diff --git a/src/composer.lock b/src/composer.lock
index ffef87d678..dfe2706255 100644
--- a/src/composer.lock
+++ b/src/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e4128741cec5610310f9aaf6d9de934f",
+    "content-hash": "edee4ba68851a73a621d5bf67c4d7fb8",
     "packages": [
         {
             "name": "deliciousbrains/wp-background-processing",
@@ -298,6 +298,64 @@
             ],
             "time": "2020-10-18T11:50:25+00:00"
         },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.12.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
+            "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-01-05T16:40:22+00:00"
+        },
         {
             "name": "psr/container",
             "version": "1.0.0",
@@ -1154,10 +1212,10 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "platform": {},
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }