From 45a424eaf91b3d6af48db9ded0ffdf10f6cae2a2 Mon Sep 17 00:00:00 2001
From: barryhughes <3594411+barryhughes@users.noreply.github.com>
Date: Fri, 17 Sep 2021 09:31:37 -0700
Subject: [PATCH] Resolve conflicts (WooCommerce Blocks bump to 5.9.0).

---
 bin/composer/mozart/composer.lock |  9 +++++++++
 bin/composer/phpcs/composer.lock  | 12 ++++++++++++
 composer.json                     |  2 +-
 composer.lock                     | 17 +++++++++--------
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/bin/composer/mozart/composer.lock b/bin/composer/mozart/composer.lock
index 721d86b7aec..c6a2e502ca4 100644
--- a/bin/composer/mozart/composer.lock
+++ b/bin/composer/mozart/composer.lock
@@ -618,6 +618,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -779,6 +782,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -938,6 +944,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
diff --git a/bin/composer/phpcs/composer.lock b/bin/composer/phpcs/composer.lock
index 13aa03f0d46..5d674b4890b 100644
--- a/bin/composer/phpcs/composer.lock
+++ b/bin/composer/phpcs/composer.lock
@@ -71,6 +71,10 @@
                 "stylecheck",
                 "tests"
             ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
             "time": "2020-12-07T18:04:37+00:00"
         },
         {
@@ -239,6 +243,10 @@
                 "standards",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
+            },
             "time": "2021-07-21T11:09:57+00:00"
         },
         {
@@ -335,6 +343,10 @@
                 "woocommerce",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/woocommerce/woocommerce-sniffs/issues",
+                "source": "https://github.com/woocommerce/woocommerce-sniffs/tree/0.1.1"
+            },
             "time": "2021-07-29T17:25:16+00:00"
         },
         {
diff --git a/composer.json b/composer.json
index 3737cd6d67b..fd79b4bcb0f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "psr/container": "1.0.0",
     "woocommerce/action-scheduler": "3.3.0",
     "woocommerce/woocommerce-admin": "2.6.2",
-    "woocommerce/woocommerce-blocks": "5.7.1"
+    "woocommerce/woocommerce-blocks": "5.9.0"
   },
   "require-dev": {
     "bamarni/composer-bin-plugin": "^1.4",
diff --git a/composer.lock b/composer.lock
index 9fd0f1e50df..f9aff714808 100644
--- a/composer.lock
+++ b/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": "5eac31e7455cc69f5e7eaa1869d473c6",
+    "content-hash": "f4e4f1b246c0f4581566253aadf74143",
     "packages": [
         {
             "name": "automattic/jetpack-autoloader",
@@ -595,16 +595,16 @@
         },
         {
             "name": "woocommerce/woocommerce-blocks",
-            "version": "v5.7.1",
+            "version": "v5.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/woocommerce/woocommerce-gutenberg-products-block.git",
-                "reference": "7dfe482d9b36f05f3d0ee78d74a26b49f3ebe6f1"
+                "reference": "d4f0040e6c41a2e02ce4dff1cd9fc8efe3113af1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/7dfe482d9b36f05f3d0ee78d74a26b49f3ebe6f1",
-                "reference": "7dfe482d9b36f05f3d0ee78d74a26b49f3ebe6f1",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/d4f0040e6c41a2e02ce4dff1cd9fc8efe3113af1",
+                "reference": "d4f0040e6c41a2e02ce4dff1cd9fc8efe3113af1",
                 "shasum": ""
             },
             "require": {
@@ -612,8 +612,9 @@
                 "composer/installers": "^1.7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "7.5.20",
-                "woocommerce/woocommerce-sniffs": "0.1.0"
+                "woocommerce/woocommerce-sniffs": "0.1.0",
+                "wp-phpunit/wp-phpunit": "^5.4",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "type": "wordpress-plugin",
             "extra": {
@@ -638,7 +639,7 @@
                 "gutenberg",
                 "woocommerce"
             ],
-            "time": "2021-08-30T08:15:59+00:00"
+            "time": "2021-09-14T13:42:34+00:00"
         }
     ],
     "packages-dev": [