Pimp the accesibility controller
* No usused members * appRoot member * less constructor args Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
fec679dd8d
commit
f2ed6df9c4
|
@ -42,8 +42,6 @@ use OCP\AppFramework\Utility\ITimeFactory;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IURLGenerator;
|
|
||||||
use OCP\IUserManager;
|
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
use ScssPhp\ScssPhp\Compiler;
|
use ScssPhp\ScssPhp\Compiler;
|
||||||
use ScssPhp\ScssPhp\Exception\ParserException;
|
use ScssPhp\ScssPhp\Exception\ParserException;
|
||||||
|
@ -60,24 +58,15 @@ class AccessibilityController extends Controller {
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
private $config;
|
private $config;
|
||||||
|
|
||||||
/** @var IUserManager */
|
|
||||||
private $userManager;
|
|
||||||
|
|
||||||
/** @var ILogger */
|
/** @var ILogger */
|
||||||
private $logger;
|
private $logger;
|
||||||
|
|
||||||
/** @var IURLGenerator */
|
|
||||||
private $urlGenerator;
|
|
||||||
|
|
||||||
/** @var ITimeFactory */
|
/** @var ITimeFactory */
|
||||||
protected $timeFactory;
|
protected $timeFactory;
|
||||||
|
|
||||||
/** @var IUserSession */
|
/** @var IUserSession */
|
||||||
private $userSession;
|
private $userSession;
|
||||||
|
|
||||||
/** @var IAppManager */
|
|
||||||
private $appManager;
|
|
||||||
|
|
||||||
/** @var IconsCacher */
|
/** @var IconsCacher */
|
||||||
protected $iconsCacher;
|
protected $iconsCacher;
|
||||||
|
|
||||||
|
@ -87,26 +76,13 @@ class AccessibilityController extends Controller {
|
||||||
/** @var null|string */
|
/** @var null|string */
|
||||||
private $injectedVariables;
|
private $injectedVariables;
|
||||||
|
|
||||||
/**
|
/** @var string */
|
||||||
* Account constructor.
|
private $appRoot;
|
||||||
*
|
|
||||||
* @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
|
|
||||||
*/
|
|
||||||
public function __construct(string $appName,
|
public function __construct(string $appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
IConfig $config,
|
IConfig $config,
|
||||||
IUserManager $userManager,
|
|
||||||
ILogger $logger,
|
ILogger $logger,
|
||||||
IURLGenerator $urlGenerator,
|
|
||||||
ITimeFactory $timeFactory,
|
ITimeFactory $timeFactory,
|
||||||
IUserSession $userSession,
|
IUserSession $userSession,
|
||||||
IAppManager $appManager,
|
IAppManager $appManager,
|
||||||
|
@ -115,17 +91,14 @@ class AccessibilityController extends Controller {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
$this->appName = $appName;
|
$this->appName = $appName;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
$this->userManager = $userManager;
|
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
$this->urlGenerator = $urlGenerator;
|
|
||||||
$this->timeFactory = $timeFactory;
|
$this->timeFactory = $timeFactory;
|
||||||
$this->userSession = $userSession;
|
$this->userSession = $userSession;
|
||||||
$this->appManager = $appManager;
|
|
||||||
$this->iconsCacher = $iconsCacher;
|
$this->iconsCacher = $iconsCacher;
|
||||||
$this->defaults = $defaults;
|
$this->defaults = $defaults;
|
||||||
|
|
||||||
$this->serverRoot = \OC::$SERVERROOT;
|
$this->serverRoot = \OC::$SERVERROOT;
|
||||||
$this->appRoot = $this->appManager->getAppPath($this->appName);
|
$this->appRoot = $appManager->getAppPath($this->appName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue