nextcloud / server

lib/public/IContainer.php

Indentation +67 added lines, -67 removed lines

@@ -44,75 +44,75 @@
  * @deprecated 20.0.0 use \Psr\Container\ContainerInterface
  */
 interface IContainer extends ContainerInterface {
-	/**
-	 * @template T
-	 *
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @psalm-param string|class-string<T> $name
-	 * @return \stdClass
-	 * @psalm-return ($name is class-string ? T : mixed)
-	 * @since 8.2.0
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 * @throws ContainerExceptionInterface if the class could not be found or instantiated
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name);
+    /**
+     * @template T
+     *
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @psalm-param string|class-string<T> $name
+     * @return \stdClass
+     * @psalm-return ($name is class-string ? T : mixed)
+     * @since 8.2.0
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     * @throws ContainerExceptionInterface if the class could not be found or instantiated
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name);
 
-	/**
-	 * Look up a service for a given name in the container.
-	 *
-	 * @template T
-	 *
-	 * @param string $name
-	 * @psalm-param string|class-string<T> $name
-	 * @param bool $autoload Should we try to autoload the service. If we are trying to resolve built in types this makes no sense for example
-	 * @return mixed
-	 * @psalm-return ($name is class-string ? T : mixed)
-	 * @throws ContainerExceptionInterface if the query could not be resolved
-	 * @throws NotFoundExceptionInterface if the name could not be found within the container
-	 * @throws QueryException if the query could not be resolved
-	 * @since 6.0.0
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 */
-	public function query(string $name, bool $autoload = true);
+    /**
+     * Look up a service for a given name in the container.
+     *
+     * @template T
+     *
+     * @param string $name
+     * @psalm-param string|class-string<T> $name
+     * @param bool $autoload Should we try to autoload the service. If we are trying to resolve built in types this makes no sense for example
+     * @return mixed
+     * @psalm-return ($name is class-string ? T : mixed)
+     * @throws ContainerExceptionInterface if the query could not be resolved
+     * @throws NotFoundExceptionInterface if the name could not be found within the container
+     * @throws QueryException if the query could not be resolved
+     * @since 6.0.0
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     */
+    public function query(string $name, bool $autoload = true);
 
-	/**
-	 * A value is stored in the container with it's corresponding name
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 * @return void
-	 * @since 6.0.0
-	 * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerParameter
-	 */
-	public function registerParameter($name, $value);
+    /**
+     * A value is stored in the container with it's corresponding name
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     * @since 6.0.0
+     * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerParameter
+     */
+    public function registerParameter($name, $value);
 
-	/**
-	 * A service is registered in the container where a closure is passed in which will actually
-	 * create the service on demand.
-	 * In case the parameter $shared is set to true (the default usage) the once created service will remain in
-	 * memory and be reused on subsequent calls.
-	 * In case the parameter is false the service will be recreated on every call.
-	 *
-	 * @param string $name
-	 * @param \Closure $closure
-	 * @param bool $shared
-	 * @return void
-	 * @since 6.0.0
-	 * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerService
-	 */
-	public function registerService($name, Closure $closure, $shared = true);
+    /**
+     * A service is registered in the container where a closure is passed in which will actually
+     * create the service on demand.
+     * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+     * memory and be reused on subsequent calls.
+     * In case the parameter is false the service will be recreated on every call.
+     *
+     * @param string $name
+     * @param \Closure $closure
+     * @param bool $shared
+     * @return void
+     * @since 6.0.0
+     * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerService
+     */
+    public function registerService($name, Closure $closure, $shared = true);
 
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 * @since 8.2.0
-	 * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerServiceAlias
-	 */
-	public function registerAlias($alias, $target);
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     * @since 8.2.0
+     * @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerServiceAlias
+     */
+    public function registerAlias($alias, $target);
 }

lib/private/AppFramework/Utility/SimpleContainer.php

Indentation +186 added lines, -186 removed lines

@@ -45,193 +45,193 @@
  * SimpleContainer is a simple implementation of a container on basis of Pimple
  */
 class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
-	/** @var Container */
-	private $container;
-
-	public function __construct() {
-		$this->container = new Container();
-	}
-
-	/**
-	 * @template T
-	 * @param class-string<T>|string $id
-	 * @return T|mixed
-	 * @psalm-template S as class-string<T>|string
-	 * @psalm-param S $id
-	 * @psalm-return (S is class-string<T> ? T : mixed)
-	 * @throws QueryException
-	 */
-	public function get(string $id) {
-		return $this->query($id);
-	}
-
-	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->container[$id]) || class_exists($id);
-	}
-
-	/**
-	 * @param ReflectionClass $class the class to instantiate
-	 * @return \stdClass the created class
-	 * @suppress PhanUndeclaredClassInstanceof
-	 */
-	private function buildClass(ReflectionClass $class) {
-		$constructor = $class->getConstructor();
-		if ($constructor === null) {
-			return $class->newInstance();
-		}
-
-		return $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) {
-						// 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()));
-	}
-
-	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
-		try {
-			$class = new ReflectionClass($name);
-			if ($class->isInstantiable()) {
-				return $this->buildClass($class);
-			} else {
-				throw new QueryException($baseMsg .
-					' Class can not be instantiated');
-			}
-		} catch (ReflectionException $e) {
-			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
-		}
-	}
-
-	public function query(string $name, bool $autoload = true) {
-		$name = $this->sanitizeName($name);
-		if (isset($this->container[$name])) {
-			return $this->container[$name];
-		}
-
-		if ($autoload) {
-			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
-				return $object;
-			});
-			return $object;
-		}
-
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
-	}
-
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public function registerParameter($name, $value) {
-		$this[$name] = $value;
-	}
-
-	/**
-	 * The given closure is call the first time the given service is queried.
-	 * The closure has to return the instance for the given service.
-	 * Created instance will be cached in case $shared is true.
-	 *
-	 * @param string $name name of the service to register another backend for
-	 * @param Closure $closure the closure to be called on service creation
-	 * @param bool $shared
-	 */
-	public function registerService($name, Closure $closure, $shared = true) {
-		$wrapped = function () use ($closure) {
-			return $closure($this);
-		};
-		$name = $this->sanitizeName($name);
-		if (isset($this[$name])) {
-			unset($this[$name]);
-		}
-		if ($shared) {
-			$this[$name] = $wrapped;
-		} else {
-			$this[$name] = $this->container->factory($wrapped);
-		}
-	}
-
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 */
-	public function registerAlias($alias, $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target) {
-			return $container->get($target);
-		}, false);
-	}
-
-	/*
+    /** @var Container */
+    private $container;
+
+    public function __construct() {
+        $this->container = new Container();
+    }
+
+    /**
+     * @template T
+     * @param class-string<T>|string $id
+     * @return T|mixed
+     * @psalm-template S as class-string<T>|string
+     * @psalm-param S $id
+     * @psalm-return (S is class-string<T> ? T : mixed)
+     * @throws QueryException
+     */
+    public function get(string $id) {
+        return $this->query($id);
+    }
+
+    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->container[$id]) || class_exists($id);
+    }
+
+    /**
+     * @param ReflectionClass $class the class to instantiate
+     * @return \stdClass the created class
+     * @suppress PhanUndeclaredClassInstanceof
+     */
+    private function buildClass(ReflectionClass $class) {
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            return $class->newInstance();
+        }
+
+        return $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) {
+                        // 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()));
+    }
+
+    public function resolve($name) {
+        $baseMsg = 'Could not resolve ' . $name . '!';
+        try {
+            $class = new ReflectionClass($name);
+            if ($class->isInstantiable()) {
+                return $this->buildClass($class);
+            } else {
+                throw new QueryException($baseMsg .
+                    ' Class can not be instantiated');
+            }
+        } catch (ReflectionException $e) {
+            // Class does not exist
+            throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+        }
+    }
+
+    public function query(string $name, bool $autoload = true) {
+        $name = $this->sanitizeName($name);
+        if (isset($this->container[$name])) {
+            return $this->container[$name];
+        }
+
+        if ($autoload) {
+            $object = $this->resolve($name);
+            $this->registerService($name, function () use ($object) {
+                return $object;
+            });
+            return $object;
+        }
+
+        throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function registerParameter($name, $value) {
+        $this[$name] = $value;
+    }
+
+    /**
+     * The given closure is call the first time the given service is queried.
+     * The closure has to return the instance for the given service.
+     * Created instance will be cached in case $shared is true.
+     *
+     * @param string $name name of the service to register another backend for
+     * @param Closure $closure the closure to be called on service creation
+     * @param bool $shared
+     */
+    public function registerService($name, Closure $closure, $shared = true) {
+        $wrapped = function () use ($closure) {
+            return $closure($this);
+        };
+        $name = $this->sanitizeName($name);
+        if (isset($this[$name])) {
+            unset($this[$name]);
+        }
+        if ($shared) {
+            $this[$name] = $wrapped;
+        } else {
+            $this[$name] = $this->container->factory($wrapped);
+        }
+    }
+
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     */
+    public function registerAlias($alias, $target) {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target) {
+            return $container->get($target);
+        }, false);
+    }
+
+    /*
 	 * @param string $name
 	 * @return string
 	 */
-	protected function sanitizeName($name) {
-		if (isset($name[0]) && $name[0] === '\\') {
-			return ltrim($name, '\\');
-		}
-		return $name;
-	}
-
-	/**
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::has
-	 */
-	public function offsetExists($id): bool {
-		return $this->container->offsetExists($id);
-	}
-
-	/**
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 * @return mixed
-	 */
-	#[\ReturnTypeWillChange]
-	public function offsetGet($id) {
-		return $this->container->offsetGet($id);
-	}
-
-	/**
-	 * @deprecated 20.0.0 use \OCP\IContainer::registerService
-	 */
-	public function offsetSet($id, $service): void {
-		$this->container->offsetSet($id, $service);
-	}
-
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public function offsetUnset($offset): void {
-		$this->container->offsetUnset($offset);
-	}
+    protected function sanitizeName($name) {
+        if (isset($name[0]) && $name[0] === '\\') {
+            return ltrim($name, '\\');
+        }
+        return $name;
+    }
+
+    /**
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::has
+     */
+    public function offsetExists($id): bool {
+        return $this->container->offsetExists($id);
+    }
+
+    /**
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($id) {
+        return $this->container->offsetGet($id);
+    }
+
+    /**
+     * @deprecated 20.0.0 use \OCP\IContainer::registerService
+     */
+    public function offsetSet($id, $service): void {
+        $this->container->offsetSet($id, $service);
+    }
+
+    /**
+     * @deprecated 20.0.0
+     */
+    public function offsetUnset($offset): void {
+        $this->container->offsetUnset($offset);
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -81,7 +81,7 @@ 
 			return $class->newInstance();
 		}
 
-		return $class->newInstanceArgs(array_map(function (ReflectionParameter $parameter) {
+		return $class->newInstanceArgs(array_map(function(ReflectionParameter $parameter) {
 			$parameterType = $parameter->getType();
 
 			$resolveName = $parameter->getName();
@@ -117,18 +117,18 @@ 
 	}
 
 	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
+		$baseMsg = 'Could not resolve '.$name.'!';
 		try {
 			$class = new ReflectionClass($name);
 			if ($class->isInstantiable()) {
 				return $this->buildClass($class);
 			} else {
-				throw new QueryException($baseMsg .
+				throw new QueryException($baseMsg.
 					' Class can not be instantiated');
 			}
 		} catch (ReflectionException $e) {
 			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+			throw new QueryNotFoundException($baseMsg.' '.$e->getMessage());
 		}
 	}
 
@@ -140,13 +140,13 @@ 
 
 		if ($autoload) {
 			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
+			$this->registerService($name, function() use ($object) {
 				return $object;
 			});
 			return $object;
 		}
 
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+		throw new QueryNotFoundException('Could not resolve '.$name.'!');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @param bool $shared
 	 */
 	public function registerService($name, Closure $closure, $shared = true) {
-		$wrapped = function () use ($closure) {
+		$wrapped = function() use ($closure) {
 			return $closure($this);
 		};
 		$name = $this->sanitizeName($name);
@@ -189,7 +189,7 @@ 
 	 * @param string $target the target that should be resolved instead
 	 */
 	public function registerAlias($alias, $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target) {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target) {
 			return $container->get($target);
 		}, false);
 	}