mirror of https://github.com/nextcloud/server
Merge pull request #36271 from nextcloud/fix/fix-codestyle
Fix codestyle using codesniffer
This commit is contained in:
Côme Chilliet
GitHub
commit
3f231d68d7
|
|
@ -28,7 +28,6 @@ require_once(dirname(__DIR__) . '/3rdparty/autoload.php');
|
|||
* this class checks all methods for the presence of the @since tag
|
||||
*/
|
||||
class SinceTagCheckVisitor extends \PhpParser\NodeVisitorAbstract {
|
||||
|
||||
/** @var string */
|
||||
protected $namespace = '';
|
||||
/** @var string */
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ use PHPUnit\Framework\Assert;
|
|||
require __DIR__ . '/../../vendor/autoload.php';
|
||||
|
||||
trait Avatar {
|
||||
|
||||
/** @var string **/
|
||||
private $lastAvatar;
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ trait BasicStructure {
|
|||
protected $remoteBaseUrl;
|
||||
|
||||
public function __construct($baseUrl, $admin, $regular_user_password) {
|
||||
|
||||
// Initialize your context here
|
||||
$this->baseUrl = $baseUrl;
|
||||
$this->adminUser = $admin;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
use PHPUnit\Framework\Assert;
|
||||
|
||||
trait ContactsMenu {
|
||||
|
||||
// BasicStructure trait is expected to be used in the class that uses this
|
||||
// trait.
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ use PHPUnit\Framework\Assert;
|
|||
require __DIR__ . '/../../vendor/autoload.php';
|
||||
|
||||
trait Download {
|
||||
|
||||
/** @var string **/
|
||||
private $downloadedFile;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
*
|
||||
*/
|
||||
trait Mail {
|
||||
|
||||
// CommandLine trait is expected to be used in the class that uses this
|
||||
// trait.
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ use Behat\Gherkin\Node\TableNode;
|
|||
use PHPUnit\Framework\Assert;
|
||||
|
||||
trait Search {
|
||||
|
||||
// BasicStructure trait is expected to be used in the class that uses this
|
||||
// trait.
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
use Behat\Behat\Context\Context;
|
||||
|
||||
class TalkContext implements Context {
|
||||
|
||||
/**
|
||||
* @BeforeFeature @Talk
|
||||
* @BeforeScenario @Talk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ require __DIR__ . '/../../vendor/autoload.php';
|
|||
* Trashbin functions
|
||||
*/
|
||||
trait Trashbin {
|
||||
|
||||
// WebDav trait is expected to be used in the class that uses this trait.
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ class Install extends Command {
|
|||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int {
|
||||
|
||||
// validate the environment
|
||||
$server = \OC::$server;
|
||||
$setupHelper = new Setup(
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ use OCP\AppFramework\Http;
|
|||
use OCP\AppFramework\Http\Response;
|
||||
|
||||
class WalledGardenController extends Controller {
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
* @NoCSRFRequired
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response;
|
|||
use OCP\IRequest;
|
||||
|
||||
class WellKnownController extends Controller {
|
||||
|
||||
/** @var RequestManager */
|
||||
private $requestManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ use OCP\IUserSession;
|
|||
use OCP\L10N\IFactory;
|
||||
|
||||
class WhatsNewController extends OCSController {
|
||||
|
||||
/** @var IConfig */
|
||||
protected $config;
|
||||
/** @var IUserSession */
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\AppFramework\Http\JSONResponse;
|
|||
use OCP\IRequest;
|
||||
|
||||
class WipeController extends Controller {
|
||||
|
||||
/** @var RemoteWipe */
|
||||
private $remoteWipe;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ declare(strict_types=1);
|
|||
namespace OC\Core\Data;
|
||||
|
||||
class LoginFlowV2Tokens {
|
||||
|
||||
/** @var string */
|
||||
private $loginToken;
|
||||
/** @var string */
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ use OCP\Profile\ParameterDoesNotExistException;
|
|||
* @method void setConfig(string $config)
|
||||
*/
|
||||
class ProfileConfig extends Entity implements JsonSerializable {
|
||||
|
||||
/**
|
||||
* Visible to users, guests, and public access
|
||||
*
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ use OCP\IURLGenerator;
|
|||
use OCP\IUser;
|
||||
|
||||
class TwoFactorMiddleware extends Middleware {
|
||||
|
||||
/** @var Manager */
|
||||
private $twoFactorManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version13000Date20170718121200 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version13000Date20170814074715 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
* Auto-generated migration step: Please modify to your needs!
|
||||
*/
|
||||
class Version13000Date20170919121250 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ use OCP\Migration\BigIntMigration;
|
|||
* Auto-generated migration step: Please modify to your needs!
|
||||
*/
|
||||
class Version13000Date20170926101637 extends BigIntMigration {
|
||||
|
||||
/**
|
||||
* @return array Returns an array with the following structure
|
||||
* ['table1' => ['column1', 'column2'], ...]
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
* Auto-generated migration step: Please modify to your needs!
|
||||
*/
|
||||
class Version14000Date20180404140050 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version14000Date20180516101403 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
*/
|
||||
class Version14000Date20180712153140 extends SimpleMigrationStep {
|
||||
public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
|
||||
|
||||
/** @var ISchemaWrapper $schema */
|
||||
$schema = $schemaClosure();
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version15000Date20180926101451 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version15000Date20181015062942 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version15000Date20181029084625 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version16000Date20190207141427 extends SimpleMigrationStep {
|
||||
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version16000Date20190427105638 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version16000Date20190428150708 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version17000Date20190514105811 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version18000Date20190920085628 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
protected $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
use OCP\Migration\IOutput;
|
||||
|
||||
class Version18000Date20191014105105 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
protected $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
use OCP\Migration\IOutput;
|
||||
|
||||
class Version18000Date20191204114856 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
protected $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version20000Date20201109081918 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
protected $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version20000Date20201109081919 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
use OCP\Migration\IOutput;
|
||||
|
||||
class Version23000Date20210721100600 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ namespace OC\Core\Migrations;
|
|||
use OCP\Migration\BigIntMigration;
|
||||
|
||||
class Version23000Date20211213203940 extends BigIntMigration {
|
||||
|
||||
/**
|
||||
* @return array Returns an array with the following structure
|
||||
* ['table1' => ['column1', 'column2'], ...]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ use OCP\Migration\SimpleMigrationStep;
|
|||
*
|
||||
*/
|
||||
class Version24000Date20211210141942 extends SimpleMigrationStep {
|
||||
|
||||
/** @var IDBConnection */
|
||||
protected $connection;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version25000Date20220602190540 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\Migration\IOutput;
|
|||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
class Version25000Date20220905140840 extends SimpleMigrationStep {
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Accounts\IAccountManager;
|
|||
use OCP\Accounts\IAccountProperty;
|
||||
|
||||
class AccountProperty implements IAccountProperty {
|
||||
|
||||
/** @var string */
|
||||
private $name;
|
||||
/** @var string */
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\Accounts\IAccountProperty;
|
|||
use OCP\Accounts\IAccountPropertyCollection;
|
||||
|
||||
class AccountPropertyCollection implements IAccountPropertyCollection {
|
||||
|
||||
/** @var string */
|
||||
protected $collectionName = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ use Psr\Log\LoggerInterface;
|
|||
* @template-implements IEventListener<UserChangedEvent>
|
||||
*/
|
||||
class Hooks implements IEventListener {
|
||||
|
||||
/** @var IAccountManager */
|
||||
private $accountManager;
|
||||
/** @var LoggerInterface */
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ use OCP\Activity\IEventMerger;
|
|||
use OCP\IL10N;
|
||||
|
||||
class EventMerger implements IEventMerger {
|
||||
|
||||
/** @var IL10N */
|
||||
protected $l10n;
|
||||
|
||||
|
|
|
|||
|
|
@ -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[]
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
namespace OC\App\AppStore\Bundles;
|
||||
|
||||
class EducationBundle extends Bundle {
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
namespace OC\App\AppStore\Bundles;
|
||||
|
||||
class EnterpriseBundle extends Bundle {
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
namespace OC\App\AppStore\Bundles;
|
||||
|
||||
class GroupwareBundle extends Bundle {
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
namespace OC\App\AppStore\Bundles;
|
||||
|
||||
class SocialSharingBundle extends Bundle {
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ use OCP\Support\Subscription\IRegistry;
|
|||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class AppFetcher extends Fetcher {
|
||||
|
||||
/** @var CompareVersion */
|
||||
private $compareVersion;
|
||||
|
||||
|
|
|
|||
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ namespace OC\App;
|
|||
use OCP\IL10N;
|
||||
|
||||
class DependencyAnalyzer {
|
||||
|
||||
/** @var Platform */
|
||||
private $platform;
|
||||
/** @var \OCP\IL10N */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ use OCP\IRequest;
|
|||
* Handles all the dependency injection, controllers and output flow
|
||||
*/
|
||||
class App {
|
||||
|
||||
/** @var string[] */
|
||||
private static $nameSpaceCache = [];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @psalm-immutable
|
||||
*/
|
||||
abstract class ARegistration {
|
||||
|
||||
/** @var string */
|
||||
private $appId;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ use OCP\AppFramework\IAppContainer;
|
|||
use OCP\IServerContainer;
|
||||
|
||||
class BootContext implements IBootContext {
|
||||
|
||||
/** @var IAppContainer */
|
||||
private $appContainer;
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ use Psr\Log\LoggerInterface;
|
|||
use Throwable;
|
||||
|
||||
class Coordinator {
|
||||
|
||||
/** @var IServerContainer */
|
||||
private $serverContainer;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @template-extends ServiceRegistration<\OCP\EventDispatcher\IEventListener>
|
||||
*/
|
||||
class EventListenerRegistration extends ServiceRegistration {
|
||||
|
||||
/** @var string */
|
||||
private $event;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use ReflectionParameter;
|
|||
use function array_map;
|
||||
|
||||
class FunctionInjector {
|
||||
|
||||
/** @var ContainerInterface */
|
||||
private $container;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @psalm-immutable
|
||||
*/
|
||||
final class ParameterRegistration extends ARegistration {
|
||||
|
||||
/** @var string */
|
||||
private $name;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @template-extends ServiceRegistration<\OCP\Preview\IProviderV2>
|
||||
*/
|
||||
class PreviewProviderRegistration extends ServiceRegistration {
|
||||
|
||||
/** @var string */
|
||||
private $mimeTypeRegex;
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ use Psr\Log\LoggerInterface;
|
|||
use Throwable;
|
||||
|
||||
class RegistrationContext {
|
||||
|
||||
/** @var ServiceRegistration<ICapability>[] */
|
||||
private $capabilities = [];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @psalm-immutable
|
||||
*/
|
||||
class ServiceAliasRegistration extends ARegistration {
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* @psalm-var string|class-string
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ namespace OC\AppFramework\Bootstrap;
|
|||
* @psalm-immutable
|
||||
*/
|
||||
class ServiceFactoryRegistration extends ARegistration {
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* @psalm-var string|class-string
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ use Psr\Log\LoggerInterface;
|
|||
* Class to dispatch the request to the middleware dispatcher
|
||||
*/
|
||||
class Dispatcher {
|
||||
|
||||
/** @var MiddlewareDispatcher */
|
||||
private $middlewareDispatcher;
|
||||
|
||||
|
|
@ -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');
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\ILogger;
|
|||
* @deprecated
|
||||
*/
|
||||
class Logger implements ILogger {
|
||||
|
||||
/** @var ILogger */
|
||||
private $logger;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\AppFramework\Middleware;
|
|||
use OCP\IRequest;
|
||||
|
||||
class CompressionMiddleware extends Middleware {
|
||||
|
||||
/** @var bool */
|
||||
private $useGZip;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ use OCP\AppFramework\OCSController;
|
|||
use OCP\IRequest;
|
||||
|
||||
class OCSMiddleware extends Middleware {
|
||||
|
||||
/** @var IRequest */
|
||||
private $request;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\IRequest;
|
|||
use OCP\ISession;
|
||||
|
||||
class PublicShareMiddleware extends Middleware {
|
||||
|
||||
/** @var IRequest */
|
||||
private $request;
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ use OCP\AppFramework\Http\Response;
|
|||
use OCP\AppFramework\Middleware;
|
||||
|
||||
class CSPMiddleware extends Middleware {
|
||||
|
||||
/** @var ContentSecurityPolicyManager */
|
||||
private $contentSecurityPolicyManager;
|
||||
/** @var ContentSecurityPolicyNonceManager */
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\AppFramework\Http\Response;
|
|||
use OCP\AppFramework\Middleware;
|
||||
|
||||
class FeaturePolicyMiddleware extends Middleware {
|
||||
|
||||
/** @var FeaturePolicyManager */
|
||||
private $policyManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ use OCP\AppFramework\Http\Response;
|
|||
use OCP\AppFramework\Middleware;
|
||||
|
||||
class SameSiteCookieMiddleware extends Middleware {
|
||||
|
||||
/** @var Request */
|
||||
private $request;
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\AppFramework\Middleware;
|
|||
use OCP\ISession;
|
||||
|
||||
class SessionMiddleware extends Middleware {
|
||||
|
||||
/** @var ControllerMethodReflector */
|
||||
private $reflector;
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ use Psr\Log\LoggerInterface;
|
|||
use function array_merge;
|
||||
|
||||
class ScopedPsrLogger implements LoggerInterface {
|
||||
|
||||
/** @var LoggerInterface */
|
||||
private $inner;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ use OCP\AppFramework\Services\IAppConfig;
|
|||
use OCP\IConfig;
|
||||
|
||||
class AppConfig implements IAppConfig {
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ use OC\Authentication\Token\IToken;
|
|||
use OCP\EventDispatcher\Event;
|
||||
|
||||
abstract class ARemoteWipeEvent extends Event {
|
||||
|
||||
/** @var IToken */
|
||||
private $token;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ use OCP\Util;
|
|||
* @template-implements IEventListener<\OC\Authentication\Events\LoginFailed>
|
||||
*/
|
||||
class LoginFailedListener implements IEventListener {
|
||||
|
||||
/** @var IEventDispatcher */
|
||||
private $dispatcher;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ use Psr\Log\LoggerInterface;
|
|||
* @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
|
||||
*/
|
||||
class RemoteWipeActivityListener implements IEventListener {
|
||||
|
||||
/** @var IActvityManager */
|
||||
private $activityManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ use function substr;
|
|||
* @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
|
||||
*/
|
||||
class RemoteWipeEmailListener implements IEventListener {
|
||||
|
||||
/** @var IMailer */
|
||||
private $mailer;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ use OCP\User\Events\UserDeletedEvent;
|
|||
* @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
|
||||
*/
|
||||
class UserDeletedStoreCleanupListener implements IEventListener {
|
||||
|
||||
/** @var Registry */
|
||||
private $registry;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ use Throwable;
|
|||
* @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
|
||||
*/
|
||||
class UserDeletedTokenCleanupListener implements IEventListener {
|
||||
|
||||
/** @var Manager */
|
||||
private $manager;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OCP\EventDispatcher\IEventListener;
|
|||
use OCP\User\Events\UserDeletedEvent;
|
||||
|
||||
class UserDeletedWebAuthnCleanupListener implements IEventListener {
|
||||
|
||||
/** @var PublicKeyCredentialMapper */
|
||||
private $credentialMapper;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ use OCP\User\Events\PostLoginEvent;
|
|||
* @template-implements IEventListener<\OCP\User\Events\PostLoginEvent>
|
||||
*/
|
||||
class UserLoggedInListener implements IEventListener {
|
||||
|
||||
/** @var Manager */
|
||||
private $manager;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ declare(strict_types=1);
|
|||
namespace OC\Authentication\Login;
|
||||
|
||||
abstract class ALoginCommand {
|
||||
|
||||
/** @var ALoginCommand */
|
||||
protected $next;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ declare(strict_types=1);
|
|||
namespace OC\Authentication\Login;
|
||||
|
||||
class Chain {
|
||||
|
||||
/** @var PreLoginHookCommand */
|
||||
private $preLoginHookCommand;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ namespace OC\Authentication\Login;
|
|||
use OCP\IConfig;
|
||||
|
||||
class ClearLostPasswordTokensCommand extends ALoginCommand {
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ namespace OC\Authentication\Login;
|
|||
use OC\User\Session;
|
||||
|
||||
class CompleteLoginCommand extends ALoginCommand {
|
||||
|
||||
/** @var Session */
|
||||
private $userSession;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ use OC\User\Session;
|
|||
use OCP\IConfig;
|
||||
|
||||
class CreateSessionTokenCommand extends ALoginCommand {
|
||||
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ use OC\User\Session;
|
|||
use OCP\IConfig;
|
||||
|
||||
class FinishRememberedLoginCommand extends ALoginCommand {
|
||||
|
||||
/** @var Session */
|
||||
private $userSession;
|
||||
/** @var IConfig */
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ use OCP\EventDispatcher\IEventDispatcher;
|
|||
use Psr\Log\LoggerInterface;
|
||||
|
||||
class LoggedInCheckCommand extends ALoginCommand {
|
||||
|
||||
/** @var LoggerInterface */
|
||||
private $logger;
|
||||
/** @var IEventDispatcher */
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ use OCP\IRequest;
|
|||
use OCP\IUser;
|
||||
|
||||
class LoginData {
|
||||
|
||||
/** @var IRequest */
|
||||
private $request;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue