From 3d09a3bf894f0a8874a98ddce34f7763713d747b Mon Sep 17 00:00:00 2001
From: Deeka Wong <huangdijia@gmail.com>
Date: Tue, 20 Sep 2022 10:38:43 +0800
Subject: [PATCH] Move `MessageBag` and `MessageProvider` to `contract` from
 `utils` (#5092)

---
 src/MessageBag.php         | 87 ++++++++++++++++++++++++++++++++++++++
 src/MessageProvider.php    | 20 +++++++++
 src/ValidatorInterface.php |  3 --
 3 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 src/MessageBag.php
 create mode 100644 src/MessageProvider.php

diff --git a/src/MessageBag.php b/src/MessageBag.php
new file mode 100644
index 0000000..4da9cdc
--- /dev/null
+++ b/src/MessageBag.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Contract;
+
+interface MessageBag
+{
+    /**
+     * Get the keys present in the message bag.
+     */
+    public function keys(): array;
+
+    /**
+     * Add a message to the bag.
+     */
+    public function add(string $key, string $message): MessageBag;
+
+    /**
+     * Merge a new array of messages into the bag.
+     *
+     * @param array|MessageProvider $messages
+     * @return $this
+     */
+    public function merge($messages);
+
+    /**
+     * Determine if messages exist for a given key.
+     *
+     * @param array|string $key
+     */
+    public function has($key): bool;
+
+    /**
+     * Get the first message from the bag for a given key.
+     */
+    public function first(?string $key = null, ?string $format = null): string;
+
+    /**
+     * Get all of the messages from the bag for a given key.
+     */
+    public function get(string $key, ?string $format = null): array;
+
+    /**
+     * Get all of the messages for every key in the bag.
+     */
+    public function all(?string $format = null): array;
+
+    /**
+     * Get the raw messages in the container.
+     */
+    public function getMessages(): array;
+
+    /**
+     * Get the default message format.
+     */
+    public function getFormat(): string;
+
+    /**
+     * Set the default message format.
+     *
+     * @return $this
+     */
+    public function setFormat(string $format = ':message');
+
+    /**
+     * Determine if the message bag has any messages.
+     */
+    public function isEmpty(): bool;
+
+    /**
+     * Determine if the message bag has any messages.
+     */
+    public function isNotEmpty(): bool;
+
+    /**
+     * Get the number of messages in the container.
+     */
+    public function count(): int;
+}
diff --git a/src/MessageProvider.php b/src/MessageProvider.php
new file mode 100644
index 0000000..9242a96
--- /dev/null
+++ b/src/MessageProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Contract;
+
+interface MessageProvider
+{
+    /**
+     * Get the messages for the instance.
+     */
+    public function getMessageBag(): MessageBag;
+}
diff --git a/src/ValidatorInterface.php b/src/ValidatorInterface.php
index cecdd40..84ca731 100644
--- a/src/ValidatorInterface.php
+++ b/src/ValidatorInterface.php
@@ -11,9 +11,6 @@
  */
 namespace Hyperf\Contract;
 
-use Hyperf\Utils\Contracts\MessageBag;
-use Hyperf\Utils\Contracts\MessageProvider;
-
 interface ValidatorInterface extends MessageProvider
 {
     /**