refactor(input): create typed input objects through factory

- Add InputDataFactory as the shared creation service
- Remove data-bearing inputdata and validatedinput services
- Create ValidatedInput through the factory from Validation and FormRequest
- Keep the Input-to-Validation architecture edge narrowly scoped
- Update tests and changelog for the factory-based design

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

deptrac.yaml

@@ -275,6 +275,8 @@ deptrac:
       - CodeIgniter\HTTP\URI
     CodeIgniter\HTTP\FormRequest:
       - CodeIgniter\Validation\ValidatedInput
+    CodeIgniter\Input\InputDataFactory:
+      - CodeIgniter\Validation\ValidatedInput
     CodeIgniter\Log\Handlers\ChromeLoggerHandler:
       - CodeIgniter\HTTP\ResponseInterface
     CodeIgniter\Security\CheckPhpIni:

system/Config/BaseService.php

@@ -46,7 +46,7 @@
 use CodeIgniter\HTTP\SiteURIFactory;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Images\Handlers\BaseHandler;
-use CodeIgniter\Input\InputData;
+use CodeIgniter\Input\InputDataFactory;
 use CodeIgniter\Language\Language;
 use CodeIgniter\Lock\LockManager;
 use CodeIgniter\Log\Logger;
@@ -59,7 +59,6 @@
 use CodeIgniter\Superglobals;
 use CodeIgniter\Throttle\Throttler;
 use CodeIgniter\Typography\Typography;
-use CodeIgniter\Validation\ValidatedInput;
 use CodeIgniter\Validation\ValidationInterface;
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Parser;
@@ -122,7 +121,7 @@
  * @method static Honeypot                   honeypot(ConfigHoneyPot $config = null, $getShared = true)
  * @method static BaseHandler                image($handler = null, Images $config = null, $getShared = true)
  * @method static IncomingRequest            incomingrequest(?App $config = null, bool $getShared = true)
- * @method static InputData                  inputdata(array<string, mixed> $data = [], bool $getShared = false)
+ * @method static InputDataFactory           inputdatafactory(bool $getShared = true)
  * @method static Iterator                   iterator($getShared = true)
  * @method static Language                   language($locale = null, $getShared = true)
  * @method static LockManager                locks(?CacheInterface $cache = null, bool $getShared = true)
@@ -147,7 +146,6 @@
  * @method static Toolbar                    toolbar(ConfigToolbar $config = null, $getShared = true)
  * @method static Typography                 typography($getShared = true)
  * @method static URI                        uri($uri = null, $getShared = true)
- * @method static ValidatedInput             validatedinput(array<string, mixed> $data = [], bool $getShared = false)
  * @method static ValidationInterface        validation(ConfigValidation $config = null, $getShared = true)
  * @method static Cell                       viewcell($getShared = true)
  */

system/Config/Services.php

@@ -46,7 +46,7 @@
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Images\Handlers\BaseHandler;
-use CodeIgniter\Input\InputData;
+use CodeIgniter\Input\InputDataFactory;
 use CodeIgniter\Language\Language;
 use CodeIgniter\Lock\LockManager;
 use CodeIgniter\Log\Logger;
@@ -63,7 +63,6 @@
 use CodeIgniter\Superglobals;
 use CodeIgniter\Throttle\Throttler;
 use CodeIgniter\Typography\Typography;
-use CodeIgniter\Validation\ValidatedInput;
 use CodeIgniter\Validation\Validation;
 use CodeIgniter\Validation\ValidationInterface;
 use CodeIgniter\View\Cell;
@@ -390,17 +389,15 @@ public static function image(?string $handler = null, ?Images $config = null, bo
     }
 
     /**
-     * Returns a typed input data object.
-     *
-     * @param array<string, mixed> $data
+     * Returns the typed input data factory.
      */
-    public static function inputdata(array $data = [], bool $getShared = false): InputData
+    public static function inputdatafactory(bool $getShared = true): InputDataFactory
     {
         if ($getShared) {
-            return static::getSharedInstance('inputdata', $data);
+            return static::getSharedInstance('inputdatafactory');
         }
 
-        return new InputData($data);
+        return new InputDataFactory();
     }
 
     /**
@@ -889,20 +886,6 @@ public static function validation(?ValidationConfig $config = null, bool $getSha
         return new Validation($config, AppServices::get('renderer'));
     }
 
-    /**
-     * Returns a typed validated input object.
-     *
-     * @param array<string, mixed> $data
-     */
-    public static function validatedinput(array $data = [], bool $getShared = false): ValidatedInput
-    {
-        if ($getShared) {
-            return static::getSharedInstance('validatedinput', $data);
-        }
-
-        return new ValidatedInput($data);
-    }
-
     /**
      * View cells are intended to let you insert HTML into view
      * that has been generated by any callable in the system.

system/HTTP/FormRequest.php

@@ -188,7 +188,7 @@ public function validated(): array
      */
     public function validatedInput(): ValidatedInput
     {
-        return service('validatedinput', $this->validatedData, false);
+        return service('inputdatafactory')->createValidated($this->validatedData);
     }
 
     /**

system/Input/InputDataFactory.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Input;
+
+use CodeIgniter\Validation\ValidatedInput;
+
+/**
+ * @see \CodeIgniter\Input\InputDataFactoryTest
+ */
+class InputDataFactory
+{
+    /**
+     * @param array<string, mixed> $data
+     */
+    public function create(array $data): InputData
+    {
+        return new InputData($data);
+    }
+
+    /**
+     * @param array<string, mixed> $data
+     */
+    public function createValidated(array $data): ValidatedInput
+    {
+        return new ValidatedInput($data);
+    }
+}

system/Validation/Validation.php

@@ -276,7 +276,7 @@ public function getValidated(): array
      */
     public function getValidatedInput(): ValidatedInput
     {
-        return service('validatedinput', $this->validated, false);
+        return service('inputdatafactory')->createValidated($this->validated);
     }
 
     /**

tests/system/Config/ServicesTest.php

@@ -31,7 +31,7 @@
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Images\ImageHandlerInterface;
-use CodeIgniter\Input\InputData;
+use CodeIgniter\Input\InputDataFactory;
 use CodeIgniter\Language\Language;
 use CodeIgniter\Lock\LockManager;
 use CodeIgniter\Pager\Pager;
@@ -45,7 +45,6 @@
 use CodeIgniter\Test\Mock\MockSecurity;
 use CodeIgniter\Throttle\Throttler;
 use CodeIgniter\Typography\Typography;
-use CodeIgniter\Validation\ValidatedInput;
 use CodeIgniter\Validation\Validation;
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Parser;
@@ -277,22 +276,13 @@ public function testNewValidation(): void
         $this->assertInstanceOf(Validation::class, $actual);
     }
 
-    public function testNewInputData(): void
+    public function testNewInputDataFactory(): void
     {
-        $actual = Services::inputdata(['page' => '2']);
+        $actual = Services::inputdatafactory();
 
-        $this->assertInstanceOf(InputData::class, $actual);
-        $this->assertSame(2, $actual->integer('page'));
-        $this->assertNotSame($actual, Services::inputdata(['page' => '2']));
-    }
-
-    public function testNewValidatedInput(): void
-    {
-        $actual = Services::validatedinput(['page' => '2']);
-
-        $this->assertInstanceOf(ValidatedInput::class, $actual);
-        $this->assertSame(2, $actual->integer('page'));
-        $this->assertNotSame($actual, Services::validatedinput(['page' => '2']));
+        $this->assertInstanceOf(InputDataFactory::class, $actual);
+        $this->assertSame($actual, Services::inputdatafactory());
+        $this->assertNotSame($actual, Services::inputdatafactory(false));
     }
 
     public function testNewViewcellFromShared(): void

tests/system/Input/InputDataFactoryTest.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Input;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\ValidatedInput;
+use PHPUnit\Framework\Attributes\Group;
+
+/**
+ * @internal
+ */
+#[Group('Others')]
+final class InputDataFactoryTest extends CIUnitTestCase
+{
+    public function testCreateReturnsInputData(): void
+    {
+        $factory = new InputDataFactory();
+        $input   = $factory->create(['page' => '2']);
+
+        $this->assertInstanceOf(InputData::class, $input);
+        $this->assertSame(2, $input->integer('page'));
+    }
+
+    public function testCreateReturnsNewInputDataInstances(): void
+    {
+        $factory = new InputDataFactory();
+
+        $this->assertNotSame($factory->create([]), $factory->create([]));
+    }
+
+    public function testCreateValidatedReturnsValidatedInput(): void
+    {
+        $factory = new InputDataFactory();
+        $input   = $factory->createValidated(['page' => '2']);
+
+        $this->assertInstanceOf(ValidatedInput::class, $input);
+        $this->assertSame(2, $input->integer('page'));
+    }
+
+    public function testCreateValidatedReturnsNewValidatedInputInstances(): void
+    {
+        $factory = new InputDataFactory();
+
+        $this->assertNotSame($factory->createValidated([]), $factory->createValidated([]));
+    }
+}

user_guide_src/source/changelogs/v4.8.0.rst

@@ -276,7 +276,7 @@ Others
 ======
 
 - **Float and Double Casting:** Added support for precision and rounding mode when casting to float or double in entities.
-- Added ``CodeIgniter\Input\InputData`` as a reusable typed input data object.
+- Added ``CodeIgniter\Input\InputData`` and ``InputDataFactory`` for reusable typed input data objects.
 - Float and Double casting now throws ``CastException::forInvalidFloatRoundingMode()`` if an rounding mode other than up, down, even or odd is provided.
 - **Environment:** Added ``CodeIgniter\EnvironmentDetector`` class and corresponding ``environment`` service as a mockable wrapper around the ``ENVIRONMENT`` constant.
   Framework internals that previously compared ``ENVIRONMENT`` directly now go through this service, making environment-specific branches reachable in tests via ``Services::injectMock()``. See :ref:`environment-detector-service`.