Skip to content

Commit d87116f

Browse files
author
Nikolay Shapovalov
committed
remove hook_info special handling
1 parent 988f22f commit d87116f

File tree

4 files changed

+7
-48
lines changed

4 files changed

+7
-48
lines changed

Diff for: coder_sniffer/Drupal/Sniffs/Attributes/ValidHookNameSniff.php

+1-10
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@
2222
class ValidHookNameSniff implements Sniff
2323
{
2424

25-
/**
26-
* List of hooks that should not be fixed.
27-
*
28-
* @var string[]
29-
*/
30-
public array $hookExceptions = ['hook_info'];
31-
3225

3326
/**
3427
* Returns an array of tokens this test wants to listen for.
@@ -69,9 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
6962
// Remove outer quotes.
7063
$hookNameValue = trim($tokens[$hookName]['content'], '"\'');
7164

72-
if (in_array($hookNameValue, $this->hookExceptions) === false
73-
&& strpos($hookNameValue, 'hook_') === 0
74-
) {
65+
if (strpos($hookNameValue, 'hook_') === 0) {
7566
$fix = $phpcsFile->addFixableWarning("Hook name should not start with 'hook_'. Hook name used: $hookNameValue", $hookName, 'HookPrefix');
7667
if ($fix === true && strlen($hookNameValue) > 5) {
7768
// Remove "hook_" prefix.

Diff for: tests/Drupal/Attributes/ValidHookNameUnitTest.inc

+2-18
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ function module_valid() {
1616
/**
1717
* Single quotes.
1818
*/
19-
#[Hook('hook_node_view')]
20-
function module_node_view() {
19+
#[Hook('hook_info')]
20+
function module_info() {
2121

2222
}
2323

@@ -64,22 +64,6 @@ function module_hookpirate_view() {
6464

6565
}
6666

67-
/**
68-
* "hook_info" is exception. No warning.
69-
*/
70-
#[Hook('hook_info')]
71-
function module_hook_info() {
72-
73-
}
74-
75-
/**
76-
* Named argument. "hook_info" is exception. No warning.
77-
*/
78-
#[Hook(hook: 'hook_info')]
79-
function mymodule_hook_info() {
80-
81-
}
82-
8367
/**
8468
* Valid hook.
8569
*/

Diff for: tests/Drupal/Attributes/ValidHookNameUnitTest.inc.fixed

+2-18
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ function module_valid() {
1616
/**
1717
* Single quotes.
1818
*/
19-
#[Hook('node_view')]
20-
function module_node_view() {
19+
#[Hook('info')]
20+
function module_info() {
2121

2222
}
2323

@@ -63,22 +63,6 @@ function module_hookpirate_view() {
6363

6464
}
6565

66-
/**
67-
* "hook_info" is exception. No warning.
68-
*/
69-
#[Hook('hook_info')]
70-
function module_hook_info() {
71-
72-
}
73-
74-
/**
75-
* Named argument. "hook_info" is exception. No warning.
76-
*/
77-
#[Hook(hook: 'hook_info')]
78-
function mymodule_hook_info() {
79-
80-
}
81-
8266
/**
8367
* Valid hook.
8468
*/

Diff for: tests/Drupal/Attributes/ValidHookNameUnitTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ protected function getWarningList(string $testFile): array
4444
44 => 1,
4545
52 => 1,
4646
62 => 1,
47-
101 => 1,
48-
116 => 1,
47+
85 => 1,
48+
100 => 1,
4949
];
5050

5151
}//end getWarningList()

0 commit comments

Comments
 (0)