Merge branch 'master' of github.com:dunglas/phpdoc-to-typehint

dunglas · dunglas · commit 46068ec8957d · 2015-11-12T00:26:21.000+01:00
diff --git a/src/Converter.php b/src/Converter.php
@@ -456,7 +456,7 @@ private function getType(Tag $tag): array
             }
 
             if (!$type1 instanceof Null_ && $type0 instanceof Null_) {
-                return [$type1>__toString(), true];
+                return [$type1->__toString(), true];
             }
 
             // Mixed types, cannot guess
diff --git a/tests/test.php b/tests/test.php
@@ -1,6 +1,5 @@
-<?php
-
 #!/usr/bin/env php
+<?php
 
 /*
  * This file is part of the PHPDoc to Type Hint package.

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ private function getType(Tag $tag): array`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`if (!$type1 instanceof Null_ && $type0 instanceof Null_) {`
`459`		`- return [$type1>__toString(), true];`
	`459`	`+ return [$type1->__toString(), true];`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`// Mixed types, cannot guess`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 -<?php
+-
 #!/usr/bin/env php
 +<?php
 /*
  * This file is part of the PHPDoc to Type Hint package.