From 2dd88a645cd9e7673807d67d3272d0c842d0ca66 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Jul 2022 10:29:11 +0900
Subject: [PATCH] refactor: [BC] do not use ValidationInterface

---
 system/BaseModel.php             |  3 +--
 system/Model.php                 |  4 ++--
 system/Validation/Validation.php | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 2f7fa2bf23f9..ec4903b97451 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -20,7 +20,6 @@
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Pager\Pager;
 use CodeIgniter\Validation\Validation;
-use CodeIgniter\Validation\ValidationInterface;
 use Config\Services;
 use InvalidArgumentException;
 use ReflectionClass;
@@ -319,7 +318,7 @@ abstract class BaseModel
      */
     protected bool $allowEmptyInserts = false;
 
-    public function __construct(?ValidationInterface $validation = null)
+    public function __construct(?Validation $validation = null)
     {
         $this->tempReturnType     = $this->returnType;
         $this->tempUseSoftDeletes = $this->useSoftDeletes;
diff --git a/system/Model.php b/system/Model.php
index 59fbef240668..f41a48b99e65 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -22,7 +22,7 @@
 use CodeIgniter\Database\Query;
 use CodeIgniter\Exceptions\ModelException;
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Validation\ValidationInterface;
+use CodeIgniter\Validation\Validation;
 use Config\Database;
 use ReflectionClass;
 use ReflectionException;
@@ -128,7 +128,7 @@ class Model extends BaseModel
         'getCompiledUpdate',
     ];
 
-    public function __construct(?ConnectionInterface $db = null, ?ValidationInterface $validation = null)
+    public function __construct(?ConnectionInterface $db = null, ?Validation $validation = null)
     {
         /**
          * @var BaseConnection|null $db
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index eb91114ca218..9a206c834568 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -22,7 +22,7 @@
 /**
  * Validator
  */
-class Validation implements ValidationInterface
+class Validation
 {
     /**
      * Files to load with validation functions.
@@ -344,8 +344,10 @@ protected function processRules(string $field, ?string $label, $value, $rules =
     /**
      * Takes a Request object and grabs the input data to use from its
      * array values.
+     *
+     * @return $this
      */
-    public function withRequest(RequestInterface $request): ValidationInterface
+    public function withRequest(RequestInterface $request)
     {
         /** @var IncomingRequest $request */
         if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false) {
@@ -421,8 +423,10 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [
      *    ]
      *
      * @param array $errors // An array of custom error messages
+     *
+     * @return $this
      */
-    public function setRules(array $rules, array $errors = []): ValidationInterface
+    public function setRules(array $rules, array $errors = [])
     {
         $this->customErrors = $errors;
 
@@ -691,8 +695,10 @@ public function getErrors(): array
 
     /**
      * Sets the error for a specific field. Used by custom validation methods.
+     *
+     * @return $this
      */
-    public function setError(string $field, string $error): ValidationInterface
+    public function setError(string $field, string $error)
     {
         $this->errors[$field] = $error;
 
@@ -772,8 +778,10 @@ protected function splitRules(string $rules): array
     /**
      * Resets the class to a blank slate. Should be called whenever
      * you need to process more than one array.
+     *
+     * @return $this
      */
-    public function reset(): ValidationInterface
+    public function reset()
     {
         $this->data         = [];
         $this->rules        = [];