juliushaertl / apporder

tests/unit/UtilTest.php

Indentation +62 added lines, -62 removed lines

@@ -28,74 +28,74 @@
 
 class UtilTest extends \PHPUnit_Framework_TestCase {
 
-	/** @var ConfigService */
-	private $service;
-	/** @var string */
-	private $userId;
-	/** @var Util */
-	private $util;
-	/** @var IConfig */
-	private $config;
+    /** @var ConfigService */
+    private $service;
+    /** @var string */
+    private $userId;
+    /** @var Util */
+    private $util;
+    /** @var IConfig */
+    private $config;
 
-	public function setUp() {
+    public function setUp() {
 
-		parent::setUp();
+        parent::setUp();
 
-		$this->config = $this->getMockBuilder('OCP\IConfig')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userId = 'admin';
-		$this->util = new Util($this->service, $this->userId);
+        $this->config = $this->getMockBuilder('OCP\IConfig')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userId = 'admin';
+        $this->util = new Util($this->service, $this->userId);
 
-	}
+    }
 
-	public function testMatchOrder() {
-		$nav = [
-			['href' => '/app/files/', 'name' => 'Files'],
-			['href' => '/app/calendar/', 'name' => 'Calendar'],
-			['href' => '/app/tasks/', 'name' => 'Tasks'],
-		];
-		$order = ['/app/calendar/', '/app/tasks/'];
-		$result = $this->util->matchOrder($nav, $order);
-		$expected = [
-			'/app/calendar/' => ['href' => '/app/calendar/', 'name' => 'Calendar'],
-			'/app/tasks/' => ['href' => '/app/tasks/', 'name' => 'Tasks'],
-			'/app/files/' => ['href' => '/app/files/', 'name' => 'Files'],
-		];
-		$this->assertEquals($expected, $result);
-	}
+    public function testMatchOrder() {
+        $nav = [
+            ['href' => '/app/files/', 'name' => 'Files'],
+            ['href' => '/app/calendar/', 'name' => 'Calendar'],
+            ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        ];
+        $order = ['/app/calendar/', '/app/tasks/'];
+        $result = $this->util->matchOrder($nav, $order);
+        $expected = [
+            '/app/calendar/' => ['href' => '/app/calendar/', 'name' => 'Calendar'],
+            '/app/tasks/' => ['href' => '/app/tasks/', 'name' => 'Tasks'],
+            '/app/files/' => ['href' => '/app/files/', 'name' => 'Files'],
+        ];
+        $this->assertEquals($expected, $result);
+    }
 
-	public function testGetAppOrder() {
-		$nav_system = ['/app/calendar/', '/app/tasks/'];
-		$nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
-		$this->service->expects($this->once())
-			->method('getAppValue')
-			->with('order')
-			->will($this->returnValue(json_encode($nav_system)));
-		$this->service->expects($this->once())
-			->method('getUserValue')
-			->with('order', $this->userId)
-			->will($this->returnValue(json_encode($nav_user)));
-		$result = $this->util->getAppOrder();
-		$this->assertEquals(json_encode($nav_user), $result);
-	}
+    public function testGetAppOrder() {
+        $nav_system = ['/app/calendar/', '/app/tasks/'];
+        $nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
+        $this->service->expects($this->once())
+            ->method('getAppValue')
+            ->with('order')
+            ->will($this->returnValue(json_encode($nav_system)));
+        $this->service->expects($this->once())
+            ->method('getUserValue')
+            ->with('order', $this->userId)
+            ->will($this->returnValue(json_encode($nav_user)));
+        $result = $this->util->getAppOrder();
+        $this->assertEquals(json_encode($nav_user), $result);
+    }
 
-	public function testGetAppOrderNoUser() {
-		$nav_system = ['/app/calendar/', '/app/tasks/'];
-		$nav_user = '';
-		$this->service->expects($this->once())
-			->method('getAppValue')
-			->with('order')
-			->will($this->returnValue(json_encode($nav_system)));
-		$this->service->expects($this->once())
-			->method('getUserValue')
-			->with('order', $this->userId)
-			->will($this->returnValue($nav_user));
-		$result = $this->util->getAppOrder();
-		$this->assertEquals(json_encode($nav_system), $result);
-	}
+    public function testGetAppOrderNoUser() {
+        $nav_system = ['/app/calendar/', '/app/tasks/'];
+        $nav_user = '';
+        $this->service->expects($this->once())
+            ->method('getAppValue')
+            ->with('order')
+            ->will($this->returnValue(json_encode($nav_system)));
+        $this->service->expects($this->once())
+            ->method('getUserValue')
+            ->with('order', $this->userId)
+            ->will($this->returnValue($nav_user));
+        $result = $this->util->getAppOrder();
+        $this->assertEquals(json_encode($nav_system), $result);
+    }
 
 }

tests/unit/service/ConfigServiceTest.php

Indentation +29 added lines, -29 removed lines

@@ -28,34 +28,34 @@
 
 class ConfigServiceTest extends \PHPUnit_Framework_TestCase {
 
-	/** @var IConfig */
-	private $config;
-	/** @var ConfigService */
-	private $service;
-
-	public function setUp() {
-		$this->config = $this->getMockBuilder('\OCP\IConfig')
-			->disableOriginalConstructor()->getMock();
-		$this->service = new ConfigService($this->config, 'apporder');
-	}
-
-	public function testAppValue() {
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->with('apporder', 'foo')
-			->willReturn('bar');
-		$result = $this->service->getAppValue("foo");
-		$this->assertEquals('bar', $result);
-	}
-
-	public function testUserValue() {
-		$this->config->expects($this->any())
-			->method('getUserValue')
-			->with('user', 'apporder', 'foo')
-			->willReturn('bar');
-		$this->service->setUserValue("foo", "user", "bar");
-		$result = $this->service->getUserValue("foo", "user");
-		$this->assertEquals('bar', $result);
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var ConfigService */
+    private $service;
+
+    public function setUp() {
+        $this->config = $this->getMockBuilder('\OCP\IConfig')
+            ->disableOriginalConstructor()->getMock();
+        $this->service = new ConfigService($this->config, 'apporder');
+    }
+
+    public function testAppValue() {
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->with('apporder', 'foo')
+            ->willReturn('bar');
+        $result = $this->service->getAppValue("foo");
+        $this->assertEquals('bar', $result);
+    }
+
+    public function testUserValue() {
+        $this->config->expects($this->any())
+            ->method('getUserValue')
+            ->with('user', 'apporder', 'foo')
+            ->willReturn('bar');
+        $this->service->setUserValue("foo", "user", "bar");
+        $result = $this->service->getUserValue("foo", "user");
+        $this->assertEquals('bar', $result);
+    }
 
 }

tests/unit/controller/AppControllerTest.php

Indentation +52 added lines, -52 removed lines

@@ -32,61 +32,61 @@
 
 class AppControllerTest extends \PHPUnit_Framework_TestCase {
 
-	/** @var IRequest */
-	private $request;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $userId;
-	/** @var string */
-	private $appName;
-	/** @var AppController */
-	private $controller;
-	/** @var IConfig */
-	private $config;
-	/** @var Util */
-	private $util;
+    /** @var IRequest */
+    private $request;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $userId;
+    /** @var string */
+    private $appName;
+    /** @var AppController */
+    private $controller;
+    /** @var IConfig */
+    private $config;
+    /** @var Util */
+    private $util;
 
-	public function setUp() {
-		parent::setUp();
-		$this->request = $this->getMockBuilder('OCP\IRequest')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->config = $this->getMockBuilder('OCP\IConfig')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->util = $this->getMockBuilder('\OCA\AppOrder\Util')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->urlGenerator = \OC::$server->getURLGenerator();
-		$this->userId = 'admin';
-		$this->appName = 'apporder';
-		$this->controller = new AppController(
-			$this->appName,
-			$this->request,
-			$this->urlGenerator,
-			$this->util,
-			$this->userId
-		);
-	}
+    public function setUp() {
+        parent::setUp();
+        $this->request = $this->getMockBuilder('OCP\IRequest')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->config = $this->getMockBuilder('OCP\IConfig')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->util = $this->getMockBuilder('\OCA\AppOrder\Util')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlGenerator = \OC::$server->getURLGenerator();
+        $this->userId = 'admin';
+        $this->appName = 'apporder';
+        $this->controller = new AppController(
+            $this->appName,
+            $this->request,
+            $this->urlGenerator,
+            $this->util,
+            $this->userId
+        );
+    }
 
-	public function testIndex() {
-		$this->util->expects($this->once())
-			->method('getAppOrder')
-			->willReturn(json_encode(['/index.php/foo/bar', '/index.php/bar/foo']));
-		$expected = new Http\RedirectResponse('/index.php/foo/bar');
-		$result = $this->controller->index();
-		$this->assertEquals($expected, $result);
-	}
+    public function testIndex() {
+        $this->util->expects($this->once())
+            ->method('getAppOrder')
+            ->willReturn(json_encode(['/index.php/foo/bar', '/index.php/bar/foo']));
+        $expected = new Http\RedirectResponse('/index.php/foo/bar');
+        $result = $this->controller->index();
+        $this->assertEquals($expected, $result);
+    }
 
-	public function testIndexEmpty() {
-		$this->util->expects($this->once())
-			->method('getAppOrder')
-			->willReturn("");
-		$result = $this->controller->index();
-		$expected = new Http\RedirectResponse('http://localhost/index.php/apps/files/');
-		$this->assertEquals($expected, $result);
-	}
+    public function testIndexEmpty() {
+        $this->util->expects($this->once())
+            ->method('getAppOrder')
+            ->willReturn("");
+        $result = $this->controller->index();
+        $expected = new Http\RedirectResponse('http://localhost/index.php/apps/files/');
+        $this->assertEquals($expected, $result);
+    }
 
 
 }

tests/unit/controller/SettingsControllerTest.php

Indentation +104 added lines, -104 removed lines

@@ -32,118 +32,118 @@
 
 class SettingsControllerTest extends \PHPUnit_Framework_TestCase  {
 
-	/** @var IRequest */
-	private $request;
-	/** @var ConfigService */
-	private $service;
-	/** @var INavigationManager */
-	private $navigationManager;
-	/** @var string */
-	private $userId;
-	/** @var string */
-	private $appName;
-	/** @var SettingsController */
-	private $controller;
-	/** @var IConfig */
-	private $config;
-	/** @var Util */
-	private $util;
+    /** @var IRequest */
+    private $request;
+    /** @var ConfigService */
+    private $service;
+    /** @var INavigationManager */
+    private $navigationManager;
+    /** @var string */
+    private $userId;
+    /** @var string */
+    private $appName;
+    /** @var SettingsController */
+    private $controller;
+    /** @var IConfig */
+    private $config;
+    /** @var Util */
+    private $util;
 
-	public function setUp() {
+    public function setUp() {
 
-		parent::setUp();
-		$this->request = $this->getMockBuilder('OCP\IRequest')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->config = $this->getMockBuilder('OCP\IConfig')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')
-			->setMethods(['getAll', 'add', 'setActiveEntry'])
-			->disableOriginalConstructor()
-			->getMock();
+        parent::setUp();
+        $this->request = $this->getMockBuilder('OCP\IRequest')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->config = $this->getMockBuilder('OCP\IConfig')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')
+            ->setMethods(['getAll', 'add', 'setActiveEntry'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
-		$this->userId = 'admin';
-		$this->appName = 'apporder';
-		$this->util = new Util($this->service, $this->userId);
-		$this->controller = new SettingsController(
-			$this->appName,
-			$this->request,
-			$this->service,
-			$this->navigationManager,
-			$this->util,
-			$this->userId
-		);
+        $this->userId = 'admin';
+        $this->appName = 'apporder';
+        $this->util = new Util($this->service, $this->userId);
+        $this->controller = new SettingsController(
+            $this->appName,
+            $this->request,
+            $this->service,
+            $this->navigationManager,
+            $this->util,
+            $this->userId
+        );
 
-	}
+    }
 
-	public function testAdminIndex() {
-		$nav_custom = ['/app/calendar/', '/app/tasks/'];
-		$nav_oc = [
-			['href' => '/app/files/', 'name' => 'Files'],
-			['href' => '/app/calendar/', 'name' => 'Calendar'],
-			['href' => '/app/tasks/', 'name' => 'Tasks'],
-		];
-		$nav_final = [
-			'/app/calendar/' => $nav_oc[1], '/app/tasks/' => $nav_oc[2], '/app/files/' => $nav_oc[0]
-		];
-		$this->service->expects($this->once())
-			->method('getAppValue')
-			->with('order')
-			->will($this->returnValue(json_encode($nav_custom)));
-		$this->navigationManager->expects($this->once())
-			->method('getAll')
-			->will($this->returnValue($nav_oc));
+    public function testAdminIndex() {
+        $nav_custom = ['/app/calendar/', '/app/tasks/'];
+        $nav_oc = [
+            ['href' => '/app/files/', 'name' => 'Files'],
+            ['href' => '/app/calendar/', 'name' => 'Calendar'],
+            ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        ];
+        $nav_final = [
+            '/app/calendar/' => $nav_oc[1], '/app/tasks/' => $nav_oc[2], '/app/files/' => $nav_oc[0]
+        ];
+        $this->service->expects($this->once())
+            ->method('getAppValue')
+            ->with('order')
+            ->will($this->returnValue(json_encode($nav_custom)));
+        $this->navigationManager->expects($this->once())
+            ->method('getAll')
+            ->will($this->returnValue($nav_oc));
 
-		$result = $this->controller->adminIndex();
-		$expected = new \OCP\AppFramework\Http\TemplateResponse(
-			$this->appName,
-			'admin',
-			["nav" => $nav_final],
-			'blank'
-		);
-		$this->assertEquals($expected, $result);
-	}
+        $result = $this->controller->adminIndex();
+        $expected = new \OCP\AppFramework\Http\TemplateResponse(
+            $this->appName,
+            'admin',
+            ["nav" => $nav_final],
+            'blank'
+        );
+        $this->assertEquals($expected, $result);
+    }
 
 
-	public function testGetOrder() {
-		$nav_system = ['/app/calendar/', '/app/tasks/'];
-		$nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
-		$this->service->expects($this->once())
-			->method('getAppValue')
-			->with('order')
-			->will($this->returnValue(json_encode($nav_system)));
-		$this->service->expects($this->once())
-			->method('getUserValue')
-			->with('order', $this->userId)
-			->will($this->returnValue(json_encode($nav_user)));
-		$order = ['/app/files/', '/app/calendar/', '/app/tasks/'];
-		$result = $this->controller->getOrder();
-		$expected = array('status' => 'success', 'order' => json_encode($order));
-		$this->assertEquals($expected, $result);
-	}
+    public function testGetOrder() {
+        $nav_system = ['/app/calendar/', '/app/tasks/'];
+        $nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
+        $this->service->expects($this->once())
+            ->method('getAppValue')
+            ->with('order')
+            ->will($this->returnValue(json_encode($nav_system)));
+        $this->service->expects($this->once())
+            ->method('getUserValue')
+            ->with('order', $this->userId)
+            ->will($this->returnValue(json_encode($nav_user)));
+        $order = ['/app/files/', '/app/calendar/', '/app/tasks/'];
+        $result = $this->controller->getOrder();
+        $expected = array('status' => 'success', 'order' => json_encode($order));
+        $this->assertEquals($expected, $result);
+    }
 
-	public function testSavePersonal() {
-		$order = "RANDOMORDER";
-		$expected = array(
-			'status' => 'success',
-			'data' => array('message' => 'User order saved successfully.'),
-			'order' => $order
-		);
-		$result = $this->controller->savePersonal($order);
-		$this->assertEquals($expected, $result);
-	}
+    public function testSavePersonal() {
+        $order = "RANDOMORDER";
+        $expected = array(
+            'status' => 'success',
+            'data' => array('message' => 'User order saved successfully.'),
+            'order' => $order
+        );
+        $result = $this->controller->savePersonal($order);
+        $this->assertEquals($expected, $result);
+    }
 
-	public function testSaveDefaultOrder() {
-		$order = "RANDOMORDER";
-		$expected = array(
-			'status' => 'success',
-			'order' => $order
-		);
-		$result = $this->controller->saveDefaultOrder($order);
-		$this->assertEquals($expected, $result);
-	}
+    public function testSaveDefaultOrder() {
+        $order = "RANDOMORDER";
+        $expected = array(
+            'status' => 'success',
+            'order' => $order
+        );
+        $result = $this->controller->saveDefaultOrder($order);
+        $this->assertEquals($expected, $result);
+    }
 }

appinfo/routes.php

Indentation +6 added lines, -6 removed lines

@@ -22,10 +22,10 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'],
-		['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'],
-		['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'],
+        ['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'],
+        ['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'],
+    ]
 ];

lib/AppInfo/Application.php

Indentation +10 added lines, -10 removed lines

@@ -28,14 +28,14 @@
 
 class Application extends App {
 
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('apporder', $urlParams);
-		$container = $this->getContainer();
-		$container->registerService('ConfigService', function ($c) {
-			return new ConfigService(
-				$c->query('Config'),
-				$c->query('AppName')
-			);
-		});
-	}
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('apporder', $urlParams);
+        $container = $this->getContainer();
+        $container->registerService('ConfigService', function ($c) {
+            return new ConfigService(
+                $c->query('Config'),
+                $c->query('AppName')
+            );
+        });
+    }
 }

lib/Util.php

Indentation +31 added lines, -31 removed lines

@@ -27,36 +27,36 @@
 
 class Util {
 
-	private $userId;
-	private $appConfig;
-
-	public function __construct(ConfigService $appConfig, $userId) {
-		$this->userId = $userId;
-		$this->appConfig = $appConfig;
-	}
-
-	public function getAppOrder() {
-		$order_user = $this->appConfig->getUserValue('order', $this->userId);
-		$order_default = $this->appConfig->getAppValue('order');
-		if ($order_user !== null && $order_user !== "")
-			$order = $order_user;
-		else
-			$order = $order_default;
-		return $order;
-	}
-
-	public function matchOrder($nav, $order) {
-		$nav_tmp = array();
-		$result = array();
-		foreach ($nav as $app)
-			$nav_tmp[$app['href']] = $app;
-		foreach ($order as $app)
-			if(array_key_exists($app, $nav_tmp))
-				$result[$app] = $nav_tmp[$app];
-		foreach ($nav as $app)
-			if (!array_key_exists($app['href'], $result))
-				$result[$app['href']] = $app;
-		return $result;
-	}
+    private $userId;
+    private $appConfig;
+
+    public function __construct(ConfigService $appConfig, $userId) {
+        $this->userId = $userId;
+        $this->appConfig = $appConfig;
+    }
+
+    public function getAppOrder() {
+        $order_user = $this->appConfig->getUserValue('order', $this->userId);
+        $order_default = $this->appConfig->getAppValue('order');
+        if ($order_user !== null && $order_user !== "")
+            $order = $order_user;
+        else
+            $order = $order_default;
+        return $order;
+    }
+
+    public function matchOrder($nav, $order) {
+        $nav_tmp = array();
+        $result = array();
+        foreach ($nav as $app)
+            $nav_tmp[$app['href']] = $app;
+        foreach ($order as $app)
+            if(array_key_exists($app, $nav_tmp))
+                $result[$app] = $nav_tmp[$app];
+        foreach ($nav as $app)
+            if (!array_key_exists($app['href'], $result))
+                $result[$app['href']] = $app;
+        return $result;
+    }
 
 }
\ No newline at end of file

lib/Service/ConfigService.php

Indentation +18 added lines, -18 removed lines

@@ -27,28 +27,28 @@
 
 class ConfigService {
 
-	private $config;
-	private $appName;
+    private $config;
+    private $appName;
 
-	public function __construct(IConfig $config, $appName) {
-		$this->config = $config;
-		$this->appName = $appName;
-	}
+    public function __construct(IConfig $config, $appName) {
+        $this->config = $config;
+        $this->appName = $appName;
+    }
 
-	public function getAppValue($key) {
-		return $this->config->getAppValue($this->appName, $key);
-	}
+    public function getAppValue($key) {
+        return $this->config->getAppValue($this->appName, $key);
+    }
 
-	public function setAppValue($key, $value) {
-		$this->config->setAppValue($this->appName, $key, $value);
-	}
+    public function setAppValue($key, $value) {
+        $this->config->setAppValue($this->appName, $key, $value);
+    }
 
-	public function getUserValue($key, $userId) {
-		return $this->config->getUserValue($userId, $this->appName, $key);
-	}
+    public function getUserValue($key, $userId) {
+        return $this->config->getUserValue($userId, $this->appName, $key);
+    }
 
-	public function setUserValue($key, $userId, $value) {
-		$this->config->setUserValue($userId, $this->appName, $key, $value);
-	}
+    public function setUserValue($key, $userId, $value) {
+        $this->config->setUserValue($userId, $this->appName, $key, $value);
+    }
 
 }

lib/Controller/SettingsController.php

Indentation +67 added lines, -67 removed lines

@@ -32,78 +32,78 @@
 
 class SettingsController extends Controller {
 
-	private $userId;
-	private $appConfig;
-	private $navigationManager;
-	private $util;
+    private $userId;
+    private $appConfig;
+    private $navigationManager;
+    private $util;
 
-	public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $urlGenerator, Util $util, $userId) {
-		parent::__construct($appName, $request);
-		$this->userId = $userId;
-		$this->appConfig = $appConfig;
-		$this->navigationManager = $urlGenerator;
-		$this->util = $util;
-	}
+    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $urlGenerator, Util $util, $userId) {
+        parent::__construct($appName, $request);
+        $this->userId = $userId;
+        $this->appConfig = $appConfig;
+        $this->navigationManager = $urlGenerator;
+        $this->util = $util;
+    }
 
-	/**
-	 * Admin: render admin page
-	 * FIXME: Move to dedicated class
-	 *
-	 * @return TemplateResponse
-	 */
-	public function adminIndex() {
-		// Private API call
-		$navigation = $this->navigationManager->getAll();
-		$order = json_decode($this->appConfig->getAppValue('order'));
-		$nav = $this->util->matchOrder($navigation, $order);
-		return new TemplateResponse(
-			$this->appName,
-			'admin',
-			["nav" => $nav],
-			'blank'
-		);
-	}
+    /**
+     * Admin: render admin page
+     * FIXME: Move to dedicated class
+     *
+     * @return TemplateResponse
+     */
+    public function adminIndex() {
+        // Private API call
+        $navigation = $this->navigationManager->getAll();
+        $order = json_decode($this->appConfig->getAppValue('order'));
+        $nav = $this->util->matchOrder($navigation, $order);
+        return new TemplateResponse(
+            $this->appName,
+            'admin',
+            ["nav" => $nav],
+            'blank'
+        );
+    }
 
-	/**
-	 * Admin: save default order
-	 *
-	 * @param $order
-	 * @return array response
-	 */
-	public function saveDefaultOrder($order) {
-		if (!is_null($order)) {
-			$this->appConfig->setAppValue('order', $order);
-		}
-		return array('status' => 'success', 'order' => $order);
-	}
+    /**
+     * Admin: save default order
+     *
+     * @param $order
+     * @return array response
+     */
+    public function saveDefaultOrder($order) {
+        if (!is_null($order)) {
+            $this->appConfig->setAppValue('order', $order);
+        }
+        return array('status' => 'success', 'order' => $order);
+    }
 
-	/**
-	 * Return order for current user
-	 *
-	 * @NoAdminRequired
-	 * @return array response
-	 */
-	public function getOrder() {
-		$order = $this->util->getAppOrder();
-		return array('status' => 'success', 'order' => $order);
-	}
+    /**
+     * Return order for current user
+     *
+     * @NoAdminRequired
+     * @return array response
+     */
+    public function getOrder() {
+        $order = $this->util->getAppOrder();
+        return array('status' => 'success', 'order' => $order);
+    }
 
-	/**
-	 * Save order for current user
-	 *
-	 * @NoAdminRequired
-	 * @param $order string
-	 * @return array response
-	 */
-	public function savePersonal($order) {
-		$this->appConfig->setUserValue('order', $this->userId, $order);
-		$response = array(
-			'status' => 'success',
-			'data' => array('message' => 'User order saved successfully.'),
-			'order' => $order
-		);
-		return $response;
-	}
+    /**
+     * Save order for current user
+     *
+     * @NoAdminRequired
+     * @param $order string
+     * @return array response
+     */
+    public function savePersonal($order) {
+        $this->appConfig->setUserValue('order', $this->userId, $order);
+        $response = array(
+            'status' => 'success',
+            'data' => array('message' => 'User order saved successfully.'),
+            'order' => $order
+        );
+        return $response;
+    }
 
 
 }