Treat constructors as implicitly void-typed for the purposes of prependCodeToFunctions()

src/CodeManipulation/Actions/Generic.php

@@ -78,6 +78,10 @@ function prependCodeToFunctions($code, $typedVariants = array(), $fillArgRefs =
 function getDeclaredReturnType(Source $s, $function)
 {
     $parenthesis = $s->next(LEFT_ROUND, $function);
+    $name = $s->next(T_STRING, $function);
+    if ($name < $parenthesis && ($s->read($name) === '__construct' || $s->read($name) === '__destruct')) {
+        return 'void';
+    }
     $next = $s->skip(Source::junk(), $s->match($parenthesis));
     if ($s->is(T_USE, $next)) {
         $next = $s->skip(Source::junk(), $s->match($s->next(LEFT_ROUND, $next)));

tests/includes/NamedObject.php

@@ -4,13 +4,32 @@ class NamedObject
 {
     private $name;
 
-    function __construct($name)
+    public function __construct($name)
     {
         $this->name = $name;
     }
 
-    function getName()
+    public function getName()
     {
         return $this->name;
     }
+
+    public function __destruct()
+    {
+    }
+
+    public static function createAnonymousSubclassInstance()
+    {
+        return new class extends NamedObject {
+            public function __construct()
+            {
+            }
+
+            public function __destruct()
+            {
+            }
+        };
+    }
 }
+
+NamedObject::createAnonymousSubclassInstance();

tests/return-from-constructor.phpt

@@ -0,0 +1,52 @@
+--TEST--
+Return from constructor / antecedent/patchwork#213
+
+--FILE--
+<?php
+
+use function Patchwork\redefine;
+
+ini_set('zend.assertions', 1);
+error_reporting(E_ALL);
+
+$_SERVER['PHP_SELF'] = __FILE__;
+
+require __DIR__ . "/../Patchwork.php";
+require __DIR__ . "/includes/NamedObject.php";
+
+$classes = [];
+
+echo "Named class:\n";
+
+redefine('*::__construct', function () use (&$classes) {
+    $class = get_class($this);
+    $classes[] = $class;
+    return $class;
+});
+
+try {
+    new NamedObject('foo');
+} catch (Exception $e) {
+    echo get_class($e), "\n";
+}
+
+echo "Anonymous subclass:\n";
+
+try {
+    NamedObject::createAnonymousSubclassInstance();
+} catch (Exception $e) {
+    echo get_class($e), "\n";
+}
+
+assert(count($classes) === 2);
+assert($classes[0] === 'NamedObject');
+assert($classes[1] !== 'NamedObject');
+?>
+===DONE===
+
+--EXPECT--
+Named class:
+Patchwork\Exceptions\NonNullToVoid
+Anonymous subclass:
+Patchwork\Exceptions\NonNullToVoid
+===DONE===

tests/return-from-destructor.phpt

@@ -0,0 +1,53 @@
+--TEST--
+Return from destructor / antecedent/patchwork#213
+
+--FILE--
+<?php
+
+use function Patchwork\redefine;
+
+ini_set('zend.assertions', 1);
+error_reporting(E_ALL);
+
+$_SERVER['PHP_SELF'] = __FILE__;
+
+require __DIR__ . "/../Patchwork.php";
+require __DIR__ . "/includes/NamedObject.php";
+
+$classes = [];
+
+redefine('*::__destruct', function () use (&$classes) {
+    $class = get_class($this);
+    $classes[] = $class;
+    return $class;
+});
+
+echo "Named class:\n";
+
+try {
+    new NamedObject('foo');
+} catch (Exception $e) {
+    echo get_class($e), "\n";
+}
+
+echo "Anonymous subclass:\n";
+
+try {
+    NamedObject::createAnonymousSubclassInstance();
+} catch (Exception $e) {
+    echo get_class($e), "\n";
+}
+
+assert(count($classes) === 2);
+assert($classes[0] === 'NamedObject');
+assert($classes[1] !== 'NamedObject');
+
+?>
+===DONE===
+
+--EXPECT--
+Named class:
+Patchwork\Exceptions\NonNullToVoid
+Anonymous subclass:
+Patchwork\Exceptions\NonNullToVoid
+===DONE===