Fix a bug when a return type already exists.

Author: dunglas

src/Converter.php

@@ -55,6 +55,7 @@ public function convert(Project $project, File $file): string
         $objectType = self::OBJECT_FUNCTION;
         $outputTypeHint = true;
         $outputDefaultValue = false;
+        $outputReturn = true;
         $namespace = null;
         $object = null;
         $function = null;
@@ -70,26 +71,19 @@ public function convert(Project $project, File $file): string
                         }
                         break;
 
+                    case ':':
+                        if (null !== $function) {
+                            $outputReturn = false;
+                        }
+                    break;
+
                     case ')':
                         if ($insideFunctionSignature) {
                             if ($outputDefaultValue) {
                                 $output .= ' = null';
                             }
 
                             $insideFunctionSignature = false;
-
-                            if (null !== $function) {
-                                $return = $this->getReturn($project, $objectType, $namespace, $object, $function);
-                                if ($return && $return[0] && !$return[1]) {
-                                    $output .= sprintf('): %s', $return[0]);
-                                } else {
-                                    $output .= ')';
-                                }
-
-                                $function = null;
-
-                                continue 2;
-                            }
                         }
                         break;
 
@@ -105,9 +99,27 @@ public function convert(Project $project, File $file): string
                         }
                         break;
 
+                    case ';':
                     case '{':
-                        ++$level;
-                        break;
+                        if (null !== $function && $outputReturn) {
+                            $return = $this->getReturn($project, $objectType, $namespace, $object, $function);
+
+                            if ($return && $return[0] && !$return[1]) {
+                                $output .= sprintf(': %s', $return[0]);
+                            }
+
+                            $function = null;
+                            $outputReturn = false;
+                        }
+
+                        if ('{' === $token) {
+                            ++$level;
+                        }
+
+                        if (';' === $token && $insideNamespace) {
+                            $insideNamespace = false;
+                        }
+                    break;
 
                     case '}':
                         --$level;
@@ -116,12 +128,6 @@ public function convert(Project $project, File $file): string
                             $objectType = self::OBJECT_FUNCTION;
                         }
                         break;
-
-                    case ';':
-                        if ($insideNamespace) {
-                            $insideNamespace = false;
-                        }
-                    break;
                 }
 
                 $output .= $token;
@@ -183,6 +189,7 @@ public function convert(Project $project, File $file): string
                 case T_FUNCTION:
                     $outsideFunctionSignature = true;
                     $outputDefaultValue = false;
+                    $outputReturn = true;
                     break;
 
                 case T_VARIABLE:

tests/Fixtures/functions1.php

@@ -33,3 +33,14 @@ function bar(\DateTime $a = null, array $b, $c, $d, bool $e, callable $f = null)
 function baz($a)
 {
 }
+
+/**
+ * Must not be converted (already using type hints).
+ *
+ * @param int $a
+ *
+ * @return string
+ */
+function bat(int $a): string
+{
+}

tests/test.php

@@ -57,8 +57,8 @@ function foo()
  *
  * @return float
  */
-function bar(\DateTime $a = null, array $b, int $c = null, string $d, bool $e, callable $f = null): float
-{
+function bar(\DateTime $a = null, array $b, int $c = null, string $d, bool $e, callable $f = null)
+: float{
     return 0.0;
 }
 
@@ -69,6 +69,17 @@ function baz($a)
 {
 }
 
+/**
+ * Must not be converted (already using type hints).
+ *
+ * @param int $a
+ *
+ * @return string
+ */
+function bat(int $a): string
+{
+}
+
 PHP
     , $converter->convert($project, $file));
 }
@@ -87,8 +98,8 @@ function baz($a)
  *
  * @return int
  */
-function test(string $a = null): int
-{
+function test(string $a = null)
+: int{
 }
 
 PHP
@@ -163,8 +174,8 @@ trait BazTrait
      *
      * @return \DateTime
      */
-    protected function inTrait(int $a): \DateTime
-    {
+    protected function inTrait(int $a)
+    : \DateTime{
     }
 }
 
@@ -195,8 +206,8 @@ public function test(float $a)
     /**
      * {@inheritdoc}
      */
-    public function baz(array $a, int $b): float
-    {
+    public function baz(array $a, int $b)
+    : float{
     }
 }