Merge branch 'master' of github.com:railt/reflection

railt · Aug 9, 2018 · 1b72cca · 1b72cca
2 parents 5e06d12 + ca1c7cc
commit 1b72cca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/Definition/Behaviour/HasInheritance.php b/src/Definition/Behaviour/HasInheritance.php
@@ -70,7 +70,7 @@ public function extends($definition): ProvidesInheritance
 
         if ($definition instanceof ProvidesInheritance) {
             /** @var HasInheritance $definition */
-            $definition->extendedBy[] = $this->extends;
+            $definition->extendedBy[] = $this->getName();
         }
 
         return $this;

diff --git a/src/Definition/Behaviour/HasTypeIndication.php b/src/Definition/Behaviour/HasTypeIndication.php
@@ -82,8 +82,7 @@ public function __toString(): string
             $parent .= '!';
         }
 
-        return \sprintf('%s<%s>: %s', $this->getName(), static::getType(), $parent);
-
+        return \sprintf('%s: %s', $this->getName(), $parent);
     }
 
     /**

diff --git a/src/Definition/ScalarDefinition.php b/src/Definition/ScalarDefinition.php
@@ -33,7 +33,7 @@ public static function getType(): TypeInterface
      */
     public function parse($value)
     {
-        if ($parent = $this->getParentInheritance()) {
+        if ($parent = $this->getInheritedParent()) {
             $value = $parent->parse($value);
         }
 

diff --git a/src/Invocation/AbstractTypeInvocation.php b/src/Invocation/AbstractTypeInvocation.php
@@ -59,6 +59,6 @@ public function getName(): string
      */
     public function __toString(): string
     {
-        return \sprintf('%s()<%s>', $this->getName(), static::getType());
+        return \sprintf('%s<%s>()', $this->getName(), static::getType());
     }
 }