Merge branch '2.14.x' into 1.x

* 2.14.x:
  Reduce minimum covered code mutation score - floating point rounding hits again :-\
  Replaced `infection/infection` with a stricter `roave/infection-static-analysis-plugin`
  Add `github`-formatted output to infection runs
  Reoved `branch-alias` - the project no longer has a `master` branch, so the alias is no longer needed
  Upgraded locked reference to `vimeo/psalm`
  Upgraded `vimeo/psalm`, `infection/infection` and removed a lot of unused inline annotations and superfluous code
  Upgraded to `phpbench/phpbench:^1.0.0`
  Upgraded to `phpbench/phpbench:^1.0.0`
  Removing pinned `nikic/php-parser` dependency: newer `vimeo/psalm` versions use newer releases anyway
  Ignoring missing type declarations on some BC-sensitive interfaces
  Re-enabling the `SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint` rule
  Re-enabling the `SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.NoAssignment` rule
  Cleaning up unused imports: as the tooling improves, CS and psalm now understand each other more
  Upgraded to `doctrine/coding-standard:^9.0.0`
  Upgraded PHPUnit dependencies
  Drop PHP 7.4 from CI pipelines (no longer supported)
  Upgraded to latest `laminas/laminas-code` dependency
  Removed conflict with `doctrine/annotations`
  Removed conflict with `zendframework/zend-stdlib` and `laminas/laminas-stdlib`
  Drop PHP 7.x support: time to move on to PHP 8.0+

Author: nicolas-grekas

phpunit.xml.dist

@@ -1,18 +1,11 @@
 <?xml version="1.0"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="./vendor/autoload.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     verbose="true"
-    stopOnFailure="false"
-    processIsolation="false"
-    backupGlobals="false"
     columns="max"
-    beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutResourceUsageDuringSmallTests="true"
     beStrictAboutChangesToGlobalState="true"
 >
@@ -24,7 +17,7 @@
             <directory suffix=".phpt">./tests/language-feature-scripts</directory>
         </testsuite>
     </testsuites>
-    <coverage includeUncoveredFiles="true">
+    <coverage>
         <include>
             <directory suffix=".php">./src</directory>
         </include>

src/ProxyManager/Factory/AbstractBaseFactory.php

@@ -44,16 +44,15 @@ public function __construct(?Configuration $configuration = null)
      * Generate a proxy from a class name
      *
      * @param array<string, mixed> $proxyOptions
+     * @psalm-param class-string<RealObjectType> $className
+     *
+     * @psalm-return class-string<RealObjectType>
      *
      * @throws InvalidSignatureException
      * @throws MissingSignatureException
      * @throws OutOfBoundsException
      *
      * @psalm-template RealObjectType of object
-     *
-     * @psalm-param class-string<RealObjectType> $className
-     *
-     * @psalm-return class-string<RealObjectType>
      */
     protected function generateProxy(string $className, array $proxyOptions = []): string
     {
@@ -102,7 +101,6 @@ abstract protected function getGenerator(): ProxyGeneratorInterface;
      *
      * @param array<string, mixed> $proxyParameters
      * @param array<string, mixed> $proxyOptions
-     *
      * @psalm-param class-string $proxyClassName
      * @psalm-param class-string $className
      */

src/ProxyManager/Factory/AccessInterceptorScopeLocalizerFactory.php

@@ -35,13 +35,6 @@ public function __construct(?Configuration $configuration = null)
      *                                       before method logic is executed
      * @param array<string, Closure> $suffixInterceptors an array (indexed by method name) of interceptor closures to be called
      *                                       after method logic is executed
-     *
-     * @throws InvalidSignatureException
-     * @throws MissingSignatureException
-     * @throws OutOfBoundsException
-     *
-     * @psalm-template RealObjectType of object
-     *
      * @psalm-param RealObjectType $instance
      * @psalm-param array<string, Closure(
      *   RealObjectType&AccessInterceptorInterface<RealObjectType>=,
@@ -61,6 +54,11 @@ public function __construct(?Configuration $configuration = null)
      *
      * @psalm-return RealObjectType&AccessInterceptorInterface<RealObjectType>
      *
+     * @throws InvalidSignatureException
+     * @throws MissingSignatureException
+     * @throws OutOfBoundsException
+     *
+     * @psalm-template RealObjectType of object
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Factory/AccessInterceptorValueHolderFactory.php

@@ -37,13 +37,6 @@ public function __construct(?Configuration $configuration = null)
      *                                       before method logic is executed
      * @param array<string, Closure> $suffixInterceptors an array (indexed by method name) of interceptor closures to be called
      *                                       after method logic is executed
-     *
-     * @throws InvalidSignatureException
-     * @throws MissingSignatureException
-     * @throws OutOfBoundsException
-     *
-     * @psalm-template RealObjectType of object
-     *
      * @psalm-param RealObjectType $instance
      * @psalm-param array<string, callable(
      *   RealObjectType&AccessInterceptorInterface<RealObjectType>=,
@@ -63,6 +56,11 @@ public function __construct(?Configuration $configuration = null)
      *
      * @psalm-return RealObjectType&AccessInterceptorInterface<RealObjectType>&ValueHolderInterface<RealObjectType>&AccessInterceptorValueHolderInterface<RealObjectType>
      *
+     * @throws InvalidSignatureException
+     * @throws MissingSignatureException
+     * @throws OutOfBoundsException
+     *
+     * @psalm-template RealObjectType of object
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Factory/LazyLoadingGhostFactory.php

@@ -8,7 +8,6 @@
 use OutOfBoundsException;
 use ProxyManager\Configuration;
 use ProxyManager\Proxy\GhostObjectInterface;
-use ProxyManager\Proxy\LazyLoadingInterface;
 use ProxyManager\ProxyGenerator\LazyLoadingGhostGenerator;
 use ProxyManager\ProxyGenerator\ProxyGeneratorInterface;
 use ProxyManager\Signature\Exception\InvalidSignatureException;
@@ -67,13 +66,6 @@ protected function getGenerator(): ProxyGeneratorInterface
      *                              key "skippedProperties", which allows to skip lazy-loading of some properties.
      *                              "skippedProperties" is a string[], containing a list of properties referenced
      *                              via PHP's internal property name (i.e. "\0ClassName\0propertyName")
-     *
-     * @throws MissingSignatureException
-     * @throws InvalidSignatureException
-     * @throws OutOfBoundsException
-     *
-     * @psalm-template RealObjectType as object
-     *
      * @psalm-param class-string<RealObjectType> $className
      * @psalm-param Closure(
      *   RealObjectType&GhostObjectInterface<RealObjectType>=,
@@ -86,6 +78,11 @@ protected function getGenerator(): ProxyGeneratorInterface
      *
      * @psalm-return RealObjectType&GhostObjectInterface<RealObjectType>
      *
+     * @throws MissingSignatureException
+     * @throws InvalidSignatureException
+     * @throws OutOfBoundsException
+     *
+     * @psalm-template RealObjectType as object
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Factory/LazyLoadingValueHolderFactory.php

@@ -27,9 +27,6 @@ public function __construct(?Configuration $configuration = null)
 
     /**
      * @param array<string, mixed> $proxyOptions
-     *
-     * @psalm-template RealObjectType of object
-     *
      * @psalm-param class-string<RealObjectType> $className
      * @psalm-param Closure(
      *   RealObjectType|null=,
@@ -42,6 +39,7 @@ public function __construct(?Configuration $configuration = null)
      *
      * @psalm-return RealObjectType&ValueHolderInterface<RealObjectType>&VirtualProxyInterface
      *
+     * @psalm-template RealObjectType of object
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Factory/NullObjectFactory.php

@@ -31,17 +31,15 @@ public function __construct(?Configuration $configuration = null)
 
     /**
      * @param object|string $instanceOrClassName the object to be wrapped or interface to transform to null object
+     * @psalm-param RealObjectType|class-string<RealObjectType> $instanceOrClassName
+     *
+     * @psalm-return RealObjectType&NullObjectInterface
      *
      * @throws InvalidSignatureException
      * @throws MissingSignatureException
      * @throws OutOfBoundsException
      *
      * @psalm-template RealObjectType of object
-     *
-     * @psalm-param RealObjectType|class-string<RealObjectType> $instanceOrClassName
-     *
-     * @psalm-return RealObjectType&NullObjectInterface
-     *
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Factory/RemoteObject/AdapterInterface.php

@@ -14,6 +14,10 @@ interface AdapterInterface
      *
      * @param array<int, mixed> $params
      *
+     * Due to BC compliance, we cannot add a native `: mixed` return type declaration here
+     *
+     * phpcs:disable SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
+     *
      * @return mixed
      */
     public function call(string $wrappedClass, string $method, array $params = []);

src/ProxyManager/Factory/RemoteObjectFactory.php

@@ -39,18 +39,15 @@ public function __construct(AdapterInterface $adapter, ?Configuration $configura
     }
 
     /**
-     * @param string|object $instanceOrClassName
+     * @psalm-param RealObjectType|class-string<RealObjectType> $instanceOrClassName
+     *
+     * @psalm-return RealObjectType&RemoteObjectInterface
      *
      * @throws InvalidSignatureException
      * @throws MissingSignatureException
      * @throws OutOfBoundsException
      *
      * @psalm-template RealObjectType of object
-     *
-     * @psalm-param RealObjectType|class-string<RealObjectType> $instanceOrClassName
-     *
-     * @psalm-return RealObjectType&RemoteObjectInterface
-     *
      * @psalm-suppress MixedInferredReturnType We ignore type checks here, since `staticProxyConstructor` is not
      *                                         interfaced (by design)
      */

src/ProxyManager/Generator/Util/UniqueIdentifierGenerator.php

@@ -21,6 +21,7 @@ abstract class UniqueIdentifierGenerator
      * Generates a valid unique identifier from the given name
      *
      * @psalm-return class-string
+     *
      * @psalm-suppress MoreSpecificReturnType
      */
     public static function getIdentifier(string $name): string