Passed
Push — master ( 0571fd...48a8f0 )
by Blizzz
19:19 queued 08:57
created
lib/private/App/CodeChecker/DatabaseSchemaChecker.php 2 patches
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -25,81 +25,81 @@
 block discarded – undo
25 25
 
26 26
 class DatabaseSchemaChecker {
27 27
 
28
-	/**
29
-	 * @param string $appId
30
-	 * @return array
31
-	 */
32
-	public function analyse($appId) {
33
-		$appPath = \OC_App::getAppPath($appId);
34
-		if ($appPath === false) {
35
-			throw new \RuntimeException("No app with given id <$appId> known.");
36
-		}
37
-
38
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
39
-			return ['errors' => [], 'warnings' => []];
40
-		}
41
-
42
-		libxml_use_internal_errors(true);
43
-		$loadEntities = libxml_disable_entity_loader(false);
44
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
45
-		libxml_disable_entity_loader($loadEntities);
46
-
47
-
48
-		$errors = $warnings = [];
49
-
50
-		foreach ($xml->table as $table) {
51
-			// Table names
52
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
53
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
54
-			}
55
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
56
-			if (strpos($tableName, '*dbprefix*') !== false) {
57
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
58
-			}
59
-
60
-			if (strlen($tableName) > 27) {
61
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
62
-			}
63
-
64
-			$hasAutoIncrement = false;
65
-
66
-			// Column names
67
-			foreach ($table->declaration->field as $column) {
68
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
69
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
70
-				}
71
-
72
-				if (strlen((string)$column->name) > 30) {
73
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
74
-				}
75
-
76
-				if ($column->autoincrement) {
77
-					if ($hasAutoIncrement) {
78
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
79
-					}
80
-
81
-					if (strlen($tableName) > 21) {
82
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
83
-					}
84
-
85
-					$hasAutoIncrement = true;
86
-				}
87
-			}
88
-
89
-			// Index names
90
-			foreach ($table->declaration->index as $index) {
91
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
92
-				if ($hasPrefix !== false && $hasPrefix !== 0) {
93
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
94
-				}
95
-
96
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
97
-				if (strlen($indexName) > 27) {
98
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
99
-				}
100
-			}
101
-		}
102
-
103
-		return ['errors' => $errors, 'warnings' => $warnings];
104
-	}
28
+    /**
29
+     * @param string $appId
30
+     * @return array
31
+     */
32
+    public function analyse($appId) {
33
+        $appPath = \OC_App::getAppPath($appId);
34
+        if ($appPath === false) {
35
+            throw new \RuntimeException("No app with given id <$appId> known.");
36
+        }
37
+
38
+        if (!file_exists($appPath . '/appinfo/database.xml')) {
39
+            return ['errors' => [], 'warnings' => []];
40
+        }
41
+
42
+        libxml_use_internal_errors(true);
43
+        $loadEntities = libxml_disable_entity_loader(false);
44
+        $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
45
+        libxml_disable_entity_loader($loadEntities);
46
+
47
+
48
+        $errors = $warnings = [];
49
+
50
+        foreach ($xml->table as $table) {
51
+            // Table names
52
+            if (strpos((string)$table->name, '*dbprefix*') !== 0) {
53
+                $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
54
+            }
55
+            $tableName = substr((string)$table->name, strlen('*dbprefix*'));
56
+            if (strpos($tableName, '*dbprefix*') !== false) {
57
+                $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
58
+            }
59
+
60
+            if (strlen($tableName) > 27) {
61
+                $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
62
+            }
63
+
64
+            $hasAutoIncrement = false;
65
+
66
+            // Column names
67
+            foreach ($table->declaration->field as $column) {
68
+                if (strpos((string)$column->name, '*dbprefix*') !== false) {
69
+                    $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
70
+                }
71
+
72
+                if (strlen((string)$column->name) > 30) {
73
+                    $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
74
+                }
75
+
76
+                if ($column->autoincrement) {
77
+                    if ($hasAutoIncrement) {
78
+                        $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
79
+                    }
80
+
81
+                    if (strlen($tableName) > 21) {
82
+                        $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
83
+                    }
84
+
85
+                    $hasAutoIncrement = true;
86
+                }
87
+            }
88
+
89
+            // Index names
90
+            foreach ($table->declaration->index as $index) {
91
+                $hasPrefix = strpos((string)$index->name, '*dbprefix*');
92
+                if ($hasPrefix !== false && $hasPrefix !== 0) {
93
+                    $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
94
+                }
95
+
96
+                $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
97
+                if (strlen($indexName) > 27) {
98
+                    $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
99
+                }
100
+            }
101
+        }
102
+
103
+        return ['errors' => $errors, 'warnings' => $warnings];
104
+    }
105 105
 }
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 			throw new \RuntimeException("No app with given id <$appId> known.");
36 36
 		}
37 37
 
38
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
38
+		if (!file_exists($appPath.'/appinfo/database.xml')) {
39 39
 			return ['errors' => [], 'warnings' => []];
40 40
 		}
41 41
 
42 42
 		libxml_use_internal_errors(true);
43 43
 		$loadEntities = libxml_disable_entity_loader(false);
44
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
44
+		$xml = simplexml_load_file($appPath.'/appinfo/database.xml');
45 45
 		libxml_disable_entity_loader($loadEntities);
46 46
 
47 47
 
@@ -49,37 +49,37 @@  discard block
 block discarded – undo
49 49
 
50 50
 		foreach ($xml->table as $table) {
51 51
 			// Table names
52
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
53
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
52
+			if (strpos((string) $table->name, '*dbprefix*') !== 0) {
53
+				$errors[] = 'Database schema error: name of table '.(string) $table->name.' does not start with *dbprefix*';
54 54
 			}
55
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
55
+			$tableName = substr((string) $table->name, strlen('*dbprefix*'));
56 56
 			if (strpos($tableName, '*dbprefix*') !== false) {
57
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
57
+				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.(string) $table->name;
58 58
 			}
59 59
 
60 60
 			if (strlen($tableName) > 27) {
61
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
61
+				$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
62 62
 			}
63 63
 
64 64
 			$hasAutoIncrement = false;
65 65
 
66 66
 			// Column names
67 67
 			foreach ($table->declaration->field as $column) {
68
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
69
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
68
+				if (strpos((string) $column->name, '*dbprefix*') !== false) {
69
+					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.(string) $column->name.' on table '.(string) $table->name;
70 70
 				}
71 71
 
72
-				if (strlen((string)$column->name) > 30) {
73
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
72
+				if (strlen((string) $column->name) > 30) {
73
+					$errors[] = 'Database schema error: Name of column '.(string) $column->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
74 74
 				}
75 75
 
76 76
 				if ($column->autoincrement) {
77 77
 					if ($hasAutoIncrement) {
78
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
78
+						$errors[] = 'Database schema error: Table '.(string) $table->name.' has multiple autoincrement columns';
79 79
 					}
80 80
 
81 81
 					if (strlen($tableName) > 21) {
82
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
82
+						$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
83 83
 					}
84 84
 
85 85
 					$hasAutoIncrement = true;
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 
89 89
 			// Index names
90 90
 			foreach ($table->declaration->index as $index) {
91
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
91
+				$hasPrefix = strpos((string) $index->name, '*dbprefix*');
92 92
 				if ($hasPrefix !== false && $hasPrefix !== 0) {
93
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
93
+					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.(string) $index->name.' on table '.(string) $table->name;
94 94
 				}
95 95
 
96
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
96
+				$indexName = $hasPrefix === 0 ? substr((string) $index->name, strlen('*dbprefix*')) : (string) $index->name;
97 97
 				if (strlen($indexName) > 27) {
98
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
98
+					$errors[] = 'Database schema error: Name of index '.(string) $index->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed';
99 99
 				}
100 100
 			}
101 101
 		}
Please login to merge, or discard this patch.
lib/private/Security/RateLimiting/Backend/IBackend.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -33,26 +33,26 @@
 block discarded – undo
33 33
  * @package OC\Security\RateLimiting\Backend
34 34
  */
35 35
 interface IBackend {
36
-	/**
37
-	 * Gets the amount of attempts within the last specified seconds
38
-	 *
39
-	 * @param string $methodIdentifier Identifier for the method
40
-	 * @param string $userIdentifier Identifier for the user
41
-	 * @param int $seconds Seconds to look back at
42
-	 * @return int
43
-	 */
44
-	public function getAttempts(string $methodIdentifier,
45
-								string $userIdentifier,
46
-								int $seconds): int;
36
+    /**
37
+     * Gets the amount of attempts within the last specified seconds
38
+     *
39
+     * @param string $methodIdentifier Identifier for the method
40
+     * @param string $userIdentifier Identifier for the user
41
+     * @param int $seconds Seconds to look back at
42
+     * @return int
43
+     */
44
+    public function getAttempts(string $methodIdentifier,
45
+                                string $userIdentifier,
46
+                                int $seconds): int;
47 47
 
48
-	/**
49
-	 * Registers an attempt
50
-	 *
51
-	 * @param string $methodIdentifier Identifier for the method
52
-	 * @param string $userIdentifier Identifier for the user
53
-	 * @param int $period Period in seconds how long this attempt should be stored
54
-	 */
55
-	public function registerAttempt(string $methodIdentifier,
56
-									string $userIdentifier,
57
-									int $period);
48
+    /**
49
+     * Registers an attempt
50
+     *
51
+     * @param string $methodIdentifier Identifier for the method
52
+     * @param string $userIdentifier Identifier for the user
53
+     * @param int $period Period in seconds how long this attempt should be stored
54
+     */
55
+    public function registerAttempt(string $methodIdentifier,
56
+                                    string $userIdentifier,
57
+                                    int $period);
58 58
 }
Please login to merge, or discard this patch.
apps/systemtags/list.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,19 +23,19 @@
 block discarded – undo
23 23
 // WARNING: this should be moved to proper AppFramework handling
24 24
 // Check if we are a user
25 25
 if (!\OC::$server->getUserSession()->isLoggedIn()) {
26
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
27
-			'core.login.showLoginForm',
28
-			[
29
-				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
30
-			]
31
-		)
32
-	);
33
-	exit();
26
+    header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
27
+            'core.login.showLoginForm',
28
+            [
29
+                'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
30
+            ]
31
+        )
32
+    );
33
+    exit();
34 34
 }
35 35
 // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
36 36
 if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
37
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
38
-	exit();
37
+    header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
38
+    exit();
39 39
 }
40 40
 
41 41
 $tmpl = new OCP\Template('systemtags', 'list', '');
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 // WARNING: this should be moved to proper AppFramework handling
24 24
 // Check if we are a user
25 25
 if (!\OC::$server->getUserSession()->isLoggedIn()) {
26
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
26
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
27 27
 			'core.login.showLoginForm',
28 28
 			[
29 29
 				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
36 36
 if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
37
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
37
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
38 38
 	exit();
39 39
 }
40 40
 
Please login to merge, or discard this patch.
lib/public/Federation/ICloudId.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,35 +30,35 @@
 block discarded – undo
30 30
  * @since 12.0.0
31 31
  */
32 32
 interface ICloudId {
33
-	/**
34
-	 * The remote cloud id
35
-	 *
36
-	 * @return string
37
-	 * @since 12.0.0
38
-	 */
39
-	public function getId(): string;
33
+    /**
34
+     * The remote cloud id
35
+     *
36
+     * @return string
37
+     * @since 12.0.0
38
+     */
39
+    public function getId(): string;
40 40
 
41
-	/**
42
-	 * Get a clean representation of the cloud id for display
43
-	 *
44
-	 * @return string
45
-	 * @since 12.0.0
46
-	 */
47
-	public function getDisplayId(): string;
41
+    /**
42
+     * Get a clean representation of the cloud id for display
43
+     *
44
+     * @return string
45
+     * @since 12.0.0
46
+     */
47
+    public function getDisplayId(): string;
48 48
 
49
-	/**
50
-	 * The username on the remote server
51
-	 *
52
-	 * @return string
53
-	 * @since 12.0.0
54
-	 */
55
-	public function getUser(): string;
49
+    /**
50
+     * The username on the remote server
51
+     *
52
+     * @return string
53
+     * @since 12.0.0
54
+     */
55
+    public function getUser(): string;
56 56
 
57
-	/**
58
-	 * The base address of the remote server
59
-	 *
60
-	 * @return string
61
-	 * @since 12.0.0
62
-	 */
63
-	public function getRemote(): string;
57
+    /**
58
+     * The base address of the remote server
59
+     *
60
+     * @return string
61
+     * @since 12.0.0
62
+     */
63
+    public function getRemote(): string;
64 64
 }
Please login to merge, or discard this patch.
lib/public/Federation/ICloudIdManager.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -31,33 +31,33 @@
 block discarded – undo
31 31
  * @since 12.0.0
32 32
  */
33 33
 interface ICloudIdManager {
34
-	/**
35
-	 * @param string $cloudId
36
-	 * @return ICloudId
37
-	 * @throws \InvalidArgumentException
38
-	 *
39
-	 * @since 12.0.0
40
-	 */
41
-	public function resolveCloudId(string $cloudId): ICloudId;
34
+    /**
35
+     * @param string $cloudId
36
+     * @return ICloudId
37
+     * @throws \InvalidArgumentException
38
+     *
39
+     * @since 12.0.0
40
+     */
41
+    public function resolveCloudId(string $cloudId): ICloudId;
42 42
 
43
-	/**
44
-	 * Get the cloud id for a remote user
45
-	 *
46
-	 * @param string $user
47
-	 * @param string $remote
48
-	 * @return ICloudId
49
-	 *
50
-	 * @since 12.0.0
51
-	 */
52
-	public function getCloudId(string $user, string $remote): ICloudId;
43
+    /**
44
+     * Get the cloud id for a remote user
45
+     *
46
+     * @param string $user
47
+     * @param string $remote
48
+     * @return ICloudId
49
+     *
50
+     * @since 12.0.0
51
+     */
52
+    public function getCloudId(string $user, string $remote): ICloudId;
53 53
 
54
-	/**
55
-	 * Check if the input is a correctly formatted cloud id
56
-	 *
57
-	 * @param string $cloudId
58
-	 * @return bool
59
-	 *
60
-	 * @since 12.0.0
61
-	 */
62
-	public function isValidCloudId(string $cloudId): bool;
54
+    /**
55
+     * Check if the input is a correctly formatted cloud id
56
+     *
57
+     * @param string $cloudId
58
+     * @return bool
59
+     *
60
+     * @since 12.0.0
61
+     */
62
+    public function isValidCloudId(string $cloudId): bool;
63 63
 }
Please login to merge, or discard this patch.
lib/private/Federation/CloudId.php 1 patch
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -27,54 +27,54 @@
 block discarded – undo
27 27
 use OCP\Federation\ICloudId;
28 28
 
29 29
 class CloudId implements ICloudId {
30
-	/** @var string */
31
-	private $id;
32
-	/** @var string */
33
-	private $user;
34
-	/** @var string */
35
-	private $remote;
30
+    /** @var string */
31
+    private $id;
32
+    /** @var string */
33
+    private $user;
34
+    /** @var string */
35
+    private $remote;
36 36
 
37
-	/**
38
-	 * CloudId constructor.
39
-	 *
40
-	 * @param string $id
41
-	 * @param string $user
42
-	 * @param string $remote
43
-	 */
44
-	public function __construct(string $id, string $user, string $remote) {
45
-		$this->id = $id;
46
-		$this->user = $user;
47
-		$this->remote = $remote;
48
-	}
37
+    /**
38
+     * CloudId constructor.
39
+     *
40
+     * @param string $id
41
+     * @param string $user
42
+     * @param string $remote
43
+     */
44
+    public function __construct(string $id, string $user, string $remote) {
45
+        $this->id = $id;
46
+        $this->user = $user;
47
+        $this->remote = $remote;
48
+    }
49 49
 
50
-	/**
51
-	 * The full remote cloud id
52
-	 *
53
-	 * @return string
54
-	 */
55
-	public function getId(): string {
56
-		return $this->id;
57
-	}
50
+    /**
51
+     * The full remote cloud id
52
+     *
53
+     * @return string
54
+     */
55
+    public function getId(): string {
56
+        return $this->id;
57
+    }
58 58
 
59
-	public function getDisplayId(): string {
60
-		return str_replace('https://', '', str_replace('http://', '', $this->getId()));
61
-	}
59
+    public function getDisplayId(): string {
60
+        return str_replace('https://', '', str_replace('http://', '', $this->getId()));
61
+    }
62 62
 
63
-	/**
64
-	 * The username on the remote server
65
-	 *
66
-	 * @return string
67
-	 */
68
-	public function getUser(): string {
69
-		return $this->user;
70
-	}
63
+    /**
64
+     * The username on the remote server
65
+     *
66
+     * @return string
67
+     */
68
+    public function getUser(): string {
69
+        return $this->user;
70
+    }
71 71
 
72
-	/**
73
-	 * The base address of the remote server
74
-	 *
75
-	 * @return string
76
-	 */
77
-	public function getRemote(): string {
78
-		return $this->remote;
79
-	}
72
+    /**
73
+     * The base address of the remote server
74
+     *
75
+     * @return string
76
+     */
77
+    public function getRemote(): string {
78
+        return $this->remote;
79
+    }
80 80
 }
Please login to merge, or discard this patch.
lib/public/Http/Client/IClient.php 1 patch
Indentation   +169 added lines, -169 removed lines patch added patch discarded remove patch
@@ -32,178 +32,178 @@
 block discarded – undo
32 32
  */
33 33
 interface IClient {
34 34
 
35
-	/**
36
-	 * Sends a GET request
37
-	 * @param string $uri
38
-	 * @param array $options Array such as
39
-	 *              'query' => [
40
-	 *                  'field' => 'abc',
41
-	 *                  'other_field' => '123',
42
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
43
-	 *              ],
44
-	 *              'headers' => [
45
-	 *                  'foo' => 'bar',
46
-	 *              ],
47
-	 *              'cookies' => ['
48
-	 *                  'foo' => 'bar',
49
-	 *              ],
50
-	 *              'allow_redirects' => [
51
-	 *                   'max'       => 10,  // allow at most 10 redirects.
52
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
53
-	 *                   'referer'   => true,     // add a Referer header
54
-	 *                   'protocols' => ['https'] // only allow https URLs
55
-	 *              ],
56
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
57
-	 *              'verify' => true, // bool or string to CA file
58
-	 *              'debug' => true,
59
-	 * @return IResponse
60
-	 * @throws \Exception If the request could not get completed
61
-	 * @since 8.1.0
62
-	 */
63
-	public function get(string $uri, array $options = []): IResponse;
35
+    /**
36
+     * Sends a GET request
37
+     * @param string $uri
38
+     * @param array $options Array such as
39
+     *              'query' => [
40
+     *                  'field' => 'abc',
41
+     *                  'other_field' => '123',
42
+     *                  'file_name' => fopen('/path/to/file', 'r'),
43
+     *              ],
44
+     *              'headers' => [
45
+     *                  'foo' => 'bar',
46
+     *              ],
47
+     *              'cookies' => ['
48
+     *                  'foo' => 'bar',
49
+     *              ],
50
+     *              'allow_redirects' => [
51
+     *                   'max'       => 10,  // allow at most 10 redirects.
52
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
53
+     *                   'referer'   => true,     // add a Referer header
54
+     *                   'protocols' => ['https'] // only allow https URLs
55
+     *              ],
56
+     *              'save_to' => '/path/to/file', // save to a file or a stream
57
+     *              'verify' => true, // bool or string to CA file
58
+     *              'debug' => true,
59
+     * @return IResponse
60
+     * @throws \Exception If the request could not get completed
61
+     * @since 8.1.0
62
+     */
63
+    public function get(string $uri, array $options = []): IResponse;
64 64
 
65
-	/**
66
-	 * Sends a HEAD request
67
-	 * @param string $uri
68
-	 * @param array $options Array such as
69
-	 *              'headers' => [
70
-	 *                  'foo' => 'bar',
71
-	 *              ],
72
-	 *              'cookies' => ['
73
-	 *                  'foo' => 'bar',
74
-	 *              ],
75
-	 *              'allow_redirects' => [
76
-	 *                   'max'       => 10,  // allow at most 10 redirects.
77
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
78
-	 *                   'referer'   => true,     // add a Referer header
79
-	 *                   'protocols' => ['https'] // only allow https URLs
80
-	 *              ],
81
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
82
-	 *              'verify' => true, // bool or string to CA file
83
-	 *              'debug' => true,
84
-	 * @return IResponse
85
-	 * @throws \Exception If the request could not get completed
86
-	 * @since 8.1.0
87
-	 */
88
-	public function head(string $uri, array $options = []): IResponse;
65
+    /**
66
+     * Sends a HEAD request
67
+     * @param string $uri
68
+     * @param array $options Array such as
69
+     *              'headers' => [
70
+     *                  'foo' => 'bar',
71
+     *              ],
72
+     *              'cookies' => ['
73
+     *                  'foo' => 'bar',
74
+     *              ],
75
+     *              'allow_redirects' => [
76
+     *                   'max'       => 10,  // allow at most 10 redirects.
77
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
78
+     *                   'referer'   => true,     // add a Referer header
79
+     *                   'protocols' => ['https'] // only allow https URLs
80
+     *              ],
81
+     *              'save_to' => '/path/to/file', // save to a file or a stream
82
+     *              'verify' => true, // bool or string to CA file
83
+     *              'debug' => true,
84
+     * @return IResponse
85
+     * @throws \Exception If the request could not get completed
86
+     * @since 8.1.0
87
+     */
88
+    public function head(string $uri, array $options = []): IResponse;
89 89
 
90
-	/**
91
-	 * Sends a POST request
92
-	 * @param string $uri
93
-	 * @param array $options Array such as
94
-	 *              'body' => [
95
-	 *                  'field' => 'abc',
96
-	 *                  'other_field' => '123',
97
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
98
-	 *              ],
99
-	 *              'headers' => [
100
-	 *                  'foo' => 'bar',
101
-	 *              ],
102
-	 *              'cookies' => ['
103
-	 *                  'foo' => 'bar',
104
-	 *              ],
105
-	 *              'allow_redirects' => [
106
-	 *                   'max'       => 10,  // allow at most 10 redirects.
107
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
108
-	 *                   'referer'   => true,     // add a Referer header
109
-	 *                   'protocols' => ['https'] // only allow https URLs
110
-	 *              ],
111
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
112
-	 *              'verify' => true, // bool or string to CA file
113
-	 *              'debug' => true,
114
-	 * @return IResponse
115
-	 * @throws \Exception If the request could not get completed
116
-	 * @since 8.1.0
117
-	 */
118
-	public function post(string $uri, array $options = []): IResponse;
90
+    /**
91
+     * Sends a POST request
92
+     * @param string $uri
93
+     * @param array $options Array such as
94
+     *              'body' => [
95
+     *                  'field' => 'abc',
96
+     *                  'other_field' => '123',
97
+     *                  'file_name' => fopen('/path/to/file', 'r'),
98
+     *              ],
99
+     *              'headers' => [
100
+     *                  'foo' => 'bar',
101
+     *              ],
102
+     *              'cookies' => ['
103
+     *                  'foo' => 'bar',
104
+     *              ],
105
+     *              'allow_redirects' => [
106
+     *                   'max'       => 10,  // allow at most 10 redirects.
107
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
108
+     *                   'referer'   => true,     // add a Referer header
109
+     *                   'protocols' => ['https'] // only allow https URLs
110
+     *              ],
111
+     *              'save_to' => '/path/to/file', // save to a file or a stream
112
+     *              'verify' => true, // bool or string to CA file
113
+     *              'debug' => true,
114
+     * @return IResponse
115
+     * @throws \Exception If the request could not get completed
116
+     * @since 8.1.0
117
+     */
118
+    public function post(string $uri, array $options = []): IResponse;
119 119
 
120
-	/**
121
-	 * Sends a PUT request
122
-	 * @param string $uri
123
-	 * @param array $options Array such as
124
-	 *              'body' => [
125
-	 *                  'field' => 'abc',
126
-	 *                  'other_field' => '123',
127
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
128
-	 *              ],
129
-	 *              'headers' => [
130
-	 *                  'foo' => 'bar',
131
-	 *              ],
132
-	 *              'cookies' => ['
133
-	 *                  'foo' => 'bar',
134
-	 *              ],
135
-	 *              'allow_redirects' => [
136
-	 *                   'max'       => 10,  // allow at most 10 redirects.
137
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
138
-	 *                   'referer'   => true,     // add a Referer header
139
-	 *                   'protocols' => ['https'] // only allow https URLs
140
-	 *              ],
141
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
142
-	 *              'verify' => true, // bool or string to CA file
143
-	 *              'debug' => true,
144
-	 * @return IResponse
145
-	 * @throws \Exception If the request could not get completed
146
-	 * @since 8.1.0
147
-	 */
148
-	public function put(string $uri, array $options = []): IResponse;
120
+    /**
121
+     * Sends a PUT request
122
+     * @param string $uri
123
+     * @param array $options Array such as
124
+     *              'body' => [
125
+     *                  'field' => 'abc',
126
+     *                  'other_field' => '123',
127
+     *                  'file_name' => fopen('/path/to/file', 'r'),
128
+     *              ],
129
+     *              'headers' => [
130
+     *                  'foo' => 'bar',
131
+     *              ],
132
+     *              'cookies' => ['
133
+     *                  'foo' => 'bar',
134
+     *              ],
135
+     *              'allow_redirects' => [
136
+     *                   'max'       => 10,  // allow at most 10 redirects.
137
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
138
+     *                   'referer'   => true,     // add a Referer header
139
+     *                   'protocols' => ['https'] // only allow https URLs
140
+     *              ],
141
+     *              'save_to' => '/path/to/file', // save to a file or a stream
142
+     *              'verify' => true, // bool or string to CA file
143
+     *              'debug' => true,
144
+     * @return IResponse
145
+     * @throws \Exception If the request could not get completed
146
+     * @since 8.1.0
147
+     */
148
+    public function put(string $uri, array $options = []): IResponse;
149 149
 
150
-	/**
151
-	 * Sends a DELETE request
152
-	 * @param string $uri
153
-	 * @param array $options Array such as
154
-	 *              'body' => [
155
-	 *                  'field' => 'abc',
156
-	 *                  'other_field' => '123',
157
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
158
-	 *              ],
159
-	 *              'headers' => [
160
-	 *                  'foo' => 'bar',
161
-	 *              ],
162
-	 *              'cookies' => ['
163
-	 *                  'foo' => 'bar',
164
-	 *              ],
165
-	 *              'allow_redirects' => [
166
-	 *                   'max'       => 10,  // allow at most 10 redirects.
167
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
168
-	 *                   'referer'   => true,     // add a Referer header
169
-	 *                   'protocols' => ['https'] // only allow https URLs
170
-	 *              ],
171
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
172
-	 *              'verify' => true, // bool or string to CA file
173
-	 *              'debug' => true,
174
-	 * @return IResponse
175
-	 * @throws \Exception If the request could not get completed
176
-	 * @since 8.1.0
177
-	 */
178
-	public function delete(string $uri, array $options = []): IResponse;
150
+    /**
151
+     * Sends a DELETE request
152
+     * @param string $uri
153
+     * @param array $options Array such as
154
+     *              'body' => [
155
+     *                  'field' => 'abc',
156
+     *                  'other_field' => '123',
157
+     *                  'file_name' => fopen('/path/to/file', 'r'),
158
+     *              ],
159
+     *              'headers' => [
160
+     *                  'foo' => 'bar',
161
+     *              ],
162
+     *              'cookies' => ['
163
+     *                  'foo' => 'bar',
164
+     *              ],
165
+     *              'allow_redirects' => [
166
+     *                   'max'       => 10,  // allow at most 10 redirects.
167
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
168
+     *                   'referer'   => true,     // add a Referer header
169
+     *                   'protocols' => ['https'] // only allow https URLs
170
+     *              ],
171
+     *              'save_to' => '/path/to/file', // save to a file or a stream
172
+     *              'verify' => true, // bool or string to CA file
173
+     *              'debug' => true,
174
+     * @return IResponse
175
+     * @throws \Exception If the request could not get completed
176
+     * @since 8.1.0
177
+     */
178
+    public function delete(string $uri, array $options = []): IResponse;
179 179
 
180
-	/**
181
-	 * Sends a options request
182
-	 * @param string $uri
183
-	 * @param array $options Array such as
184
-	 *              'body' => [
185
-	 *                  'field' => 'abc',
186
-	 *                  'other_field' => '123',
187
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
188
-	 *              ],
189
-	 *              'headers' => [
190
-	 *                  'foo' => 'bar',
191
-	 *              ],
192
-	 *              'cookies' => ['
193
-	 *                  'foo' => 'bar',
194
-	 *              ],
195
-	 *              'allow_redirects' => [
196
-	 *                   'max'       => 10,  // allow at most 10 redirects.
197
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
198
-	 *                   'referer'   => true,     // add a Referer header
199
-	 *                   'protocols' => ['https'] // only allow https URLs
200
-	 *              ],
201
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
202
-	 *              'verify' => true, // bool or string to CA file
203
-	 *              'debug' => true,
204
-	 * @return IResponse
205
-	 * @throws \Exception If the request could not get completed
206
-	 * @since 8.1.0
207
-	 */
208
-	public function options(string $uri, array $options = []): IResponse;
180
+    /**
181
+     * Sends a options request
182
+     * @param string $uri
183
+     * @param array $options Array such as
184
+     *              'body' => [
185
+     *                  'field' => 'abc',
186
+     *                  'other_field' => '123',
187
+     *                  'file_name' => fopen('/path/to/file', 'r'),
188
+     *              ],
189
+     *              'headers' => [
190
+     *                  'foo' => 'bar',
191
+     *              ],
192
+     *              'cookies' => ['
193
+     *                  'foo' => 'bar',
194
+     *              ],
195
+     *              'allow_redirects' => [
196
+     *                   'max'       => 10,  // allow at most 10 redirects.
197
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
198
+     *                   'referer'   => true,     // add a Referer header
199
+     *                   'protocols' => ['https'] // only allow https URLs
200
+     *              ],
201
+     *              'save_to' => '/path/to/file', // save to a file or a stream
202
+     *              'verify' => true, // bool or string to CA file
203
+     *              'debug' => true,
204
+     * @return IResponse
205
+     * @throws \Exception If the request could not get completed
206
+     * @since 8.1.0
207
+     */
208
+    public function options(string $uri, array $options = []): IResponse;
209 209
 }
Please login to merge, or discard this patch.
lib/public/Http/Client/IClientService.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
  * @since 8.1.0
32 32
  */
33 33
 interface IClientService {
34
-	/**
35
-	 * @return IClient
36
-	 * @since 8.1.0
37
-	 */
38
-	public function newClient(): IClient;
34
+    /**
35
+     * @return IClient
36
+     * @since 8.1.0
37
+     */
38
+    public function newClient(): IClient;
39 39
 }
Please login to merge, or discard this patch.
lib/public/Http/Client/IResponse.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -32,28 +32,28 @@
 block discarded – undo
32 32
  * @since 8.1.0
33 33
  */
34 34
 interface IResponse {
35
-	/**
36
-	 * @return string|resource
37
-	 * @since 8.1.0
38
-	 */
39
-	public function getBody();
35
+    /**
36
+     * @return string|resource
37
+     * @since 8.1.0
38
+     */
39
+    public function getBody();
40 40
 
41
-	/**
42
-	 * @return int
43
-	 * @since 8.1.0
44
-	 */
45
-	public function getStatusCode(): int;
41
+    /**
42
+     * @return int
43
+     * @since 8.1.0
44
+     */
45
+    public function getStatusCode(): int;
46 46
 
47
-	/**
48
-	 * @param string $key
49
-	 * @return string
50
-	 * @since 8.1.0
51
-	 */
52
-	public function getHeader(string $key): string;
47
+    /**
48
+     * @param string $key
49
+     * @return string
50
+     * @since 8.1.0
51
+     */
52
+    public function getHeader(string $key): string;
53 53
 
54
-	/**
55
-	 * @return array
56
-	 * @since 8.1.0
57
-	 */
58
-	public function getHeaders(): array;
54
+    /**
55
+     * @return array
56
+     * @since 8.1.0
57
+     */
58
+    public function getHeaders(): array;
59 59
 }
Please login to merge, or discard this patch.