From ec2feae36701b6f60f38664823bd9a72dbd512a0 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 22 Dec 2022 14:16:02 +0100 Subject: [PATCH] Added final keyword to some methods not meant to be extended MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Adam Wójs Co-Authored-By: Paweł Niedzielski --- .../PathPrefixer/BaseSiteAccessAwarePathPrefixer.php | 8 ++++---- .../PathPrefixer/LocalSiteAccessAwarePathPrefixer.php | 2 +- .../VisibilityConverter/BaseVisibilityConverter.php | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixer.php b/src/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixer.php index db0486b822..5063535a6e 100644 --- a/src/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixer.php +++ b/src/lib/IO/Flysystem/PathPrefixer/BaseSiteAccessAwarePathPrefixer.php @@ -24,7 +24,7 @@ public function __construct(string $separator = DIRECTORY_SEPARATOR) abstract protected function getSiteAccessAwarePathPrefix(): string; - public function prefixPath(string $path): string + final public function prefixPath(string $path): string { $siteAccessAwarePathPrefix = $this->getSiteAccessAwarePathPrefix(); $prefix = rtrim($siteAccessAwarePathPrefix, '\\/'); @@ -35,17 +35,17 @@ public function prefixPath(string $path): string return $prefix . ltrim($path, '\\/'); } - public function stripPrefix(string $path): string + final public function stripPrefix(string $path): string { return substr($path, strlen($this->getSiteAccessAwarePathPrefix())); } - public function stripDirectoryPrefix(string $path): string + final public function stripDirectoryPrefix(string $path): string { return rtrim($this->stripPrefix($path), '\\/'); } - public function prefixDirectoryPath(string $path): string + final public function prefixDirectoryPath(string $path): string { $prefixedPath = $this->prefixPath(rtrim($path, '\\/')); diff --git a/src/lib/IO/Flysystem/PathPrefixer/LocalSiteAccessAwarePathPrefixer.php b/src/lib/IO/Flysystem/PathPrefixer/LocalSiteAccessAwarePathPrefixer.php index e58d0ab592..1460a22ecc 100644 --- a/src/lib/IO/Flysystem/PathPrefixer/LocalSiteAccessAwarePathPrefixer.php +++ b/src/lib/IO/Flysystem/PathPrefixer/LocalSiteAccessAwarePathPrefixer.php @@ -14,7 +14,7 @@ /** * @internal */ -class LocalSiteAccessAwarePathPrefixer extends BaseSiteAccessAwarePathPrefixer +final class LocalSiteAccessAwarePathPrefixer extends BaseSiteAccessAwarePathPrefixer { private IOConfigProvider $ioConfigProvider; diff --git a/src/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverter.php b/src/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverter.php index ed770053c1..ac263b467f 100644 --- a/src/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverter.php +++ b/src/lib/IO/Flysystem/VisibilityConverter/BaseVisibilityConverter.php @@ -35,7 +35,7 @@ abstract protected function getPublicFilePermissions(): int; abstract protected function getPublicDirectoryPermissions(): int; - public function forFile(string $visibility): int + final public function forFile(string $visibility): int { PortableVisibilityGuard::guardAgainstInvalidInput($visibility); @@ -44,7 +44,7 @@ public function forFile(string $visibility): int : $this->nativeVisibilityConverter->forFile($visibility); } - public function forDirectory(string $visibility): int + final public function forDirectory(string $visibility): int { PortableVisibilityGuard::guardAgainstInvalidInput($visibility); @@ -53,7 +53,7 @@ public function forDirectory(string $visibility): int : $this->nativeVisibilityConverter->forDirectory($visibility); } - public function inverseForFile(int $visibility): string + final public function inverseForFile(int $visibility): string { if ($visibility === $this->getPublicFilePermissions()) { return Visibility::PUBLIC; @@ -66,7 +66,7 @@ public function inverseForFile(int $visibility): string return Visibility::PUBLIC; // default } - public function inverseForDirectory(int $visibility): string + final public function inverseForDirectory(int $visibility): string { if ($visibility === $this->getPublicDirectoryPermissions()) { return Visibility::PUBLIC; @@ -79,7 +79,7 @@ public function inverseForDirectory(int $visibility): string return Visibility::PUBLIC; // default } - public function defaultForDirectories(): int + final public function defaultForDirectories(): int { return $this->nativeVisibilityConverter->defaultForDirectories(); }