diff options
-rw-r--r-- | build/psalm-baseline.xml | 44 | ||||
-rw-r--r-- | lib/base.php | 1 |
2 files changed, 1 insertions, 44 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index ad2ccce5641..80a255a6580 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -3456,53 +3456,9 @@ </MoreSpecificImplementedParamType> </file> <file src="lib/private/AppFramework/Utility/SimpleContainer.php"> - <LessSpecificReturnStatement> - <code><![CDATA[$class->newInstance()]]></code> - <code><![CDATA[$class->newInstanceArgs(array_map(function (ReflectionParameter $parameter) { - $parameterType = $parameter->getType(); - - $resolveName = $parameter->getName(); - - // try to find out if it is a class or a simple parameter - if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) { - $resolveName = $parameterType->getName(); - } - - try { - $builtIn = $parameter->hasType() && ($parameter->getType() instanceof ReflectionNamedType) - && $parameter->getType()->isBuiltin(); - return $this->query($resolveName, !$builtIn); - } catch (QueryException $e) { - // Service not found, use the default value when available - if ($parameter->isDefaultValueAvailable()) { - return $parameter->getDefaultValue(); - } - - if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) { - $resolveName = $parameter->getName(); - try { - return $this->query($resolveName); - } catch (QueryException $e2) { - // Pass null if typed and nullable - if ($parameter->allowsNull() && ($parameterType instanceof ReflectionNamedType)) { - return null; - } - - // don't lose the error we got while trying to query by type - throw new QueryException($e->getMessage(), (int)$e->getCode(), $e); - } - } - - throw $e; - } - }, $constructor->getParameters()))]]></code> - </LessSpecificReturnStatement> <MissingTemplateParam> <code><![CDATA[ArrayAccess]]></code> </MissingTemplateParam> - <MoreSpecificReturnType> - <code><![CDATA[\stdClass]]></code> - </MoreSpecificReturnType> <RedundantCast> <code><![CDATA[(int)$e->getCode()]]></code> </RedundantCast> diff --git a/lib/base.php b/lib/base.php index e00179fbab4..c22e7b702f7 100644 --- a/lib/base.php +++ b/lib/base.php @@ -792,6 +792,7 @@ class OC { if (PHP_VERSION_ID >= 80400) { /* FIXME On 8.4 constructor is not called unless we do that or use the object */ $reflector = new \ReflectionClass(\OC\Core\Application::class); + /** @psalm-suppress UndefinedMethod */ $reflector->initializeLazyObject($coreApplication); } } |