Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev: Remove the Security and Validation ignore errors in phpstan-baseline.php #7772

Merged
merged 5 commits into from
Aug 8, 2023
Merged

Dev: Remove the Security and Validation ignore errors in phpstan-baseline.php #7772

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a826f93
Dev: Remove the `Security` and `Validation` ignore errors in phpstan-…
ping-yee Aug 3, 2023
f1c9caf
dev: change the return type.
ping-yee Aug 4, 2023
336a86a
Dev: Define the Security and Validation exception.
ping-yee Aug 4, 2023
a932877
Dev: Add the param type.
ping-yee Aug 4, 2023
61f8bd5
Dev: change the comment.
ping-yee Aug 7, 2023
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
60 changes: 0 additions & 60 deletions phpstan-baseline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,26 +1746,6 @@
'count' => 1,
'path' => __DIR__ . '/system/Router/RouterInterface.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forDisallowedAction\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidControlChars\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidSameSite\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidUTF8Chars\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forEmptySavepath\\(\\) has no return type specified\\.$#',
'count' => 1,
Expand Down Expand Up @@ -2531,51 +2511,11 @@
'count' => 1,
'path' => __DIR__ . '/system/Throttle/Throttler.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forGroupNotArray\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forGroupNotFound\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forInvalidTemplate\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forNoRuleSets\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forRuleNotFound\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isClosure\\(\\) has parameter \\$rule with no signature specified for Closure\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Validation.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:loadRuleSets\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Validation.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRuleGroup\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/Validation.php',
];
$ignoreErrors[] = [
'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRuleGroup\\(\\) has no return type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/system/Validation/ValidationInterface.php',
];
$ignoreErrors[] = [
'message' => '#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#',
'count' => 1,
Expand Down
8 changes: 4 additions & 4 deletions system/Security/Exceptions/SecurityException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@

class SecurityException extends FrameworkException implements HTTPExceptionInterface
{
public static function forDisallowedAction()
public static function forDisallowedAction(): self
{
return new static(lang('Security.disallowedAction'), 403);
}

public static function forInvalidUTF8Chars(string $source, string $string)
public static function forInvalidUTF8Chars(string $source, string $string): self
{
return new static(
'Invalid UTF-8 characters in ' . $source . ': ' . $string,
400
);
}

public static function forInvalidControlChars(string $source, string $string)
public static function forInvalidControlChars(string $source, string $string): self
{
return new static(
'Invalid Control characters in ' . $source . ': ' . $string,
Expand All @@ -42,7 +42,7 @@ public static function forInvalidControlChars(string $source, string $string)
*
* @codeCoverageIgnore
*/
public static function forInvalidSameSite(string $samesite)
public static function forInvalidSameSite(string $samesite): self
{
return new static(lang('Security.invalidSameSite', [$samesite]));
}
Expand Down
10 changes: 5 additions & 5 deletions system/Validation/Exceptions/ValidationException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@

class ValidationException extends FrameworkException
{
public static function forRuleNotFound(?string $rule = null)
public static function forRuleNotFound(?string $rule = null): ValidationException
{
return new static(lang('Validation.ruleNotFound', [$rule]));
}

public static function forGroupNotFound(?string $group = null)
public static function forGroupNotFound(?string $group = null): ValidationException
{
return new static(lang('Validation.groupNotFound', [$group]));
}

public static function forGroupNotArray(?string $group = null)
public static function forGroupNotArray(?string $group = null): ValidationException
{
return new static(lang('Validation.groupNotArray', [$group]));
}

public static function forInvalidTemplate(?string $template = null)
public static function forInvalidTemplate(?string $template = null): ValidationException
{
return new static(lang('Validation.invalidTemplate', [$template]));
}

public static function forNoRuleSets()
public static function forNoRuleSets(): ValidationException
{
return new static(lang('Validation.noRuleSets'));
}
Expand Down
4 changes: 4 additions & 0 deletions system/Validation/Validation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@ public function getRuleGroup(string $group): array
*
* @param string $group Group.
*
* @return void
*
* @throws ValidationException If group not found.
*/
public function setRuleGroup(string $group)
Expand Down Expand Up @@ -645,6 +647,8 @@ public function showError(string $field, string $template = 'single'): string
/**
* Loads all of the rulesets classes that have been defined in the
* Config\Validation and stores them locally so we can use them.
*
* @return void
*/
protected function loadRuleSets()
{
Expand Down
2 changes: 2 additions & 0 deletions system/Validation/ValidationInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public function getRuleGroup(string $group): array;
* Set rule group.
*
* @param string $group Group.
*
* @return void
*/
public function setRuleGroup(string $group);

Expand Down