Fix up I18n namespace.

docs/Upgrade.md

@@ -9,3 +9,11 @@
 ## Utility
 - `L10n`, `Mime` classes have been removed
 - Mutable `Time` class has been removed, use immutable `DateTime` instead.
+- `Number` class has been moved from Utility to I18n namespace.
+- `DateTime` class has been moved from Utility to I18n namespace.
+
+## NumberHelper
+- Custom engine has been moved from Utility to I18n namespace.
+
+## TimeHelper
+- Custom engine has been moved from Utility to I18n namespace.

src/Utility/Number.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tools\Utility;
+
+use Tools\I18n\Number as I18nNumber;
+
+/**
+ * @deprecated Use I18n one directly
+ */
+class Number extends I18nNumber {
+}

src/View/Helper/NumberHelper.php

@@ -10,13 +10,11 @@ use Cake\View\View;
 /**
  * Overwrite to allow usage of own Number class.
  *
- * @mixin \Tools\Utility\Number
+ * @mixin \Tools\I18n\Number
  */
 class NumberHelper extends CakeNumberHelper {
 
 	/**
-	 * Cake\I18n\Number instance
-	 *
 	 * @var \Cake\I18n\Number
 	 */
 	protected $_engine;

src/View/Helper/TextHelper.php

@@ -32,8 +32,6 @@ if (!defined('CHAR_HELLIP')) {
 class TextHelper extends CakeTextHelper {
 
 	/**
-	 * Cake Utility Text instance
-	 *
 	 * @var \Cake\Utility\Text
 	 */
 	protected $_engine;

src/View/Helper/TimeHelper.php

@@ -27,13 +27,11 @@ class TimeHelper extends CakeTimeHelper {
 	 * @var array<string, mixed>
 	 */
 	protected array $_defaultConfig = [
-		'engine' => 'Tools\Utility\DateTime',
+		'engine' => 'Tools\I18n\DateTime',
 	];
 
 	/**
-	 * Cake\I18n\LocalizedNumber instance
-	 *
-	 * @var \Cake\I18n\Number
+	 * @var \Cake\I18n\DateTime
 	 */
 	protected $_engine;
 
@@ -56,8 +54,8 @@ class TimeHelper extends CakeTimeHelper {
 		parent::__construct($View, $config);
 
 		$config = $this->_config + $defaults;
-		/** @var class-string<\Tools\Utility\Number>|null $engineClass */
-		$engineClass = App::className($config['engine'], 'Utility');
+		/** @var class-string<\Tools\I18n\DateTime>|null $engineClass */
+		$engineClass = App::className($config['engine'], 'I18n');
 		if (!$engineClass) {
 			throw new CakeException(sprintf('Class for %s could not be found', $config['engine']));
 		}