diff options
Diffstat (limited to 'lib/private')
266 files changed, 103 insertions, 377 deletions
diff --git a/lib/private/Accounts/AccountProperty.php b/lib/private/Accounts/AccountProperty.php index 896dfd247b5..a8e195feb98 100644 --- a/lib/private/Accounts/AccountProperty.php +++ b/lib/private/Accounts/AccountProperty.php @@ -32,7 +32,6 @@ use OCP\Accounts\IAccountManager; use OCP\Accounts\IAccountProperty; class AccountProperty implements IAccountProperty { - /** @var string */ private $name; /** @var string */ diff --git a/lib/private/Accounts/AccountPropertyCollection.php b/lib/private/Accounts/AccountPropertyCollection.php index 091c5734218..1e5d8a5112a 100644 --- a/lib/private/Accounts/AccountPropertyCollection.php +++ b/lib/private/Accounts/AccountPropertyCollection.php @@ -32,7 +32,6 @@ use OCP\Accounts\IAccountProperty; use OCP\Accounts\IAccountPropertyCollection; class AccountPropertyCollection implements IAccountPropertyCollection { - /** @var string */ protected $collectionName = ''; diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php index b440bc394d6..a6c52275d2d 100644 --- a/lib/private/Accounts/Hooks.php +++ b/lib/private/Accounts/Hooks.php @@ -36,7 +36,6 @@ use Psr\Log\LoggerInterface; * @template-implements IEventListener<UserChangedEvent> */ class Hooks implements IEventListener { - /** @var IAccountManager */ private $accountManager; /** @var LoggerInterface */ diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 5f0993532cb..9332d8b111a 100644 --- a/lib/private/Activity/EventMerger.php +++ b/lib/private/Activity/EventMerger.php @@ -29,7 +29,6 @@ use OCP\Activity\IEventMerger; use OCP\IL10N; class EventMerger implements IEventMerger { - /** @var IL10N */ protected $l10n; diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 6d2fe51d0ed..d14f0a2644e 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -52,7 +52,6 @@ use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AppManager implements IAppManager { - /** * Apps with these types can not be enabled for certain groups only * @var string[] diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index 661cc70578f..58ffd4f83b8 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EducationBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php index 901467048a8..bb64ec391ff 100644 --- a/lib/private/App/AppStore/Bundles/EnterpriseBundle.php +++ b/lib/private/App/AppStore/Bundles/EnterpriseBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class EnterpriseBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/GroupwareBundle.php b/lib/private/App/AppStore/Bundles/GroupwareBundle.php index f1e130806c4..3a46ada52ad 100644 --- a/lib/private/App/AppStore/Bundles/GroupwareBundle.php +++ b/lib/private/App/AppStore/Bundles/GroupwareBundle.php @@ -25,7 +25,6 @@ namespace OC\App\AppStore\Bundles; class GroupwareBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php index 394cce17d63..f823792745b 100644 --- a/lib/private/App/AppStore/Bundles/SocialSharingBundle.php +++ b/lib/private/App/AppStore/Bundles/SocialSharingBundle.php @@ -24,7 +24,6 @@ namespace OC\App\AppStore\Bundles; class SocialSharingBundle extends Bundle { - /** * {@inheritDoc} */ diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 579f350b5bb..35bec10f5ae 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -39,7 +39,6 @@ use OCP\Support\Subscription\IRegistry; use Psr\Log\LoggerInterface; class AppFetcher extends Fetcher { - /** @var CompareVersion */ private $compareVersion; @@ -117,15 +116,15 @@ class AppFetcher extends Fetcher { $minPhpVersion = $phpVersion->getMinimumVersion(); $maxPhpVersion = $phpVersion->getMaximumVersion(); $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $minPhpVersion, - '>=' - ); + PHP_VERSION, + $minPhpVersion, + '>=' + ); $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible( - PHP_VERSION, - $maxPhpVersion, - '<=' - ); + PHP_VERSION, + $maxPhpVersion, + '<=' + ); $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled; } diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index 788f15c183f..0eb089bbdc2 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -167,10 +167,8 @@ abstract class Fetcher { // Always get latests apps info if $allowUnstable if (!$allowUnstable && is_array($jsonBlob)) { - // No caching when the version has been updated if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) { - // If the timestamp is older than 3600 seconds request the files new if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) { return $jsonBlob['data']; diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php index 373e3c5e04d..aa136f0e965 100644 --- a/lib/private/App/DependencyAnalyzer.php +++ b/lib/private/App/DependencyAnalyzer.php @@ -33,7 +33,6 @@ namespace OC\App; use OCP\IL10N; class DependencyAnalyzer { - /** @var Platform */ private $platform; /** @var \OCP\IL10N */ diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index 9d57ef95688..25f191502c3 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -267,7 +267,7 @@ class InfoParser { } else { $array[$element] = $data; } - // Just a value + // Just a value } else { if ($totalElement > 1) { $array[$element][] = $this->xmlToArray($node); diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index 325220823b8..04e76373466 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -42,7 +42,6 @@ use OCP\IConfig; * database. */ class AppConfig implements IAppConfig { - /** @var array[] */ protected $sensitiveValues = [ 'circles' => [ @@ -285,7 +284,6 @@ class AppConfig implements IAppConfig { * > Large objects (LOBs) are not supported in comparison conditions. */ if (!($this->conn instanceof OracleConnection)) { - /* * Only update the value when it is not the same * Note that NULL requires some special handling. Since comparing diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index 170acba0689..d2ef7da9e46 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -53,7 +53,6 @@ use OCP\IRequest; * Handles all the dependency injection, controllers and output flow */ class App { - /** @var string[] */ private static $nameSpaceCache = []; diff --git a/lib/private/AppFramework/Bootstrap/ARegistration.php b/lib/private/AppFramework/Bootstrap/ARegistration.php index bb8fe0c8e92..797d7d2317b 100644 --- a/lib/private/AppFramework/Bootstrap/ARegistration.php +++ b/lib/private/AppFramework/Bootstrap/ARegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ abstract class ARegistration { - /** @var string */ private $appId; diff --git a/lib/private/AppFramework/Bootstrap/BootContext.php b/lib/private/AppFramework/Bootstrap/BootContext.php index f21d7d00b1e..8c37d00a419 100644 --- a/lib/private/AppFramework/Bootstrap/BootContext.php +++ b/lib/private/AppFramework/Bootstrap/BootContext.php @@ -31,7 +31,6 @@ use OCP\AppFramework\IAppContainer; use OCP\IServerContainer; class BootContext implements IBootContext { - /** @var IAppContainer */ private $appContainer; diff --git a/lib/private/AppFramework/Bootstrap/Coordinator.php b/lib/private/AppFramework/Bootstrap/Coordinator.php index 3ab6ac4c8b0..f5f50b1b775 100644 --- a/lib/private/AppFramework/Bootstrap/Coordinator.php +++ b/lib/private/AppFramework/Bootstrap/Coordinator.php @@ -46,7 +46,6 @@ use Psr\Log\LoggerInterface; use Throwable; class Coordinator { - /** @var IServerContainer */ private $serverContainer; diff --git a/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php b/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php index be279cbfd52..2ad410be26f 100644 --- a/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php +++ b/lib/private/AppFramework/Bootstrap/EventListenerRegistration.php @@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap; * @template-extends ServiceRegistration<\OCP\EventDispatcher\IEventListener> */ class EventListenerRegistration extends ServiceRegistration { - /** @var string */ private $event; diff --git a/lib/private/AppFramework/Bootstrap/FunctionInjector.php b/lib/private/AppFramework/Bootstrap/FunctionInjector.php index 13eb5d88969..2f95906ab4c 100644 --- a/lib/private/AppFramework/Bootstrap/FunctionInjector.php +++ b/lib/private/AppFramework/Bootstrap/FunctionInjector.php @@ -33,7 +33,6 @@ use ReflectionParameter; use function array_map; class FunctionInjector { - /** @var ContainerInterface */ private $container; diff --git a/lib/private/AppFramework/Bootstrap/ParameterRegistration.php b/lib/private/AppFramework/Bootstrap/ParameterRegistration.php index 5a683f41a9f..b501a757abd 100644 --- a/lib/private/AppFramework/Bootstrap/ParameterRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ParameterRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ final class ParameterRegistration extends ARegistration { - /** @var string */ private $name; diff --git a/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php b/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php index 47c25d39300..36c5cae7db3 100644 --- a/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php +++ b/lib/private/AppFramework/Bootstrap/PreviewProviderRegistration.php @@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap; * @template-extends ServiceRegistration<\OCP\Preview\IProviderV2> */ class PreviewProviderRegistration extends ServiceRegistration { - /** @var string */ private $mimeTypeRegex; diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index 3ade98e334f..04faf330dc3 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -58,7 +58,6 @@ use Psr\Log\LoggerInterface; use Throwable; class RegistrationContext { - /** @var ServiceRegistration<ICapability>[] */ private $capabilities = []; diff --git a/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php b/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php index a8b9ddd1295..e2b115e0353 100644 --- a/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ class ServiceAliasRegistration extends ARegistration { - /** * @var string * @psalm-var string|class-string diff --git a/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php b/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php index 21e6d37865a..b6658e55239 100644 --- a/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php +++ b/lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php @@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap; * @psalm-immutable */ class ServiceFactoryRegistration extends ARegistration { - /** * @var string * @psalm-var string|class-string diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index cc288edc966..b4b03574d56 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -49,7 +49,6 @@ use Psr\Log\LoggerInterface; * Class to dispatch the request to the middleware dispatcher */ class Dispatcher { - /** @var MiddlewareDispatcher */ private $middlewareDispatcher; @@ -169,7 +168,7 @@ class Dispatcher { } 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); + $controller, $methodName, $exception); } $response = $this->middlewareDispatcher->afterController( @@ -202,7 +201,6 @@ class Dispatcher { $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); @@ -234,7 +232,6 @@ class Dispatcher { // format response if ($response instanceof DataResponse || !($response instanceof Response)) { - // get format from the url format or request format parameter $format = $this->request->getParam('format'); diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index d8aac063f3e..ac162f6565e 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -429,7 +429,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { $this->items['post'] = $params; } } - // Handle application/x-www-form-urlencoded for methods other than GET + // Handle application/x-www-form-urlencoded for methods other than GET // or post correctly } elseif ($this->method !== 'GET' && $this->method !== 'POST' diff --git a/lib/private/AppFramework/Logger.php b/lib/private/AppFramework/Logger.php index 7fb30905df3..cd70cead7e9 100644 --- a/lib/private/AppFramework/Logger.php +++ b/lib/private/AppFramework/Logger.php @@ -32,7 +32,6 @@ use OCP\ILogger; * @deprecated */ class Logger implements ILogger { - /** @var ILogger */ private $logger; diff --git a/lib/private/AppFramework/Middleware/CompressionMiddleware.php b/lib/private/AppFramework/Middleware/CompressionMiddleware.php index 5128afa8cad..530c270c7bc 100644 --- a/lib/private/AppFramework/Middleware/CompressionMiddleware.php +++ b/lib/private/AppFramework/Middleware/CompressionMiddleware.php @@ -35,7 +35,6 @@ use OCP\AppFramework\Middleware; use OCP\IRequest; class CompressionMiddleware extends Middleware { - /** @var bool */ private $useGZip; diff --git a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index adf17e53caa..35eb0098eed 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -39,7 +39,6 @@ use OCP\AppFramework\Middleware; * This class is used to store and run all the middleware in correct order */ class MiddlewareDispatcher { - /** * @var array array containing all the middlewares */ diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 4c2dbd0f828..955b15f80c8 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -39,7 +39,6 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; class OCSMiddleware extends Middleware { - /** @var IRequest */ private $request; diff --git a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php index d956ce58912..f20bd333452 100644 --- a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php +++ b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php @@ -35,7 +35,6 @@ use OCP\IRequest; use OCP\ISession; class PublicShareMiddleware extends Middleware { - /** @var IRequest */ private $request; diff --git a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php index dd964915006..2476f4ec9b3 100644 --- a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php @@ -118,7 +118,6 @@ class CORSMiddleware extends Middleware { if (isset($this->request->server['HTTP_ORIGIN']) && $this->reflector->hasAnnotation('CORS')) { - // allow credentials headers must not be true or CSRF is possible // otherwise foreach ($response->getHeaders() as $header => $value) { diff --git a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php index 1eea52d620c..ae0dc1f134e 100644 --- a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php @@ -36,7 +36,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class CSPMiddleware extends Middleware { - /** @var ContentSecurityPolicyManager */ private $contentSecurityPolicyManager; /** @var ContentSecurityPolicyNonceManager */ diff --git a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php index 534ff56cced..418d4185184 100644 --- a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class FeaturePolicyMiddleware extends Middleware { - /** @var FeaturePolicyManager */ private $policyManager; diff --git a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php index 0ab5d061c44..e6d35dc66f2 100644 --- a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class SameSiteCookieMiddleware extends Middleware { - /** @var Request */ private $request; diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index e0f36231b68..eb8c1b8dc43 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -137,7 +137,6 @@ class SecurityMiddleware extends Middleware { * @suppress PhanUndeclaredClassConstant */ public function beforeController($controller, $methodName) { - // this will set the current navigation entry of the app, use this only // for normal HTML requests and not for AJAX requests $this->navigationManager->setActiveEntry($this->appName); @@ -207,11 +206,11 @@ class SecurityMiddleware extends Middleware { * This allows oauth apps (e.g. moodle) to use the OCS endpoints */ if (!$this->request->passesCSRFCheck() && !( - $controller instanceof OCSController && ( - $this->request->getHeader('OCS-APIREQUEST') === 'true' || - strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0 - ) - )) { + $controller instanceof OCSController && ( + $this->request->getHeader('OCS-APIREQUEST') === 'true' || + strpos($this->request->getHeader('Authorization'), 'Bearer ') === 0 + ) + )) { throw new CrossSiteRequestForgeryException(); } } diff --git a/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index 32ac2b17ae5..af195df0de9 100644 --- a/lib/private/AppFramework/Middleware/SessionMiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php @@ -32,7 +32,6 @@ use OCP\AppFramework\Middleware; use OCP\ISession; class SessionMiddleware extends Middleware { - /** @var ControllerMethodReflector */ private $reflector; diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index 3986abd6d6e..6e3e49e8d99 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -79,7 +79,6 @@ class RouteConfig { * The routes and resource will be registered to the \OCP\Route\IRouter */ public function register() { - // parse simple $this->processIndexRoutes($this->routes); diff --git a/lib/private/AppFramework/ScopedPsrLogger.php b/lib/private/AppFramework/ScopedPsrLogger.php index 46832c6d38d..4ed91cdb6c0 100644 --- a/lib/private/AppFramework/ScopedPsrLogger.php +++ b/lib/private/AppFramework/ScopedPsrLogger.php @@ -30,7 +30,6 @@ use Psr\Log\LoggerInterface; use function array_merge; class ScopedPsrLogger implements LoggerInterface { - /** @var LoggerInterface */ private $inner; diff --git a/lib/private/AppFramework/Services/AppConfig.php b/lib/private/AppFramework/Services/AppConfig.php index 355a4123987..1fc07bc22b0 100644 --- a/lib/private/AppFramework/Services/AppConfig.php +++ b/lib/private/AppFramework/Services/AppConfig.php @@ -30,7 +30,6 @@ use OCP\AppFramework\Services\IAppConfig; use OCP\IConfig; class AppConfig implements IAppConfig { - /** @var IConfig */ private $config; diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 925ef67de64..06e9d4a3ec7 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -45,7 +45,6 @@ use function class_exists; * SimpleContainer is a simple implementation of a container on basis of Pimple */ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer { - /** @var Container */ private $container; diff --git a/lib/private/AppFramework/Utility/TimeFactory.php b/lib/private/AppFramework/Utility/TimeFactory.php index d4fe451a995..27117ed3cfc 100644 --- a/lib/private/AppFramework/Utility/TimeFactory.php +++ b/lib/private/AppFramework/Utility/TimeFactory.php @@ -33,8 +33,6 @@ use OCP\AppFramework\Utility\ITimeFactory; * Needed to mock calls to time() */ class TimeFactory implements ITimeFactory { - - /** * @return int the result of a call to time() */ diff --git a/lib/private/Authentication/Events/ARemoteWipeEvent.php b/lib/private/Authentication/Events/ARemoteWipeEvent.php index adfe1935013..e36b7d1087b 100644 --- a/lib/private/Authentication/Events/ARemoteWipeEvent.php +++ b/lib/private/Authentication/Events/ARemoteWipeEvent.php @@ -29,7 +29,6 @@ use OC\Authentication\Token\IToken; use OCP\EventDispatcher\Event; abstract class ARemoteWipeEvent extends Event { - /** @var IToken */ private $token; diff --git a/lib/private/Authentication/Listeners/LoginFailedListener.php b/lib/private/Authentication/Listeners/LoginFailedListener.php index f75ee51b287..d2971e07b55 100644 --- a/lib/private/Authentication/Listeners/LoginFailedListener.php +++ b/lib/private/Authentication/Listeners/LoginFailedListener.php @@ -39,7 +39,6 @@ use OCP\Util; * @template-implements IEventListener<\OC\Authentication\Events\LoginFailed> */ class LoginFailedListener implements IEventListener { - /** @var IEventDispatcher */ private $dispatcher; diff --git a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php index 6cc2403653f..edebb2a2641 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php @@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeActivityListener implements IEventListener { - /** @var IActvityManager */ private $activityManager; diff --git a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php index 4499f90d79b..cba2b183589 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php @@ -44,7 +44,6 @@ use function substr; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeEmailListener implements IEventListener { - /** @var IMailer */ private $mailer; diff --git a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php index 4b7e809d742..81feab32746 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php @@ -38,7 +38,6 @@ use OCP\Notification\IManager as INotificationManager; * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent> */ class RemoteWipeNotificationsListener implements IEventListener { - /** @var INotificationManager */ private $notificationManager; diff --git a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php index e52b989c353..e478c21239f 100644 --- a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php @@ -34,7 +34,6 @@ use OCP\User\Events\UserDeletedEvent; * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent> */ class UserDeletedStoreCleanupListener implements IEventListener { - /** @var Registry */ private $registry; diff --git a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php index 6a3f4402886..a09a08568d5 100644 --- a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php @@ -37,7 +37,6 @@ use Throwable; * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent> */ class UserDeletedTokenCleanupListener implements IEventListener { - /** @var Manager */ private $manager; diff --git a/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php index a56ac3bd54e..4927c3ac7f9 100644 --- a/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php @@ -32,7 +32,6 @@ use OCP\EventDispatcher\IEventListener; use OCP\User\Events\UserDeletedEvent; class UserDeletedWebAuthnCleanupListener implements IEventListener { - /** @var PublicKeyCredentialMapper */ private $credentialMapper; diff --git a/lib/private/Authentication/Listeners/UserLoggedInListener.php b/lib/private/Authentication/Listeners/UserLoggedInListener.php index 88298889057..df030c44749 100644 --- a/lib/private/Authentication/Listeners/UserLoggedInListener.php +++ b/lib/private/Authentication/Listeners/UserLoggedInListener.php @@ -35,7 +35,6 @@ use OCP\User\Events\PostLoginEvent; * @template-implements IEventListener<\OCP\User\Events\PostLoginEvent> */ class UserLoggedInListener implements IEventListener { - /** @var Manager */ private $manager; diff --git a/lib/private/Authentication/Login/ALoginCommand.php b/lib/private/Authentication/Login/ALoginCommand.php index 5b245db6bda..7944eac1b62 100644 --- a/lib/private/Authentication/Login/ALoginCommand.php +++ b/lib/private/Authentication/Login/ALoginCommand.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; abstract class ALoginCommand { - /** @var ALoginCommand */ protected $next; diff --git a/lib/private/Authentication/Login/Chain.php b/lib/private/Authentication/Login/Chain.php index 32f44268d52..3c3179472c4 100644 --- a/lib/private/Authentication/Login/Chain.php +++ b/lib/private/Authentication/Login/Chain.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; class Chain { - /** @var PreLoginHookCommand */ private $preLoginHookCommand; diff --git a/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php b/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php index 7e872a855a5..1643b5af1d5 100644 --- a/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php +++ b/lib/private/Authentication/Login/ClearLostPasswordTokensCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IConfig; class ClearLostPasswordTokensCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/CompleteLoginCommand.php b/lib/private/Authentication/Login/CompleteLoginCommand.php index ffe76b4c89d..46f7f1a3fa7 100644 --- a/lib/private/Authentication/Login/CompleteLoginCommand.php +++ b/lib/private/Authentication/Login/CompleteLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OC\User\Session; class CompleteLoginCommand extends ALoginCommand { - /** @var Session */ private $userSession; diff --git a/lib/private/Authentication/Login/CreateSessionTokenCommand.php b/lib/private/Authentication/Login/CreateSessionTokenCommand.php index 31ca0936942..ba237dfbf20 100644 --- a/lib/private/Authentication/Login/CreateSessionTokenCommand.php +++ b/lib/private/Authentication/Login/CreateSessionTokenCommand.php @@ -32,7 +32,6 @@ use OC\User\Session; use OCP\IConfig; class CreateSessionTokenCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/EmailLoginCommand.php b/lib/private/Authentication/Login/EmailLoginCommand.php index 7145ab9e14f..315fe450697 100644 --- a/lib/private/Authentication/Login/EmailLoginCommand.php +++ b/lib/private/Authentication/Login/EmailLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IUserManager; class EmailLoginCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; @@ -45,7 +44,6 @@ class EmailLoginCommand extends ALoginCommand { $users = $this->userManager->getByEmail($loginData->getUsername()); // we only allow login by email if unique if (count($users) === 1) { - // FIXME: This is a workaround to still stick to configured LDAP login filters // this can be removed once the email login is properly implemented in the local user backend // as described in https://github.com/nextcloud/server/issues/5221 diff --git a/lib/private/Authentication/Login/FinishRememberedLoginCommand.php b/lib/private/Authentication/Login/FinishRememberedLoginCommand.php index 9b5b4ed0642..04ed7ed846e 100644 --- a/lib/private/Authentication/Login/FinishRememberedLoginCommand.php +++ b/lib/private/Authentication/Login/FinishRememberedLoginCommand.php @@ -30,7 +30,6 @@ use OC\User\Session; use OCP\IConfig; class FinishRememberedLoginCommand extends ALoginCommand { - /** @var Session */ private $userSession; /** @var IConfig */ diff --git a/lib/private/Authentication/Login/LoggedInCheckCommand.php b/lib/private/Authentication/Login/LoggedInCheckCommand.php index 9f80d47a3d4..dc1a4d2d883 100644 --- a/lib/private/Authentication/Login/LoggedInCheckCommand.php +++ b/lib/private/Authentication/Login/LoggedInCheckCommand.php @@ -33,7 +33,6 @@ use OCP\EventDispatcher\IEventDispatcher; use Psr\Log\LoggerInterface; class LoggedInCheckCommand extends ALoginCommand { - /** @var LoggerInterface */ private $logger; /** @var IEventDispatcher */ diff --git a/lib/private/Authentication/Login/LoginData.php b/lib/private/Authentication/Login/LoginData.php index 43d1a725668..240a1dc6476 100644 --- a/lib/private/Authentication/Login/LoginData.php +++ b/lib/private/Authentication/Login/LoginData.php @@ -30,7 +30,6 @@ use OCP\IRequest; use OCP\IUser; class LoginData { - /** @var IRequest */ private $request; diff --git a/lib/private/Authentication/Login/LoginResult.php b/lib/private/Authentication/Login/LoginResult.php index 1f91c9c6a25..dec012c2fc9 100644 --- a/lib/private/Authentication/Login/LoginResult.php +++ b/lib/private/Authentication/Login/LoginResult.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Authentication\Login; class LoginResult { - /** @var bool */ private $success; diff --git a/lib/private/Authentication/Login/PreLoginHookCommand.php b/lib/private/Authentication/Login/PreLoginHookCommand.php index b989927a21c..21c97433f5a 100644 --- a/lib/private/Authentication/Login/PreLoginHookCommand.php +++ b/lib/private/Authentication/Login/PreLoginHookCommand.php @@ -30,7 +30,6 @@ use OC\Hooks\PublicEmitter; use OCP\IUserManager; class PreLoginHookCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/Login/SetUserTimezoneCommand.php b/lib/private/Authentication/Login/SetUserTimezoneCommand.php index 57859b032b6..f68fce1771e 100644 --- a/lib/private/Authentication/Login/SetUserTimezoneCommand.php +++ b/lib/private/Authentication/Login/SetUserTimezoneCommand.php @@ -29,7 +29,6 @@ use OCP\IConfig; use OCP\ISession; class SetUserTimezoneCommand extends ALoginCommand { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/Login/TwoFactorCommand.php b/lib/private/Authentication/Login/TwoFactorCommand.php index d20bc881f1f..256d88ffa81 100644 --- a/lib/private/Authentication/Login/TwoFactorCommand.php +++ b/lib/private/Authentication/Login/TwoFactorCommand.php @@ -34,7 +34,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; use OCP\IURLGenerator; class TwoFactorCommand extends ALoginCommand { - /** @var Manager */ private $twoFactorManager; diff --git a/lib/private/Authentication/Login/UidLoginCommand.php b/lib/private/Authentication/Login/UidLoginCommand.php index a1bc9c585ab..d3216b6aad8 100644 --- a/lib/private/Authentication/Login/UidLoginCommand.php +++ b/lib/private/Authentication/Login/UidLoginCommand.php @@ -29,7 +29,6 @@ use OC\User\Manager; use OCP\IUser; class UidLoginCommand extends ALoginCommand { - /** @var Manager */ private $userManager; diff --git a/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php b/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php index cd9cdfab6e8..571ea931d8a 100644 --- a/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php +++ b/lib/private/Authentication/Login/UpdateLastPasswordConfirmCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\ISession; class UpdateLastPasswordConfirmCommand extends ALoginCommand { - /** @var ISession */ private $session; diff --git a/lib/private/Authentication/Login/UserDisabledCheckCommand.php b/lib/private/Authentication/Login/UserDisabledCheckCommand.php index 87446dc72d7..7cf4c7235ec 100644 --- a/lib/private/Authentication/Login/UserDisabledCheckCommand.php +++ b/lib/private/Authentication/Login/UserDisabledCheckCommand.php @@ -31,7 +31,6 @@ use OCP\IUserManager; use Psr\Log\LoggerInterface; class UserDisabledCheckCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/Login/WebAuthnLoginCommand.php b/lib/private/Authentication/Login/WebAuthnLoginCommand.php index 5f79768d257..478a579853c 100644 --- a/lib/private/Authentication/Login/WebAuthnLoginCommand.php +++ b/lib/private/Authentication/Login/WebAuthnLoginCommand.php @@ -28,7 +28,6 @@ namespace OC\Authentication\Login; use OCP\IUserManager; class WebAuthnLoginCommand extends ALoginCommand { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Authentication/LoginCredentials/Credentials.php b/lib/private/Authentication/LoginCredentials/Credentials.php index 42f8f374059..69bfc2ba198 100644 --- a/lib/private/Authentication/LoginCredentials/Credentials.php +++ b/lib/private/Authentication/LoginCredentials/Credentials.php @@ -25,7 +25,6 @@ namespace OC\Authentication\LoginCredentials; use OCP\Authentication\LoginCredentials\ICredentials; class Credentials implements ICredentials { - /** @var string */ private $uid; diff --git a/lib/private/Authentication/LoginCredentials/Store.php b/lib/private/Authentication/LoginCredentials/Store.php index d3db0444664..3a09e983ee8 100644 --- a/lib/private/Authentication/LoginCredentials/Store.php +++ b/lib/private/Authentication/LoginCredentials/Store.php @@ -38,7 +38,6 @@ use OCP\Util; use Psr\Log\LoggerInterface; class Store implements IStore { - /** @var ISession */ private $session; diff --git a/lib/private/Authentication/Notifications/Notifier.php b/lib/private/Authentication/Notifications/Notifier.php index 849b421d4c3..8cf5d653771 100644 --- a/lib/private/Authentication/Notifications/Notifier.php +++ b/lib/private/Authentication/Notifications/Notifier.php @@ -32,7 +32,6 @@ use OCP\Notification\INotification; use OCP\Notification\INotifier; class Notifier implements INotifier { - /** @var IL10nFactory */ private $factory; diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php index 33e0ad46263..b5af3f3a5ee 100644 --- a/lib/private/Authentication/Token/IProvider.php +++ b/lib/private/Authentication/Token/IProvider.php @@ -35,8 +35,6 @@ use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Exceptions\WipeTokenException; interface IProvider { - - /** * Create and persist a new token * diff --git a/lib/private/Authentication/Token/IWipeableToken.php b/lib/private/Authentication/Token/IWipeableToken.php index 64dbb604ed2..5ba994e0d5e 100644 --- a/lib/private/Authentication/Token/IWipeableToken.php +++ b/lib/private/Authentication/Token/IWipeableToken.php @@ -27,7 +27,6 @@ declare(strict_types=1); namespace OC\Authentication\Token; interface IWipeableToken extends IToken { - /** * Mark the token for remote wipe */ diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php index f8a0fb11c52..59c7ca714c6 100644 --- a/lib/private/Authentication/Token/Manager.php +++ b/lib/private/Authentication/Token/Manager.php @@ -34,7 +34,6 @@ use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Exceptions\WipeTokenException; class Manager implements IProvider { - /** @var PublicKeyTokenProvider */ private $publicKeyTokenProvider; diff --git a/lib/private/Authentication/Token/RemoteWipe.php b/lib/private/Authentication/Token/RemoteWipe.php index 9e152d16a04..5fd01cfbe87 100644 --- a/lib/private/Authentication/Token/RemoteWipe.php +++ b/lib/private/Authentication/Token/RemoteWipe.php @@ -37,7 +37,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; class RemoteWipe { - /** @var IProvider */ private $tokenProvider; diff --git a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php index ed157f49006..b95128c1e0f 100644 --- a/lib/private/Authentication/TwoFactorAuth/EnforcementState.php +++ b/lib/private/Authentication/TwoFactorAuth/EnforcementState.php @@ -28,7 +28,6 @@ namespace OC\Authentication\TwoFactorAuth; use JsonSerializable; class EnforcementState implements JsonSerializable { - /** @var bool */ private $enforced; diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index ce732384987..d62556465df 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -342,7 +342,6 @@ class Manager { // First check if the session tells us we should do 2FA (99% case) if (!$this->session->exists(self::SESSION_UID_KEY)) { - // Check if the session tells us it is 2FA authenticated already if ($this->session->exists(self::SESSION_UID_DONE) && $this->session->get(self::SESSION_UID_DONE) === $user->getUID()) { diff --git a/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php b/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php index 675f4faf63a..3bfbd77941b 100644 --- a/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php +++ b/lib/private/Authentication/TwoFactorAuth/MandatoryTwoFactor.php @@ -30,7 +30,6 @@ use OCP\IGroupManager; use OCP\IUser; class MandatoryTwoFactor { - /** @var IConfig */ private $config; diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php index e2bb367f47e..c7c075bdab3 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php @@ -33,7 +33,6 @@ use OCP\Authentication\TwoFactorAuth\IRegistry; use OCP\IUser; class ProviderManager { - /** @var ProviderLoader */ private $providerLoader; diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php index 5e05cb0f710..af270fb83c8 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderSet.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderSet.php @@ -33,7 +33,6 @@ use OCP\Authentication\TwoFactorAuth\IProvider; * Contains all two-factor provider information for the two-factor login challenge */ class ProviderSet { - /** @var IProvider */ private $providers; diff --git a/lib/private/Authentication/TwoFactorAuth/Registry.php b/lib/private/Authentication/TwoFactorAuth/Registry.php index 1846ebcf8e2..6c82572578c 100644 --- a/lib/private/Authentication/TwoFactorAuth/Registry.php +++ b/lib/private/Authentication/TwoFactorAuth/Registry.php @@ -35,7 +35,6 @@ use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; class Registry implements IRegistry { - /** @var ProviderUserAssignmentDao */ private $assignmentDao; diff --git a/lib/private/Authentication/WebAuthn/CredentialRepository.php b/lib/private/Authentication/WebAuthn/CredentialRepository.php index 34af75b1ba6..e5c3fcf1618 100644 --- a/lib/private/Authentication/WebAuthn/CredentialRepository.php +++ b/lib/private/Authentication/WebAuthn/CredentialRepository.php @@ -33,7 +33,6 @@ use Webauthn\PublicKeyCredentialSourceRepository; use Webauthn\PublicKeyCredentialUserEntity; class CredentialRepository implements PublicKeyCredentialSourceRepository { - /** @var PublicKeyCredentialMapper */ private $credentialMapper; diff --git a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php index 786154d6d14..6f97ded483d 100644 --- a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php +++ b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php @@ -43,7 +43,6 @@ use Webauthn\PublicKeyCredentialSource; * @method void setData(string $data); */ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { - /** @var string */ protected $name; diff --git a/lib/private/Authentication/WebAuthn/Manager.php b/lib/private/Authentication/WebAuthn/Manager.php index de22fd6d450..744a3fa354a 100644 --- a/lib/private/Authentication/WebAuthn/Manager.php +++ b/lib/private/Authentication/WebAuthn/Manager.php @@ -56,7 +56,6 @@ use Webauthn\PublicKeyCredentialUserEntity; use Webauthn\TokenBinding\TokenBindingNotSupportedHandler; class Manager { - /** @var CredentialRepository */ private $repository; diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index ec9bed40850..5c4f04de6d6 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -55,7 +55,6 @@ use Psr\Log\LoggerInterface; * This class implements methods to access Avatar functionality */ class AvatarManager implements IAvatarManager { - /** @var IUserSession */ private $userSession; diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index 02fcfcb0fc8..6d39d5f067d 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -124,7 +124,7 @@ class UserAvatar extends Avatar { if ( (is_resource($data) && get_resource_type($data) === 'gd') || (is_object($data) && get_class($data) === \GdImage::class) - ) { + ) { $img->setResource($data); } elseif (is_resource($data)) { $img->loadFromFileHandle($data); diff --git a/lib/private/Broadcast/Events/BroadcastEvent.php b/lib/private/Broadcast/Events/BroadcastEvent.php index 47871e00132..de950ac9371 100644 --- a/lib/private/Broadcast/Events/BroadcastEvent.php +++ b/lib/private/Broadcast/Events/BroadcastEvent.php @@ -31,7 +31,6 @@ use OCP\EventDispatcher\ABroadcastedEvent; use OCP\EventDispatcher\Event; class BroadcastEvent extends Event implements IBroadcastEvent { - /** @var ABroadcastedEvent */ private $event; diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php index 8e192b22332..1f63e462bb5 100644 --- a/lib/private/Cache/File.php +++ b/lib/private/Cache/File.php @@ -36,7 +36,6 @@ use OCP\Security\ISecureRandom; use Psr\Log\LoggerInterface; class File implements ICache { - /** @var View */ protected $storage; diff --git a/lib/private/Calendar/CalendarQuery.php b/lib/private/Calendar/CalendarQuery.php index 0569b66b616..64f74c2728b 100644 --- a/lib/private/Calendar/CalendarQuery.php +++ b/lib/private/Calendar/CalendarQuery.php @@ -28,7 +28,6 @@ namespace OC\Calendar; use OCP\Calendar\ICalendarQuery; class CalendarQuery implements ICalendarQuery { - /** @var string */ private $principalUri; diff --git a/lib/private/Calendar/Manager.php b/lib/private/Calendar/Manager.php index e85c2d2e377..7ef9dc585ae 100644 --- a/lib/private/Calendar/Manager.php +++ b/lib/private/Calendar/Manager.php @@ -47,7 +47,6 @@ use function array_map; use function array_merge; class Manager implements IManager { - /** * @var ICalendar[] holds all registered calendars */ diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index ff92ebb5444..9e63798475b 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -35,7 +35,6 @@ use OCP\Capabilities\IInitialStateExcludedCapability; use Psr\Log\LoggerInterface; class CapabilitiesManager { - /** @var \Closure[] */ private $capabilities = []; diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php index 72cbfd4de4b..a9038a0aa35 100644 --- a/lib/private/Collaboration/Collaborators/LookupPlugin.php +++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php @@ -38,7 +38,6 @@ use OCP\Share\IShare; use Psr\Log\LoggerInterface; class LookupPlugin implements ISearchPlugin { - /** @var IConfig */ private $config; /** @var IClientService */ diff --git a/lib/private/Collaboration/Resources/Collection.php b/lib/private/Collaboration/Resources/Collection.php index ba4005c2139..2e67c041566 100644 --- a/lib/private/Collaboration/Resources/Collection.php +++ b/lib/private/Collaboration/Resources/Collection.php @@ -37,7 +37,6 @@ use OCP\IDBConnection; use OCP\IUser; class Collection implements ICollection { - /** @var IManager|Manager */ protected $manager; diff --git a/lib/private/Collaboration/Resources/ProviderManager.php b/lib/private/Collaboration/Resources/ProviderManager.php index 4b099f33b4f..4f5ed53b162 100644 --- a/lib/private/Collaboration/Resources/ProviderManager.php +++ b/lib/private/Collaboration/Resources/ProviderManager.php @@ -33,7 +33,6 @@ use OCP\IServerContainer; use Psr\Log\LoggerInterface; class ProviderManager implements IProviderManager { - /** @var string[] */ protected $providers = []; diff --git a/lib/private/Collaboration/Resources/Resource.php b/lib/private/Collaboration/Resources/Resource.php index f138204403c..b5e0215cb39 100644 --- a/lib/private/Collaboration/Resources/Resource.php +++ b/lib/private/Collaboration/Resources/Resource.php @@ -33,7 +33,6 @@ use OCP\IDBConnection; use OCP\IUser; class Resource implements IResource { - /** @var IManager */ protected $manager; diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index c481e36f95b..f9e5c166872 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -306,7 +306,7 @@ class Comment implements IComment { */ public function setActor($actorType, $actorId) { if ( - !is_string($actorType) || !trim($actorType) + !is_string($actorType) || !trim($actorType) || !is_string($actorId) || $actorId === '' ) { throw new \InvalidArgumentException('String expected.'); @@ -388,7 +388,7 @@ class Comment implements IComment { */ public function setObject($objectType, $objectId) { if ( - !is_string($objectType) || !trim($objectType) + !is_string($objectType) || !trim($objectType) || !is_string($objectId) || trim($objectId) === '' ) { throw new \InvalidArgumentException('String expected.'); diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 3eb9aab6817..00cf323bfbf 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -47,7 +47,6 @@ use OCP\Util; use Psr\Log\LoggerInterface; class Manager implements ICommentsManager { - /** @var IDBConnection */ protected $dbConn; diff --git a/lib/private/Comments/ManagerFactory.php b/lib/private/Comments/ManagerFactory.php index c2fb3d37ab7..2b59a284b61 100644 --- a/lib/private/Comments/ManagerFactory.php +++ b/lib/private/Comments/ManagerFactory.php @@ -30,7 +30,6 @@ use OCP\Comments\ICommentsManagerFactory; use OCP\IServerContainer; class ManagerFactory implements ICommentsManagerFactory { - /** * Server container * diff --git a/lib/private/Contacts/ContactsMenu/ActionFactory.php b/lib/private/Contacts/ContactsMenu/ActionFactory.php index 891951a88e5..739c43d0bce 100644 --- a/lib/private/Contacts/ContactsMenu/ActionFactory.php +++ b/lib/private/Contacts/ContactsMenu/ActionFactory.php @@ -27,7 +27,6 @@ use OCP\Contacts\ContactsMenu\IActionFactory; use OCP\Contacts\ContactsMenu\ILinkAction; class ActionFactory implements IActionFactory { - /** * {@inheritDoc} */ diff --git a/lib/private/Contacts/ContactsMenu/Entry.php b/lib/private/Contacts/ContactsMenu/Entry.php index 3bbe679e999..51fde760407 100644 --- a/lib/private/Contacts/ContactsMenu/Entry.php +++ b/lib/private/Contacts/ContactsMenu/Entry.php @@ -31,7 +31,6 @@ use OCP\Contacts\ContactsMenu\IAction; use OCP\Contacts\ContactsMenu\IEntry; class Entry implements IEntry { - /** @var string|int|null */ private $id = null; diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index cc8111774d1..5a02968ad9b 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -32,7 +32,6 @@ use OCP\Contacts\IManager; use OCP\IAddressBook; class ContactsManager implements IManager { - /** * This function is used to search and find contacts within the users address books. * In case $pattern is empty all contacts will be returned. diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php index 334006d1706..acaa529c0e2 100644 --- a/lib/private/DB/Adapter.php +++ b/lib/private/DB/Adapter.php @@ -36,7 +36,6 @@ use Doctrine\DBAL\Exception\UniqueConstraintViolationException; * handled by the database abstraction layer. */ class Adapter { - /** * @var \OC\DB\Connection $conn */ diff --git a/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index b4be5c2e96a..295783616b6 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -23,7 +23,6 @@ namespace OC\DB; class AdapterMySQL extends Adapter { - /** @var string */ protected $collation; diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index bed7194ac39..27c700bce7f 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -29,7 +29,6 @@ namespace OC\DB; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; class AdapterSqlite extends Adapter { - /** * @param string $tableName */ diff --git a/lib/private/DB/ConnectionAdapter.php b/lib/private/DB/ConnectionAdapter.php index b21bce490f4..a53c7ecd994 100644 --- a/lib/private/DB/ConnectionAdapter.php +++ b/lib/private/DB/ConnectionAdapter.php @@ -38,7 +38,6 @@ use OCP\IDBConnection; * Adapts the public API to our internal DBAL connection wrapper */ class ConnectionAdapter implements IDBConnection { - /** @var Connection */ private $inner; diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php index ca0119a576c..f9610c5bf25 100644 --- a/lib/private/DB/Exceptions/DbalException.php +++ b/lib/private/DB/Exceptions/DbalException.php @@ -49,7 +49,6 @@ use OCP\DB\Exception; * @psalm-immutable */ class DbalException extends Exception { - /** @var \Doctrine\DBAL\Exception */ private $original; diff --git a/lib/private/DB/MySqlTools.php b/lib/private/DB/MySqlTools.php index a4bf728881f..b78db32eb53 100644 --- a/lib/private/DB/MySqlTools.php +++ b/lib/private/DB/MySqlTools.php @@ -29,7 +29,6 @@ use OCP\IDBConnection; * Various MySQL specific helper functions. */ class MySqlTools { - /** * @param IDBConnection $connection * @return bool diff --git a/lib/private/DB/OracleMigrator.php b/lib/private/DB/OracleMigrator.php index df331230f47..db9fc33f07f 100644 --- a/lib/private/DB/OracleMigrator.php +++ b/lib/private/DB/OracleMigrator.php @@ -37,7 +37,6 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Table; class OracleMigrator extends Migrator { - /** * Quote a column's name but changing the name requires recreating * the column instance and copying over all properties. @@ -74,7 +73,7 @@ class OracleMigrator extends Migrator { */ protected function quoteIndex($index) { return new Index( - //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()), + //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()), $index->getName(), array_map(function ($columnName) { return $this->connection->quoteIdentifier($columnName); diff --git a/lib/private/DB/PgSqlTools.php b/lib/private/DB/PgSqlTools.php index a150e9475d3..2781d3556e2 100644 --- a/lib/private/DB/PgSqlTools.php +++ b/lib/private/DB/PgSqlTools.php @@ -33,7 +33,6 @@ use function preg_quote; * Various PostgreSQL specific helper functions. */ class PgSqlTools { - /** @var \OCP\IConfig */ private $config; diff --git a/lib/private/DB/PreparedStatement.php b/lib/private/DB/PreparedStatement.php index 0debc762c87..849aa379832 100644 --- a/lib/private/DB/PreparedStatement.php +++ b/lib/private/DB/PreparedStatement.php @@ -42,7 +42,6 @@ use PDO; * methods without much magic. */ class PreparedStatement implements IPreparedStatement { - /** @var Statement */ private $statement; diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php index 3bb54d4b26e..618487e0f71 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php @@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class MySqlExpressionBuilder extends ExpressionBuilder { - /** @var string */ protected $collation; diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php index f9b58d7d8ed..caeb8009885 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php @@ -31,7 +31,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class OCIExpressionBuilder extends ExpressionBuilder { - /** * @param mixed $column * @param mixed|null $type diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php index 0fba5363a28..03b58e222f3 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php @@ -29,7 +29,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class PgSqlExpressionBuilder extends ExpressionBuilder { - /** * Returns a IQueryFunction that casts the column to the given type * diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index e81ba61b3a7..99eaed07488 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -56,7 +56,6 @@ use OCP\DB\QueryBuilder\IQueryFunction; use Psr\Log\LoggerInterface; class QueryBuilder implements IQueryBuilder { - /** @var ConnectionAdapter */ private $connection; diff --git a/lib/private/DB/ResultAdapter.php b/lib/private/DB/ResultAdapter.php index 989839a473d..63881b71e7d 100644 --- a/lib/private/DB/ResultAdapter.php +++ b/lib/private/DB/ResultAdapter.php @@ -33,7 +33,6 @@ use PDO; * Adapts DBAL 2.6 API for DBAL 3.x for backwards compatibility of a leaked type */ class ResultAdapter implements IResult { - /** @var Result */ private $inner; diff --git a/lib/private/DB/SQLiteMigrator.php b/lib/private/DB/SQLiteMigrator.php index 76138fee545..2be3591afdc 100644 --- a/lib/private/DB/SQLiteMigrator.php +++ b/lib/private/DB/SQLiteMigrator.php @@ -28,7 +28,6 @@ use Doctrine\DBAL\Types\BigIntType; use Doctrine\DBAL\Types\Type; class SQLiteMigrator extends Migrator { - /** * @param Schema $targetSchema * @param \Doctrine\DBAL\Connection $connection diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php index 40d41f0dafc..31b74014a98 100644 --- a/lib/private/DB/SchemaWrapper.php +++ b/lib/private/DB/SchemaWrapper.php @@ -29,7 +29,6 @@ use Doctrine\DBAL\Schema\Schema; use OCP\DB\ISchemaWrapper; class SchemaWrapper implements ISchemaWrapper { - /** @var Connection */ protected $connection; diff --git a/lib/private/Dashboard/Manager.php b/lib/private/Dashboard/Manager.php index ba34219a615..18a66499167 100644 --- a/lib/private/Dashboard/Manager.php +++ b/lib/private/Dashboard/Manager.php @@ -37,7 +37,6 @@ use Throwable; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var array */ private $lazyWidgets = []; diff --git a/lib/private/Diagnostics/EventLogger.php b/lib/private/Diagnostics/EventLogger.php index 7b9bd9630ab..f1dd1addb08 100644 --- a/lib/private/Diagnostics/EventLogger.php +++ b/lib/private/Diagnostics/EventLogger.php @@ -31,7 +31,6 @@ use OCP\Diagnostics\IEventLogger; use Psr\Log\LoggerInterface; class EventLogger implements IEventLogger { - /** @var Event[] */ private $events = []; diff --git a/lib/private/DirectEditing/Token.php b/lib/private/DirectEditing/Token.php index 5f98ef51386..0ec911f9624 100644 --- a/lib/private/DirectEditing/Token.php +++ b/lib/private/DirectEditing/Token.php @@ -26,7 +26,6 @@ use OCP\DirectEditing\IToken; use OCP\Files\File; class Token implements IToken { - /** @var Manager */ private $manager; private $data; diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index 6d604e38d4b..7bf4ce62d28 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -37,7 +37,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class DecryptAll { - /** @var OutputInterface */ protected $output; @@ -250,7 +249,6 @@ class DecryptAll { * @return bool */ protected function decryptFile($path) { - // skip already decrypted files $fileInfo = $this->rootView->getFileInfo($path); if ($fileInfo !== false && !$fileInfo->isEncrypted()) { diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index f2803fa5ff8..37264e81823 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -40,7 +40,6 @@ use Psr\Log\LoggerInterface; * @package OC\Encryption */ class EncryptionWrapper { - /** @var ArrayCache */ private $arrayCache; diff --git a/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php index 7c9e70b4958..99cfb1eb8d1 100644 --- a/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php +++ b/lib/private/Encryption/Exceptions/EncryptionHeaderKeyExistsException.php @@ -25,7 +25,6 @@ namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; class EncryptionHeaderKeyExistsException extends GenericEncryptionException { - /** * @param string $key */ diff --git a/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php index 64b34e1b883..d0a2756212b 100644 --- a/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php +++ b/lib/private/Encryption/Exceptions/ModuleAlreadyExistsException.php @@ -25,7 +25,6 @@ namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; class ModuleAlreadyExistsException extends GenericEncryptionException { - /** * @param string $id * @param string $name diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php index 87bc35bc159..daab097ce7c 100644 --- a/lib/private/Encryption/File.php +++ b/lib/private/Encryption/File.php @@ -71,7 +71,6 @@ class File implements \OCP\Encryption\IFile { * @return array{users: string[], public: bool} */ public function getAccessList($path) { - // Make sure that a share key is generated for the owner too [$owner, $ownerPath] = $this->util->getUidAndFilename($path); diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index a3772af5878..b6376dc0146 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -37,7 +37,6 @@ use OCP\IConfig; use OCP\Security\ICrypto; class Storage implements IStorage { - // hidden file which indicate that the folder is a valid key storage public const KEY_STORAGE_MARKER = '.oc_key_storage'; diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php index 5788da990d5..a553d6a55d1 100644 --- a/lib/private/Encryption/Manager.php +++ b/lib/private/Encryption/Manager.php @@ -37,7 +37,6 @@ use OCP\IL10N; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var array */ protected $encryptionModules; diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php index 9996d6e077c..2e390177baf 100644 --- a/lib/private/Encryption/Update.php +++ b/lib/private/Encryption/Update.php @@ -37,7 +37,6 @@ use Psr\Log\LoggerInterface; * update encrypted files, e.g. because a file was shared */ class Update { - /** @var View */ protected $view; diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php index bf7bbce8ad7..371f2588289 100644 --- a/lib/private/Encryption/Util.php +++ b/lib/private/Encryption/Util.php @@ -308,7 +308,6 @@ class Util { $normalizedPath = Filesystem::normalizePath($path); $root = explode('/', $normalizedPath, 4); if (count($root) > 1) { - // detect alternative key storage root $rootDir = $this->getKeyStorageRoot(); if ($rootDir !== '' && diff --git a/lib/private/EventDispatcher/EventDispatcher.php b/lib/private/EventDispatcher/EventDispatcher.php index 7de1f68d8d7..2a306344923 100644 --- a/lib/private/EventDispatcher/EventDispatcher.php +++ b/lib/private/EventDispatcher/EventDispatcher.php @@ -39,7 +39,6 @@ use OCP\IServerContainer; use Symfony\Component\EventDispatcher\EventDispatcher as SymfonyDispatcher; class EventDispatcher implements IEventDispatcher { - /** @var SymfonyDispatcher */ private $dispatcher; diff --git a/lib/private/EventDispatcher/ServiceEventListener.php b/lib/private/EventDispatcher/ServiceEventListener.php index a7e15f1df1b..21cdf7f8cc2 100644 --- a/lib/private/EventDispatcher/ServiceEventListener.php +++ b/lib/private/EventDispatcher/ServiceEventListener.php @@ -41,7 +41,6 @@ use function sprintf; * created by the service container */ final class ServiceEventListener { - /** @var IServerContainer */ private $container; diff --git a/lib/private/EventDispatcher/SymfonyAdapter.php b/lib/private/EventDispatcher/SymfonyAdapter.php index a12e932e380..aa6fcbc1ad3 100644 --- a/lib/private/EventDispatcher/SymfonyAdapter.php +++ b/lib/private/EventDispatcher/SymfonyAdapter.php @@ -40,7 +40,6 @@ use function is_string; * @deprecated 20.0.0 use \OCP\EventDispatcher\IEventDispatcher */ class SymfonyAdapter implements EventDispatcherInterface { - /** @var EventDispatcher */ private $eventDispatcher; private LoggerInterface $logger; diff --git a/lib/private/Federation/CloudFederationFactory.php b/lib/private/Federation/CloudFederationFactory.php index 010ffdafe47..391213c21e0 100644 --- a/lib/private/Federation/CloudFederationFactory.php +++ b/lib/private/Federation/CloudFederationFactory.php @@ -27,7 +27,6 @@ use OCP\Federation\ICloudFederationNotification; use OCP\Federation\ICloudFederationShare; class CloudFederationFactory implements ICloudFederationFactory { - /** * get a CloudFederationShare Object to prepare a share you want to send * diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php index f077e36d97d..b11c4060ab4 100644 --- a/lib/private/Federation/CloudFederationProviderManager.php +++ b/lib/private/Federation/CloudFederationProviderManager.php @@ -42,7 +42,6 @@ use Psr\Log\LoggerInterface; * @package OC\Federation */ class CloudFederationProviderManager implements ICloudFederationProviderManager { - /** @var array list of available cloud federation providers */ private $cloudFederationProvider; diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index 3529ede9746..eba2aac927b 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -38,7 +38,6 @@ use OCP\IDBConnection; use Psr\Log\LoggerInterface; class QuerySearchHelper { - /** @var IMimeTypeLoader */ private $mimetypeLoader; /** @var IDBConnection */ diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index 7be9c750262..f7d1d105d83 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -142,7 +142,6 @@ class Scanner extends BasicEmitter implements IScanner { } // only proceed if $file is not a partial file, blacklist is handled by the storage if (!self::isPartialFile($file)) { - // acquire a lock if ($lock) { if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { @@ -164,7 +163,6 @@ class Scanner extends BasicEmitter implements IScanner { try { if ($data) { - // pre-emit only if it was a file. By that we avoid counting/treating folders as files if ($data['mimetype'] !== 'httpd/unix-directory') { $this->emit('\OC\Files\Cache\Scanner', 'scanFile', [$file, $this->storageId]); diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index 1a8c3637063..63dc4b9cd0e 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -111,7 +111,7 @@ class SearchBuilder { } else { throw new \InvalidArgumentException('Binary operators inside "not" is not supported'); } - // no break + // no break case ISearchBinaryOperator::OPERATOR_AND: return call_user_func_array([$expr, 'andX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments())); case ISearchBinaryOperator::OPERATOR_OR: diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 6c763540847..64a6fc57b27 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -49,7 +49,6 @@ use OCP\IUserManager; use OCP\IUserSession; class Filesystem { - /** * @var Mount\Manager $mounts */ diff --git a/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php b/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php index 1e10c3ad593..2f6db935236 100644 --- a/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/AppdataPreviewObjectStoreStorage.php @@ -26,7 +26,6 @@ declare(strict_types=1); namespace OC\Files\ObjectStore; class AppdataPreviewObjectStoreStorage extends ObjectStoreStorage { - /** @var string */ private $internalId; diff --git a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index afc0ac96abc..824adcc1d0e 100644 --- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php @@ -28,7 +28,6 @@ namespace OC\Files\ObjectStore; use OC\User\User; class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage { - /** * The home user storage requires a user object to create a unique storage id * @param array $params diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 02b65bf37f7..d0c5bd14b38 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -342,7 +342,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { } else { return false; } - // no break + // no break case 'w': case 'wb': case 'w+': diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index ec5cd59d960..979e4ce966a 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -191,10 +191,10 @@ class SetupManager { return new PermissionsMask([ 'storage' => $storage, 'mask' => Constants::PERMISSION_ALL & ~( - Constants::PERMISSION_UPDATE | - Constants::PERMISSION_CREATE | - Constants::PERMISSION_DELETE - ), + Constants::PERMISSION_UPDATE | + Constants::PERMISSION_CREATE | + Constants::PERMISSION_DELETE + ), ]); } return $storage; diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php index 1f267119871..4d24aa138c1 100644 --- a/lib/private/Files/SimpleFS/SimpleFolder.php +++ b/lib/private/Files/SimpleFS/SimpleFolder.php @@ -32,7 +32,6 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFile; class SimpleFolder implements ISimpleFolder { - /** @var Folder */ private $folder; diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index a53ed5d1957..0c121feb11e 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -523,7 +523,6 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { * @throws InvalidPathException */ public function verifyPath($path, $fileName) { - // verify empty and dot files $trimmed = trim($fileName); if ($trimmed === '') { diff --git a/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php index 482cdc453af..d748b3410c3 100644 --- a/lib/private/Files/Storage/FailedStorage.php +++ b/lib/private/Files/Storage/FailedStorage.php @@ -34,7 +34,6 @@ use OCP\Lock\ILockingProvider; * Storage placeholder to represent a missing precondition, storage unavailable */ class FailedStorage extends Common { - /** @var \Exception */ protected $e; diff --git a/lib/private/Files/Storage/LocalTempFileTrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php index 2a1338148f5..2ac0a74b692 100644 --- a/lib/private/Files/Storage/LocalTempFileTrait.php +++ b/lib/private/Files/Storage/LocalTempFileTrait.php @@ -35,7 +35,6 @@ namespace OC\Files\Storage; * in classes which extend it, e.g. $this->stat() . */ trait LocalTempFileTrait { - /** @var string[] */ protected $cachedFiles = []; diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php index cc317de2669..0a2511de164 100644 --- a/lib/private/Files/Storage/Storage.php +++ b/lib/private/Files/Storage/Storage.php @@ -32,7 +32,6 @@ use OCP\Lock\ILockingProvider; * All paths passed to the storage are relative to the storage and should NOT have a leading slash. */ interface Storage extends \OCP\Files\Storage { - /** * get a cache instance for the storage * diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index cb82e00845c..ed680f5045d 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -40,7 +40,6 @@ use OCP\ICache; * the actual given name and then try its NFD form. */ class Encoding extends Wrapper { - /** * @var ICache */ diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 2f7123426d1..be0db3d414a 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -375,7 +375,6 @@ class Encryption extends Wrapper { * @throws ModuleDoesNotExistsException */ public function fopen($path, $mode) { - // check if the file is stored in the array cache, this means that we // copy a file over to the versions folder, in this case we don't want to // decrypt it @@ -685,7 +684,6 @@ class Encryption extends Wrapper { $preserveMtime = false, $isRename = false ) { - // TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed: // - call $this->storage->copyFromStorage() instead of $this->copyBetweenStorage // - copy the file cache update from $this->copyBetweenStorage to this method @@ -766,7 +764,6 @@ class Encryption extends Wrapper { $preserveMtime, $isRename ) { - // for versions we have nothing to do, because versions should always use the // key from the original file. Just create a 1:1 copy and done if ($this->isVersion($targetInternalPath) || diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 9cc8b238ee1..cebf7bafced 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/lib/private/Files/Stream/Encryption.php @@ -37,7 +37,6 @@ use function is_array; use function stream_context_create; class Encryption extends Wrapper { - /** @var \OC\Encryption\Util */ protected $util; @@ -375,7 +374,6 @@ class Encryption extends Wrapper { // only allow writes on seekable streams, or at the end of the encrypted stream if (!$this->readOnly && ($resultFseek || $positionInFile === $this->size)) { - // switch the writeFlag so flush() will write the block $this->writeFlag = true; $this->fileUpdated = true; @@ -392,7 +390,7 @@ class Encryption extends Wrapper { $length += $remainingLength; $data = ''; // if $data doesn't fit the current block, the fill the current block and reiterate - // after the block is filled, it is flushed and $data is updatedxxx + // after the block is filled, it is flushed and $data is updatedxxx } else { $this->cache = substr($this->cache, 0, $blockPosition) . substr($data, 0, $this->unencryptedBlockSize - $blockPosition); diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index 4cade024460..432bc4c4d6d 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -202,7 +202,6 @@ class Detection implements IMimeTypeDetector { // note: leading dot doesn't qualify as extension if (strpos($fileName, '.') > 0) { - // remove versioning extension: name.v1508946057 and transfer extension: name.ocTransferId2057600214.part $fileName = preg_replace('!((\.v\d+)|((\.ocTransferId\d+)?\.part))$!', '', $fileName); diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index 8193a3f7b03..bf5af36ec6e 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -33,7 +33,6 @@ use OCP\IDBConnection; * @package OC\Files\Type */ class Loader implements IMimeTypeLoader { - /** @var IDBConnection */ private $dbConnection; @@ -121,7 +120,7 @@ class Loader implements IMimeTypeLoader { ->from('mimetypes') ->where( $fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype) - )); + )); $result = $fetch->execute(); $row = $result->fetch(); diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 16a9381768b..8f073da9164 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -821,14 +821,14 @@ class View { } else { $result = false; } - // moving a file/folder within the same mount point + // moving a file/folder within the same mount point } elseif ($storage1 === $storage2) { if ($storage1) { $result = $storage1->rename($internalPath1, $internalPath2); } else { $result = false; } - // moving a file/folder between storages (from $storage1 to $storage2) + // moving a file/folder between storages (from $storage1 to $storage2) } else { $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2); } @@ -1047,7 +1047,6 @@ class View { public function fromTmpFile($tmpFile, $path) { $this->assertPathLength($path); if (Filesystem::isValidPath($path)) { - // Get directory that the file is going into $filePath = dirname($path); @@ -1803,7 +1802,6 @@ class View { * @return boolean */ private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) { - // note: cannot use the view because the target is already locked $fileId = (int)$targetStorage->getCache()->getId($targetInternalPath); if ($fileId === -1) { diff --git a/lib/private/FullTextSearch/FullTextSearchManager.php b/lib/private/FullTextSearch/FullTextSearchManager.php index 6265c6dc94d..8d850513949 100644 --- a/lib/private/FullTextSearch/FullTextSearchManager.php +++ b/lib/private/FullTextSearch/FullTextSearchManager.php @@ -39,8 +39,6 @@ use OCP\FullTextSearch\Service\ISearchService; * @package OC\FullTextSearch */ class FullTextSearchManager implements IFullTextSearchManager { - - /** @var IProviderService */ private $providerService; diff --git a/lib/private/FullTextSearch/Model/DocumentAccess.php b/lib/private/FullTextSearch/Model/DocumentAccess.php index 3fe08dfcc08..cb2b95284f1 100644 --- a/lib/private/FullTextSearch/Model/DocumentAccess.php +++ b/lib/private/FullTextSearch/Model/DocumentAccess.php @@ -49,8 +49,6 @@ use OCP\FullTextSearch\Model\IDocumentAccess; * @package OC\FullTextSearch\Model */ final class DocumentAccess implements IDocumentAccess, JsonSerializable { - - /** @var string */ private $ownerId; diff --git a/lib/private/FullTextSearch/Model/IndexDocument.php b/lib/private/FullTextSearch/Model/IndexDocument.php index 3078f12c465..74788463693 100644 --- a/lib/private/FullTextSearch/Model/IndexDocument.php +++ b/lib/private/FullTextSearch/Model/IndexDocument.php @@ -47,8 +47,6 @@ use OCP\FullTextSearch\Model\IIndexDocument; * @package OC\FullTextSearch\Model */ class IndexDocument implements IIndexDocument, JsonSerializable { - - /** @var string */ protected $id = ''; diff --git a/lib/private/FullTextSearch/Model/SearchOption.php b/lib/private/FullTextSearch/Model/SearchOption.php index c4c63a801a3..91f45db5fb4 100644 --- a/lib/private/FullTextSearch/Model/SearchOption.php +++ b/lib/private/FullTextSearch/Model/SearchOption.php @@ -36,8 +36,6 @@ use OCP\FullTextSearch\Model\ISearchOption; * @package OC\FullTextSearch\Model */ final class SearchOption implements ISearchOption, JsonSerializable { - - /** @var string */ private $name = ''; diff --git a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php index d6bfe6d9102..c58d55b9b55 100644 --- a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php +++ b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php @@ -37,8 +37,6 @@ use OCP\FullTextSearch\Model\ISearchRequestSimpleQuery; * @package OC\FullTextSearch\Model */ final class SearchRequestSimpleQuery implements ISearchRequestSimpleQuery, JsonSerializable { - - /** @var int */ private $type = 0; diff --git a/lib/private/FullTextSearch/Model/SearchTemplate.php b/lib/private/FullTextSearch/Model/SearchTemplate.php index eb1ab8ead84..4bb56f24b58 100644 --- a/lib/private/FullTextSearch/Model/SearchTemplate.php +++ b/lib/private/FullTextSearch/Model/SearchTemplate.php @@ -56,8 +56,6 @@ use OCP\FullTextSearch\Model\ISearchTemplate; * @package OC\FullTextSearch\Model */ final class SearchTemplate implements ISearchTemplate, JsonSerializable { - - /** @var string */ private $icon = ''; diff --git a/lib/private/GlobalScale/Config.php b/lib/private/GlobalScale/Config.php index 71bcbbc4a1e..a5449ade691 100644 --- a/lib/private/GlobalScale/Config.php +++ b/lib/private/GlobalScale/Config.php @@ -25,7 +25,6 @@ namespace OC\GlobalScale; use OCP\IConfig; class Config implements \OCP\GlobalScale\IConfig { - /** @var IConfig */ private $config; diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 7b7ee41def9..5f17477db77 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -49,16 +49,15 @@ use OCP\IDBConnection; */ class Database extends ABackend implements IAddToGroupBackend, - ICountDisabledInGroup, - ICountUsersBackend, - ICreateGroupBackend, - IDeleteGroupBackend, - IGetDisplayNameBackend, - IGroupDetailsBackend, - IRemoveFromGroupBackend, - ISetDisplayNameBackend, - INamedBackend { - + ICountDisabledInGroup, + ICountUsersBackend, + ICreateGroupBackend, + IDeleteGroupBackend, + IGetDisplayNameBackend, + IGroupDetailsBackend, + IRemoveFromGroupBackend, + ISetDisplayNameBackend, + INamedBackend { /** @var string[] */ private $groupCache = []; diff --git a/lib/private/Hooks/EmitterTrait.php b/lib/private/Hooks/EmitterTrait.php index de012cca044..da4e3da2bd6 100644 --- a/lib/private/Hooks/EmitterTrait.php +++ b/lib/private/Hooks/EmitterTrait.php @@ -27,7 +27,6 @@ namespace OC\Hooks; * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service */ trait EmitterTrait { - /** * @var callable[][] $listeners */ diff --git a/lib/private/Http/WellKnown/RequestManager.php b/lib/private/Http/WellKnown/RequestManager.php index 17e2ed658a6..b83ff2ada50 100644 --- a/lib/private/Http/WellKnown/RequestManager.php +++ b/lib/private/Http/WellKnown/RequestManager.php @@ -39,7 +39,6 @@ use RuntimeException; use function array_reduce; class RequestManager { - /** @var Coordinator */ private $coordinator; diff --git a/lib/private/InitialStateService.php b/lib/private/InitialStateService.php index 4920e1bf40e..1d997e4133a 100644 --- a/lib/private/InitialStateService.php +++ b/lib/private/InitialStateService.php @@ -37,7 +37,6 @@ use OCP\IServerContainer; use Psr\Log\LoggerInterface; class InitialStateService implements IInitialStateService { - /** @var LoggerInterface */ private $logger; diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index ba555cff438..9587e0fd42a 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -259,7 +259,7 @@ class Checker { $hashes = $this->generateHashes($iterator, $path); $signature = $this->createSignatureData($hashes, $certificate, $privateKey); $this->fileAccessHelper->file_put_contents( - $appInfoDir . '/signature.json', + $appInfoDir . '/signature.json', json_encode($signature, JSON_PRETTY_PRINT) ); } catch (\Exception $e) { @@ -357,7 +357,7 @@ class Checker { // Verify if certificate has proper CN. "core" CN is always trusted. if ($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') { throw new InvalidSignatureException( - sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN']) + sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN']) ); } @@ -515,10 +515,10 @@ class Checker { $path = $this->appLocator->getAppPath($appId); } $result = $this->verify( - $path . '/appinfo/signature.json', - $path, - $appId, - $forceVerify + $path . '/appinfo/signature.json', + $path, + $appId, + $forceVerify ); } catch (\Exception $e) { $result = [ @@ -566,9 +566,9 @@ class Checker { public function verifyCoreSignature(): array { try { $result = $this->verify( - $this->environmentHelper->getServerRoot() . '/core/signature.json', - $this->environmentHelper->getServerRoot(), - 'core' + $this->environmentHelper->getServerRoot() . '/core/signature.json', + $this->environmentHelper->getServerRoot(), + 'core' ); } catch (\Exception $e) { $result = [ diff --git a/lib/private/KnownUser/KnownUser.php b/lib/private/KnownUser/KnownUser.php index fa0453e0329..532d3ccb565 100644 --- a/lib/private/KnownUser/KnownUser.php +++ b/lib/private/KnownUser/KnownUser.php @@ -34,7 +34,6 @@ use OCP\AppFramework\Db\Entity; * @method string getKnownUser() */ class KnownUser extends Entity { - /** @var string */ protected $knownTo; diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 71910873db7..593af02bd1c 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -54,7 +54,6 @@ use function is_null; * A factory that generates language instances */ class Factory implements IFactory { - /** @var string */ protected $requestLanguage = ''; diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index 82ef3350b1f..d0794c9c9c0 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -34,7 +34,6 @@ use Punic\Calendar; use Symfony\Component\Translation\IdentityTranslator; class L10N implements IL10N { - /** @var IFactory */ protected $factory; diff --git a/lib/private/L10N/LanguageIterator.php b/lib/private/L10N/LanguageIterator.php index 4a76667caf2..b3549782d54 100644 --- a/lib/private/L10N/LanguageIterator.php +++ b/lib/private/L10N/LanguageIterator.php @@ -63,8 +63,8 @@ class LanguageIterator implements ILanguageIterator { return $forcedLang; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 1: $forcedLang = $this->config->getSystemValue('force_language', false); if (is_string($forcedLang) @@ -73,16 +73,16 @@ class LanguageIterator implements ILanguageIterator { return $truncated; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 2: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang)) { return $userLang; } $this->next(); - /** @noinspection PhpMissingBreakStatementInspection */ - // no break + /** @noinspection PhpMissingBreakStatementInspection */ + // no break case 3: $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null); if (is_string($userLang) @@ -94,7 +94,7 @@ class LanguageIterator implements ILanguageIterator { // no break case 4: return $this->config->getSystemValue('default_language', 'en'); - /** @noinspection PhpMissingBreakStatementInspection */ + /** @noinspection PhpMissingBreakStatementInspection */ case 5: $defaultLang = $this->config->getSystemValue('default_language', 'en'); if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) { diff --git a/lib/private/L10N/LazyL10N.php b/lib/private/L10N/LazyL10N.php index f56761799b3..3226c1a604b 100644 --- a/lib/private/L10N/LazyL10N.php +++ b/lib/private/L10N/LazyL10N.php @@ -28,7 +28,6 @@ namespace OC\L10N; use OCP\IL10N; class LazyL10N implements IL10N { - /** @var IL10N */ private $l; diff --git a/lib/private/Lock/NoopLockingProvider.php b/lib/private/Lock/NoopLockingProvider.php index ff56932a894..542cb5c028e 100644 --- a/lib/private/Lock/NoopLockingProvider.php +++ b/lib/private/Lock/NoopLockingProvider.php @@ -34,7 +34,6 @@ use OCP\Lock\ILockingProvider; * To be used when locking is disabled. */ class NoopLockingProvider implements ILockingProvider { - /** * {@inheritdoc} */ diff --git a/lib/private/Log.php b/lib/private/Log.php index 2ee5bfc9c5a..c139510a3b3 100644 --- a/lib/private/Log.php +++ b/lib/private/Log.php @@ -237,7 +237,6 @@ class Log implements ILogger, IDataLogger { // default to false to just process this once per request $this->logConditionSatisfied = false; if (!empty($logCondition)) { - // check for secret token in the request if (isset($logCondition['shared_secret'])) { $request = \OC::$server->getRequest(); diff --git a/lib/private/Log/Errorlog.php b/lib/private/Log/Errorlog.php index 5c00528210a..72d11aa098c 100644 --- a/lib/private/Log/Errorlog.php +++ b/lib/private/Log/Errorlog.php @@ -32,7 +32,6 @@ use OC\SystemConfig; use OCP\Log\IWriter; class Errorlog extends LogDetails implements IWriter { - /** @var string */ protected $tag; diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php index b3544572708..c82904d7cea 100644 --- a/lib/private/Log/LogDetails.php +++ b/lib/private/Log/LogDetails.php @@ -28,7 +28,6 @@ namespace OC\Log; use OC\SystemConfig; abstract class LogDetails { - /** @var SystemConfig */ private $config; diff --git a/lib/private/Log/LogFactory.php b/lib/private/Log/LogFactory.php index 2fdadc3bdb2..a5008f5ef77 100644 --- a/lib/private/Log/LogFactory.php +++ b/lib/private/Log/LogFactory.php @@ -57,7 +57,7 @@ class LogFactory implements ILogFactory { case 'file': return $this->buildLogFile(); - // Backwards compatibility for old and fallback for unknown log types + // Backwards compatibility for old and fallback for unknown log types case 'owncloud': case 'nextcloud': default: diff --git a/lib/private/Log/PsrLoggerAdapter.php b/lib/private/Log/PsrLoggerAdapter.php index 1cf81c49a69..80c4c187b13 100644 --- a/lib/private/Log/PsrLoggerAdapter.php +++ b/lib/private/Log/PsrLoggerAdapter.php @@ -35,7 +35,6 @@ use function array_key_exists; use function array_merge; final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { - /** @var Log */ private $logger; diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php index 20a60623713..8619cb5e4dd 100644 --- a/lib/private/Log/Systemdlog.php +++ b/lib/private/Log/Systemdlog.php @@ -78,7 +78,7 @@ class Systemdlog extends LogDetails implements IWriter { public function write(string $app, $message, int $level) { $journal_level = $this->levels[$level]; sd_journal_send('PRIORITY='.$journal_level, - 'SYSLOG_IDENTIFIER='.$this->syslogId, - 'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level)); + 'SYSLOG_IDENTIFIER='.$this->syslogId, + 'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level)); } } diff --git a/lib/private/Mail/Attachment.php b/lib/private/Mail/Attachment.php index bebcd19e107..12f71df86d9 100644 --- a/lib/private/Mail/Attachment.php +++ b/lib/private/Mail/Attachment.php @@ -35,7 +35,6 @@ use OCP\Mail\IAttachment; * @since 13.0.0 */ class Attachment implements IAttachment { - /** @var \Swift_Mime_Attachment */ protected $swiftAttachment; diff --git a/lib/private/Memcache/APCu.php b/lib/private/Memcache/APCu.php index f0eb98b9db2..957926ab848 100644 --- a/lib/private/Memcache/APCu.php +++ b/lib/private/Memcache/APCu.php @@ -156,8 +156,8 @@ class APCu extends Cache implements IMemcache { } elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enable_cli') && \OC::$CLI) { return false; } elseif ( - version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 && - version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1 + version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 && + version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1 ) { return false; } else { diff --git a/lib/private/Migration/ConsoleOutput.php b/lib/private/Migration/ConsoleOutput.php index b8fb25e9655..9e3396f2a75 100644 --- a/lib/private/Migration/ConsoleOutput.php +++ b/lib/private/Migration/ConsoleOutput.php @@ -34,7 +34,6 @@ use Symfony\Component\Console\Output\OutputInterface; * @package OC\Migration */ class ConsoleOutput implements IOutput { - /** @var OutputInterface */ private $output; diff --git a/lib/private/Notification/Action.php b/lib/private/Notification/Action.php index 6d1375a611b..ff9cf9e38f5 100644 --- a/lib/private/Notification/Action.php +++ b/lib/private/Notification/Action.php @@ -27,7 +27,6 @@ namespace OC\Notification; use OCP\Notification\IAction; class Action implements IAction { - /** @var string */ protected $label; diff --git a/lib/private/OCS/CoreCapabilities.php b/lib/private/OCS/CoreCapabilities.php index 578152ff108..2c630531b17 100644 --- a/lib/private/OCS/CoreCapabilities.php +++ b/lib/private/OCS/CoreCapabilities.php @@ -32,7 +32,6 @@ use OCP\IURLGenerator; * @package OC\OCS */ class CoreCapabilities implements ICapability { - /** @var IConfig */ private $config; diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php index 7ab876811e7..8f98ff7d5ae 100644 --- a/lib/private/OCS/DiscoveryService.php +++ b/lib/private/OCS/DiscoveryService.php @@ -36,7 +36,6 @@ use OCP\ICacheFactory; use OCP\OCS\IDiscoveryService; class DiscoveryService implements IDiscoveryService { - /** @var ICache */ private $cache; diff --git a/lib/private/OCS/Exception.php b/lib/private/OCS/Exception.php index 981c138b385..ca3c3f70430 100644 --- a/lib/private/OCS/Exception.php +++ b/lib/private/OCS/Exception.php @@ -23,7 +23,6 @@ namespace OC\OCS; class Exception extends \Exception { - /** @var Result */ private $result; diff --git a/lib/private/OCS/Result.php b/lib/private/OCS/Result.php index 73c2bf98272..d77e360e6d2 100644 --- a/lib/private/OCS/Result.php +++ b/lib/private/OCS/Result.php @@ -31,7 +31,6 @@ namespace OC\OCS; class Result { - /** @var array */ protected $data; diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index ffe5bc88856..84c7b4a8968 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -37,7 +37,6 @@ use Psr\Log\LoggerInterface; * @package OC\Preview */ abstract class Bitmap extends ProviderV2 { - /** * {@inheritDoc} */ diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 7d2408d683f..47f2952c6e6 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -513,7 +513,6 @@ class Generator { * @return int[] */ private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) { - /* * If we are not cropping we have to make sure the requested image * respects the aspect ratio of the original. diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php index 6a94b948241..64714a9f899 100644 --- a/lib/private/Preview/GeneratorHelper.php +++ b/lib/private/Preview/GeneratorHelper.php @@ -38,7 +38,6 @@ use OCP\Preview\IProviderV2; * Very small wrapper class to make the generator fully unit testable */ class GeneratorHelper { - /** @var IRootFolder */ private $rootFolder; diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php index 55e1220b56a..95b66a922fd 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -33,7 +33,6 @@ use OCP\Files\File; use OCP\IImage; abstract class Image extends ProviderV2 { - /** * {@inheritDoc} */ diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 5cb66a00881..486c301d987 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -35,7 +35,6 @@ use OCP\IImage; use Psr\Log\LoggerInterface; class Movie extends ProviderV2 { - /** * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2 * @var string diff --git a/lib/private/Preview/WatcherConnector.php b/lib/private/Preview/WatcherConnector.php index 4d038c9a2b7..d0eafed42c1 100644 --- a/lib/private/Preview/WatcherConnector.php +++ b/lib/private/Preview/WatcherConnector.php @@ -30,7 +30,6 @@ use OCP\Files\IRootFolder; use OCP\Files\Node; class WatcherConnector { - /** @var IRootFolder */ private $root; diff --git a/lib/private/Profile/Actions/EmailAction.php b/lib/private/Profile/Actions/EmailAction.php index d3c749e06c3..8ab4939b515 100644 --- a/lib/private/Profile/Actions/EmailAction.php +++ b/lib/private/Profile/Actions/EmailAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class EmailAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/PhoneAction.php b/lib/private/Profile/Actions/PhoneAction.php index 43974df62fb..6081a04ad7e 100644 --- a/lib/private/Profile/Actions/PhoneAction.php +++ b/lib/private/Profile/Actions/PhoneAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class PhoneAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/TwitterAction.php b/lib/private/Profile/Actions/TwitterAction.php index 204284be1f5..041da42e539 100644 --- a/lib/private/Profile/Actions/TwitterAction.php +++ b/lib/private/Profile/Actions/TwitterAction.php @@ -34,7 +34,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class TwitterAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/Actions/WebsiteAction.php b/lib/private/Profile/Actions/WebsiteAction.php index 0a08879059c..6b052be57bd 100644 --- a/lib/private/Profile/Actions/WebsiteAction.php +++ b/lib/private/Profile/Actions/WebsiteAction.php @@ -33,7 +33,6 @@ use OCP\L10N\IFactory; use OCP\Profile\ILinkAction; class WebsiteAction implements ILinkAction { - /** @var string */ private $value; diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php index ab1af1c1c16..ddc0670604b 100644 --- a/lib/private/Profile/ProfileManager.php +++ b/lib/private/Profile/ProfileManager.php @@ -50,7 +50,6 @@ use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; class ProfileManager { - /** @var IAccountManager */ private $accountManager; diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 9ca3ece6dd4..330fa241b1e 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -89,7 +89,6 @@ use Psr\Log\LoggerInterface; use Throwable; class Repair implements IOutput { - /** @var IRepairStep[] */ private array $repairSteps; diff --git a/lib/private/Repair/AddBruteForceCleanupJob.php b/lib/private/Repair/AddBruteForceCleanupJob.php index 5a82c7c9176..5584e5b81c7 100644 --- a/lib/private/Repair/AddBruteForceCleanupJob.php +++ b/lib/private/Repair/AddBruteForceCleanupJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddBruteForceCleanupJob implements IRepairStep { - /** @var IJobList */ protected $jobList; diff --git a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php index b9e20186fc8..3642931694a 100644 --- a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php +++ b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddCleanupUpdaterBackupsJob implements IRepairStep { - /** @var IJobList */ protected $jobList; diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php index 0dd70112984..531fcc1112f 100644 --- a/lib/private/Repair/CleanTags.php +++ b/lib/private/Repair/CleanTags.php @@ -38,7 +38,6 @@ use OCP\Migration\IRepairStep; * @package OC\Repair */ class CleanTags implements IRepairStep { - /** @var IDBConnection */ protected $connection; diff --git a/lib/private/Repair/ClearFrontendCaches.php b/lib/private/Repair/ClearFrontendCaches.php index 47f037fd626..bf94e5bfbff 100644 --- a/lib/private/Repair/ClearFrontendCaches.php +++ b/lib/private/Repair/ClearFrontendCaches.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ClearFrontendCaches implements IRepairStep { - /** @var ICacheFactory */ protected $cacheFactory; diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php index 9731babe4ce..905fc9451f5 100644 --- a/lib/private/Repair/MoveUpdaterStepFile.php +++ b/lib/private/Repair/MoveUpdaterStepFile.php @@ -27,7 +27,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class MoveUpdaterStepFile implements IRepairStep { - /** @var \OCP\IConfig */ protected $config; diff --git a/lib/private/Repair/NC11/FixMountStorages.php b/lib/private/Repair/NC11/FixMountStorages.php index 6552ea4bde9..4cf721e9b13 100644 --- a/lib/private/Repair/NC11/FixMountStorages.php +++ b/lib/private/Repair/NC11/FixMountStorages.php @@ -29,7 +29,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class FixMountStorages implements IRepairStep { - /** @var IDBConnection */ private $db; diff --git a/lib/private/Repair/NC13/AddLogRotateJob.php b/lib/private/Repair/NC13/AddLogRotateJob.php index 0b5f3d10e70..e0156ff873c 100644 --- a/lib/private/Repair/NC13/AddLogRotateJob.php +++ b/lib/private/Repair/NC13/AddLogRotateJob.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddLogRotateJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php index afd442a18b5..e12f2771903 100644 --- a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php +++ b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddPreviewBackgroundCleanupJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php b/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php index 70c73fbf9a6..217141cf0b9 100644 --- a/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php +++ b/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddClenupLoginFlowV2BackgroundJob implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php index 25dc24fb66c..b12604cd132 100644 --- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php +++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php @@ -45,7 +45,6 @@ use RuntimeException; * photo could be returned for this vcard. These invalid files are removed by this migration step. */ class CleanupCardDAVPhotoCache implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php index 44cb4b050ad..8bc73c8f66b 100644 --- a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php +++ b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ClearCollectionsAccessCache implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php index 95839823a82..3635c86e1b9 100644 --- a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php +++ b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php @@ -31,7 +31,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ResetGeneratedAvatarFlag implements IRepairStep { - /** @var IConfig */ private $config; /** @var IDBConnection */ diff --git a/lib/private/Repair/NC20/EncryptionLegacyCipher.php b/lib/private/Repair/NC20/EncryptionLegacyCipher.php index d9ac1bcad4b..6e31423915f 100644 --- a/lib/private/Repair/NC20/EncryptionLegacyCipher.php +++ b/lib/private/Repair/NC20/EncryptionLegacyCipher.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class EncryptionLegacyCipher implements IRepairStep { - /** @var IConfig */ private $config; /** @var IManager */ diff --git a/lib/private/Repair/NC20/EncryptionMigration.php b/lib/private/Repair/NC20/EncryptionMigration.php index 60b5032955c..6e209314462 100644 --- a/lib/private/Repair/NC20/EncryptionMigration.php +++ b/lib/private/Repair/NC20/EncryptionMigration.php @@ -32,7 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class EncryptionMigration implements IRepairStep { - /** @var IConfig */ private $config; /** @var IManager */ diff --git a/lib/private/Repair/NC20/ShippedDashboardEnable.php b/lib/private/Repair/NC20/ShippedDashboardEnable.php index 61f402f1af4..a9713d49a6f 100644 --- a/lib/private/Repair/NC20/ShippedDashboardEnable.php +++ b/lib/private/Repair/NC20/ShippedDashboardEnable.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ShippedDashboardEnable implements IRepairStep { - /** @var IConfig */ private $config; diff --git a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php index 3a98f6bab3c..e9b26947db6 100644 --- a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php +++ b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php @@ -29,7 +29,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class AddCheckForUserCertificatesJob implements IRepairStep { - /** @var IJobList */ protected $jobList; /** @var IConfig */ diff --git a/lib/private/Repair/NC21/ValidatePhoneNumber.php b/lib/private/Repair/NC21/ValidatePhoneNumber.php index 3217a1f082c..f9c3c5952bf 100644 --- a/lib/private/Repair/NC21/ValidatePhoneNumber.php +++ b/lib/private/Repair/NC21/ValidatePhoneNumber.php @@ -34,7 +34,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class ValidatePhoneNumber implements IRepairStep { - /** @var IConfig */ protected $config; /** @var IUserManager */ diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php index 1cee4077731..be507debbd9 100644 --- a/lib/private/Repair/OldGroupMembershipShares.php +++ b/lib/private/Repair/OldGroupMembershipShares.php @@ -29,7 +29,6 @@ use OCP\Migration\IRepairStep; use OCP\Share\IShare; class OldGroupMembershipShares implements IRepairStep { - /** @var \OCP\IDBConnection */ protected $connection; diff --git a/lib/private/Repair/Owncloud/CleanPreviews.php b/lib/private/Repair/Owncloud/CleanPreviews.php index b9146b77249..853a94c8adc 100644 --- a/lib/private/Repair/Owncloud/CleanPreviews.php +++ b/lib/private/Repair/Owncloud/CleanPreviews.php @@ -30,7 +30,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class CleanPreviews implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/Owncloud/DropAccountTermsTable.php b/lib/private/Repair/Owncloud/DropAccountTermsTable.php index e0c6a4f17ac..d5c01d64131 100644 --- a/lib/private/Repair/Owncloud/DropAccountTermsTable.php +++ b/lib/private/Repair/Owncloud/DropAccountTermsTable.php @@ -27,7 +27,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class DropAccountTermsTable implements IRepairStep { - /** @var IDBConnection */ protected $db; diff --git a/lib/private/Repair/Owncloud/MigrateOauthTables.php b/lib/private/Repair/Owncloud/MigrateOauthTables.php index 4011a043f20..10481a966f2 100644 --- a/lib/private/Repair/Owncloud/MigrateOauthTables.php +++ b/lib/private/Repair/Owncloud/MigrateOauthTables.php @@ -27,7 +27,6 @@ use OC\DB\SchemaWrapper; use OCP\DB\QueryBuilder\IQueryBuilder; class MigrateOauthTables implements IRepairStep { - /** @var Connection */ protected $db; diff --git a/lib/private/Repair/Owncloud/MoveAvatars.php b/lib/private/Repair/Owncloud/MoveAvatars.php index ab48731ecb0..fa3dd924648 100644 --- a/lib/private/Repair/Owncloud/MoveAvatars.php +++ b/lib/private/Repair/Owncloud/MoveAvatars.php @@ -28,7 +28,6 @@ use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; class MoveAvatars implements IRepairStep { - /** @var IJobList */ private $jobList; diff --git a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php index 280426fb9c1..83c78c2cba4 100644 --- a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php +++ b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php @@ -34,7 +34,6 @@ use Psr\Log\LoggerInterface; use function is_resource; class MoveAvatarsBackgroundJob extends QueuedJob { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php index 23ca2a6a0fa..4585cbfc814 100644 --- a/lib/private/RichObjectStrings/Validator.php +++ b/lib/private/RichObjectStrings/Validator.php @@ -35,7 +35,6 @@ use OCP\RichObjectStrings\IValidator; * @since 11.0.0 */ class Validator implements IValidator { - /** @var Definitions */ protected $definitions; diff --git a/lib/private/Search/Provider/File.php b/lib/private/Search/Provider/File.php index fba8e6db05f..7046fea33d2 100644 --- a/lib/private/Search/Provider/File.php +++ b/lib/private/Search/Provider/File.php @@ -42,7 +42,6 @@ use OCP\Search\PagedProvider; * @deprecated 20.0.0 */ class File extends PagedProvider { - /** * Search for files and folders matching the given query * diff --git a/lib/private/Search/Result/Audio.php b/lib/private/Search/Result/Audio.php index 0a734767df0..41afe691e8c 100644 --- a/lib/private/Search/Result/Audio.php +++ b/lib/private/Search/Result/Audio.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Audio extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php index dc10cab09e9..59111b0cee2 100644 --- a/lib/private/Search/Result/File.php +++ b/lib/private/Search/Result/File.php @@ -36,7 +36,6 @@ use OCP\IUserSession; * @deprecated 20.0.0 */ class File extends \OCP\Search\Result { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/Folder.php b/lib/private/Search/Result/Folder.php index 590943fb941..36d0e91c042 100644 --- a/lib/private/Search/Result/Folder.php +++ b/lib/private/Search/Result/Folder.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Folder extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/Result/Image.php b/lib/private/Search/Result/Image.php index 9870e316a79..27f5702e39a 100644 --- a/lib/private/Search/Result/Image.php +++ b/lib/private/Search/Result/Image.php @@ -28,7 +28,6 @@ namespace OC\Search\Result; * @deprecated 20.0.0 */ class Image extends File { - /** * Type name; translated in templates * @var string diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php index 3c228261ec2..4ec73ec54e9 100644 --- a/lib/private/Search/SearchComposer.php +++ b/lib/private/Search/SearchComposer.php @@ -58,7 +58,6 @@ use function array_map; * @see IProvider::search() for the arguments of the individual search requests */ class SearchComposer { - /** @var IProvider[] */ private $providers = []; diff --git a/lib/private/Security/Bruteforce/CleanupJob.php b/lib/private/Security/Bruteforce/CleanupJob.php index 6faf853760a..45cfe572acb 100644 --- a/lib/private/Security/Bruteforce/CleanupJob.php +++ b/lib/private/Security/Bruteforce/CleanupJob.php @@ -32,7 +32,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; class CleanupJob extends TimedJob { - /** @var IDBConnection */ private $connection; diff --git a/lib/private/Server.php b/lib/private/Server.php index 92fa9bf768d..d8857b4efc6 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -275,7 +275,6 @@ use OC\Profiler\Profiler; * TODO: hookup all manager classes */ class Server extends ServerContainer implements IServerContainer { - /** @var string */ private $webRoot; diff --git a/lib/private/Session/Session.php b/lib/private/Session/Session.php index affba322bec..b434461a335 100644 --- a/lib/private/Session/Session.php +++ b/lib/private/Session/Session.php @@ -30,7 +30,6 @@ namespace OC\Session; use OCP\ISession; abstract class Session implements \ArrayAccess, ISession { - /** * @var bool */ diff --git a/lib/private/Settings/AuthorizedGroup.php b/lib/private/Settings/AuthorizedGroup.php index d549e3d48f3..21b897b6787 100644 --- a/lib/private/Settings/AuthorizedGroup.php +++ b/lib/private/Settings/AuthorizedGroup.php @@ -33,7 +33,6 @@ use OCP\AppFramework\Db\Entity; * @method getClass(): string */ class AuthorizedGroup extends Entity implements \JsonSerializable { - /** @var string $group_id */ protected $groupId; diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 44f1df09c15..2d44ac7d3df 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -48,7 +48,6 @@ use OCP\Settings\ISubAdminSettings; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var LoggerInterface */ private $log; diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 6c67254deba..94719a742e2 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -37,7 +37,6 @@ use OCP\Security\ISecureRandom; use Psr\Log\LoggerInterface; abstract class AbstractDatabase { - /** @var IL10N */ protected $trans; /** @var string */ diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php index 3632a2a26d1..03c4c2ba828 100644 --- a/lib/private/Share/Constants.php +++ b/lib/private/Share/Constants.php @@ -29,7 +29,6 @@ namespace OC\Share; use OCP\Share\IShare; class Constants { - /** * @deprecated 17.0.0 - use IShare::TYPE_USER instead */ diff --git a/lib/private/Share/Helper.php b/lib/private/Share/Helper.php index 8f2cfa4e197..f1b9ae2b9fa 100644 --- a/lib/private/Share/Helper.php +++ b/lib/private/Share/Helper.php @@ -26,7 +26,6 @@ namespace OC\Share; class Helper extends \OC\Share\Constants { - /** * get default expire settings defined by the admin * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays' @@ -128,14 +127,14 @@ class Helper extends \OC\Share\Constants { if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) { // FIXME this should be a method in the user management instead \OCP\Util::emitHook( - '\OCA\Files_Sharing\API\Server2Server', - 'preLoginNameUsedAsUserName', - ['uid' => &$user1] + '\OCA\Files_Sharing\API\Server2Server', + 'preLoginNameUsedAsUserName', + ['uid' => &$user1] ); \OCP\Util::emitHook( - '\OCA\Files_Sharing\API\Server2Server', - 'preLoginNameUsedAsUserName', - ['uid' => &$user2] + '\OCA\Files_Sharing\API\Server2Server', + 'preLoginNameUsedAsUserName', + ['uid' => &$user2] ); if ($user1 === $user2) { diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 9e7b913d60a..487625affc1 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -50,7 +50,6 @@ use Psr\Log\LoggerInterface; * - post_shared */ class Share extends Constants { - /** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask * Construct permissions for share() and setPermissions with Or (|) e.g. * Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index a5a5568788d..215b47344b5 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -62,7 +62,6 @@ use OCP\Share\IShareProvider; * @package OC\Share20 */ class DefaultShareProvider implements IShareProvider { - // Special share type for user modified group shares public const SHARE_TYPE_USERGROUP = 2; @@ -608,7 +607,6 @@ class DefaultShareProvider implements IShareProvider { ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))) ->execute(); } elseif ($share->getShareType() === IShare::TYPE_GROUP) { - // Check if there is a usergroup share $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->select('id') @@ -664,9 +662,9 @@ class DefaultShareProvider implements IShareProvider { public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) { $qb = $this->dbConn->getQueryBuilder(); $qb->select('s.*', - 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash', - 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime', - 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum') + 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash', + 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime', + 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum') ->from('share', 's') ->andWhere($qb->expr()->orX( $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), diff --git a/lib/private/Share20/LegacyHooks.php b/lib/private/Share20/LegacyHooks.php index 94cfa6636d7..feb4604e884 100644 --- a/lib/private/Share20/LegacyHooks.php +++ b/lib/private/Share20/LegacyHooks.php @@ -33,7 +33,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; class LegacyHooks { - /** @var EventDispatcherInterface */ private $eventDispatcher; diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ffd779707df..7fd99545668 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -82,7 +82,6 @@ use Symfony\Component\EventDispatcher\GenericEvent; * This class is the communication hub for all sharing related operations. */ class Manager implements IManager { - /** @var IProviderFactory */ private $factory; private LoggerInterface $logger; @@ -668,7 +667,6 @@ class Manager implements IManager { * @param IShare $share */ protected function setLinkParent(IShare $share) { - // No sense in checking if the method is not there. if (method_exists($share, 'setParent')) { $storage = $share->getNode()->getStorage(); diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 9bba4d771aa..16f9a17ee42 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -56,7 +56,6 @@ use Psr\Log\LoggerInterface; * @package OC\Share20 */ class ProviderFactory implements IProviderFactory { - /** @var IServerContainer */ private $serverContainer; /** @var DefaultShareProvider */ diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index c2d45503696..0a50fa0ccfb 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -41,7 +41,6 @@ use OCP\Share\IAttributes; use OCP\Share\IShare; class Share implements IShare { - /** @var string */ private $id; /** @var string */ diff --git a/lib/private/Share20/ShareAttributes.php b/lib/private/Share20/ShareAttributes.php index 92f034e6783..9b97c94275d 100644 --- a/lib/private/Share20/ShareAttributes.php +++ b/lib/private/Share20/ShareAttributes.php @@ -23,7 +23,6 @@ namespace OC\Share20; use OCP\Share\IAttributes; class ShareAttributes implements IAttributes { - /** @var array */ private $attributes; diff --git a/lib/private/Share20/ShareHelper.php b/lib/private/Share20/ShareHelper.php index 329e4470cb4..3debfe185e0 100644 --- a/lib/private/Share20/ShareHelper.php +++ b/lib/private/Share20/ShareHelper.php @@ -31,7 +31,6 @@ use OCP\Share\IManager; use OCP\Share\IShareHelper; class ShareHelper implements IShareHelper { - /** @var IManager */ private $shareManager; diff --git a/lib/private/Share20/UserRemovedListener.php b/lib/private/Share20/UserRemovedListener.php index 6db0f2e0910..3af7b5a3650 100644 --- a/lib/private/Share20/UserRemovedListener.php +++ b/lib/private/Share20/UserRemovedListener.php @@ -34,7 +34,6 @@ use OCP\Share\IManager; * @template-implements IEventListener<UserRemovedEvent> */ class UserRemovedListener implements IEventListener { - /** @var IManager */ protected $shareManager; diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php index db7d0024b5a..f96646e3365 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -54,7 +54,6 @@ class Streamer { * be included in the streamed file */ public function __construct(IRequest $request, int $size, int $numberOfFiles) { - /** * zip32 constraints for a basic (without compression, volumes nor * encryption) zip file according to the Zip specification: diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index 10eff9ffad5..54f14b8ab88 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -42,7 +42,6 @@ use OCP\IUser; use OCP\IUserManager; class SubAdmin extends PublicEmitter implements ISubAdmin { - /** @var IUserManager */ private $userManager; diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php index f5457f60ad4..f2a35069288 100644 --- a/lib/private/Support/CrashReport/Registry.php +++ b/lib/private/Support/CrashReport/Registry.php @@ -38,7 +38,6 @@ use Throwable; use function array_shift; class Registry implements IRegistry { - /** @var string[] */ private $lazyReporters = []; diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php index 6cd0e4376c5..a18c4c2a138 100644 --- a/lib/private/SystemConfig.php +++ b/lib/private/SystemConfig.php @@ -34,7 +34,6 @@ use OCP\IConfig; * fixes cyclic DI: AllConfig needs AppConfig needs Database needs AllConfig */ class SystemConfig { - /** @var array */ protected $sensitiveValues = [ 'instanceid' => true, diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php index f878cbf07c3..ca0508fe19b 100644 --- a/lib/private/SystemTag/ManagerFactory.php +++ b/lib/private/SystemTag/ManagerFactory.php @@ -38,7 +38,6 @@ use OCP\SystemTag\ISystemTagObjectMapper; * @since 9.0.0 */ class ManagerFactory implements ISystemTagManagerFactory { - /** * Server container * diff --git a/lib/private/SystemTag/SystemTag.php b/lib/private/SystemTag/SystemTag.php index e6b84c9916e..da6d4bd4b11 100644 --- a/lib/private/SystemTag/SystemTag.php +++ b/lib/private/SystemTag/SystemTag.php @@ -30,7 +30,6 @@ namespace OC\SystemTag; use OCP\SystemTag\ISystemTag; class SystemTag implements ISystemTag { - /** * @var string */ diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php index c075e65d76a..b87829360d5 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -37,7 +37,6 @@ use OCP\IURLGenerator; use Psr\Log\LoggerInterface; class JSCombiner { - /** @var IAppData */ protected $appData; diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index 88323af75de..7648c7953f3 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -30,7 +30,6 @@ namespace OC\Template; use Psr\Log\LoggerInterface; class JSResourceLocator extends ResourceLocator { - /** @var JSCombiner */ protected $jsCombiner; diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index aa1ee203f31..5a4cd32e5df 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -79,7 +79,6 @@ class TemplateLayout extends \OC_Template { * @param string $appId application id */ public function __construct($renderAs, $appId = '') { - /** @var IConfig */ $this->config = \OC::$server->get(IConfig::class); diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 53b07e25809..09516674e9b 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -73,7 +73,6 @@ use Psr\Log\LoggerInterface; * - failure(string $message) */ class Updater extends BasicEmitter { - /** @var LoggerInterface */ private $log; diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index d9f795796b8..3abbae682b5 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -31,7 +31,6 @@ use OCP\IConfig; use OCP\Util; class VersionCheck { - /** @var IClientService */ private $clientService; diff --git a/lib/private/User/User.php b/lib/private/User/User.php index eda6b5f79d9..7044770b57e 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -275,7 +275,6 @@ class User implements IUser { $this->dispatcher->dispatchTyped(new BeforeUserDeletedEvent($this)); $result = $this->backend->deleteUser($this->uid); if ($result) { - // FIXME: Feels like an hack - suggestions? $groupManager = \OC::$server->getGroupManager(); diff --git a/lib/private/UserStatus/Manager.php b/lib/private/UserStatus/Manager.php index c93795bea5b..89a1bb455c7 100644 --- a/lib/private/UserStatus/Manager.php +++ b/lib/private/UserStatus/Manager.php @@ -32,7 +32,6 @@ use Psr\Container\ContainerExceptionInterface; use Psr\Log\LoggerInterface; class Manager implements IManager { - /** @var IServerContainer */ private $container; diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php index 0da546f3263..275e02986c4 100644 --- a/lib/private/legacy/OC_API.php +++ b/lib/private/legacy/OC_API.php @@ -32,7 +32,6 @@ use OCP\API; use OCP\AppFramework\Http; class OC_API { - /** * api actions */ diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index f5e4780a25f..c7433d7c6c8 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -429,7 +429,6 @@ class OC_App { */ public function enable(string $appId, array $groups = []) { - // Check if app is already downloaded /** @var Installer $installer */ $installer = \OC::$server->query(Installer::class); diff --git a/lib/private/legacy/OC_Hook.php b/lib/private/legacy/OC_Hook.php index b223b0fa6d6..a7a0f755673 100644 --- a/lib/private/legacy/OC_Hook.php +++ b/lib/private/legacy/OC_Hook.php @@ -87,7 +87,6 @@ class OC_Hook { * TODO: write example */ public static function emit($signalClass, $signalName, $params = []) { - // Return false if no hook handlers are listening to this // emitting class if (!array_key_exists($signalClass, self::$registered)) { diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php index d2faae9e24d..f2fa2058faa 100644 --- a/lib/private/legacy/OC_Image.php +++ b/lib/private/legacy/OC_Image.php @@ -49,7 +49,6 @@ use OCP\IImage; * Class for basic image manipulation */ class OC_Image implements \OCP\IImage { - // Default memory limit for images to load (256 MBytes). protected const DEFAULT_MEMORY_LIMIT = 256; @@ -728,30 +727,30 @@ class OC_Image implements \OCP\IImage { $this->logger->debug('OC_Image->loadFromFile, webp images not supported: ' . $imagePath, ['app' => 'core']); } break; - /* - case IMAGETYPE_TIFF_II: // (intel byte order) - break; - case IMAGETYPE_TIFF_MM: // (motorola byte order) - break; - case IMAGETYPE_JPC: - break; - case IMAGETYPE_JP2: - break; - case IMAGETYPE_JPX: - break; - case IMAGETYPE_JB2: - break; - case IMAGETYPE_SWC: - break; - case IMAGETYPE_IFF: - break; - case IMAGETYPE_ICO: - break; - case IMAGETYPE_SWF: - break; - case IMAGETYPE_PSD: - break; - */ + /* + case IMAGETYPE_TIFF_II: // (intel byte order) + break; + case IMAGETYPE_TIFF_MM: // (motorola byte order) + break; + case IMAGETYPE_JPC: + break; + case IMAGETYPE_JP2: + break; + case IMAGETYPE_JPX: + break; + case IMAGETYPE_JB2: + break; + case IMAGETYPE_SWC: + break; + case IMAGETYPE_IFF: + break; + case IMAGETYPE_ICO: + break; + case IMAGETYPE_SWF: + break; + case IMAGETYPE_PSD: + break; + */ default: // this is mostly file created from encrypted file diff --git a/lib/private/legacy/OC_JSON.php b/lib/private/legacy/OC_JSON.php index 7734e29c545..b9cfb8210e0 100644 --- a/lib/private/legacy/OC_JSON.php +++ b/lib/private/legacy/OC_JSON.php @@ -28,7 +28,6 @@ * */ class OC_JSON { - /** * Check if the app is enabled, send json error msg if not * @param string $app diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 813cedd0740..0c9fa1ccc0c 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -47,7 +47,6 @@ require_once __DIR__.'/template/functions.php'; * This class provides the templates for ownCloud. */ class OC_Template extends \OC\Template\Base { - /** @var string */ private $renderAs; // Create a full page? @@ -101,7 +100,6 @@ class OC_Template extends \OC\Template\Base { */ public static function initTemplateEngine($renderAs) { if (self::$initTemplateEngineFirstRun) { - // apps that started before the template initialization can load their own scripts/styles // so to make sure this scripts/styles here are loaded first we put all core scripts first // check lib/public/Util.php diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php index de066e143b4..8aaa9072ba4 100644 --- a/lib/private/legacy/OC_User.php +++ b/lib/private/legacy/OC_User.php @@ -202,10 +202,10 @@ class OC_User { /** @var IEventDispatcher $dispatcher */ $dispatcher = \OC::$server->get(IEventDispatcher::class); $dispatcher->dispatchTyped(new UserLoggedInEvent( - \OC::$server->get(IUserManager::class)->get($uid), - $uid, - null, - false) + \OC::$server->get(IUserManager::class)->get($uid), + $uid, + null, + false) ); //trigger creation of user home and /files folder diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 429f7ed5d05..6dc08341b18 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -544,7 +544,7 @@ class OC_Util { 'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. ' . $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s', - [ $urlGenerator->linkToDocs('admin-config') ]) + [ $urlGenerator->linkToDocs('admin-config') ]) ]; } } @@ -839,11 +839,11 @@ class OC_Util { // Check if we are a user if (!\OC::$server->getUserSession()->isLoggedIn()) { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( - 'core.login.showLoginForm', - [ - 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), - ] - ) + 'core.login.showLoginForm', + [ + 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), + ] + ) ); exit(); } |