fredden
diff --git a/‎Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
Copy file name to clipboardExpand all lines: Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+4-5Lines changed: 4 additions & 5 deletions b/‎Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
Copy file name to clipboardExpand all lines: Magento2/Helpers/Commenting/PHPDocFormattingValidator.php
+4-5Lines changed: 4 additions & 5 deletions
diff --git a/‎Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+2-2Lines changed: 2 additions & 2 deletions b/‎Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+2-2Lines changed: 2 additions & 2 deletions b/‎Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Commenting/ClassAndInterfacePHPDocFormattingUnitTest.1.inc
+2-2Lines changed: 2 additions & 2 deletions
@@ -13,9 +13,6 @@
  */
 class PHPDocFormattingValidator
 {
-    private const REMOVED_IN_VERSION = 'removed in version';
-    private const WITHOUT_REPLACEMENT = 'without replacement';
-
     /**
      * Finds matching PHPDoc for current pointer
      *
@@ -126,8 +123,10 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)
         }
         $seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);
         if ($seePtr === -1) {
-            if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) !== false &&
-                stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) !== false) {
+            if (preg_match(
+                "/This [a-zA-Z]* will be removed in version \d.\d.\d without replacement/",
+                $tokens[$deprecatedPtr + 2]['content']
+            )) {
                 return true;
             }
             return false;
 
@@ -373,7 +373,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated It will be removed in version 1.0.0 without replacement
+     * @deprecated This method will be removed in version 1.0.0 without replacement
      */
     public function correctBecauseOfKeywordPhrase()
     {
@@ -383,7 +383,7 @@ class MethodAnnotationFixture
     /**
      * This deprecated function is correct even though it only contains the @deprecated tag.
      *
-     * @deprecated WOW! It will be removed in version 1.0.0 without replacement
+     * @deprecated WOW! This method will be removed in version 1.0.0 without replacement
      */
     public function alsoCorrectBecauseOfKeywordPhrase()
     {
 
@@ -164,15 +164,15 @@ class OldHandler
 }
 
 /**
- * @deprecated It will be removed in version 1.0.0 without replacement
+ * @deprecated This class will be removed in version 1.0.0 without replacement
  */
 class DeprecatedButHandler
 {
 
 }
 
 /**
- * @deprecated It's also deprecated, but it will be removed in version 1.0.0 without replacement
+ * @deprecated It's also deprecated - This class will be removed in version 1.0.0 without replacement
  */
 class AlsoDeprecatedButHandler
 {
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`	`*/`
`14`	`14`	`class PHPDocFormattingValidator`
`15`	`15`	`{`
`16`		`- private const REMOVED_IN_VERSION = 'removed in version';`
`17`		`- private const WITHOUT_REPLACEMENT = 'without replacement';`
`18`		`-`
`19`	`16`	`/**`
`20`	`17`	`* Finds matching PHPDoc for current pointer`
`21`	`18`	`*`
`@@ -126,8 +123,10 @@ public function hasDeprecatedWellFormatted($commentStartPtr, $tokens)`
`126`	`123`	`}`
`127`	`124`	`$seePtr = $this->getTagPosition('@see', $commentStartPtr, $tokens);`
`128`	`125`	`if ($seePtr === -1) {`
`129`		`- if (stripos($tokens[$deprecatedPtr + 2]['content'], self::REMOVED_IN_VERSION, 0) !== false &&`
`130`		`- stripos($tokens[$deprecatedPtr + 2]['content'], self::WITHOUT_REPLACEMENT, 0) !== false) {`
	`126`	`+ if (preg_match(`
	`127`	`+ "/This [a-zA-Z]* will be removed in version \d.\d.\d without replacement/",`
	`128`	`+ $tokens[$deprecatedPtr + 2]['content']`
	`129`	`+ )) {`
`131`	`130`	`return true;`
`132`	`131`	`}`
`133`	`132`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ class MethodAnnotationFixture`
`373`	`373`	`/**`
`374`	`374`	`* This deprecated function is correct even though it only contains the @deprecated tag.`
`375`	`375`	`*`
`376`		`- * @deprecated It will be removed in version 1.0.0 without replacement`
	`376`	`+ * @deprecated This method will be removed in version 1.0.0 without replacement`
`377`	`377`	`*/`
`378`	`378`	`public function correctBecauseOfKeywordPhrase()`
`379`	`379`	`{`
`@@ -383,7 +383,7 @@ class MethodAnnotationFixture`
`383`	`383`	`/**`
`384`	`384`	`* This deprecated function is correct even though it only contains the @deprecated tag.`
`385`	`385`	`*`
`386`		`- * @deprecated WOW! It will be removed in version 1.0.0 without replacement`
	`386`	`+ * @deprecated WOW! This method will be removed in version 1.0.0 without replacement`
`387`	`387`	`*/`
`388`	`388`	`public function alsoCorrectBecauseOfKeywordPhrase()`
`389`	`389`	`{`
Original file line number	Diff line number	Diff line change
`@@ -164,15 +164,15 @@ class OldHandler`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/**`
`167`		`- * @deprecated It will be removed in version 1.0.0 without replacement`
	`167`	`+ * @deprecated This class will be removed in version 1.0.0 without replacement`
`168`	`168`	`*/`
`169`	`169`	`class DeprecatedButHandler`
`170`	`170`	`{`
`171`	`171`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`/**`
`175`		`- * @deprecated It's also deprecated, but it will be removed in version 1.0.0 without replacement`
	`175`	`+ * @deprecated It's also deprecated - This class will be removed in version 1.0.0 without replacement`
`176`	`176`	`*/`
`177`	`177`	`class AlsoDeprecatedButHandler`
`178`	`178`	`{`