Inspection of "Merge pull request #24241 from nextcloud/enh/harde..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 0d3004...7fd760 )

by Roeland

created 2020-11-20 13:15 UTC

Status

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -33,35 +33,35 @@
 block discarded – undo
 
 class EncryptionLegacyCipher implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IManager */
-	private $manager;
+    /** @var IConfig */
+    private $config;
+    /** @var IManager */
+    private $manager;
 
-	public function __construct(IConfig $config,
-								IManager $manager) {
-		$this->config = $config;
-		$this->manager = $manager;
-	}
+    public function __construct(IConfig $config,
+                                IManager $manager) {
+        $this->config = $config;
+        $this->manager = $manager;
+    }
 
-	public function getName(): string {
-		return 'Keep legacy encryption enabled';
-	}
+    public function getName(): string {
+        return 'Keep legacy encryption enabled';
+    }
 
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
-		return version_compare($versionFromBeforeUpdate, '20.0.0.0', '<=');
-	}
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+        return version_compare($versionFromBeforeUpdate, '20.0.0.0', '<=');
+    }
 
-	public function run(IOutput $output): void {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    public function run(IOutput $output): void {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		if ($this->manager->isEnabled()) {
-			if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
-				$this->config->setSystemValue('encryption.legacy_format_support', true);
-			}
-		}
-	}
+        if ($this->manager->isEnabled()) {
+            if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
+                $this->config->setSystemValue('encryption.legacy_format_support', true);
+            }
+        }
+    }
 }

Please login to merge, or discard this patch.

lib/private/Repair/NC20/EncryptionMigration.php 1 patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -33,35 +33,35 @@
 block discarded – undo
 
 class EncryptionMigration implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IManager */
-	private $manager;
+    /** @var IConfig */
+    private $config;
+    /** @var IManager */
+    private $manager;
 
-	public function __construct(IConfig $config,
-								IManager $manager) {
-		$this->config = $config;
-		$this->manager = $manager;
-	}
+    public function __construct(IConfig $config,
+                                IManager $manager) {
+        $this->config = $config;
+        $this->manager = $manager;
+    }
 
-	public function getName(): string {
-		return 'Check encryption key format';
-	}
+    public function getName(): string {
+        return 'Check encryption key format';
+    }
 
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
-		return version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=');
-	}
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+        return version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=');
+    }
 
-	public function run(IOutput $output): void {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    public function run(IOutput $output): void {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		if ($this->manager->isEnabled()) {
-			if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
-				$this->config->setSystemValue('encryption.key_storage_migrated', false);
-			}
-		}
-	}
+        if ($this->manager->isEnabled()) {
+            if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
+                $this->config->setSystemValue('encryption.key_storage_migrated', false);
+            }
+        }
+    }
 }

Please login to merge, or discard this patch.

		@@ -33,35 +33,35 @@
		block discarded – undo
33	33
34	34	class EncryptionLegacyCipher implements IRepairStep {
35	35
36		- /** @var IConfig */
37		- private $config;
38		- /** @var IManager */
39		- private $manager;
	36	+ /** @var IConfig */
	37	+ private $config;
	38	+ /** @var IManager */
	39	+ private $manager;
40	40
41		- public function __construct(IConfig $config,
42		- IManager $manager) {
43		- $this->config = $config;
44		- $this->manager = $manager;
45		- }
	41	+ public function __construct(IConfig $config,
	42	+ IManager $manager) {
	43	+ $this->config = $config;
	44	+ $this->manager = $manager;
	45	+ }
46	46
47		- public function getName(): string {
48		- return 'Keep legacy encryption enabled';
49		- }
	47	+ public function getName(): string {
	48	+ return 'Keep legacy encryption enabled';
	49	+ }
50	50
51		- private function shouldRun(): bool {
52		- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
53		- return version_compare($versionFromBeforeUpdate, '20.0.0.0', '<=');
54		- }
	51	+ private function shouldRun(): bool {
	52	+ $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
	53	+ return version_compare($versionFromBeforeUpdate, '20.0.0.0', '<=');
	54	+ }
55	55
56		- public function run(IOutput $output): void {
57		- if (!$this->shouldRun()) {
58		- return;
59		- }
	56	+ public function run(IOutput $output): void {
	57	+ if (!$this->shouldRun()) {
	58	+ return;
	59	+ }
60	60
61		- if ($this->manager->isEnabled()) {
62		- if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
63		- $this->config->setSystemValue('encryption.legacy_format_support', true);
64		- }
65		- }
66		- }
	61	+ if ($this->manager->isEnabled()) {
	62	+ if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
	63	+ $this->config->setSystemValue('encryption.legacy_format_support', true);
	64	+ }
	65	+ }
	66	+ }
67	67	}

		@@ -33,35 +33,35 @@
		block discarded – undo
33	33
34	34	class EncryptionMigration implements IRepairStep {
35	35
36		- /** @var IConfig */
37		- private $config;
38		- /** @var IManager */
39		- private $manager;
	36	+ /** @var IConfig */
	37	+ private $config;
	38	+ /** @var IManager */
	39	+ private $manager;
40	40
41		- public function __construct(IConfig $config,
42		- IManager $manager) {
43		- $this->config = $config;
44		- $this->manager = $manager;
45		- }
	41	+ public function __construct(IConfig $config,
	42	+ IManager $manager) {
	43	+ $this->config = $config;
	44	+ $this->manager = $manager;
	45	+ }
46	46
47		- public function getName(): string {
48		- return 'Check encryption key format';
49		- }
	47	+ public function getName(): string {
	48	+ return 'Check encryption key format';
	49	+ }
50	50
51		- private function shouldRun(): bool {
52		- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
53		- return version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=');
54		- }
	51	+ private function shouldRun(): bool {
	52	+ $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
	53	+ return version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=');
	54	+ }
55	55
56		- public function run(IOutput $output): void {
57		- if (!$this->shouldRun()) {
58		- return;
59		- }
	56	+ public function run(IOutput $output): void {
	57	+ if (!$this->shouldRun()) {
	58	+ return;
	59	+ }
60	60
61		- if ($this->manager->isEnabled()) {
62		- if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
63		- $this->config->setSystemValue('encryption.key_storage_migrated', false);
64		- }
65		- }
66		- }
	61	+ if ($this->manager->isEnabled()) {
	62	+ if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
	63	+ $this->config->setSystemValue('encryption.key_storage_migrated', false);
	64	+ }
	65	+ }
	66	+ }
67	67	}

nextcloud / server

Push — master ( 0d3004...7fd760 )

Status

Category

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch