diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php index 7ff493e4edf8..5185f6d3c843 100644 --- a/system/Honeypot/Exceptions/HoneypotException.php +++ b/system/Honeypot/Exceptions/HoneypotException.php @@ -41,6 +41,8 @@ public static function forNoNameField() * Thrown when the hidden value of config is false. * * @return static + * + * @deprecated 4.6.4 Never used. */ public static function forNoHiddenValue() { diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php index 79c9e8326ad0..ec9dd3277e1e 100644 --- a/system/I18n/Exceptions/I18nException.php +++ b/system/I18n/Exceptions/I18nException.php @@ -72,7 +72,7 @@ public static function forInvalidOverDay(string $lastDay, string $day) */ public static function forInvalidHour(string $hour) { - return new static(lang('Time.invalidHour', [$hour])); + return new static(lang('Time.invalidHours', [$hour])); } /** diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php index 233ea2d07149..bd2df0e49478 100644 --- a/system/Images/Handlers/ImageMagickHandler.php +++ b/system/Images/Handlers/ImageMagickHandler.php @@ -320,7 +320,7 @@ protected function supportedFormatCheck() switch ($this->image()->imageType) { case IMAGETYPE_WEBP: if (! in_array('WEBP', Imagick::queryFormats(), true)) { - throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported')); + throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported')); } break; } diff --git a/system/Language/en/Honeypot.php b/system/Language/en/Honeypot.php new file mode 100644 index 000000000000..65676da56017 --- /dev/null +++ b/system/Language/en/Honeypot.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +// Honeypot language settings +return [ + 'noTemplate' => 'The HTML template for the Honeypot is not configured.', + 'noNameField' => 'The name of the Honeypot field is not set.', + 'theClientIsABot' => 'The Honeypot client may be a bot.', +]; diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php index 7bb55860198b..a073d98d4ada 100644 --- a/system/Language/en/Router.php +++ b/system/Language/en/Router.php @@ -16,5 +16,5 @@ 'invalidParameter' => 'A parameter does not match the expected type.', 'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.', 'invalidDynamicController' => 'A dynamic controller is not allowed for security reasons. Route handler: "{0}"', - 'invalidControllerName' => 'The namespace delimiter is a backslash (\), not a slash (/). Route handler: "{0}"', + 'invalidControllerName' => 'The namespace delimiter is a backslash (\\), not a slash (/). Route handler: "{0}"', ]; diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php index 378647289a72..7a65603d84b2 100644 --- a/system/Router/Exceptions/RouterException.php +++ b/system/Router/Exceptions/RouterException.php @@ -28,7 +28,7 @@ class RouterException extends FrameworkException implements ExceptionInterface */ public static function forInvalidParameterType() { - return new static(lang('Router.invalidParameterType')); + return new static(lang('Router.invalidParameter')); } /** diff --git a/user_guide_src/source/changelogs/v4.6.4.rst b/user_guide_src/source/changelogs/v4.6.4.rst index cc16d924fb03..ed9909d0face 100644 --- a/user_guide_src/source/changelogs/v4.6.4.rst +++ b/user_guide_src/source/changelogs/v4.6.4.rst @@ -18,6 +18,8 @@ BREAKING Message Changes *************** +- Added ``Honeypot.noTemplate``, ``Honeypot.noNameField``, ``Honeypot.theClientIsABot``. + ******* Changes ******* @@ -28,6 +30,9 @@ Changes Deprecations ************ +- **Exception:** + - The ``CodeIgniter\Honeypot\Exceptions\HoneypotException::forNoHiddenValue()`` method has been deprecated. Never used. + ********** Bugs Fixed **********