From 61567348c65f5e1ee456f8b7d0fab5eb5a5f7c66 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 9 Oct 2016 20:07:30 +0200
Subject: [PATCH] Fix install

---
 Admin/Install/Navigation.php |  2 +-
 Admin/Installer.php          |  4 ++--
 Controller.php               | 30 +++++++++++++++---------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 53a7305..fa8d40a 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -32,7 +32,7 @@ class Navigation
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool)
+    public static function install(string $path, Pool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index b675b8b..c1a85d0 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, Pool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
 
         switch ($dbPool->get('core')->getType()) {
             case DatabaseType::MYSQL:
diff --git a/Controller.php b/Controller.php
index 044a150..9301742 100644
--- a/Controller.php
+++ b/Controller.php
@@ -267,15 +267,15 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $val = [];
         if (
-        $val['name'] = empty($request->getData('name'))
-            || $val['parent'] = (
+        ($val['name'] = empty($request->getData('name')))
+            || ($val['parent'] = (
                     $request->getData('parent') !== null
                     && !is_numeric($request->getData('parent'))
-                )
-                || $val['status'] = (
+                ))
+                || ($val['status'] = (
                     $request->getData('status') === null
                     || !Status::isValidValue((int) $request->getData('status'))
-                )
+                ))
         ) {
             $response->set('unit_create_validation', new FormValidation($val));
 
@@ -296,15 +296,15 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $val = [];
         if (
-        $val['name'] = empty($request->getData('name'))
-            || $val['parent'] = (
+        ($val['name'] = empty($request->getData('name')))
+            || ($val['parent'] = (
                     $request->getData('parent') !== null
                     && !is_numeric($request->getData('parent'))
-                )
-                || $val['status'] = (
+                ))
+                || ($val['status'] = (
                     $request->getData('status') === null
                     || !Status::isValidValue((int) $request->getData('status'))
-                )
+                ))
         ) {
             $response->set('position_create_validation', new FormValidation($val));
 
@@ -325,14 +325,14 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $val = [];
         if (
-        $val['name'] = empty($request->getData('name'))
-            || $val['parent'] = (
+        ($val['name'] = empty($request->getData('name')))
+            || ($val['parent'] = (
                     $request->getData('parent') !== null
                     && !is_numeric((int) $request->getData('parent'))
-                )
-                || $val['status'] = (
+                ))
+                || ($val['status'] = (
                     $request->getData('status') === null
-                    || !Status::isValidValue($request->getData('status'))
+                    || !Status::isValidValue($request->getData('status')))
                 )
         ) {
             $response->set('department_create_validation', new FormValidation($val));