#632 #645 #646 ensured that unset() code generated by PublicScopeSimulator respects :void no-return-value semantics

Before this, generating `unset()` code while forgetting to pass all parameters to `PublicScopeSimulator` led to a
crash due to `__unset(): void { ... }` containing `return $value` statements (invalid starting from PHP 7.3.0)

Author: Ocramius

src/ProxyManager/ProxyGenerator/Util/PublicScopeSimulator.php

@@ -59,12 +59,14 @@ public static function getPublicAccessSimulationCode(
             ? 'new \\ReflectionClass(get_parent_class($this))'
             : 'new \\ReflectionClass(' . var_export($originalClass->getName(), true) . ')';
 
+        $returnPropertyName = $returnPropertyName
+            ?? ($operationType === self::OPERATION_UNSET ? 'unset' : $returnPropertyName);
+
         return '$realInstanceReflection = ' . $originalClassReflection . ';' . "\n\n"
             . 'if (! $realInstanceReflection->hasProperty($' . $nameParameter . ')) {' . "\n"
             . '    $targetObject = ' . $target . ';' . "\n\n"
             . self::getUndefinedPropertyNotice($operationType, $nameParameter)
             . '    ' . self::getOperation($operationType, $nameParameter, $valueParameter) . "\n"
-            . "    return;\n"
             . '}' . "\n\n"
             . '$targetObject = ' . self::getTargetObject($valueHolder) . ";\n"
             . '$accessor = function ' . $byRef . '() use ($targetObject, $' . $nameParameter . $value . ') {' . "\n"
@@ -144,7 +146,9 @@ private static function getOperation(string $operationType, string $nameParamete
                 return 'return isset($targetObject->$' . $nameParameter . ');';
 
             case self::OPERATION_UNSET:
-                return 'unset($targetObject->$' . $nameParameter . ');';
+                return 'unset($targetObject->$' . $nameParameter . ');'
+                    . "\n\n"
+                    . '    return;';
         }
 
         throw new InvalidArgumentException(sprintf('Invalid operation "%s" provided', $operationType));

tests/ProxyManagerTest/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/MagicUnsetTest.php

@@ -41,7 +41,7 @@ public function testBodyStructure(): void
             "\$this->foo && \$this->foo->__invoke(\$this->bar, \$this, '__unset', array('name' => \$name)"
             . ", \$this->foo);\n\n"
             . "if (isset(self::\$bar[\$name])) {\n    unset(\$this->bar->\$name);\n\n    return;\n}"
-            . '%areturn %s;',
+            . '%a',
             $magicIsset->getBody()
         );
     }

tests/ProxyManagerTest/ProxyGenerator/Util/PublicScopeSimulatorTest.php

@@ -42,7 +42,6 @@ public function testSimpleGet(): void
         \E_USER_NOTICE
     );
     return $targetObject->$foo;
-    return;
 }
 
 $targetObject = $realInstanceReflection->newInstanceWithoutConstructor();
@@ -76,7 +75,6 @@ public function testSimpleSet(): void
     $targetObject = $this;
 
     $targetObject->$foo = $baz; return $targetObject->$foo;
-    return;
 }
 
 $targetObject = $realInstanceReflection->newInstanceWithoutConstructor();
@@ -110,7 +108,6 @@ public function testSimpleIsset(): void
     $targetObject = $this;
 
     return isset($targetObject->$foo);
-    return;
 }
 
 $targetObject = $realInstanceReflection->newInstanceWithoutConstructor();
@@ -144,12 +141,15 @@ public function testSimpleUnset(): void
     $targetObject = $this;
 
     unset($targetObject->$foo);
+
     return;
 }
 
 $targetObject = $realInstanceReflection->newInstanceWithoutConstructor();
 $accessor = function () use ($targetObject, $foo) {
     unset($targetObject->$foo);
+
+    return;
 };
 $backtrace = debug_backtrace(true, 2);
 $scopeObject = isset($backtrace[1]['object']) ? $backtrace[1]['object'] : new \ProxyManager\Stub\EmptyClassStub();
@@ -169,6 +169,22 @@ public function testSimpleUnset(): void
         );
     }
 
+    /**
+     * @group #632
+     * @group #645
+     * @group #646
+     */
+    public function testUnsetCodeWillNotProduceReturnValueStatements(): void
+    {
+        self::assertStringNotContainsString(
+            'return ',
+            PublicScopeSimulator::getPublicAccessSimulationCode(
+                PublicScopeSimulator::OPERATION_UNSET,
+                'foo'
+            )
+        );
+    }
+
     public function testSetRequiresValueParameterName(): void
     {
         $this->expectException(InvalidArgumentException::class);
@@ -191,7 +207,6 @@ public function testDelegatesToValueHolderWhenAvailable(): void
     $targetObject = $this->valueHolder;
 
     $targetObject->$foo = $baz; return $targetObject->$foo;
-    return;
 }
 
 $targetObject = $this->valueHolder;
@@ -243,7 +258,6 @@ public function testWillReturnDirectlyWithNoReturnParam(): void
         \E_USER_NOTICE
     );
     return $targetObject->$foo;
-    return;
 }
 
 $targetObject = $realInstanceReflection->newInstanceWithoutConstructor();