upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

fix: use array_key_exists instead of isset in di container

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2025-04-15 20:17:23 +02:00
parent bb632f0cfa
commit 4bdc0751c0
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -415,7 +415,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$name = $this->resolveAlias($name);
$isServerClass = str_starts_with($name, 'OCP\\') || str_starts_with($name, 'OC\\');
if ($isServerClass && !self::has($name)) {
if ($isServerClass && !$this->has($name)) {
return $this->server->queryNoApps($name, $autoload);
}

13
lib/private/AppFramework/Utility/SimpleContainer.php
View file

@ -41,7 +41,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
public function has(string $id): bool {
// If a service is no registered but is an existing class, we can probably load it
return isset($this->items[$id]) || isset($this->aliases[$id]) || class_exists($id);
return array_key_exists($id, $this->items) || array_key_exists($id, $this->aliases) || class_exists($id);
}
/**
@ -129,7 +129,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
$name = $this->sanitizeName($name);
$name = $this->resolveAlias($name);
if (isset($this->items[$name])) {
if (array_key_exists($name, $this->items)) {
$item = $this->items[$name];
if ($item instanceof ServiceFactory) {
return $item->get();
@ -145,7 +145,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
return $object;
}
throw new QueryNotFoundException('Could not resolve ' . $name . '!');
throw new QueryNotFoundException('Could not resolve ' . $name . '!' . get_class($this));
}
/**
@ -189,6 +189,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
if ($alias === $target) {
throw new QueryNotFoundException('Can\'t alias to self');
}
unset($this->items[$alias]);
$this->aliases[$alias] = $target;
}
@ -204,7 +205,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* @deprecated 20.0.0 use \Psr\Container\ContainerInterface::has
*/
public function offsetExists($id): bool {
return isset($this->items[$id]) || isset($this->aliases[$id]);
return array_key_exists($id, $this->items) || array_key_exists($id, $this->aliases);
}
/**
@ -235,7 +236,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* Check if we already have a resolved instance of $name
*/
public function isResolved($name): bool {
if (!isset($this->items[$name])) {
if (!array_key_exists($name, $this->items)) {
return false;
}
$item = $this->items[$name];
@ -247,7 +248,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
}
protected function resolveAlias(string $name): string {
while (isset($this->aliases[$name])) {
while (array_key_exists($name, $this->aliases)) {
$name = $this->aliases[$name];
}
return $name;

2
lib/private/ServerContainer.php
View file

@ -127,7 +127,7 @@ class ServerContainer extends SimpleContainer {
// In case the service starts with OCA\ we try to find the service in
// the apps container first.
if (!isset($this->items[$name]) && ($appContainer = $this->getAppContainerForService($name)) !== null) {
if (!array_key_exists($name, $this->items) && !array_key_exists($name, $this->aliases) && ($appContainer = $this->getAppContainerForService($name)) !== null) {
try {
return $appContainer->queryNoFallback($name);
} catch (QueryException $e) {