juliushaertl / apporder

controller/settingscontroller.php

Spacing +12 added lines, -12 removed lines

@@ -8,21 +8,21 @@ 
 use \OCP\INavigationManager;
 use \OCA\AppOrder\Service\ConfigService;
 
-class SettingsController extends Controller{
+class SettingsController extends Controller {
 
     private $userId;
     private $l10n;
     private $appConfig;
     private $navigationManager;
 
-    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $navigationManager, $userId){
+    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $navigationManager, $userId) {
         parent::__construct($appName, $request);
         $this->userId = $userId;
         $this->appConfig = $appConfig;
         $this->navigationManager = $navigationManager;
     }
 
-    public function adminIndex(){
+    public function adminIndex() {
         $navigation = $this->navigationManager->getAll();
         $order = json_decode($this->appConfig->getAppValue('order'));
         $nav = $this->matchOrder($navigation, $order);
@@ -47,12 +47,12 @@ 
     private function matchOrder($nav, $order) {
         $nav_tmp = array();
         $result = array();
-        foreach($nav as $app)
+        foreach ($nav as $app)
             $nav_tmp[$app['href']] = $app;
-        foreach($order as $app)
+        foreach ($order as $app)
             $result[$app] = $nav_tmp[$app];
-        foreach($nav as $app)
-            if(!array_key_exists($app['href'], $result))
+        foreach ($nav as $app)
+            if (!array_key_exists($app['href'], $result))
                 $result[$app['href']] = $app;
         return $result;
     }
@@ -60,7 +60,7 @@ 
     /**
      * @NoAdminRequired
      */
-    public function getOrder(){
+    public function getOrder() {
         $order = $this->getAppOrder();
         return array('status' => 'success', 'order' => $order);
     }
@@ -68,7 +68,7 @@ 
     /**
      * @NoAdminRequired
      */
-    public function savePersonal($order){
+    public function savePersonal($order) {
         $this->appConfig->setUserValue('order', $this->userId, $order);
         $response = array(
             'status' => 'success',
@@ -78,9 +78,9 @@ 
         return $response;
     }
 
-    public function saveDefaultOrder($order){
-        if (!is_null($order)){
-            $this->appConfig->setAppValue('order',$order);
+    public function saveDefaultOrder($order) {
+        if (!is_null($order)) {
+            $this->appConfig->setAppValue('order', $order);
         }
         return array('status' => 'success', 'order' => $order);
     }

Braces +14 added lines, -10 removed lines

@@ -37,23 +37,27 @@
     private 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;
+        if ($order_user !== null && $order_user !== "") {
+                    $order = $order_user;
+        } else {
+                    $order = $order_default;
+        }
         return $order;
     }
 
     private function matchOrder($nav, $order) {
         $nav_tmp = array();
         $result = array();
-        foreach($nav as $app)
-            $nav_tmp[$app['href']] = $app;
-        foreach($order as $app)
-            $result[$app] = $nav_tmp[$app];
-        foreach($nav as $app)
-            if(!array_key_exists($app['href'], $result))
+        foreach($nav as $app) {
+                    $nav_tmp[$app['href']] = $app;
+        }
+        foreach($order as $app) {
+                    $result[$app] = $nav_tmp[$app];
+        }
+        foreach($nav as $app) {
+                    if(!array_key_exists($app['href'], $result))
                 $result[$app['href']] = $app;
+        }
         return $result;
     }
 

appinfo/application.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class Application extends App {
 
-    public function __construct(array $urlParams=array()){
+    public function __construct(array $urlParams = array()) {
         parent::__construct('apporder', $urlParams);
         $container = $this->getContainer();
         $container->registerService('ConfigService', function($c) {

service/configservice.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     private $config;
     private $appName;
 
-    public function __construct(IConfig $config, $appName){
+    public function __construct(IConfig $config, $appName) {
         $this->config = $config;
         $this->appName = $appName;
     }

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@
  * @copyright jus 2016
  */
 
-require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__ . '/../appinfo/autoload.php';
+require_once __DIR__.'/../../../tests/bootstrap.php';
+require_once __DIR__.'/../appinfo/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 \OC_App::loadApp('apporder');

tests/unit/controller/SettingsControllerTest.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
   private $appName;
   private $controller;
   private $config;
-  public function setUp (){
+  public function setUp() {
 
     parent::setUp();
 
@@ -34,7 +34,7 @@ 
     $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
       ->disableOriginalConstructor()
       ->getMock();
-    $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->setMethods(['getAll','add','setActiveEntry'])
+    $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->setMethods(['getAll', 'add', 'setActiveEntry'])
       ->disableOriginalConstructor()
       ->getMock();
     $this->userId = 'admin';
@@ -101,7 +101,7 @@ 
   }
 
   public function testGetAppOrder() {
-    $nav_system= ['/app/calendar/', '/app/tasks/'];
+    $nav_system = ['/app/calendar/', '/app/tasks/'];
     $nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
     $this->service->expects($this->once())
       ->method('getAppValue')
@@ -115,7 +115,7 @@ 
     $this->assertEquals(json_encode($nav_user), $result);
   }
   public function testGetAppOrderNoUser() {
-    $nav_system= ['/app/calendar/', '/app/tasks/'];
+    $nav_system = ['/app/calendar/', '/app/tasks/'];
     $nav_user = '';
     $this->service->expects($this->once())
       ->method('getAppValue')

Indentation +60 added lines, -60 removed lines

@@ -11,111 +11,111 @@
 
 class SettingsControllerTest extends \Test\TestCase {
 
-  private $container;
-  private $request;
-  private $service;
-  private $navigationManager;
-  private $userId;
-  private $appName;
-  private $controller;
-  private $config;
-  public function setUp (){
+    private $container;
+    private $request;
+    private $service;
+    private $navigationManager;
+    private $userId;
+    private $appName;
+    private $controller;
+    private $config;
+    public function setUp (){
 
     parent::setUp();
 
     $app = new Application();
     $this->container = $app->getContainer();
     $this->request = $this->getMockBuilder('OCP\IRequest')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->config = $this->getMockBuilder('OCP\IConfig')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->setMethods(['getAll','add','setActiveEntry'])
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->userId = 'admin';
     $this->appName = 'apporder';
     $this->controller = new \OCA\AppOrder\Controller\SettingsController(
-      $this->appName, $this->request, $this->service, $this->navigationManager,
-      $this->userId
+        $this->appName, $this->request, $this->service, $this->navigationManager,
+        $this->userId
     );
 
-  }
+    }
 
-  public function testAdminIndex() {
+    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'],
+        ['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]
-      ];
+        '/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)));
+        ->method('getAppValue')
+        ->with('order')
+        ->will($this->returnValue(json_encode($nav_custom)));
     $this->navigationManager->expects($this->once())
-      ->method('getAll')
-      ->will($this->returnValue($nav_oc));
+        ->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->appName, 
+        'admin',
+        ["nav" => $nav_final],
+        'blank'
     );
     $this->assertEquals($expected, $result);
-  }
+    }
 
-  public function testMatchOrder() {
+    public function testMatchOrder() {
     $nav = [
-      ['href' => '/app/files/', 'name' => 'Files'],
-      ['href' => '/app/calendar/', 'name' => 'Calendar'],
-      ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        ['href' => '/app/files/', 'name' => 'Files'],
+        ['href' => '/app/calendar/', 'name' => 'Calendar'],
+        ['href' => '/app/tasks/', 'name' => 'Tasks'],
     ];
     $order = ['/app/calendar/', '/app/tasks/'];
     $result = $this->controller->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'],
+        '/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() {
+    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)));
+        ->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)));
+        ->method('getUserValue')
+        ->with('order', $this->userId)
+        ->will($this->returnValue(json_encode($nav_user)));
     $result = $this->controller->getAppOrder();
     $this->assertEquals(json_encode($nav_user), $result);
-  }
-  public function testGetAppOrderNoUser() {
+    }
+    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)));
+        ->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));
+        ->method('getUserValue')
+        ->with('order', $this->userId)
+        ->will($this->returnValue($nav_user));
     $result = $this->controller->getAppOrder();
     $this->assertEquals(json_encode($nav_system), $result);
-  }
+    }
 }