remove useless setup base class

diff --git a/apps/encryption/lib/setup.php b/apps/encryption/lib/setup.php
deleted file mode 100644 (file)
index cc8f00f..0000000
--- a/apps/encryption/lib/setup.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @author Clark Tomlinson  <fallen013@gmail.com>
- * @since 3/6/15, 11:30 AM
- * @link http:/www.clarkt.com
- * @copyright Clark Tomlinson © 2015
- *
- */
-
-namespace OCA\Encryption;
-
-
-use OCP\ILogger;
-use OCP\IUser;
-use OCP\IUserSession;
-
-class Setup {
-       /**
-        * @var ILogger
-        */
-       protected $logger;
-       /**
-        * @var IUser
-        */
-       protected $user;
-
-       /**
-        * Setup constructor.
-        *
-        * @param ILogger $logger
-        * @param IUserSession $userSession
-        */
-       public function __construct(ILogger $logger, IUserSession $userSession) {
-               $this->logger = $logger;
-               $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
-
-       }
-}

diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index bf415c81888c2d5dde3b74b02df4bec07b59f73b..e80bf6003e6de5e93b329b585fb0b8b6a6929d58 100644 (file)
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -15,7 +15,7 @@ use OCA\Encryption\KeyManager;
 use OCP\ILogger;
 use OCP\IUserSession;
 
-class Setup extends \OCA\Encryption\Setup {
+class Setup {
        /**
         * @var Crypt
         */
@@ -24,6 +24,14 @@ class Setup extends \OCA\Encryption\Setup {
         * @var KeyManager
         */
        private $keyManager;
+       /**
+        * @var ILogger
+        */
+       private $logger;
+       /**
+        * @var bool|string
+        */
+       private $user;
 
 
        /**
@@ -33,7 +41,8 @@ class Setup extends \OCA\Encryption\Setup {
         * @param KeyManager $keyManager
         */
        public function __construct(ILogger $logger, IUserSession $userSession, Crypt $crypt, KeyManager $keyManager) {
-               parent::__construct($logger, $userSession);
+               $this->logger = $logger;
+               $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
                $this->crypt = $crypt;
                $this->keyManager = $keyManager;
        }