Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pimp the accesibility controller #24065

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Pimp the accesibility controller #24065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 4 additions & 31 deletions apps/accessibility/lib/Controller/AccessibilityController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserManager;
use OCP\IUserSession;
use ScssPhp\ScssPhp\Compiler;
use ScssPhp\ScssPhp\Exception\ParserException;
Expand All @@ -60,24 +58,15 @@ class AccessibilityController extends Controller {
/** @var IConfig */
private $config;

/** @var IUserManager */
private $userManager;

/** @var ILogger */
private $logger;

/** @var IURLGenerator */
private $urlGenerator;

/** @var ITimeFactory */
protected $timeFactory;

/** @var IUserSession */
private $userSession;

/** @var IAppManager */
private $appManager;

/** @var IconsCacher */
protected $iconsCacher;

Expand All @@ -87,26 +76,13 @@ class AccessibilityController extends Controller {
/** @var null|string */
private $injectedVariables;

/**
* Account constructor.
*
* @param string $appName
* @param IRequest $request
* @param IConfig $config
* @param IUserManager $userManager
* @param ILogger $logger
* @param IURLGenerator $urlGenerator
* @param ITimeFactory $timeFactory
* @param IUserSession $userSession
* @param IAppManager $appManager
* @param \OC_Defaults $defaults
*/
/** @var string */
private $appRoot;

public function __construct(string $appName,
IRequest $request,
IConfig $config,
IUserManager $userManager,
ILogger $logger,
IURLGenerator $urlGenerator,
ITimeFactory $timeFactory,
IUserSession $userSession,
IAppManager $appManager,
Expand All @@ -115,17 +91,14 @@ public function __construct(string $appName,
parent::__construct($appName, $request);
$this->appName = $appName;
$this->config = $config;
$this->userManager = $userManager;
$this->logger = $logger;
$this->urlGenerator = $urlGenerator;
$this->timeFactory = $timeFactory;
$this->userSession = $userSession;
$this->appManager = $appManager;
$this->iconsCacher = $iconsCacher;
$this->defaults = $defaults;

$this->serverRoot = \OC::$SERVERROOT;
$this->appRoot = $this->appManager->getAppPath($this->appName);
$this->appRoot = $appManager->getAppPath($this->appName);
}

/**
Expand Down