nextcloud / server

apps/dashboard/lib/Service/BackgroundService.php

Indentation +130 added lines, -130 removed lines

@@ -33,141 +33,141 @@
 use OCP\IConfig;
 
 class BackgroundService {
-	public const THEMING_MODE_DARK = 'dark';
+    public const THEMING_MODE_DARK = 'dark';
 
-	public const SHIPPED_BACKGROUNDS = [
-		'anatoly-mikhaltsov-butterfly-wing-scale.jpg' => [
-			'attribution' => 'Butterfly wing scale (Anatoly Mikhaltsov, CC BY-SA)',
-			'attribution_url' => 'https://commons.wikimedia.org/wiki/File:%D0%A7%D0%B5%D1%88%D1%83%D0%B9%D0%BA%D0%B8_%D0%BA%D1%80%D1%8B%D0%BB%D0%B0_%D0%B1%D0%B0%D0%B1%D0%BE%D1%87%D0%BA%D0%B8.jpg',
-		],
-		'bernie-cetonia-aurata-take-off-composition.jpg' => [
-			'attribution' => 'Cetonia aurata take off composition (Bernie, Public Domain)',
-			'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Cetonia_aurata_take_off_composition_05172009.jpg',
-			'theming' => self::THEMING_MODE_DARK,
-		],
-		'dejan-krsmanovic-ribbed-red-metal.jpg' => [
-			'attribution' => 'Ribbed red metal (Dejan Krsmanovic, CC BY)',
-			'attribution_url' => 'https://www.flickr.com/photos/dejankrsmanovic/42971456774/',
-		],
-		'eduardo-neves-pedra-azul.jpg' => [
-			'attribution' => 'Pedra azul milky way (Eduardo Neves, CC BY-SA)',
-			'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg',
-		],
-		'european-space-agency-barents-bloom.jpg' => [
-			'attribution' => 'Barents bloom (European Space Agency, CC BY-SA)',
-			'attribution_url' => 'https://www.esa.int/ESA_Multimedia/Images/2016/08/Barents_bloom',
-		],
-		'hannes-fritz-flippity-floppity.jpg' => [
-			'attribution' => 'Flippity floppity (Hannes Fritz, CC BY-SA)',
-			'attribution_url' => 'http://hannes.photos/flippity-floppity',
-		],
-		'hannes-fritz-roulette.jpg' => [
-			'attribution' => 'Roulette (Hannes Fritz, CC BY-SA)',
-			'attribution_url' => 'http://hannes.photos/roulette',
-		],
-		'hannes-fritz-sea-spray.jpg' => [
-			'attribution' => 'Sea spray (Hannes Fritz, CC BY-SA)',
-			'attribution_url' => 'http://hannes.photos/sea-spray',
-		],
-		'kamil-porembinski-clouds.jpg' => [
-			'attribution' => 'Clouds (Kamil Porembiński, CC BY-SA)',
-			'attribution_url' => 'https://www.flickr.com/photos/paszczak000/8715851521/',
-		],
-		'bernard-spragg-new-zealand-fern.jpg' => [
-			'attribution' => 'New zealand fern (Bernard Spragg, CC0)',
-			'attribution_url' => 'https://commons.wikimedia.org/wiki/File:NZ_Fern.(Blechnum_chambersii)_(11263534936).jpg',
-		],
-		'rawpixel-pink-tapioca-bubbles.jpg' => [
-			'attribution' => 'Pink tapioca bubbles (Rawpixel, CC BY)',
-			'attribution_url' => 'https://www.flickr.com/photos/byrawpixel/27665140298/in/photostream/',
-			'theming' => self::THEMING_MODE_DARK,
-		],
-		'nasa-waxing-crescent-moon.jpg' => [
-			'attribution' => 'Waxing crescent moon (NASA, Public Domain)',
-			'attribution_url' => 'https://www.nasa.gov/image-feature/a-waxing-crescent-moon',
-		],
-		'tommy-chau-already.jpg' => [
-			'attribution' => 'Cityscape (Tommy Chau, CC BY)',
-			'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/16910999368',
-		],
-		'tommy-chau-lion-rock-hill.jpg' => [
-			'attribution' => 'Lion rock hill (Tommy Chau, CC BY)',
-			'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/17136440246',
-			'theming' => self::THEMING_MODE_DARK,
-		],
-		'lali-masriera-yellow-bricks.jpg' => [
-			'attribution' => 'Yellow bricks (Lali Masriera, CC BY)',
-			'attribution_url' => 'https://www.flickr.com/photos/visualpanic/3982464447',
-			'theming' => self::THEMING_MODE_DARK,
-		]
-	];
-	/**
-	 * @var \OCP\Files\Folder
-	 */
-	private $userFolder;
-	/**
-	 * @var \OCP\Files\SimpleFS\ISimpleFolder
-	 */
-	private $dashboardUserFolder;
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-	private $userId;
+    public const SHIPPED_BACKGROUNDS = [
+        'anatoly-mikhaltsov-butterfly-wing-scale.jpg' => [
+            'attribution' => 'Butterfly wing scale (Anatoly Mikhaltsov, CC BY-SA)',
+            'attribution_url' => 'https://commons.wikimedia.org/wiki/File:%D0%A7%D0%B5%D1%88%D1%83%D0%B9%D0%BA%D0%B8_%D0%BA%D1%80%D1%8B%D0%BB%D0%B0_%D0%B1%D0%B0%D0%B1%D0%BE%D1%87%D0%BA%D0%B8.jpg',
+        ],
+        'bernie-cetonia-aurata-take-off-composition.jpg' => [
+            'attribution' => 'Cetonia aurata take off composition (Bernie, Public Domain)',
+            'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Cetonia_aurata_take_off_composition_05172009.jpg',
+            'theming' => self::THEMING_MODE_DARK,
+        ],
+        'dejan-krsmanovic-ribbed-red-metal.jpg' => [
+            'attribution' => 'Ribbed red metal (Dejan Krsmanovic, CC BY)',
+            'attribution_url' => 'https://www.flickr.com/photos/dejankrsmanovic/42971456774/',
+        ],
+        'eduardo-neves-pedra-azul.jpg' => [
+            'attribution' => 'Pedra azul milky way (Eduardo Neves, CC BY-SA)',
+            'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg',
+        ],
+        'european-space-agency-barents-bloom.jpg' => [
+            'attribution' => 'Barents bloom (European Space Agency, CC BY-SA)',
+            'attribution_url' => 'https://www.esa.int/ESA_Multimedia/Images/2016/08/Barents_bloom',
+        ],
+        'hannes-fritz-flippity-floppity.jpg' => [
+            'attribution' => 'Flippity floppity (Hannes Fritz, CC BY-SA)',
+            'attribution_url' => 'http://hannes.photos/flippity-floppity',
+        ],
+        'hannes-fritz-roulette.jpg' => [
+            'attribution' => 'Roulette (Hannes Fritz, CC BY-SA)',
+            'attribution_url' => 'http://hannes.photos/roulette',
+        ],
+        'hannes-fritz-sea-spray.jpg' => [
+            'attribution' => 'Sea spray (Hannes Fritz, CC BY-SA)',
+            'attribution_url' => 'http://hannes.photos/sea-spray',
+        ],
+        'kamil-porembinski-clouds.jpg' => [
+            'attribution' => 'Clouds (Kamil Porembiński, CC BY-SA)',
+            'attribution_url' => 'https://www.flickr.com/photos/paszczak000/8715851521/',
+        ],
+        'bernard-spragg-new-zealand-fern.jpg' => [
+            'attribution' => 'New zealand fern (Bernard Spragg, CC0)',
+            'attribution_url' => 'https://commons.wikimedia.org/wiki/File:NZ_Fern.(Blechnum_chambersii)_(11263534936).jpg',
+        ],
+        'rawpixel-pink-tapioca-bubbles.jpg' => [
+            'attribution' => 'Pink tapioca bubbles (Rawpixel, CC BY)',
+            'attribution_url' => 'https://www.flickr.com/photos/byrawpixel/27665140298/in/photostream/',
+            'theming' => self::THEMING_MODE_DARK,
+        ],
+        'nasa-waxing-crescent-moon.jpg' => [
+            'attribution' => 'Waxing crescent moon (NASA, Public Domain)',
+            'attribution_url' => 'https://www.nasa.gov/image-feature/a-waxing-crescent-moon',
+        ],
+        'tommy-chau-already.jpg' => [
+            'attribution' => 'Cityscape (Tommy Chau, CC BY)',
+            'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/16910999368',
+        ],
+        'tommy-chau-lion-rock-hill.jpg' => [
+            'attribution' => 'Lion rock hill (Tommy Chau, CC BY)',
+            'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/17136440246',
+            'theming' => self::THEMING_MODE_DARK,
+        ],
+        'lali-masriera-yellow-bricks.jpg' => [
+            'attribution' => 'Yellow bricks (Lali Masriera, CC BY)',
+            'attribution_url' => 'https://www.flickr.com/photos/visualpanic/3982464447',
+            'theming' => self::THEMING_MODE_DARK,
+        ]
+    ];
+    /**
+     * @var \OCP\Files\Folder
+     */
+    private $userFolder;
+    /**
+     * @var \OCP\Files\SimpleFS\ISimpleFolder
+     */
+    private $dashboardUserFolder;
+    /**
+     * @var IConfig
+     */
+    private $config;
+    private $userId;
 
-	public function __construct(IRootFolder $rootFolder, IAppData $appData, IConfig $config, $userId) {
-		if ($userId === null) {
-			return;
-		}
-		$this->userFolder = $rootFolder->getUserFolder($userId);
-		try {
-			$this->dashboardUserFolder = $appData->getFolder($userId);
-		} catch (NotFoundException $e) {
-			$this->dashboardUserFolder = $appData->newFolder($userId);
-		}
-		$this->config = $config;
-		$this->userId = $userId;
-	}
+    public function __construct(IRootFolder $rootFolder, IAppData $appData, IConfig $config, $userId) {
+        if ($userId === null) {
+            return;
+        }
+        $this->userFolder = $rootFolder->getUserFolder($userId);
+        try {
+            $this->dashboardUserFolder = $appData->getFolder($userId);
+        } catch (NotFoundException $e) {
+            $this->dashboardUserFolder = $appData->newFolder($userId);
+        }
+        $this->config = $config;
+        $this->userId = $userId;
+    }
 
-	public function setDefaultBackground(): void {
-		$this->config->deleteUserValue($this->userId, 'dashboard', 'background');
-	}
+    public function setDefaultBackground(): void {
+        $this->config->deleteUserValue($this->userId, 'dashboard', 'background');
+    }
 
-	/**
-	 * @param $path
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function setFileBackground($path): void {
-		$this->config->setUserValue($this->userId, 'dashboard', 'background', 'custom');
-		/** @var \OCP\Files\File $file */
-		$file = $this->userFolder->get($path);
-		$this->dashboardUserFolder->newFile('background.jpg', $file->fopen('r'));
-	}
+    /**
+     * @param $path
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function setFileBackground($path): void {
+        $this->config->setUserValue($this->userId, 'dashboard', 'background', 'custom');
+        /** @var \OCP\Files\File $file */
+        $file = $this->userFolder->get($path);
+        $this->dashboardUserFolder->newFile('background.jpg', $file->fopen('r'));
+    }
 
-	public function setShippedBackground($fileName): void {
-		if (!array_key_exists($fileName, self::SHIPPED_BACKGROUNDS)) {
-			throw new \InvalidArgumentException('The given file name is invalid');
-		}
-		$this->config->setUserValue($this->userId, 'dashboard', 'background', $fileName);
-	}
+    public function setShippedBackground($fileName): void {
+        if (!array_key_exists($fileName, self::SHIPPED_BACKGROUNDS)) {
+            throw new \InvalidArgumentException('The given file name is invalid');
+        }
+        $this->config->setUserValue($this->userId, 'dashboard', 'background', $fileName);
+    }
 
-	public function setColorBackground(string $color): void {
-		if (!preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $color)) {
-			throw new \InvalidArgumentException('The given color is invalid');
-		}
-		$this->config->setUserValue($this->userId, 'dashboard', 'background', $color);
-	}
+    public function setColorBackground(string $color): void {
+        if (!preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $color)) {
+            throw new \InvalidArgumentException('The given color is invalid');
+        }
+        $this->config->setUserValue($this->userId, 'dashboard', 'background', $color);
+    }
 
-	public function getBackground(): ?ISimpleFile {
-		$background = $this->config->getUserValue($this->userId, 'dashboard', 'background', 'default');
-		if ($background === 'custom') {
-			try {
-				return $this->dashboardUserFolder->getFile('background.jpg');
-			} catch (NotFoundException $e) {
-			}
-		}
-		return null;
-	}
+    public function getBackground(): ?ISimpleFile {
+        $background = $this->config->getUserValue($this->userId, 'dashboard', 'background', 'default');
+        if ($background === 'custom') {
+            try {
+                return $this->dashboardUserFolder->getFile('background.jpg');
+            } catch (NotFoundException $e) {
+            }
+        }
+        return null;
+    }
 }

apps/dashboard/lib/Controller/DashboardController.php

Indentation +119 added lines, -119 removed lines

@@ -45,132 +45,132 @@
 
 class DashboardController extends Controller {
 
-	/** @var IInitialStateService */
-	private $inititalStateService;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-	/** @var IManager */
-	private $dashboardManager;
-	/** @var IConfig */
-	private $config;
-	/** @var string */
-	private $userId;
-	/**
-	 * @var BackgroundService
-	 */
-	private $backgroundService;
+    /** @var IInitialStateService */
+    private $inititalStateService;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+    /** @var IManager */
+    private $dashboardManager;
+    /** @var IConfig */
+    private $config;
+    /** @var string */
+    private $userId;
+    /**
+     * @var BackgroundService
+     */
+    private $backgroundService;
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IInitialStateService $initialStateService,
-		IEventDispatcher $eventDispatcher,
-		IManager $dashboardManager,
-		IConfig $config,
-		BackgroundService $backgroundService,
-		$userId
-	) {
-		parent::__construct($appName, $request);
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IInitialStateService $initialStateService,
+        IEventDispatcher $eventDispatcher,
+        IManager $dashboardManager,
+        IConfig $config,
+        BackgroundService $backgroundService,
+        $userId
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->inititalStateService = $initialStateService;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->dashboardManager = $dashboardManager;
-		$this->config = $config;
-		$this->backgroundService = $backgroundService;
-		$this->userId = $userId;
-	}
+        $this->inititalStateService = $initialStateService;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->dashboardManager = $dashboardManager;
+        $this->config = $config;
+        $this->backgroundService = $backgroundService;
+        $this->userId = $userId;
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @return TemplateResponse
-	 */
-	public function index(): TemplateResponse {
-		\OCP\Util::addStyle('dashboard', 'dashboard');
-		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
-		if (class_exists(LoadViewer::class)) {
-			$this->eventDispatcher->dispatchTyped(new LoadViewer());
-		}
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @return TemplateResponse
+     */
+    public function index(): TemplateResponse {
+        \OCP\Util::addStyle('dashboard', 'dashboard');
+        $this->eventDispatcher->dispatchTyped(new LoadSidebar());
+        if (class_exists(LoadViewer::class)) {
+            $this->eventDispatcher->dispatchTyped(new LoadViewer());
+        }
 
-		$this->eventDispatcher->dispatchTyped(new RegisterWidgetEvent($this->dashboardManager));
+        $this->eventDispatcher->dispatchTyped(new RegisterWidgetEvent($this->dashboardManager));
 
-		$userLayout = explode(',', $this->config->getUserValue($this->userId, 'dashboard', 'layout', 'recommendations,spreed,mail,calendar'));
-		$widgets = array_map(function (IWidget $widget) {
-			return [
-				'id' => $widget->getId(),
-				'title' => $widget->getTitle(),
-				'iconClass' => $widget->getIconClass(),
-				'url' => $widget->getUrl()
-			];
-		}, $this->dashboardManager->getWidgets());
-		$this->inititalStateService->provideInitialState('dashboard', 'panels', $widgets);
-		$this->inititalStateService->provideInitialState('dashboard', 'layout', $userLayout);
-		$this->inititalStateService->provideInitialState('dashboard', 'firstRun', $this->config->getUserValue($this->userId, 'dashboard', 'firstRun', '1') === '1');
-		$this->inititalStateService->provideInitialState('dashboard', 'shippedBackgrounds', BackgroundService::SHIPPED_BACKGROUNDS);
-		$this->inititalStateService->provideInitialState('dashboard', 'background', $this->config->getUserValue($this->userId, 'dashboard', 'background', 'default'));
-		$this->inititalStateService->provideInitialState('dashboard', 'version', $this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', 0));
-		$this->config->setUserValue($this->userId, 'dashboard', 'firstRun', '0');
+        $userLayout = explode(',', $this->config->getUserValue($this->userId, 'dashboard', 'layout', 'recommendations,spreed,mail,calendar'));
+        $widgets = array_map(function (IWidget $widget) {
+            return [
+                'id' => $widget->getId(),
+                'title' => $widget->getTitle(),
+                'iconClass' => $widget->getIconClass(),
+                'url' => $widget->getUrl()
+            ];
+        }, $this->dashboardManager->getWidgets());
+        $this->inititalStateService->provideInitialState('dashboard', 'panels', $widgets);
+        $this->inititalStateService->provideInitialState('dashboard', 'layout', $userLayout);
+        $this->inititalStateService->provideInitialState('dashboard', 'firstRun', $this->config->getUserValue($this->userId, 'dashboard', 'firstRun', '1') === '1');
+        $this->inititalStateService->provideInitialState('dashboard', 'shippedBackgrounds', BackgroundService::SHIPPED_BACKGROUNDS);
+        $this->inititalStateService->provideInitialState('dashboard', 'background', $this->config->getUserValue($this->userId, 'dashboard', 'background', 'default'));
+        $this->inititalStateService->provideInitialState('dashboard', 'version', $this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', 0));
+        $this->config->setUserValue($this->userId, 'dashboard', 'firstRun', '0');
 
-		return new TemplateResponse('dashboard', 'index');
-	}
+        return new TemplateResponse('dashboard', 'index');
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @param string $layout
-	 * @return JSONResponse
-	 */
-	public function updateLayout(string $layout): JSONResponse {
-		$this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
-		return new JSONResponse(['layout' => $layout]);
-	}
+    /**
+     * @NoAdminRequired
+     * @param string $layout
+     * @return JSONResponse
+     */
+    public function updateLayout(string $layout): JSONResponse {
+        $this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
+        return new JSONResponse(['layout' => $layout]);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function setBackground(string $type, string $value): JSONResponse {
-		$currentVersion = (int)$this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', 0);
-		try {
-			switch ($type) {
-				case 'shipped':
-					$this->backgroundService->setShippedBackground($value);
-					break;
-				case 'custom':
-					$this->backgroundService->setFileBackground($value);
-					break;
-				case 'color':
-					$this->backgroundService->setColorBackground($value);
-					break;
-				case 'default':
-					$this->backgroundService->setDefaultBackground();
-					break;
-				default:
-					return new JSONResponse(['error' => 'Invalid type provided'], Http::STATUS_BAD_REQUEST);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
-		} catch (\Throwable $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-		$currentVersion++;
-		$this->config->setUserValue($this->userId, 'dashboard', 'backgroundVersion', (string)$currentVersion);
-		return new JSONResponse([
-			'type' => $type,
-			'value' => $value,
-			'version' => $this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', $currentVersion)
-		]);
-	}
+    /**
+     * @NoAdminRequired
+     */
+    public function setBackground(string $type, string $value): JSONResponse {
+        $currentVersion = (int)$this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', 0);
+        try {
+            switch ($type) {
+                case 'shipped':
+                    $this->backgroundService->setShippedBackground($value);
+                    break;
+                case 'custom':
+                    $this->backgroundService->setFileBackground($value);
+                    break;
+                case 'color':
+                    $this->backgroundService->setColorBackground($value);
+                    break;
+                case 'default':
+                    $this->backgroundService->setDefaultBackground();
+                    break;
+                default:
+                    return new JSONResponse(['error' => 'Invalid type provided'], Http::STATUS_BAD_REQUEST);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+        } catch (\Throwable $e) {
+            return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+        $currentVersion++;
+        $this->config->setUserValue($this->userId, 'dashboard', 'backgroundVersion', (string)$currentVersion);
+        return new JSONResponse([
+            'type' => $type,
+            'value' => $value,
+            'version' => $this->config->getUserValue($this->userId, 'dashboard', 'backgroundVersion', $currentVersion)
+        ]);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function getBackground() {
-		$file = $this->backgroundService->getBackground();
-		if ($file !== null) {
-			$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => $file->getMimeType()]);
-			$response->cacheFor(24 * 60 * 60);
-			return $response;
-		}
-		return new NotFoundResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function getBackground() {
+        $file = $this->backgroundService->getBackground();
+        if ($file !== null) {
+            $response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => $file->getMimeType()]);
+            $response->cacheFor(24 * 60 * 60);
+            return $response;
+        }
+        return new NotFoundResponse();
+    }
 }

apps/dashboard/lib/Controller/LayoutApiController.php

Indentation +27 added lines, -27 removed lines

@@ -33,31 +33,31 @@
 
 class LayoutApiController extends OCSController {
 
-	/** @var IConfig */
-	private $config;
-	/** @var string */
-	private $userId;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IConfig $config,
-		$userId
-	) {
-		parent::__construct($appName, $request);
-
-		$this->config = $config;
-		$this->userId = $userId;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $layout
-	 * @return JSONResponse
-	 */
-	public function create(string $layout): JSONResponse {
-		$this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
-		return new JSONResponse(['layout' => $layout]);
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var string */
+    private $userId;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IConfig $config,
+        $userId
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->userId = $userId;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $layout
+     * @return JSONResponse
+     */
+    public function create(string $layout): JSONResponse {
+        $this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
+        return new JSONResponse(['layout' => $layout]);
+    }
 }

apps/dashboard/appinfo/routes.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'dashboard#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'dashboard#updateLayout', 'url' => '/layout', 'verb' => 'POST'],
-		['name' => 'dashboard#getBackground', 'url' => '/background', 'verb' => 'GET'],
-		['name' => 'dashboard#setBackground', 'url' => '/background/{type}', 'verb' => 'POST'],
-	]
+    'routes' => [
+        ['name' => 'dashboard#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'dashboard#updateLayout', 'url' => '/layout', 'verb' => 'POST'],
+        ['name' => 'dashboard#getBackground', 'url' => '/background', 'verb' => 'GET'],
+        ['name' => 'dashboard#setBackground', 'url' => '/background/{type}', 'verb' => 'POST'],
+    ]
 ];