Skip to content

Commit 519fc72

Browse files
Warning raised if class member already have meaningful description
1 parent 97cc661 commit 519fc72

File tree

3 files changed

+37
-7
lines changed

3 files changed

+37
-7
lines changed

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
6666
$phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
6767
return;
6868
}
69+
70+
// Check if class has already have meaningful description
71+
$isShortDescription = $phpcsFile->findPrevious(T_DOC_COMMENT_STRING, $commentEnd, $foundVar, false);
72+
if ($tokens[$string]['line'] !== $tokens[$isShortDescription]['line']) {
73+
$error = 'Variable member already have meaningful name';
74+
$phpcsFile->addWarning($error, $isShortDescription, 'AlreadyMeaningFulNameVar');
75+
return;
76+
}
6977
}
7078

7179
/**

Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,41 @@ class Foo
3737
class Bar {
3838

3939
/**
40-
* @var correctlyFormattedPublicClassMember
40+
* @var variablehasAlreadyhaveProtectedClassMember
4141
*
4242
* Short Description
4343
*/
44-
public $correctlyFormattedPublicClassMember;
44+
public $variablehasAlreadyhavePublicClassMember;
4545

4646
/**
47-
* @var correctlyFormattedPrivateClassMember
47+
* @var variablehasAlreadyhavePrivateClassMember
4848
*
4949
* Short Description
5050
*/
51-
private $correctlyFormattedPrivateClassMember;
51+
private $variablehasAlreadyhavePrivateClassMember;
5252

5353
/**
54-
* @var correctlyFormattedProtectedClassMember
54+
* @var variablehasAlreadyhaveProtectedClassMember
5555
*
5656
* Short Description
5757
*/
58+
protected $variablehasAlreadyhaveProtectedClassMember;
59+
}
60+
61+
class correctlyFormattedClassMemberDocBlock
62+
{
63+
/**
64+
* @var correctlyFormattedPublicClassMember
65+
*/
66+
public $correctlyFormattedPublicClassMember;
67+
68+
/**
69+
* @var correctlyFormattedPrivateClassMember
70+
*/
71+
private $correctlyFormattedPrivateClassMember;
72+
73+
/**
74+
* @var correctlyFormattedProtectedClassMember
75+
*/
5876
protected $correctlyFormattedProtectedClassMember;
5977
}

Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ public function getWarningList()
2424
{
2525
return [
2626
13 => 1,
27+
18 => 1,
2728
23 => 1,
28-
30 => 1,
29-
34 => 1
29+
30 => 2,
30+
34 => 1,
31+
42 => 1,
32+
49 => 1,
33+
56 => 1
3034
];
3135
}
3236
}

0 commit comments

Comments
 (0)