nextcloud / server

apps/workflowengine/lib/Settings/Admin.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 use OCP\WorkflowEngine\IManager;
 
 class Admin extends ASettings {
-	public function getScope(): int {
-		return IManager::SCOPE_ADMIN;
-	}
+    public function getScope(): int {
+        return IManager::SCOPE_ADMIN;
+    }
 }

apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  * Amazon S3 access key authentication
  */
 class AccessKey extends AuthMechanism {
-	public const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+    public const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
 
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('amazons3::accesskey')
-			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
-			->setText($l->t('Access key'))
-			->addParameters([
-				new DefinitionParameter('key', $l->t('Access key')),
-				(new DefinitionParameter('secret', $l->t('Secret key')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			]);
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('amazons3::accesskey')
+            ->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setText($l->t('Access key'))
+            ->addParameters([
+                new DefinitionParameter('key', $l->t('Access key')),
+                (new DefinitionParameter('secret', $l->t('Secret key')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ]);
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@
 use Sabre\DAV\IFile;
 
 abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash {
-	public function put($data) {
-		throw new Forbidden();
-	}
+    public function put($data) {
+        throw new Forbidden();
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 }

apps/dav/lib/CardDAV/HasPhotoPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$ns = '{http://nextcloud.com/ns}';
 
 		if ($node instanceof Card) {
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
+			$propFind->handle($ns.'has-photo', function() use ($node) {
 				$vcard = Reader::read($node->get());
 				return $vcard instanceof VCard
 					&& $vcard->PHOTO

Indentation +60 added lines, -60 removed lines

@@ -18,69 +18,69 @@
 
 class HasPhotoPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
+    /** @var Server */
+    protected $server;
 
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-	}
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$ns = '{http://nextcloud.com/ns}';
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $ns = '{http://nextcloud.com/ns}';
 
-		if ($node instanceof Card) {
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
-				$vcard = Reader::read($node->get());
-				return $vcard instanceof VCard
-					&& $vcard->PHOTO
-					// Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
-					&& (!str_starts_with($vcard->PHOTO->getValue(), 'data:')
-						|| str_starts_with($vcard->PHOTO->getValue(), 'data:image/'))
-				;
-			});
-		}
-	}
+        if ($node instanceof Card) {
+            $propFind->handle($ns . 'has-photo', function () use ($node) {
+                $vcard = Reader::read($node->get());
+                return $vcard instanceof VCard
+                    && $vcard->PHOTO
+                    // Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
+                    && (!str_starts_with($vcard->PHOTO->getValue(), 'data:')
+                        || str_starts_with($vcard->PHOTO->getValue(), 'data:image/'))
+                ;
+            });
+        }
+    }
 
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using \Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'vcard-has-photo';
-	}
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using \Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'vcard-has-photo';
+    }
 
-	/**
-	 * Returns a bunch of meta-data about the plugin.
-	 *
-	 * Providing this information is optional, and is mainly displayed by the
-	 * Browser plugin.
-	 *
-	 * The description key in the returned array may contain html and will not
-	 * be sanitized.
-	 *
-	 * @return array
-	 */
-	public function getPluginInfo() {
-		return [
-			'name' => $this->getPluginName(),
-			'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
-		];
-	}
+    /**
+     * Returns a bunch of meta-data about the plugin.
+     *
+     * Providing this information is optional, and is mainly displayed by the
+     * Browser plugin.
+     *
+     * The description key in the returned array may contain html and will not
+     * be sanitized.
+     *
+     * @return array
+     */
+    public function getPluginInfo() {
+        return [
+            'name' => $this->getPluginName(),
+            'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
+        ];
+    }
 }

apps/user_ldap/lib/Mapping/UserMapping.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 	 */
 	protected function getTableName(bool $includePrefix = true) {
 		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_user_mapping';
+		return $p.'ldap_user_mapping';
 	}
 }

Indentation +37 added lines, -37 removed lines

@@ -20,45 +20,45 @@
  */
 class UserMapping extends AbstractMapping {
 
-	protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
+    protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
 
-	public function __construct(
-		IDBConnection $dbc,
-		private IAssertion $assertion,
-	) {
-		parent::__construct($dbc);
-	}
+    public function __construct(
+        IDBConnection $dbc,
+        private IAssertion $assertion,
+    ) {
+        parent::__construct($dbc);
+    }
 
-	/**
-	 * @throws HintException
-	 */
-	public function map($fdn, $name, $uuid): bool {
-		try {
-			$this->assertion->createUserIsLegit();
-		} catch (HintException $e) {
-			static $isProvisioningApi = null;
+    /**
+     * @throws HintException
+     */
+    public function map($fdn, $name, $uuid): bool {
+        try {
+            $this->assertion->createUserIsLegit();
+        } catch (HintException $e) {
+            static $isProvisioningApi = null;
 
-			if ($isProvisioningApi === null) {
-				$request = Server::get(IRequest::class);
-				$isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
-			}
-			if ($isProvisioningApi) {
-				// only throw when prov API is being used, since functionality
-				// should not break for end users (e.g. when sharing).
-				// On direct API usage, e.g. on users page, this is desired.
-				throw $e;
-			}
-			return false;
-		}
-		return parent::map($fdn, $name, $uuid);
-	}
+            if ($isProvisioningApi === null) {
+                $request = Server::get(IRequest::class);
+                $isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
+            }
+            if ($isProvisioningApi) {
+                // only throw when prov API is being used, since functionality
+                // should not break for end users (e.g. when sharing).
+                // On direct API usage, e.g. on users page, this is desired.
+                throw $e;
+            }
+            return false;
+        }
+        return parent::map($fdn, $name, $uuid);
+    }
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName(bool $includePrefix = true) {
-		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_user_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName(bool $includePrefix = true) {
+        $p = $includePrefix ? '*PREFIX*' : '';
+        return $p . 'ldap_user_mapping';
+    }
 }

apps/user_ldap/lib/Mapping/GroupMapping.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  */
 class GroupMapping extends AbstractMapping {
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName(bool $includePrefix = true) {
-		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName(bool $includePrefix = true) {
+        $p = $includePrefix ? '*PREFIX*' : '';
+        return $p . 'ldap_group_mapping';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 	 */
 	protected function getTableName(bool $includePrefix = true) {
 		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
+		return $p.'ldap_group_mapping';
 	}
 }

apps/user_ldap/lib/Proxy.php

Spacing +3 added lines, -3 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return string
 	 */
 	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
+		return 'user-'.$uid.'-lastSeenOn';
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
+		return 'group-'.$gid.'-lastSeenOn';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 		if ($key === null) {
 			return $prefix;
 		}
-		return $prefix . hash('sha256', $key);
+		return $prefix.hash('sha256', $key);
 	}
 
 	/**

Indentation +187 added lines, -187 removed lines

@@ -17,191 +17,191 @@
  * @template T
  */
 abstract class Proxy {
-	/** @var array<string,Access> */
-	private static array $accesses = [];
-	private ?bool $isSingleBackend = null;
-	private ?ICache $cache = null;
-
-	/** @var T[] */
-	protected array $backends = [];
-	/** @var ?T */
-	protected $refBackend = null;
-
-	protected bool $isSetUp = false;
-
-	public function __construct(
-		private Helper $helper,
-		private ILDAPWrapper $ldap,
-		private AccessFactory $accessFactory,
-	) {
-		$memcache = Server::get(ICacheFactory::class);
-		if ($memcache->isAvailable()) {
-			$this->cache = $memcache->createDistributed();
-		}
-	}
-
-	protected function setup(): void {
-		if ($this->isSetUp) {
-			return;
-		}
-
-		$serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
-		foreach ($serverConfigPrefixes as $configPrefix) {
-			$this->backends[$configPrefix] = $this->newInstance($configPrefix);
-
-			if (is_null($this->refBackend)) {
-				$this->refBackend = $this->backends[$configPrefix];
-			}
-		}
-
-		$this->isSetUp = true;
-	}
-
-	/**
-	 * @return T
-	 */
-	abstract protected function newInstance(string $configPrefix): object;
-
-	/**
-	 * @return T
-	 */
-	public function getBackend(string $configPrefix): object {
-		$this->setup();
-		return $this->backends[$configPrefix];
-	}
-
-	private function addAccess(string $configPrefix): void {
-		$userMap = Server::get(UserMapping::class);
-		$groupMap = Server::get(GroupMapping::class);
-
-		$connector = new Connection($this->ldap, $configPrefix);
-		$access = $this->accessFactory->get($connector);
-		$access->setUserMapper($userMap);
-		$access->setGroupMapper($groupMap);
-		self::$accesses[$configPrefix] = $access;
-	}
-
-	protected function getAccess(string $configPrefix): Access {
-		if (!isset(self::$accesses[$configPrefix])) {
-			$this->addAccess($configPrefix);
-		}
-		return self::$accesses[$configPrefix];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @param bool $passOnWhen
-	 * @return mixed
-	 */
-	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @return mixed
-	 */
-	abstract protected function walkBackends($id, $method, $parameters);
-
-	/**
-	 * @param string $id
-	 * @return Access
-	 */
-	abstract public function getLDAPAccess($id);
-
-	abstract protected function activeBackends(): int;
-
-	protected function isSingleBackend(): bool {
-		if ($this->isSingleBackend === null) {
-			$this->isSingleBackend = $this->activeBackends() === 1;
-		}
-		return $this->isSingleBackend;
-	}
-
-	/**
-	 * Takes care of the request to the User backend
-	 *
-	 * @param string $id
-	 * @param string $method string, the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @param bool $passOnWhen
-	 * @return mixed the result of the specified method
-	 */
-	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		if (!$this->isSingleBackend()) {
-			$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-		}
-		if (!isset($result) || $result === $passOnWhen) {
-			$result = $this->walkBackends($id, $method, $parameters);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string|null $key
-	 * @return string
-	 */
-	private function getCacheKey($key) {
-		$prefix = 'LDAP-Proxy-';
-		if ($key === null) {
-			return $prefix;
-		}
-		return $prefix . hash('sha256', $key);
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 */
-	public function getFromCache($key) {
-		if ($this->cache === null) {
-			return null;
-		}
-
-		$key = $this->getCacheKey($key);
-		$value = $this->cache->get($key);
-		if ($value === null) {
-			return null;
-		}
-
-		return json_decode(base64_decode($value));
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function writeToCache($key, $value) {
-		if ($this->cache === null) {
-			return;
-		}
-		$key = $this->getCacheKey($key);
-		$value = base64_encode(json_encode($value));
-		$this->cache->set($key, $value, 2592000);
-	}
-
-	public function clearCache() {
-		if ($this->cache === null) {
-			return;
-		}
-		$this->cache->clear($this->getCacheKey(null));
-	}
+    /** @var array<string,Access> */
+    private static array $accesses = [];
+    private ?bool $isSingleBackend = null;
+    private ?ICache $cache = null;
+
+    /** @var T[] */
+    protected array $backends = [];
+    /** @var ?T */
+    protected $refBackend = null;
+
+    protected bool $isSetUp = false;
+
+    public function __construct(
+        private Helper $helper,
+        private ILDAPWrapper $ldap,
+        private AccessFactory $accessFactory,
+    ) {
+        $memcache = Server::get(ICacheFactory::class);
+        if ($memcache->isAvailable()) {
+            $this->cache = $memcache->createDistributed();
+        }
+    }
+
+    protected function setup(): void {
+        if ($this->isSetUp) {
+            return;
+        }
+
+        $serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
+        foreach ($serverConfigPrefixes as $configPrefix) {
+            $this->backends[$configPrefix] = $this->newInstance($configPrefix);
+
+            if (is_null($this->refBackend)) {
+                $this->refBackend = $this->backends[$configPrefix];
+            }
+        }
+
+        $this->isSetUp = true;
+    }
+
+    /**
+     * @return T
+     */
+    abstract protected function newInstance(string $configPrefix): object;
+
+    /**
+     * @return T
+     */
+    public function getBackend(string $configPrefix): object {
+        $this->setup();
+        return $this->backends[$configPrefix];
+    }
+
+    private function addAccess(string $configPrefix): void {
+        $userMap = Server::get(UserMapping::class);
+        $groupMap = Server::get(GroupMapping::class);
+
+        $connector = new Connection($this->ldap, $configPrefix);
+        $access = $this->accessFactory->get($connector);
+        $access->setUserMapper($userMap);
+        $access->setGroupMapper($groupMap);
+        self::$accesses[$configPrefix] = $access;
+    }
+
+    protected function getAccess(string $configPrefix): Access {
+        if (!isset(self::$accesses[$configPrefix])) {
+            $this->addAccess($configPrefix);
+        }
+        return self::$accesses[$configPrefix];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserCacheKey($uid) {
+        return 'user-' . $uid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupCacheKey($gid) {
+        return 'group-' . $gid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @param bool $passOnWhen
+     * @return mixed
+     */
+    abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @return mixed
+     */
+    abstract protected function walkBackends($id, $method, $parameters);
+
+    /**
+     * @param string $id
+     * @return Access
+     */
+    abstract public function getLDAPAccess($id);
+
+    abstract protected function activeBackends(): int;
+
+    protected function isSingleBackend(): bool {
+        if ($this->isSingleBackend === null) {
+            $this->isSingleBackend = $this->activeBackends() === 1;
+        }
+        return $this->isSingleBackend;
+    }
+
+    /**
+     * Takes care of the request to the User backend
+     *
+     * @param string $id
+     * @param string $method string, the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @param bool $passOnWhen
+     * @return mixed the result of the specified method
+     */
+    protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
+        if (!$this->isSingleBackend()) {
+            $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+        }
+        if (!isset($result) || $result === $passOnWhen) {
+            $result = $this->walkBackends($id, $method, $parameters);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string|null $key
+     * @return string
+     */
+    private function getCacheKey($key) {
+        $prefix = 'LDAP-Proxy-';
+        if ($key === null) {
+            return $prefix;
+        }
+        return $prefix . hash('sha256', $key);
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getFromCache($key) {
+        if ($this->cache === null) {
+            return null;
+        }
+
+        $key = $this->getCacheKey($key);
+        $value = $this->cache->get($key);
+        if ($value === null) {
+            return null;
+        }
+
+        return json_decode(base64_decode($value));
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function writeToCache($key, $value) {
+        if ($this->cache === null) {
+            return;
+        }
+        $key = $this->getCacheKey($key);
+        $value = base64_encode(json_encode($value));
+        $this->cache->set($key, $value, 2592000);
+    }
+
+    public function clearCache() {
+        if ($this->cache === null) {
+            return;
+        }
+        $this->cache->clear($this->getCacheKey(null));
+    }
 }

lib/private/AppFramework/Services/InitialState.php

Indentation +14 added lines, -14 removed lines

@@ -29,22 +29,22 @@
 use OCP\IInitialStateService;
 
 class InitialState implements IInitialState {
-	/** @var IInitialStateService */
-	private $state;
+    /** @var IInitialStateService */
+    private $state;
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	public function __construct(IInitialStateService $state, string $appName) {
-		$this->state = $state;
-		$this->appName = $appName;
-	}
+    public function __construct(IInitialStateService $state, string $appName) {
+        $this->state = $state;
+        $this->appName = $appName;
+    }
 
-	public function provideInitialState(string $key, $data): void {
-		$this->state->provideInitialState($this->appName, $key, $data);
-	}
+    public function provideInitialState(string $key, $data): void {
+        $this->state->provideInitialState($this->appName, $key, $data);
+    }
 
-	public function provideLazyInitialState(string $key, \Closure $closure): void {
-		$this->state->provideLazyInitialState($this->appName, $key, $closure);
-	}
+    public function provideLazyInitialState(string $key, \Closure $closure): void {
+        $this->state->provideLazyInitialState($this->appName, $key, $closure);
+    }
 }

lib/private/AppFramework/Middleware/NotModifiedMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 	public function afterController($controller, $methodName, Response $response) {
 		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"'.$response->getETag().'"') {
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
 			return $response;
 		}

Indentation +22 added lines, -22 removed lines

@@ -14,26 +14,26 @@
 use OCP\IRequest;
 
 class NotModifiedMiddleware extends Middleware {
-	/** @var IRequest */
-	private $request;
-
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	public function afterController($controller, $methodName, Response $response) {
-		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		$modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
-		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		return $response;
-	}
+    /** @var IRequest */
+    private $request;
+
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    public function afterController($controller, $methodName, Response $response) {
+        $etagHeader = $this->request->getHeader('IF_NONE_MATCH');
+        if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
+        if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        return $response;
+    }
 }