bug-fixed: parse full namespace in relationship

irontec · Mar 9, 2020 · b6e119d · b6e119d
1 parent 659fd14
commit b6e119d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ParseTypeScript/Parser.php b/ParseTypeScript/Parser.php
@@ -151,7 +151,7 @@ private function parsePhpDocForProperty(\ReflectionProperty $property): string
  if ($result === 'unknown') {
  if (preg_match('/type="([a-zA-Z]+)"/i', $docComment, $matches)) {
  $result = $this->getTypescriptProperty($matches[1]);
- } elseif (preg_match('/targetEntity="([a-zA-Z]+)"/i', $docComment, $matches)) {
+ } elseif (preg_match('/targetEntity="([a-zA-Z-\\\\]+)"/i', $docComment, $matches)) {
  $result = $this->getRelationCollectionProperty($docComment);
  }
  }
@@ -223,13 +223,14 @@ private function getRelationCollectionProperty(string $type): string
  $matches = [];
 
  $regex = array(
- '/OneToOne\(targetEntity="([a-zA-Z]+)"/i' => '',
+ '/targetEntity="([a-zA-Z]+)"/i' => '',
+ '/targetEntity="([a-zA-Z]+)\\\\([a-zA-Z]+)\\\\([a-zA-Z]+)"/i' => '',
  '/targetEntity="([a-zA-Z]+)"/i' => '[]',
  );
 
  foreach ($regex as $reg => $val) {
  if (preg_match($reg, $type, $matches)) {
- $result = $matches[1] . $val;
+ $result = end($matches) . $val;
  break;
  }
  }