From 792f93018a41498b7fae0de0a51e4ac647d14321 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 29 Aug 2019 16:54:55 +0200
Subject: [PATCH] [ProxyManager] remove ProxiedMethodReturnExpression polyfill

---
 composer.json                                 |  3 +-
 .../Legacy/ProxiedMethodReturnExpression.php  | 75 -------------------
 src/Symfony/Bridge/ProxyManager/composer.json |  1 -
 3 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php

diff --git a/composer.json b/composer.json
index 5799e0d27eac..42397d75b851 100644
--- a/composer.json
+++ b/composer.json
@@ -123,8 +123,7 @@
             "Symfony\\Component\\": "src/Symfony/Component/"
         },
         "classmap": [
-            "src/Symfony/Component/Intl/Resources/stubs",
-            "src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php"
+            "src/Symfony/Component/Intl/Resources/stubs"
         ],
         "exclude-from-classmap": [
             "**/Tests/"
diff --git a/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php b/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php
deleted file mode 100644
index 1d7504111357..000000000000
--- a/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ProxyManager\Generator\Util;
-
-use Composer\Autoload\ClassLoader;
-use ProxyManager\Version;
-
-if (class_exists(Version::class) && version_compare(\defined(Version::class.'::VERSION') ? Version::VERSION : Version::getVersion(), '2.5', '<')) {
-    /**
-     * Utility class to generate return expressions in method, given a method signature.
-     *
-     * This is required since return expressions may be forbidden by the method signature (void).
-     *
-     * @author Marco Pivetta <ocramius@gmail.com>
-     * @license MIT
-     *
-     * @see https://github.com/Ocramius/ProxyManager
-     */
-    final class ProxiedMethodReturnExpression
-    {
-        public static function generate(string $returnedValueExpression, ?\ReflectionMethod $originalMethod): string
-        {
-            $originalReturnType = null === $originalMethod ? null : $originalMethod->getReturnType();
-
-            $originalReturnTypeName = null === $originalReturnType ? null : $originalReturnType->getName();
-
-            if ('void' === $originalReturnTypeName) {
-                return $returnedValueExpression.";\nreturn;";
-            }
-
-            return 'return '.$returnedValueExpression.';';
-        }
-    }
-} else {
-    // Fallback to the original class by unregistering this file from composer class loader
-    $getComposerClassLoader = static function ($functionLoader) use (&$getComposerClassLoader) {
-        if (\is_array($functionLoader)) {
-            $functionLoader = $functionLoader[0];
-        }
-        if (!\is_object($functionLoader)) {
-            return null;
-        }
-        if ($functionLoader instanceof ClassLoader) {
-            return $functionLoader;
-        }
-        if ($functionLoader instanceof \Symfony\Component\Debug\DebugClassLoader) {
-            return $getComposerClassLoader($functionLoader->getClassLoader());
-        }
-        if ($functionLoader instanceof \Symfony\Component\ErrorHandler\DebugClassLoader) {
-            return $getComposerClassLoader($functionLoader->getClassLoader());
-        }
-
-        return null;
-    };
-
-    $classLoader = null;
-    $functions = spl_autoload_functions();
-    while (null === $classLoader && $functions) {
-        $classLoader = $getComposerClassLoader(array_shift($functions));
-    }
-    $getComposerClassLoader = null;
-
-    if (null !== $classLoader) {
-        $classLoader->addClassMap([ProxiedMethodReturnExpression::class => null]);
-        $classLoader->loadClass(ProxiedMethodReturnExpression::class);
-    }
-}
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 4adc5c063f89..7e34cd90b513 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -25,7 +25,6 @@
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
-        "classmap": [ "Legacy/ProxiedMethodReturnExpression.php" ],
         "exclude-from-classmap": [
             "/Tests/"
         ]