nextcloud / server

lib/private/AppFramework/Http/Dispatcher.php

Indentation +223 added lines, -223 removed lines

@@ -26,227 +26,227 @@
  * Class to dispatch the request to the middleware dispatcher
  */
 class Dispatcher {
-	/** @var MiddlewareDispatcher */
-	private $middlewareDispatcher;
-
-	/** @var Http */
-	private $protocol;
-
-	/** @var ControllerMethodReflector */
-	private $reflector;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var ConnectionAdapter */
-	private $connection;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var IEventLogger */
-	private $eventLogger;
-
-	private ContainerInterface $appContainer;
-
-	/**
-	 * @param Http $protocol the http protocol with contains all status headers
-	 * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
-	 *                                                   runs the middleware
-	 * @param ControllerMethodReflector $reflector the reflector that is used to inject
-	 *                                             the arguments for the controller
-	 * @param IRequest $request the incoming request
-	 * @param IConfig $config
-	 * @param ConnectionAdapter $connection
-	 * @param LoggerInterface $logger
-	 * @param IEventLogger $eventLogger
-	 */
-	public function __construct(
-		Http $protocol,
-		MiddlewareDispatcher $middlewareDispatcher,
-		ControllerMethodReflector $reflector,
-		IRequest $request,
-		IConfig $config,
-		ConnectionAdapter $connection,
-		LoggerInterface $logger,
-		IEventLogger $eventLogger,
-		ContainerInterface $appContainer,
-	) {
-		$this->protocol = $protocol;
-		$this->middlewareDispatcher = $middlewareDispatcher;
-		$this->reflector = $reflector;
-		$this->request = $request;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->eventLogger = $eventLogger;
-		$this->appContainer = $appContainer;
-	}
-
-
-	/**
-	 * Handles a request and calls the dispatcher on the controller
-	 * @param Controller $controller the controller which will be called
-	 * @param string $methodName the method name which will be called on
-	 *                           the controller
-	 * @return array $array[0] contains the http status header as a string,
-	 *               $array[1] contains response headers as an array,
-	 *               $array[2] contains response cookies as an array,
-	 *               $array[3] contains the response output as a string,
-	 *               $array[4] contains the response object
-	 * @throws \Exception
-	 */
-	public function dispatch(Controller $controller, string $methodName): array {
-		$out = [null, [], null];
-
-		try {
-			// prefill reflector with everything that's needed for the
-			// middlewares
-			$this->reflector->reflect($controller, $methodName);
-
-			$this->middlewareDispatcher->beforeController($controller,
-				$methodName);
-
-			$databaseStatsBefore = [];
-			if ($this->config->getSystemValueBool('debug', false)) {
-				$databaseStatsBefore = $this->connection->getInner()->getStats();
-			}
-
-			$response = $this->executeController($controller, $methodName);
-
-			if (!empty($databaseStatsBefore)) {
-				$databaseStatsAfter = $this->connection->getInner()->getStats();
-				$numBuilt = $databaseStatsAfter['built'] - $databaseStatsBefore['built'];
-				$numExecuted = $databaseStatsAfter['executed'] - $databaseStatsBefore['executed'];
-
-				if ($numBuilt > 50) {
-					$this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.', [
-						'class' => get_class($controller),
-						'method' => $methodName,
-						'count' => $numBuilt,
-					]);
-				}
-
-				if ($numExecuted > 100) {
-					$this->logger->warning('Controller {class}::{method} executed {count} queries.', [
-						'class' => get_class($controller),
-						'method' => $methodName,
-						'count' => $numExecuted,
-					]);
-				}
-			}
-
-			// if an exception appears, the middleware checks if it can handle the
-			// exception and creates a response. If no response is created, it is
-			// assumed that there's no middleware who can handle it and the error is
-			// thrown again
-		} catch (\Exception $exception) {
-			$response = $this->middlewareDispatcher->afterException(
-				$controller, $methodName, $exception);
-		} catch (\Throwable $throwable) {
-			$exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable);
-			$response = $this->middlewareDispatcher->afterException(
-				$controller, $methodName, $exception);
-		}
-
-		$response = $this->middlewareDispatcher->afterController(
-			$controller, $methodName, $response);
-
-		// depending on the cache object the headers need to be changed
-		$out[0] = $this->protocol->getStatusHeader($response->getStatus());
-		$out[1] = array_merge($response->getHeaders());
-		$out[2] = $response->getCookies();
-		$out[3] = $this->middlewareDispatcher->beforeOutput(
-			$controller, $methodName, $response->render()
-		);
-		$out[4] = $response;
-
-		return $out;
-	}
-
-
-	/**
-	 * Uses the reflected parameters, types and request parameters to execute
-	 * the controller
-	 * @param Controller $controller the controller to be executed
-	 * @param string $methodName the method on the controller that should be executed
-	 * @return Response
-	 */
-	private function executeController(Controller $controller, string $methodName): Response {
-		$arguments = [];
-
-		// valid types that will be cast
-		$types = ['int', 'integer', 'bool', 'boolean', 'float', 'double'];
-
-		foreach ($this->reflector->getParameters() as $param => $default) {
-			// try to get the parameter from the request object and cast
-			// it to the type annotated in the @param annotation
-			$value = $this->request->getParam($param, $default);
-			$type = $this->reflector->getType($param);
-
-			// Converted the string `'false'` to false when the controller wants a boolean
-			if ($value === 'false' && ($type === 'bool' || $type === 'boolean')) {
-				$value = false;
-			} elseif ($value !== null && \in_array($type, $types, true)) {
-				settype($value, $type);
-				$this->ensureParameterValueSatisfiesRange($param, $value);
-			} elseif ($value === null && $type !== null && $this->appContainer->has($type)) {
-				$value = $this->appContainer->get($type);
-			}
-
-			$arguments[] = $value;
-		}
-
-		$this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
-		try {
-			$response = \call_user_func_array([$controller, $methodName], $arguments);
-		} catch (\TypeError $e) {
-			// Only intercept TypeErrors occurring on the first line, meaning that the invocation of the controller method failed.
-			// Any other TypeError happens inside the controller method logic and should be logged as normal.
-			if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
-				$this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
-				return new Response(Http::STATUS_BAD_REQUEST);
-			}
-
-			throw $e;
-		}
-		$this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
-
-		if (!($response instanceof Response)) {
-			$this->logger->debug($controller::class . '::' . $methodName . ' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
-		}
-
-		// format response
-		if ($response instanceof DataResponse || !($response instanceof Response)) {
-			$format = $this->request->getFormat();
-			if ($format !== null && $controller->isResponderRegistered($format)) {
-				$response = $controller->buildResponse($response, $format);
-			} else {
-				$response = $controller->buildResponse($response);
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @psalm-param mixed $value
-	 * @throws ParameterOutOfRangeException
-	 */
-	private function ensureParameterValueSatisfiesRange(string $param, $value): void {
-		$rangeInfo = $this->reflector->getRange($param);
-		if ($rangeInfo) {
-			if ($value < $rangeInfo['min'] || $value > $rangeInfo['max']) {
-				throw new ParameterOutOfRangeException(
-					$param,
-					$value,
-					$rangeInfo['min'],
-					$rangeInfo['max'],
-				);
-			}
-		}
-	}
+    /** @var MiddlewareDispatcher */
+    private $middlewareDispatcher;
+
+    /** @var Http */
+    private $protocol;
+
+    /** @var ControllerMethodReflector */
+    private $reflector;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var ConnectionAdapter */
+    private $connection;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var IEventLogger */
+    private $eventLogger;
+
+    private ContainerInterface $appContainer;
+
+    /**
+     * @param Http $protocol the http protocol with contains all status headers
+     * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
+     *                                                   runs the middleware
+     * @param ControllerMethodReflector $reflector the reflector that is used to inject
+     *                                             the arguments for the controller
+     * @param IRequest $request the incoming request
+     * @param IConfig $config
+     * @param ConnectionAdapter $connection
+     * @param LoggerInterface $logger
+     * @param IEventLogger $eventLogger
+     */
+    public function __construct(
+        Http $protocol,
+        MiddlewareDispatcher $middlewareDispatcher,
+        ControllerMethodReflector $reflector,
+        IRequest $request,
+        IConfig $config,
+        ConnectionAdapter $connection,
+        LoggerInterface $logger,
+        IEventLogger $eventLogger,
+        ContainerInterface $appContainer,
+    ) {
+        $this->protocol = $protocol;
+        $this->middlewareDispatcher = $middlewareDispatcher;
+        $this->reflector = $reflector;
+        $this->request = $request;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->eventLogger = $eventLogger;
+        $this->appContainer = $appContainer;
+    }
+
+
+    /**
+     * Handles a request and calls the dispatcher on the controller
+     * @param Controller $controller the controller which will be called
+     * @param string $methodName the method name which will be called on
+     *                           the controller
+     * @return array $array[0] contains the http status header as a string,
+     *               $array[1] contains response headers as an array,
+     *               $array[2] contains response cookies as an array,
+     *               $array[3] contains the response output as a string,
+     *               $array[4] contains the response object
+     * @throws \Exception
+     */
+    public function dispatch(Controller $controller, string $methodName): array {
+        $out = [null, [], null];
+
+        try {
+            // prefill reflector with everything that's needed for the
+            // middlewares
+            $this->reflector->reflect($controller, $methodName);
+
+            $this->middlewareDispatcher->beforeController($controller,
+                $methodName);
+
+            $databaseStatsBefore = [];
+            if ($this->config->getSystemValueBool('debug', false)) {
+                $databaseStatsBefore = $this->connection->getInner()->getStats();
+            }
+
+            $response = $this->executeController($controller, $methodName);
+
+            if (!empty($databaseStatsBefore)) {
+                $databaseStatsAfter = $this->connection->getInner()->getStats();
+                $numBuilt = $databaseStatsAfter['built'] - $databaseStatsBefore['built'];
+                $numExecuted = $databaseStatsAfter['executed'] - $databaseStatsBefore['executed'];
+
+                if ($numBuilt > 50) {
+                    $this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.', [
+                        'class' => get_class($controller),
+                        'method' => $methodName,
+                        'count' => $numBuilt,
+                    ]);
+                }
+
+                if ($numExecuted > 100) {
+                    $this->logger->warning('Controller {class}::{method} executed {count} queries.', [
+                        'class' => get_class($controller),
+                        'method' => $methodName,
+                        'count' => $numExecuted,
+                    ]);
+                }
+            }
+
+            // if an exception appears, the middleware checks if it can handle the
+            // exception and creates a response. If no response is created, it is
+            // assumed that there's no middleware who can handle it and the error is
+            // thrown again
+        } catch (\Exception $exception) {
+            $response = $this->middlewareDispatcher->afterException(
+                $controller, $methodName, $exception);
+        } catch (\Throwable $throwable) {
+            $exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable);
+            $response = $this->middlewareDispatcher->afterException(
+                $controller, $methodName, $exception);
+        }
+
+        $response = $this->middlewareDispatcher->afterController(
+            $controller, $methodName, $response);
+
+        // depending on the cache object the headers need to be changed
+        $out[0] = $this->protocol->getStatusHeader($response->getStatus());
+        $out[1] = array_merge($response->getHeaders());
+        $out[2] = $response->getCookies();
+        $out[3] = $this->middlewareDispatcher->beforeOutput(
+            $controller, $methodName, $response->render()
+        );
+        $out[4] = $response;
+
+        return $out;
+    }
+
+
+    /**
+     * Uses the reflected parameters, types and request parameters to execute
+     * the controller
+     * @param Controller $controller the controller to be executed
+     * @param string $methodName the method on the controller that should be executed
+     * @return Response
+     */
+    private function executeController(Controller $controller, string $methodName): Response {
+        $arguments = [];
+
+        // valid types that will be cast
+        $types = ['int', 'integer', 'bool', 'boolean', 'float', 'double'];
+
+        foreach ($this->reflector->getParameters() as $param => $default) {
+            // try to get the parameter from the request object and cast
+            // it to the type annotated in the @param annotation
+            $value = $this->request->getParam($param, $default);
+            $type = $this->reflector->getType($param);
+
+            // Converted the string `'false'` to false when the controller wants a boolean
+            if ($value === 'false' && ($type === 'bool' || $type === 'boolean')) {
+                $value = false;
+            } elseif ($value !== null && \in_array($type, $types, true)) {
+                settype($value, $type);
+                $this->ensureParameterValueSatisfiesRange($param, $value);
+            } elseif ($value === null && $type !== null && $this->appContainer->has($type)) {
+                $value = $this->appContainer->get($type);
+            }
+
+            $arguments[] = $value;
+        }
+
+        $this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
+        try {
+            $response = \call_user_func_array([$controller, $methodName], $arguments);
+        } catch (\TypeError $e) {
+            // Only intercept TypeErrors occurring on the first line, meaning that the invocation of the controller method failed.
+            // Any other TypeError happens inside the controller method logic and should be logged as normal.
+            if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
+                $this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
+                return new Response(Http::STATUS_BAD_REQUEST);
+            }
+
+            throw $e;
+        }
+        $this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
+
+        if (!($response instanceof Response)) {
+            $this->logger->debug($controller::class . '::' . $methodName . ' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
+        }
+
+        // format response
+        if ($response instanceof DataResponse || !($response instanceof Response)) {
+            $format = $this->request->getFormat();
+            if ($format !== null && $controller->isResponderRegistered($format)) {
+                $response = $controller->buildResponse($response, $format);
+            } else {
+                $response = $controller->buildResponse($response);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @psalm-param mixed $value
+     * @throws ParameterOutOfRangeException
+     */
+    private function ensureParameterValueSatisfiesRange(string $param, $value): void {
+        $rangeInfo = $this->reflector->getRange($param);
+        if ($rangeInfo) {
+            if ($value < $rangeInfo['min'] || $value > $rangeInfo['max']) {
+                throw new ParameterOutOfRangeException(
+                    $param,
+                    $value,
+                    $rangeInfo['min'],
+                    $rangeInfo['max'],
+                );
+            }
+        }
+    }
 }

lib/private/AppFramework/Middleware/OCSMiddleware.php

Indentation +102 added lines, -102 removed lines

@@ -20,109 +20,109 @@
 use OCP\IRequest;
 
 class OCSMiddleware extends Middleware {
-	/** @var IRequest */
-	private $request;
-
-	/** @var int */
-	private $ocsVersion;
-
-	/**
-	 * @param IRequest $request
-	 */
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof OCSController) {
-			if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
-				$this->ocsVersion = 2;
-			} else {
-				$this->ocsVersion = 1;
-			}
-			$controller->setOCSVersion($this->ocsVersion);
-		}
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return BaseResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($controller instanceof OCSController && $exception instanceof OCSException) {
-			$code = $exception->getCode();
-			if ($code === 0) {
-				$code = \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR;
-			}
-
-			return $this->buildNewResponse($controller, $code, $exception->getMessage());
-		}
-
-		throw $exception;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return \OCP\AppFramework\Http\Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		/*
+    /** @var IRequest */
+    private $request;
+
+    /** @var int */
+    private $ocsVersion;
+
+    /**
+     * @param IRequest $request
+     */
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof OCSController) {
+            if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
+                $this->ocsVersion = 2;
+            } else {
+                $this->ocsVersion = 1;
+            }
+            $controller->setOCSVersion($this->ocsVersion);
+        }
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return BaseResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($controller instanceof OCSController && $exception instanceof OCSException) {
+            $code = $exception->getCode();
+            if ($code === 0) {
+                $code = \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR;
+            }
+
+            return $this->buildNewResponse($controller, $code, $exception->getMessage());
+        }
+
+        throw $exception;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return \OCP\AppFramework\Http\Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        /*
 		 * If a different middleware has detected that a request unauthorized or forbidden
 		 * we need to catch the response and convert it to a proper OCS response.
 		 */
-		if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
-			if ($response->getStatus() === Http::STATUS_UNAUTHORIZED) {
-				$message = '';
-				if ($response instanceof JSONResponse) {
-					/** @var DataResponse $response */
-					$message = $response->getData()['message'];
-				}
-
-				return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message);
-			}
-			if ($response->getStatus() === Http::STATUS_FORBIDDEN) {
-				$message = '';
-				if ($response instanceof JSONResponse) {
-					/** @var DataResponse $response */
-					$message = $response->getData()['message'];
-				}
-
-				return $this->buildNewResponse($controller, Http::STATUS_FORBIDDEN, $message);
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param int $code
-	 * @param string $message
-	 * @return V1Response|V2Response
-	 */
-	private function buildNewResponse(Controller $controller, $code, $message) {
-		$format = $this->request->getFormat();
-		if ($format === null || !$controller->isResponderRegistered($format)) {
-			$format = 'xml';
-		}
-
-		$data = new DataResponse();
-		$data->setStatus($code);
-		if ($this->ocsVersion === 1) {
-			$response = new V1Response($data, $format, $message);
-		} else {
-			$response = new V2Response($data, $format, $message);
-		}
-
-		return $response;
-	}
+        if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
+            if ($response->getStatus() === Http::STATUS_UNAUTHORIZED) {
+                $message = '';
+                if ($response instanceof JSONResponse) {
+                    /** @var DataResponse $response */
+                    $message = $response->getData()['message'];
+                }
+
+                return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message);
+            }
+            if ($response->getStatus() === Http::STATUS_FORBIDDEN) {
+                $message = '';
+                if ($response instanceof JSONResponse) {
+                    /** @var DataResponse $response */
+                    $message = $response->getData()['message'];
+                }
+
+                return $this->buildNewResponse($controller, Http::STATUS_FORBIDDEN, $message);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param int $code
+     * @param string $message
+     * @return V1Response|V2Response
+     */
+    private function buildNewResponse(Controller $controller, $code, $message) {
+        $format = $this->request->getFormat();
+        if ($format === null || !$controller->isResponderRegistered($format)) {
+            $format = 'xml';
+        }
+
+        $data = new DataResponse();
+        $data->setStatus($code);
+        if ($this->ocsVersion === 1) {
+            $response = new V1Response($data, $format, $message);
+        } else {
+            $response = new V2Response($data, $format, $message);
+        }
+
+        return $response;
+    }
 }

lib/public/AppFramework/Controller.php

Indentation +126 added lines, -126 removed lines

@@ -18,130 +18,130 @@
  * @since 6.0.0
  */
 abstract class Controller {
-	/**
-	 * app name
-	 * @var string
-	 * @since 7.0.0
-	 */
-	protected $appName;
-
-	/**
-	 * current request
-	 * @var \OCP\IRequest
-	 * @since 6.0.0
-	 */
-	protected $request;
-
-	/**
-	 * @var array<string, Closure>
-	 * @since 7.0.0
-	 */
-	private $responders;
-
-	/**
-	 * constructor of the controller
-	 * @param string $appName the name of the app
-	 * @param IRequest $request an instance of the request
-	 * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
-	 */
-	public function __construct($appName,
-		IRequest $request) {
-		$this->appName = $appName;
-		$this->request = $request;
-
-		// default responders
-		$this->responders = [
-			'json' => function ($data) {
-				if ($data instanceof DataResponse) {
-					$response = new JSONResponse(
-						$data->getData(),
-						$data->getStatus()
-					);
-					$dataHeaders = $data->getHeaders();
-					$headers = $response->getHeaders();
-					// do not overwrite Content-Type if it already exists
-					if (isset($dataHeaders['Content-Type'])) {
-						unset($headers['Content-Type']);
-					}
-					$response->setHeaders(array_merge($dataHeaders, $headers));
-
-					if ($data->getETag() !== null) {
-						$response->setETag($data->getETag());
-					}
-					if ($data->getLastModified() !== null) {
-						$response->setLastModified($data->getLastModified());
-					}
-					if ($data->isThrottled()) {
-						$response->throttle($data->getThrottleMetadata());
-					}
-
-					return $response;
-				}
-				return new JSONResponse($data);
-			}
-		];
-	}
-
-
-	/**
-	 * Parses an HTTP accept header and returns the supported responder type
-	 * @param string $acceptHeader
-	 * @param string $default
-	 * @return string the responder type
-	 * @since 7.0.0
-	 * @since 9.1.0 Added default parameter
-	 * @deprecated 33.0.0 Use {@see \OCP\IRequest::getFormat} instead
-	 */
-	public function getResponderByHTTPHeader($acceptHeader, $default = 'json') {
-		$headers = explode(',', $acceptHeader);
-
-		// return the first matching responder
-		foreach ($headers as $header) {
-			$header = strtolower(trim($header));
-
-			$responder = str_replace('application/', '', $header);
-
-			if (array_key_exists($responder, $this->responders)) {
-				return $responder;
-			}
-		}
-
-		// no matching header return default
-		return $default;
-	}
-
-
-	/**
-	 * Registers a formatter for a type
-	 * @param string $format
-	 * @param Closure $responder
-	 * @since 7.0.0
-	 */
-	protected function registerResponder($format, Closure $responder) {
-		$this->responders[$format] = $responder;
-	}
-
-
-	/**
-	 * Serializes and formats a response
-	 * @param mixed $response the value that was returned from a controller and
-	 *                        is not a Response instance
-	 * @param string $format the format for which a formatter has been registered
-	 * @throws \DomainException if format does not match a registered formatter
-	 * @return Response
-	 * @since 7.0.0
-	 */
-	public function buildResponse($response, $format = 'json') {
-		if (array_key_exists($format, $this->responders)) {
-			$responder = $this->responders[$format];
-
-			return $responder($response);
-		}
-		throw new \DomainException('No responder registered for format '
-			. $format . '!');
-	}
-
-	public function isResponderRegistered(string $responder): bool {
-		return isset($this->responders[$responder]);
-	}
+    /**
+     * app name
+     * @var string
+     * @since 7.0.0
+     */
+    protected $appName;
+
+    /**
+     * current request
+     * @var \OCP\IRequest
+     * @since 6.0.0
+     */
+    protected $request;
+
+    /**
+     * @var array<string, Closure>
+     * @since 7.0.0
+     */
+    private $responders;
+
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
+     */
+    public function __construct($appName,
+        IRequest $request) {
+        $this->appName = $appName;
+        $this->request = $request;
+
+        // default responders
+        $this->responders = [
+            'json' => function ($data) {
+                if ($data instanceof DataResponse) {
+                    $response = new JSONResponse(
+                        $data->getData(),
+                        $data->getStatus()
+                    );
+                    $dataHeaders = $data->getHeaders();
+                    $headers = $response->getHeaders();
+                    // do not overwrite Content-Type if it already exists
+                    if (isset($dataHeaders['Content-Type'])) {
+                        unset($headers['Content-Type']);
+                    }
+                    $response->setHeaders(array_merge($dataHeaders, $headers));
+
+                    if ($data->getETag() !== null) {
+                        $response->setETag($data->getETag());
+                    }
+                    if ($data->getLastModified() !== null) {
+                        $response->setLastModified($data->getLastModified());
+                    }
+                    if ($data->isThrottled()) {
+                        $response->throttle($data->getThrottleMetadata());
+                    }
+
+                    return $response;
+                }
+                return new JSONResponse($data);
+            }
+        ];
+    }
+
+
+    /**
+     * Parses an HTTP accept header and returns the supported responder type
+     * @param string $acceptHeader
+     * @param string $default
+     * @return string the responder type
+     * @since 7.0.0
+     * @since 9.1.0 Added default parameter
+     * @deprecated 33.0.0 Use {@see \OCP\IRequest::getFormat} instead
+     */
+    public function getResponderByHTTPHeader($acceptHeader, $default = 'json') {
+        $headers = explode(',', $acceptHeader);
+
+        // return the first matching responder
+        foreach ($headers as $header) {
+            $header = strtolower(trim($header));
+
+            $responder = str_replace('application/', '', $header);
+
+            if (array_key_exists($responder, $this->responders)) {
+                return $responder;
+            }
+        }
+
+        // no matching header return default
+        return $default;
+    }
+
+
+    /**
+     * Registers a formatter for a type
+     * @param string $format
+     * @param Closure $responder
+     * @since 7.0.0
+     */
+    protected function registerResponder($format, Closure $responder) {
+        $this->responders[$format] = $responder;
+    }
+
+
+    /**
+     * Serializes and formats a response
+     * @param mixed $response the value that was returned from a controller and
+     *                        is not a Response instance
+     * @param string $format the format for which a formatter has been registered
+     * @throws \DomainException if format does not match a registered formatter
+     * @return Response
+     * @since 7.0.0
+     */
+    public function buildResponse($response, $format = 'json') {
+        if (array_key_exists($format, $this->responders)) {
+            $responder = $this->responders[$format];
+
+            return $responder($response);
+        }
+        throw new \DomainException('No responder registered for format '
+            . $format . '!');
+    }
+
+    public function isResponderRegistered(string $responder): bool {
+        return isset($this->responders[$responder]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
 		// default responders
 		$this->responders = [
-			'json' => function ($data) {
+			'json' => function($data) {
 				if ($data instanceof DataResponse) {
 					$response = new JSONResponse(
 						$data->getData(),
@@ -138,7 +138,7 @@ 
 			return $responder($response);
 		}
 		throw new \DomainException('No responder registered for format '
-			. $format . '!');
+			. $format.'!');
 	}
 
 	public function isResponderRegistered(string $responder): bool {