Merge pull request #142 from Roave/fix/#134-ignore-fqsen-parsing-errors

#134 suppress exceptions in parsing `Fqsen` expressions for documented property types
Roave · Jul 17, 2019 · 4d3cac1 · 4d3cac1
2 parents 5df06ce + c78ebd5
commit 4d3cac1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/DetectChanges/BCBreak/PropertyBased/PropertyDocumentedTypeChanged.php b/src/DetectChanges/BCBreak/PropertyBased/PropertyDocumentedTypeChanged.php
@@ -4,6 +4,7 @@
 
 namespace Roave\BackwardCompatibility\DetectChanges\BCBreak\PropertyBased;
 
+use InvalidArgumentException;
 use Roave\BackwardCompatibility\Change;
 use Roave\BackwardCompatibility\Changes;
 use Roave\BackwardCompatibility\Formatter\ReflectionPropertyName;
@@ -34,8 +35,13 @@ public function __invoke(ReflectionProperty $fromProperty, ReflectionProperty $t
             return Changes::empty();
         }
 
-        $fromTypes = array_unique($fromProperty->getDocBlockTypeStrings());
-        $toTypes   = array_unique($toProperty->getDocBlockTypeStrings());
+        try {
+            $fromTypes = array_unique($fromProperty->getDocBlockTypeStrings());
+            $toTypes   = array_unique($toProperty->getDocBlockTypeStrings());
+        } catch (InvalidArgumentException $failedToParseDocblock) {
+            // @TODO #134 improve docblock parsing upstream to remove this generic try-catch
+            return Changes::empty();
+        }
 
         sort($fromTypes);
         sort($toTypes);

diff --git a/test/unit/DetectChanges/BCBreak/PropertyBased/PropertyDocumentedTypeChangedTest.php b/test/unit/DetectChanges/BCBreak/PropertyBased/PropertyDocumentedTypeChangedTest.php
@@ -108,6 +108,11 @@ class TheClass {
      * @var int
      */
     private $propertyTypeBeingDuplicatedAreNotBcBreaks;
+
+    /**
+     * @var GenericType<T1, T2>
+     */ 
+    public $propertyWithComplexDocblockThatCannotBeParsed;
 }
 PHP
             ,
@@ -172,6 +177,11 @@ class TheClass {
      * @var int|int
      */
     private $propertyTypeBeingDuplicatedAreNotBcBreaks;
+
+    /**
+     * @var GenericType<T1, T2>
+     */ 
+    public $propertyWithComplexDocblockThatCannotBeParsed;
 }
 PHP
             ,
@@ -196,6 +206,7 @@ class TheClass {
             'privateDocblockToDifferentDocblock'                                => ['[BC] CHANGED: Type documentation for property TheClass#$privateDocblockToDifferentDocblock changed from int to float'],
             'duplicatePropertyTypesBeingDeduplicatedAreNotBcBreaks'             => [],
             'propertyTypeBeingDuplicatedAreNotBcBreaks'                         => [],
+            'propertyWithComplexDocblockThatCannotBeParsed'                     => [],
         ];
 
         return array_combine(