Passed
Push — master ( 416f63...904fdf )
by Robin
31:44 queued 14:53
created
lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -30,21 +30,21 @@
 block discarded – undo
30 30
  * @package OC\IntegrityCheck\Helpers
31 31
  */
32 32
 class EnvironmentHelper {
33
-	/**
34
-	 * Provides \OC::$SERVERROOT
35
-	 *
36
-	 * @return string
37
-	 */
38
-	public function getServerRoot(): string {
39
-		return rtrim(\OC::$SERVERROOT, '/');
40
-	}
33
+    /**
34
+     * Provides \OC::$SERVERROOT
35
+     *
36
+     * @return string
37
+     */
38
+    public function getServerRoot(): string {
39
+        return rtrim(\OC::$SERVERROOT, '/');
40
+    }
41 41
 
42
-	/**
43
-	 * Provides \OC_Util::getChannel()
44
-	 *
45
-	 * @return string
46
-	 */
47
-	public function getChannel(): string {
48
-		return \OC_Util::getChannel();
49
-	}
42
+    /**
43
+     * Provides \OC_Util::getChannel()
44
+     *
45
+     * @return string
46
+     */
47
+    public function getChannel(): string {
48
+        return \OC_Util::getChannel();
49
+    }
50 50
 }
Please login to merge, or discard this patch.
private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
  * @package OC\AppFramework\Middleware\Security\Exceptions
37 37
  */
38 38
 class NotAdminException extends SecurityException {
39
-	public function __construct(string $message) {
40
-		parent::__construct($message, Http::STATUS_FORBIDDEN);
41
-	}
39
+    public function __construct(string $message) {
40
+        parent::__construct($message, Http::STATUS_FORBIDDEN);
41
+    }
42 42
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Helper.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$dir = $pathinfo['dirname'];
59 59
 		$i = 2;
60 60
 		while ($view->file_exists($path) || in_array($path, $excludeList)) {
61
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
61
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
62 62
 			$i++;
63 63
 		}
64 64
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 			$dir = '';
83 83
 			$subdirs = explode('/', $shareFolder);
84 84
 			foreach ($subdirs as $subdir) {
85
-				$dir = $dir . '/' . $subdir;
85
+				$dir = $dir.'/'.$subdir;
86 86
 				if (!$view->is_dir($dir)) {
87 87
 					$view->mkdir($dir);
88 88
 				}
Please login to merge, or discard this patch.
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -32,81 +32,81 @@
 block discarded – undo
32 32
 use OCA\Files_Sharing\AppInfo\Application;
33 33
 
34 34
 class Helper {
35
-	public static function registerHooks() {
36
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
37
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
35
+    public static function registerHooks() {
36
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
37
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
38 38
 
39
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
40
-	}
39
+        \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
40
+    }
41 41
 
42
-	/**
43
-	 * check if file name already exists and generate unique target
44
-	 *
45
-	 * @param string $path
46
-	 * @param array $excludeList
47
-	 * @param View $view
48
-	 * @return string $path
49
-	 */
50
-	public static function generateUniqueTarget($path, $excludeList, $view) {
51
-		$pathinfo = pathinfo($path);
52
-		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
53
-		$name = $pathinfo['filename'];
54
-		$dir = $pathinfo['dirname'];
55
-		$i = 2;
56
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
57
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
58
-			$i++;
59
-		}
42
+    /**
43
+     * check if file name already exists and generate unique target
44
+     *
45
+     * @param string $path
46
+     * @param array $excludeList
47
+     * @param View $view
48
+     * @return string $path
49
+     */
50
+    public static function generateUniqueTarget($path, $excludeList, $view) {
51
+        $pathinfo = pathinfo($path);
52
+        $ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
53
+        $name = $pathinfo['filename'];
54
+        $dir = $pathinfo['dirname'];
55
+        $i = 2;
56
+        while ($view->file_exists($path) || in_array($path, $excludeList)) {
57
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
58
+            $i++;
59
+        }
60 60
 
61
-		return $path;
62
-	}
61
+        return $path;
62
+    }
63 63
 
64
-	/**
65
-	 * get default share folder
66
-	 *
67
-	 * @param \OC\Files\View|null $view
68
-	 * @param string|null $userId
69
-	 * @return string
70
-	 */
71
-	public static function getShareFolder(View $view = null, string $userId = null): string {
72
-		if ($view === null) {
73
-			$view = Filesystem::getView();
74
-		}
64
+    /**
65
+     * get default share folder
66
+     *
67
+     * @param \OC\Files\View|null $view
68
+     * @param string|null $userId
69
+     * @return string
70
+     */
71
+    public static function getShareFolder(View $view = null, string $userId = null): string {
72
+        if ($view === null) {
73
+            $view = Filesystem::getView();
74
+        }
75 75
 
76
-		$config = \OC::$server->getConfig();
77
-		$systemDefault = $config->getSystemValue('share_folder', '/');
78
-		$allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true);
76
+        $config = \OC::$server->getConfig();
77
+        $systemDefault = $config->getSystemValue('share_folder', '/');
78
+        $allowCustomShareFolder = $config->getSystemValueBool('sharing.allow_custom_share_folder', true);
79 79
 
80
-		// Init custom shareFolder
81
-		$shareFolder = $systemDefault;
82
-		if ($userId !== null && $allowCustomShareFolder) {
83
-			$shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault);
84
-		}
80
+        // Init custom shareFolder
81
+        $shareFolder = $systemDefault;
82
+        if ($userId !== null && $allowCustomShareFolder) {
83
+            $shareFolder = $config->getUserValue($userId, Application::APP_ID, 'share_folder', $systemDefault);
84
+        }
85 85
 
86
-		// Verify and sanitize path
87
-		$shareFolder = Filesystem::normalizePath($shareFolder);
86
+        // Verify and sanitize path
87
+        $shareFolder = Filesystem::normalizePath($shareFolder);
88 88
 
89
-		// Init path if folder doesn't exists
90
-		if (!$view->file_exists($shareFolder)) {
91
-			$dir = '';
92
-			$subdirs = explode('/', $shareFolder);
93
-			foreach ($subdirs as $subdir) {
94
-				$dir = $dir . '/' . $subdir;
95
-				if (!$view->is_dir($dir)) {
96
-					$view->mkdir($dir);
97
-				}
98
-			}
99
-		}
89
+        // Init path if folder doesn't exists
90
+        if (!$view->file_exists($shareFolder)) {
91
+            $dir = '';
92
+            $subdirs = explode('/', $shareFolder);
93
+            foreach ($subdirs as $subdir) {
94
+                $dir = $dir . '/' . $subdir;
95
+                if (!$view->is_dir($dir)) {
96
+                    $view->mkdir($dir);
97
+                }
98
+            }
99
+        }
100 100
 
101
-		return $shareFolder;
102
-	}
101
+        return $shareFolder;
102
+    }
103 103
 
104
-	/**
105
-	 * set default share folder
106
-	 *
107
-	 * @param string $shareFolder
108
-	 */
109
-	public static function setShareFolder($shareFolder) {
110
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
111
-	}
104
+    /**
105
+     * set default share folder
106
+     *
107
+     * @param string $shareFolder
108
+     */
109
+    public static function setShareFolder($shareFolder) {
110
+        \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
111
+    }
112 112
 }
Please login to merge, or discard this patch.
lib/private/Security/CSRF/CsrfTokenGenerator.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -32,23 +32,23 @@
 block discarded – undo
32 32
  * @package OC\Security\CSRF
33 33
  */
34 34
 class CsrfTokenGenerator {
35
-	/** @var ISecureRandom  */
36
-	private $random;
35
+    /** @var ISecureRandom  */
36
+    private $random;
37 37
 
38
-	/**
39
-	 * @param ISecureRandom $random
40
-	 */
41
-	public function __construct(ISecureRandom $random) {
42
-		$this->random = $random;
43
-	}
38
+    /**
39
+     * @param ISecureRandom $random
40
+     */
41
+    public function __construct(ISecureRandom $random) {
42
+        $this->random = $random;
43
+    }
44 44
 
45
-	/**
46
-	 * Generate a new CSRF token.
47
-	 *
48
-	 * @param int $length Length of the token in characters.
49
-	 * @return string
50
-	 */
51
-	public function generateToken(int $length = 32): string {
52
-		return $this->random->generate($length);
53
-	}
45
+    /**
46
+     * Generate a new CSRF token.
47
+     *
48
+     * @param int $length Length of the token in characters.
49
+     * @return string
50
+     */
51
+    public function generateToken(int $length = 32): string {
52
+        return $this->random->generate($length);
53
+    }
54 54
 }
Please login to merge, or discard this patch.
lib/private/Security/IdentityProof/Key.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -25,25 +25,25 @@
 block discarded – undo
25 25
 namespace OC\Security\IdentityProof;
26 26
 
27 27
 class Key {
28
-	/** @var string */
29
-	private $publicKey;
30
-	/** @var string */
31
-	private $privateKey;
28
+    /** @var string */
29
+    private $publicKey;
30
+    /** @var string */
31
+    private $privateKey;
32 32
 
33
-	/**
34
-	 * @param string $publicKey
35
-	 * @param string $privateKey
36
-	 */
37
-	public function __construct(string $publicKey, string $privateKey) {
38
-		$this->publicKey = $publicKey;
39
-		$this->privateKey = $privateKey;
40
-	}
33
+    /**
34
+     * @param string $publicKey
35
+     * @param string $privateKey
36
+     */
37
+    public function __construct(string $publicKey, string $privateKey) {
38
+        $this->publicKey = $publicKey;
39
+        $this->privateKey = $privateKey;
40
+    }
41 41
 
42
-	public function getPrivate(): string {
43
-		return $this->privateKey;
44
-	}
42
+    public function getPrivate(): string {
43
+        return $this->privateKey;
44
+    }
45 45
 
46
-	public function getPublic(): string {
47
-		return $this->publicKey;
48
-	}
46
+    public function getPublic(): string {
47
+        return $this->publicKey;
48
+    }
49 49
 }
Please login to merge, or discard this patch.
apps/dav/lib/Upload/ChunkingPlugin.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 
101 101
 		// casted to string because cast to float cause equality for non equal numbers
102 102
 		// and integer has the problem of limited size on 32 bit systems
103
-		if ((string)$expectedSize !== (string)$actualSize) {
103
+		if ((string) $expectedSize !== (string) $actualSize) {
104 104
 			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
105 105
 		}
106 106
 	}
Please login to merge, or discard this patch.
Indentation   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -35,97 +35,97 @@
 block discarded – undo
35 35
 
36 36
 class ChunkingPlugin extends ServerPlugin {
37 37
 
38
-	/** @var Server */
39
-	private $server;
40
-	/** @var FutureFile */
41
-	private $sourceNode;
38
+    /** @var Server */
39
+    private $server;
40
+    /** @var FutureFile */
41
+    private $sourceNode;
42 42
 
43
-	/**
44
-	 * @inheritdoc
45
-	 */
46
-	public function initialize(Server $server) {
47
-		$server->on('beforeMove', [$this, 'beforeMove']);
48
-		$this->server = $server;
49
-	}
43
+    /**
44
+     * @inheritdoc
45
+     */
46
+    public function initialize(Server $server) {
47
+        $server->on('beforeMove', [$this, 'beforeMove']);
48
+        $this->server = $server;
49
+    }
50 50
 
51
-	/**
52
-	 * @param string $sourcePath source path
53
-	 * @param string $destination destination path
54
-	 * @return bool|void
55
-	 * @throws BadRequest
56
-	 * @throws NotFound
57
-	 */
58
-	public function beforeMove($sourcePath, $destination) {
59
-		$this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
60
-		if (!$this->sourceNode instanceof FutureFile) {
61
-			// skip handling as the source is not a chunked FutureFile
62
-			return;
63
-		}
51
+    /**
52
+     * @param string $sourcePath source path
53
+     * @param string $destination destination path
54
+     * @return bool|void
55
+     * @throws BadRequest
56
+     * @throws NotFound
57
+     */
58
+    public function beforeMove($sourcePath, $destination) {
59
+        $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
60
+        if (!$this->sourceNode instanceof FutureFile) {
61
+            // skip handling as the source is not a chunked FutureFile
62
+            return;
63
+        }
64 64
 
65
-		try {
66
-			/** @var INode $destinationNode */
67
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
68
-			if ($destinationNode instanceof Directory) {
69
-				throw new BadRequest("The given destination $destination is a directory.");
70
-			}
71
-		} catch (NotFound $e) {
72
-			// If the destination does not exist yet it's not a directory either ;)
73
-		}
65
+        try {
66
+            /** @var INode $destinationNode */
67
+            $destinationNode = $this->server->tree->getNodeForPath($destination);
68
+            if ($destinationNode instanceof Directory) {
69
+                throw new BadRequest("The given destination $destination is a directory.");
70
+            }
71
+        } catch (NotFound $e) {
72
+            // If the destination does not exist yet it's not a directory either ;)
73
+        }
74 74
 
75
-		$this->verifySize();
76
-		return $this->performMove($sourcePath, $destination);
77
-	}
75
+        $this->verifySize();
76
+        return $this->performMove($sourcePath, $destination);
77
+    }
78 78
 
79
-	/**
80
-	 * Move handler for future file.
81
-	 *
82
-	 * This overrides the default move behavior to prevent Sabre
83
-	 * to delete the target file before moving. Because deleting would
84
-	 * lose the file id and metadata.
85
-	 *
86
-	 * @param string $path source path
87
-	 * @param string $destination destination path
88
-	 * @return bool|void false to stop handling, void to skip this handler
89
-	 */
90
-	public function performMove($path, $destination) {
91
-		$fileExists = $this->server->tree->nodeExists($destination);
92
-		// do a move manually, skipping Sabre's default "delete" for existing nodes
93
-		try {
94
-			$this->server->tree->move($path, $destination);
95
-		} catch (Forbidden $e) {
96
-			$sourceNode = $this->server->tree->getNodeForPath($path);
97
-			if ($sourceNode instanceof FutureFile) {
98
-				$sourceNode->delete();
99
-			}
100
-			throw $e;
101
-		}
79
+    /**
80
+     * Move handler for future file.
81
+     *
82
+     * This overrides the default move behavior to prevent Sabre
83
+     * to delete the target file before moving. Because deleting would
84
+     * lose the file id and metadata.
85
+     *
86
+     * @param string $path source path
87
+     * @param string $destination destination path
88
+     * @return bool|void false to stop handling, void to skip this handler
89
+     */
90
+    public function performMove($path, $destination) {
91
+        $fileExists = $this->server->tree->nodeExists($destination);
92
+        // do a move manually, skipping Sabre's default "delete" for existing nodes
93
+        try {
94
+            $this->server->tree->move($path, $destination);
95
+        } catch (Forbidden $e) {
96
+            $sourceNode = $this->server->tree->getNodeForPath($path);
97
+            if ($sourceNode instanceof FutureFile) {
98
+                $sourceNode->delete();
99
+            }
100
+            throw $e;
101
+        }
102 102
 
103
-		// trigger all default events (copied from CorePlugin::move)
104
-		$this->server->emit('afterMove', [$path, $destination]);
105
-		$this->server->emit('afterUnbind', [$path]);
106
-		$this->server->emit('afterBind', [$destination]);
103
+        // trigger all default events (copied from CorePlugin::move)
104
+        $this->server->emit('afterMove', [$path, $destination]);
105
+        $this->server->emit('afterUnbind', [$path]);
106
+        $this->server->emit('afterBind', [$destination]);
107 107
 
108
-		$response = $this->server->httpResponse;
109
-		$response->setHeader('Content-Length', '0');
110
-		$response->setStatus($fileExists ? 204 : 201);
108
+        $response = $this->server->httpResponse;
109
+        $response->setHeader('Content-Length', '0');
110
+        $response->setStatus($fileExists ? 204 : 201);
111 111
 
112
-		return false;
113
-	}
112
+        return false;
113
+    }
114 114
 
115
-	/**
116
-	 * @throws BadRequest
117
-	 */
118
-	private function verifySize() {
119
-		$expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
120
-		if ($expectedSize === null) {
121
-			return;
122
-		}
123
-		$actualSize = $this->sourceNode->getSize();
115
+    /**
116
+     * @throws BadRequest
117
+     */
118
+    private function verifySize() {
119
+        $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
120
+        if ($expectedSize === null) {
121
+            return;
122
+        }
123
+        $actualSize = $this->sourceNode->getSize();
124 124
 
125
-		// casted to string because cast to float cause equality for non equal numbers
126
-		// and integer has the problem of limited size on 32 bit systems
127
-		if ((string)$expectedSize !== (string)$actualSize) {
128
-			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
129
-		}
130
-	}
125
+        // casted to string because cast to float cause equality for non equal numbers
126
+        // and integer has the problem of limited size on 32 bit systems
127
+        if ((string)$expectedSize !== (string)$actualSize) {
128
+            throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
129
+        }
130
+    }
131 131
 }
Please login to merge, or discard this patch.
apps/user_ldap/ajax/getConfiguration.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 \OC_JSON::checkAppEnabled('user_ldap');
30 30
 \OC_JSON::callCheck();
31 31
 
32
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
32
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
33 33
 $ldapWrapper = new OCA\User_LDAP\LDAP();
34 34
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
35 35
 $configuration = $connection->getConfiguration();
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
36 36
 $configuration = $connection->getConfiguration();
37 37
 if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
38
-	// hide password
39
-	$configuration['ldap_agent_password'] = '**PASSWORD SET**';
38
+    // hide password
39
+    $configuration['ldap_agent_password'] = '**PASSWORD SET**';
40 40
 }
41 41
 \OC_JSON::success(['configuration' => $configuration]);
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/Template/LinkMenuAction.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,16 +51,16 @@
 block discarded – undo
51 51
 	 * @since 14.0.0
52 52
 	 */
53 53
 	public function render(): string {
54
-		return '<li>' .
55
-			'<a id="directLink-container">' .
56
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
57
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
58
-			'</a>' .
59
-			'</li>' .
60
-			'<li>' .
61
-			'<span class="menuitem">' .
62
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
63
-			'</span>' .
54
+		return '<li>'.
55
+			'<a id="directLink-container">'.
56
+			'<span class="icon '.Util::sanitizeHTML($this->getIcon()).'"></span>'.
57
+			'<label for="directLink">'.Util::sanitizeHTML($this->getLabel()).'</label>'.
58
+			'</a>'.
59
+			'</li>'.
60
+			'<li>'.
61
+			'<span class="menuitem">'.
62
+			'<input id="directLink" type="text" readonly="" value="'.Util::sanitizeHTML($this->getLink()).'">'.
63
+			'</span>'.
64 64
 			'</li>';
65 65
 	}
66 66
 }
Please login to merge, or discard this patch.
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -31,33 +31,33 @@
 block discarded – undo
31 31
  * @since 14.0.0
32 32
  */
33 33
 class LinkMenuAction extends SimpleMenuAction {
34
-	/**
35
-	 * LinkMenuAction constructor.
36
-	 *
37
-	 * @param string $label
38
-	 * @param string $icon
39
-	 * @param string $link
40
-	 * @since 14.0.0
41
-	 */
42
-	public function __construct(string $label, string $icon, string $link) {
43
-		parent::__construct('directLink-container', $label, $icon, $link);
44
-	}
34
+    /**
35
+     * LinkMenuAction constructor.
36
+     *
37
+     * @param string $label
38
+     * @param string $icon
39
+     * @param string $link
40
+     * @since 14.0.0
41
+     */
42
+    public function __construct(string $label, string $icon, string $link) {
43
+        parent::__construct('directLink-container', $label, $icon, $link);
44
+    }
45 45
 
46
-	/**
47
-	 * @return string
48
-	 * @since 14.0.0
49
-	 */
50
-	public function render(): string {
51
-		return '<li>' .
52
-			'<a id="directLink-container">' .
53
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
54
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
55
-			'</a>' .
56
-			'</li>' .
57
-			'<li>' .
58
-			'<span class="menuitem">' .
59
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
60
-			'</span>' .
61
-			'</li>';
62
-	}
46
+    /**
47
+     * @return string
48
+     * @since 14.0.0
49
+     */
50
+    public function render(): string {
51
+        return '<li>' .
52
+            '<a id="directLink-container">' .
53
+            '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
54
+            '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
55
+            '</a>' .
56
+            '</li>' .
57
+            '<li>' .
58
+            '<span class="menuitem">' .
59
+            '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
60
+            '</span>' .
61
+            '</li>';
62
+    }
63 63
 }
Please login to merge, or discard this patch.
core/Migrations/Version14000Date20180129121024.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -30,30 +30,30 @@
 block discarded – undo
30 30
  * Delete the admin|personal sections and settings tables
31 31
  */
32 32
 class Version14000Date20180129121024 extends SimpleMigrationStep {
33
-	public function name(): string {
34
-		return 'Drop obsolete settings tables';
35
-	}
33
+    public function name(): string {
34
+        return 'Drop obsolete settings tables';
35
+    }
36 36
 
37
-	public function description(): string {
38
-		return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"';
39
-	}
37
+    public function description(): string {
38
+        return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"';
39
+    }
40 40
 
41
-	/**
42
-	 * @param IOutput $output
43
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
44
-	 * @param array $options
45
-	 * @return null|ISchemaWrapper
46
-	 * @since 13.0.0
47
-	 */
48
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
49
-		/** @var ISchemaWrapper $schema */
50
-		$schema = $schemaClosure();
41
+    /**
42
+     * @param IOutput $output
43
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
44
+     * @param array $options
45
+     * @return null|ISchemaWrapper
46
+     * @since 13.0.0
47
+     */
48
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
49
+        /** @var ISchemaWrapper $schema */
50
+        $schema = $schemaClosure();
51 51
 
52
-		$schema->dropTable('admin_sections');
53
-		$schema->dropTable('admin_settings');
54
-		$schema->dropTable('personal_sections');
55
-		$schema->dropTable('personal_settings');
52
+        $schema->dropTable('admin_sections');
53
+        $schema->dropTable('admin_settings');
54
+        $schema->dropTable('personal_sections');
55
+        $schema->dropTable('personal_settings');
56 56
 
57
-		return $schema;
58
-	}
57
+        return $schema;
58
+    }
59 59
 }
Please login to merge, or discard this patch.