Merge remote-tracking branch 'upstream/2.12.x' into merge-ups

* upstream/2.12.x: (39 commits)
  #657 s/>/>= when checking for current PHP runtime in tests
  #657 prevent installation of older `thecodingmachine/safe` versions with `ocramius/proxy-manager`
  #657 upgraded `beberlei/assert` to allow `composer install` on `php: 8.0.0` environments
  #657 upgraded to stable `laminas/laminas-code` release
  #657 upgraded `laminas/laminas-code` and removed redundant conditional checks caused by upstream type refinement
  #657 upgraded `laminas/laminas-code` to a version supporting PHP 8.0+
  #657 run unit tests also against PHP 8.0, CS checks on PHP 7.4 (for BC), static analysis only on 8.0
  #657 CS: sorted import statements
  #657 CS: sorted import statements
  #657 removed internal `ClassGenerator` override from `laminas/laminas-code`
  #657 ensure that `ReflectionType#getName()` is only called on an actual `ReflectionNamedType`
  #628 added unit tests to verify correct codegen of proxies that extend classes with PHP 8.0 types
  Try PHP 8 with highest deps first
  Upgrade laminas/laminas-code
  Ignore PHP platform requirement
  Allow PHPBench 1.0.0-alpha2
  Upgrade PHPUnit
  Allow PHP 8
  Bump codelicia/xulieta from 0.1.2 to 0.1.5
  Bump infection/infection from 0.16.4 to 0.20.2
  ...

Author: nicolas-grekas

src/ProxyManager/Factory/AbstractBaseFactory.php

@@ -4,9 +4,9 @@
 
 namespace ProxyManager\Factory;
 
+use Laminas\Code\Generator\ClassGenerator;
 use OutOfBoundsException;
 use ProxyManager\Configuration;
-use ProxyManager\Generator\ClassGenerator;
 use ProxyManager\ProxyGenerator\ProxyGeneratorInterface;
 use ProxyManager\Signature\Exception\InvalidSignatureException;
 use ProxyManager\Signature\Exception\MissingSignatureException;

src/ProxyManager/Generator/ClassGenerator.php

@@ -6,40 +6,13 @@
 
 use Laminas\Code\Generator\ClassGenerator as LaminasClassGenerator;
 
-use function array_map;
-use function trim;
-
 /**
  * Class generator that ensures that interfaces/classes that are implemented/extended are FQCNs
+ *
+ * @internal do not use this in your code: it is only here for internal use
+ * @deprecated this class was in use due to parent implementation not receiving prompt bugfixes, but
+ *             `laminas/laminas-code` is actively maintained and receives quick release iterations.
  */
 class ClassGenerator extends LaminasClassGenerator
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function setExtendedClass($extendedClass): LaminasClassGenerator
-    {
-        if ($extendedClass) {
-            $extendedClass = '\\' . trim($extendedClass, '\\');
-        }
-
-        return parent::setExtendedClass($extendedClass);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array<int, string> $interfaces
-     *
-     * @psalm-suppress MoreSpecificImplementedParamType parent interface does not specify type of array values
-     */
-    public function setImplementedInterfaces(array $interfaces): LaminasClassGenerator
-    {
-        return parent::setImplementedInterfaces(array_map(
-            static function (string $interface): string {
-                return '\\' . trim($interface, '\\');
-            },
-            $interfaces
-        ));
-    }
 }

src/ProxyManager/Generator/Util/ProxiedMethodReturnExpression.php

@@ -5,6 +5,7 @@
 namespace ProxyManager\Generator\Util;
 
 use ReflectionMethod;
+use ReflectionNamedType;
 
 /**
  * Utility class to generate return expressions in method, given a method signature.
@@ -19,11 +20,7 @@ public static function generate(string $returnedValueExpression, ?ReflectionMeth
             ? null
             : $originalMethod->getReturnType();
 
-        $originalReturnTypeName = $originalReturnType === null
-            ? null
-            : $originalReturnType->getName();
-
-        if ($originalReturnTypeName === 'void') {
+        if ($originalReturnType instanceof ReflectionNamedType && $originalReturnType->getName() === 'void') {
             return $returnedValueExpression . ";\nreturn;";
         }
 

src/ProxyManager/GeneratorStrategy/EvaluatingGeneratorStrategy.php

@@ -7,9 +7,7 @@
 use Laminas\Code\Generator\ClassGenerator;
 use Symfony\Component\Filesystem\Filesystem;
 
-use function assert;
 use function ini_get;
-use function is_string;
 use function unlink;
 
 /**
@@ -38,7 +36,6 @@ public function __construct()
     public function generate(ClassGenerator $classGenerator): string
     {
         $code = $classGenerator->generate();
-        assert(is_string($code));
 
         // @codeCoverageIgnoreStart
         if (! $this->canEval) {

src/ProxyManager/GeneratorStrategy/FileWriterGeneratorStrategy.php

@@ -11,8 +11,6 @@
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 
-use function assert;
-use function is_string;
 use function restore_error_handler;
 use function set_error_handler;
 
@@ -46,9 +44,8 @@ public function __construct(FileLocatorInterface $fileLocator)
     public function generate(ClassGenerator $classGenerator): string
     {
         $generatedCode = $classGenerator->generate();
-        assert(is_string($generatedCode));
-        $className = $classGenerator->getNamespaceName() . '\\' . $classGenerator->getName();
-        $fileName  = $this->fileLocator->getProxyFileName($className);
+        $className     = $classGenerator->getNamespaceName() . '\\' . $classGenerator->getName();
+        $fileName      = $this->fileLocator->getProxyFileName($className);
 
         set_error_handler($this->emptyErrorHandler);
 

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicGet.php

@@ -39,7 +39,7 @@ public function __construct(
                 null,
                 null,
                 'returnValue',
-                $originalClass->isInterface() ? $originalClass->getName() : null
+                $originalClass
             );
         }
 

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicIsset.php

@@ -39,7 +39,7 @@ public function __construct(
                 null,
                 null,
                 'returnValue',
-                $originalClass->isInterface() ? $originalClass->getName() : null
+                $originalClass
             );
         }
 

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicSet.php

@@ -43,7 +43,7 @@ public function __construct(
                 'value',
                 null,
                 'returnValue',
-                $originalClass->isInterface() ? $originalClass->getName() : null
+                $originalClass
             );
         }
 

src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizer/MethodGenerator/MagicUnset.php

@@ -39,7 +39,7 @@ public function __construct(
                 null,
                 null,
                 'returnValue',
-                $originalClass->isInterface() ? $originalClass->getName() : null
+                $originalClass
             );
         }
 

src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolder/MethodGenerator/MagicGet.php

@@ -39,10 +39,10 @@ public function __construct(
         $callParent = PublicScopeSimulator::getPublicAccessSimulationCode(
             PublicScopeSimulator::OPERATION_GET,
             'name',
-            'value',
+            null,
             $valueHolder,
             'returnValue',
-            $originalClass->isInterface() ? $originalClass->getName() : null
+            $originalClass
         );
 
         if (! $publicProperties->isEmpty()) {