Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions system/Honeypot/Exceptions/HoneypotException.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion system/I18n/Exceptions/I18nException.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion system/Images/Handlers/ImageMagickHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
19 changes: 19 additions & 0 deletions system/Language/en/Honeypot.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

declare(strict_types=1);

/**
* This file is part of CodeIgniter 4 framework.
*
* (c) CodeIgniter Foundation <[email protected]>
*
* 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.',
];
2 changes: 1 addition & 1 deletion system/Language/en/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -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}"',
];
2 changes: 1 addition & 1 deletion system/Router/Exceptions/RouterException.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}

/**
Expand Down
5 changes: 5 additions & 0 deletions user_guide_src/source/changelogs/v4.6.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ BREAKING
Message Changes
***************

- Added ``Honeypot.noTemplate``, ``Honeypot.noNameField``, ``Honeypot.theClientIsABot``.

*******
Changes
*******
Expand All @@ -28,6 +30,9 @@ Changes
Deprecations
************

- **Exception:**
- The ``CodeIgniter\Honeypot\Exceptions\HoneypotException::forNoHiddenValue()`` method has been deprecated. Never used.

**********
Bugs Fixed
**********
Expand Down
Loading