Skip to content

Commit 978ace3

Browse files
authored
Merge pull request #52 from magento-commerce/imported-magento-magento-coding-standard-256
[Imported] Fix PHP Fatal error when docblock is invalid
2 parents d49f669 + 3fd461e commit 978ace3

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Magento2/Sniffs/Annotation/MethodArgumentsSniff.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,6 @@ public function process(File $phpcsFile, $stackPtr)
609609
* @param File $phpcsFile
610610
* @param array $paramPointers
611611
*
612-
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
613-
*
614612
* @see https://devdocs.magento.com/guides/v2.4/coding-standards/docblock-standard-general.html#format-consistency
615613
*/
616614
private function validateFormattingConsistency(
@@ -626,7 +624,9 @@ private function validateFormattingConsistency(
626624
if (isset($paramPointers[$ptr])) {
627625
$paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
628626
$paramDefinition = $paramDefinitions[$ptr];
629-
$argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
627+
if (isset($paramDefinition['paramName'])) {
628+
$argumentPositions[] = strpos($paramContent, $paramDefinition['paramName']);
629+
}
630630
$commentPositions[] = $paramDefinition['comment']
631631
? strrpos($paramContent, $paramDefinition['comment']) : null;
632632
}

Magento2/Tests/Annotation/MethodArgumentsUnitTest.inc

+11
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,14 @@ public function setExtensionAs(\Magento\Catalog\Api\Data\CategoryExtensionInterf
2222
{
2323
return $this->_setExtensionAttributes($extensionAttributes);
2424
}
25+
26+
/**
27+
* Short description of method
28+
*
29+
* @param int
30+
* @return int
31+
*/
32+
public function invalidDocBlockShouldNotCauseFatalErrorInSniff(int $number): int
33+
{
34+
return $number;
35+
}

Magento2/Tests/Annotation/MethodArgumentsUnitTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ public function getErrorList()
1616
{
1717
return [
1818
12 => 1,
19-
21 => 1
19+
21 => 1,
20+
32 => 1,
2021
];
2122
}
22-
23+
2324
/**
2425
* @inheritdoc
2526
*/

0 commit comments

Comments
 (0)