diff --git a/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php b/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php index 6d32dcbb37b..f12c2ea3dc5 100644 --- a/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php +++ b/packages/VendorLocker/ParentClassMethodTypeOverrideGuard.php @@ -52,12 +52,18 @@ final class ParentClassMethodTypeOverrideGuard } /** @var string $methodName */ $methodName = $this->nodeNameResolver->getName($classMethod); - $parentClassReflections = \array_merge($classReflection->getParents(), $classReflection->getInterfaces()); - foreach ($parentClassReflections as $parentClassReflection) { - if (!$parentClassReflection->hasNativeMethod($methodName)) { + $parentClassReflection = $classReflection->getParentClass(); + while ($parentClassReflection instanceof ClassReflection) { + if ($parentClassReflection->hasNativeMethod($methodName)) { + return $parentClassReflection->getNativeMethod($methodName); + } + $parentClassReflection = $parentClassReflection->getParentClass(); + } + foreach ($classReflection->getInterfaces() as $interfaceReflection) { + if (!$interfaceReflection->hasNativeMethod($methodName)) { continue; } - return $parentClassReflection->getNativeMethod($methodName); + return $interfaceReflection->getNativeMethod($methodName); } return null; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 6cb1a6a929d..c0bfe2d8099 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'a729d729e1e93a764494f3793ef3fff64cf5365a'; + public const PACKAGE_VERSION = 'c7379ec641e50e8227f9d3b4ef1306fba324ce6e'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-04-23 00:31:33'; + public const RELEASE_DATE = '2023-04-23 13:02:36'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 00e8b47fe16..36012044b37 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit1803a8e54f111f11d9d2b31f353683b0::getLoader(); +return ComposerAutoloaderInit2f42b7249125d65cc1e4dc8931b1cb2d::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a899e4090c0..74a3c04b3ea 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit1803a8e54f111f11d9d2b31f353683b0 +class ComposerAutoloaderInit2f42b7249125d65cc1e4dc8931b1cb2d { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit1803a8e54f111f11d9d2b31f353683b0 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit1803a8e54f111f11d9d2b31f353683b0', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit2f42b7249125d65cc1e4dc8931b1cb2d', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit1803a8e54f111f11d9d2b31f353683b0', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit2f42b7249125d65cc1e4dc8931b1cb2d', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 51226fa9ab7..91635e07313 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0 +class ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3149,9 +3149,9 @@ class ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit1803a8e54f111f11d9d2b31f353683b0::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit2f42b7249125d65cc1e4dc8931b1cb2d::$classMap; }, null, ClassLoader::class); }