diff options
Diffstat (limited to 'apps/accessibility/lib/Controller')
| -rw-r--r-- | apps/accessibility/lib/Controller/AccessibilityController.php | 49 | ||||
| -rw-r--r-- | apps/accessibility/lib/Controller/ConfigController.php | 31 |
2 files changed, 16 insertions, 64 deletions
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php index 7a5a82085dc..b3063937a1b 100644 --- a/apps/accessibility/lib/Controller/AccessibilityController.php +++ b/apps/accessibility/lib/Controller/AccessibilityController.php @@ -48,35 +48,15 @@ use ScssPhp\ScssPhp\OutputStyle; class AccessibilityController extends Controller { - /** @var string */ - protected $appName; - - /** @var string */ - protected $serverRoot; - - /** @var IConfig */ - private $config; - - /** @var LoggerInterface */ - private $logger; - - /** @var ITimeFactory */ - protected $timeFactory; - - /** @var IUserSession */ - private $userSession; - - /** @var IconsCacher */ - protected $iconsCacher; - - /** @var \OC_Defaults */ - private $defaults; - - /** @var null|string */ - private $injectedVariables; - - /** @var string */ - private $appRoot; + protected string $serverRoot; + private IConfig $config; + private LoggerInterface $logger; + protected ITimeFactory $timeFactory; + private IUserSession $userSession; + protected IconsCacher $iconsCacher; + private \OC_Defaults $defaults; + private ?string $injectedVariables = null; + private string $appRoot; public function __construct(string $appName, IRequest $request, @@ -104,8 +84,6 @@ class AccessibilityController extends Controller { * @PublicPage * @NoCSRFRequired * @NoSameSiteCookieRequired - * - * @return DataDisplayResponse */ public function getCss(): DataDisplayResponse { $css = ''; @@ -186,8 +164,6 @@ class AccessibilityController extends Controller { /** * Return an array with the user theme & font settings - * - * @return array */ private function getUserValues(): array { $userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false); @@ -210,10 +186,6 @@ class AccessibilityController extends Controller { /** * Add the correct uri prefix to make uri valid again - * - * @param string $css - * @param string $webDir - * @return string */ private function rebaseUrls(string $css, string $webDir): string { $re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x'; @@ -226,9 +198,8 @@ class AccessibilityController extends Controller { * Remove all matches from the $rule regex * * @param string $css string to parse - * @return string */ - private function invertSvgIconsColor(string $css) { + private function invertSvgIconsColor(string $css): string { return str_replace( ['color=000&', 'color=fff&', 'color=***&'], ['color=***&', 'color=000&', 'color=fff&'], diff --git a/apps/accessibility/lib/Controller/ConfigController.php b/apps/accessibility/lib/Controller/ConfigController.php index 592c2268eb8..3cc66ed4cb4 100644 --- a/apps/accessibility/lib/Controller/ConfigController.php +++ b/apps/accessibility/lib/Controller/ConfigController.php @@ -41,32 +41,13 @@ use OCP\PreConditionNotMetException; class ConfigController extends OCSController { - /** @var string */ - protected $appName; - - /** @var string */ - protected $userId; - - /** @var string */ - protected $serverRoot; - - /** @var IConfig */ - private $config; - - /** @var IUserSession */ - private $userSession; - - /** @var AccessibilityProvider */ - private $accessibilityProvider; + protected string $userId; + private IConfig $config; + private IUserSession $userSession; + private AccessibilityProvider $accessibilityProvider; /** * Config constructor. - * - * @param string $appName - * @param IRequest $request - * @param IConfig $config - * @param IUserSession $userSession - * @param AccessibilityProvider $accessibilityProvider */ public function __construct(string $appName, IRequest $request, @@ -74,7 +55,6 @@ class ConfigController extends OCSController { IUserSession $userSession, AccessibilityProvider $accessibilityProvider) { parent::__construct($appName, $request); - $this->appName = $appName; $this->config = $config; $this->userSession = $userSession; $this->accessibilityProvider = $accessibilityProvider; @@ -102,7 +82,8 @@ class ConfigController extends OCSController { * * Set theme or font config * - * @param string $key theme or font + * @param string $key the theme or font + * @param string|false $value the value * @return DataResponse * @throws OCSBadRequestException|PreConditionNotMetException */ |