diff --git a/Admin/Installer.php b/Admin/Installer.php
index 038e6f6..f33e68b 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -89,7 +89,7 @@ final class Installer extends InstallerAbstract
             (OperatingSystem::getSystem() === SystemType::WIN
                 ? 'php.exe'
                 : 'php'
-            ) . ' ' . __DIR__ . '/../../../../Cli/cli.php -v'
+            ) . ' ' . __DIR__ . '/../../../../cli.php -v'
         );
         $cmdResult = $cmdResult === null || $cmdResult === false ? '' : $cmdResult;
 
@@ -312,8 +312,8 @@ final class Installer extends InstallerAbstract
             return [];
         }
 
-        return !\is_array($responseData['response'])
-            ? $responseData['response']->toArray()
-            : $responseData['response'];
+        return \is_array($responseData['response'])
+            ? $responseData['response']
+            : $responseData['response']->toArray();
     }
 }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 1260a87..9889775 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -2176,7 +2176,7 @@ final class ApiController extends Controller
 
                 break;
             case ModuleStatusUpdateType::INSTALL:
-                $done = $this->app->moduleManager->isInstalled($module) ? true : false;
+                $done = $this->app->moduleManager->isInstalled($module);
                 $msg  = $done
                     ? $this->app->l11nManager->getText($response->getLanguage(), 'Admin', 'Api', 'ModuleInstalledSuccessful')
                     : $this->app->l11nManager->getText($response->getLanguage(), 'Admin', 'Api', 'ModuleInstalledFailure');
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 6661f6f..e89a039 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -699,7 +699,7 @@ final class BackendController extends Controller
         /** @var null|\Model\NullSetting|\Model\Setting[] $settings */
         $settings = SettingMapper::getAll()->where('module', $id)->execute();
         if ($settings->id > 0) {
-            $view->setData('settings', !\is_array($settings) ? [$settings] : $settings);
+            $view->setData('settings', \is_array($settings) ? $settings : [$settings]);
         }
 
         $class = '\\Modules\\' . $request->getData('id') . '\\Models\\SettingsEnum';
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index a10002d..9ebf543 100755
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -247,7 +247,7 @@ class AccountMapper extends DataMapperFactory
                 ->execute();
 
             return LoginReturnType::WRONG_PASSWORD;
-        } catch (\Exception $e) {
+        } catch (\Exception $_) {
             return LoginReturnType::FAILURE; // @codeCoverageIgnore
         }
     }
diff --git a/Models/ApiKeyMapper.php b/Models/ApiKeyMapper.php
index 7b366e2..e95ffb9 100755
--- a/Models/ApiKeyMapper.php
+++ b/Models/ApiKeyMapper.php
@@ -126,7 +126,7 @@ class ApiKeyMapper extends DataMapperFactory
                 ->execute();
 
             return (int) $result['account_id'];
-        } catch (\Exception $e) {
+        } catch (\Exception $_) {
             return LoginReturnType::FAILURE; // @codeCoverageIgnore
         }
     }
diff --git a/tests/Models/AddressMapperTest.php b/tests/Models/AddressMapperTest.php
index 3aa6cf1..450578b 100755
--- a/tests/Models/AddressMapperTest.php
+++ b/tests/Models/AddressMapperTest.php
@@ -25,11 +25,11 @@ use phpOMS\Stdlib\Base\AddressType;
  */
 final class AddressMapperTest extends \PHPUnit\Framework\TestCase
 {
-	/**
-	 * @covers Modules\Admin\Models\AddressMapper
-	 * @group module
-	 */
-	public function testCR() : void
+    /**
+     * @covers Modules\Admin\Models\AddressMapper
+     * @group module
+     */
+    public function testCR() : void
     {
         $address = new Address();