nextcloud / server

tests/lib/Security/Normalizer/IpAddressTest.php

Spacing +1 added lines, -1 removed lines

@@ -65,6 +65,6 @@
 	}
 
 	public function testToString(): void {
-		$this->assertSame('127.0.0.1', (string)(new IpAddress('127.0.0.1')));
+		$this->assertSame('127.0.0.1', (string) (new IpAddress('127.0.0.1')));
 	}
 }

tests/lib/Security/TrustedDomainHelperTest.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 			]);
 
 		$trustedDomainHelper = new TrustedDomainHelper($this->config);
-		$this->assertEquals($result, $trustedDomainHelper->isTrustedUrl('https://' . $testDomain . '/index.php/something'));
+		$this->assertEquals($result, $trustedDomainHelper->isTrustedUrl('https://'.$testDomain.'/index.php/something'));
 	}
 
 	/**

tests/lib/Security/CertificateTest.php

Spacing +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@ 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$goodCertificate = file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt');
+		$goodCertificate = file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt');
 		$this->goodCertificate = new Certificate($goodCertificate, 'GoodCertificate');
-		$badCertificate = file_get_contents(__DIR__ . '/../../data/certificates/badCertificate.crt');
+		$badCertificate = file_get_contents(__DIR__.'/../../data/certificates/badCertificate.crt');
 		$this->invalidCertificate = new Certificate($badCertificate, 'BadCertificate');
-		$expiredCertificate = file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt');
+		$expiredCertificate = file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt');
 		$this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate');
 	}
 
@@ -41,7 +41,7 @@ 
 	}
 
 	public function testOpenSslTrustedCertificateFormat(): void {
-		$trustedCertificate = file_get_contents(__DIR__ . '/../../data/certificates/openSslTrustedCertificate.crt');
+		$trustedCertificate = file_get_contents(__DIR__.'/../../data/certificates/openSslTrustedCertificate.crt');
 		$certificate = new Certificate($trustedCertificate, 'TrustedCertificate');
 		$this->assertSame('thawte, Inc.', $certificate->getOrganization());
 	}
@@ -50,7 +50,7 @@ 
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Certificate could not get parsed.');
 
-		new Certificate('file://' . __DIR__ . '/../../data/certificates/goodCertificate.crt', 'bar');
+		new Certificate('file://'.__DIR__.'/../../data/certificates/goodCertificate.crt', 'bar');
 	}
 
 	public function testGetName(): void {

tests/lib/Security/VerificationToken/VerificationTokenTest.php

Spacing +6 added lines, -6 removed lines

@@ -104,7 +104,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willThrowException(new \Exception('decryption failed'));
 
 		$this->expectException(InvalidTokenException::class);
@@ -131,7 +131,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willReturn('decrypted^nonsense');
 
 		$this->expectException(InvalidTokenException::class);
@@ -161,7 +161,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willReturn('604800:mY70K3n');
 
 		$this->timeFactory->expects($this->any())
@@ -195,7 +195,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willReturn('604800:mY70K3n');
 
 		$this->timeFactory->expects($this->any())
@@ -229,7 +229,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willReturn('604802:mY70K3n');
 
 		$this->timeFactory->expects($this->any())
@@ -263,7 +263,7 @@ 
 			->willReturn('357111317');
 
 		$this->crypto->method('decrypt')
-			->with('encryptedToken', 'foobar' . '357111317')
+			->with('encryptedToken', 'foobar'.'357111317')
 			->willReturn('604802:barfoo');
 
 		$this->timeFactory->expects($this->any())

tests/lib/Security/Ip/RemoteAddressTest.php

Spacing +2 added lines, -2 removed lines

@@ -68,12 +68,12 @@
 			['1.2.3.4', ['1.2.3.*'], true],
 			['fc00:1:2:3::1', ['fc00::/7'], true],
 			['1.2.3.4', ['192.168.1.2/24', '1.2.3.0/24'], true],
-			['1234:4567:8910::1', ['fe80::/8','1234:4567::/16'], true],
+			['1234:4567:8910::1', ['fe80::/8', '1234:4567::/16'], true],
 			// Blocked IP
 			['192.168.1.5', ['1.2.3.*'], false],
 			['9234:4567:8910::', ['1234:4567::1'], false],
 			['192.168.2.1', ['192.168.1.2/24', '1.2.3.0/24'], false],
-			['9234:4567:8910::', ['fe80::/8','1234:4567::/16'], false],
+			['9234:4567:8910::', ['fe80::/8', '1234:4567::/16'], false],
 		];
 	}
 }

tests/lib/Security/Ip/BruteforceAllowListTest.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 			->willReturn(array_keys($allowList));
 
 		$this->appConfig->method('getValueString')
-			->willReturnCallback(function ($app, $key, $default) use ($allowList) {
+			->willReturnCallback(function($app, $key, $default) use ($allowList) {
 				if ($app !== 'bruteForce') {
 					return $default;
 				}

tests/lib/Security/HasherTest.php

Spacing +7 added lines, -7 removed lines

@@ -115,7 +115,7 @@ 
 		$this->config = $this->createMock(IConfig::class);
 
 		$this->config->method('getSystemValueInt')
-			->willReturnCallback(function ($name, $default) {
+			->willReturnCallback(function($name, $default) {
 				return $default;
 			});
 
@@ -143,7 +143,7 @@ 
 		$this->config
 			->expects($this->any())
 			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
+			->willReturnCallback(function($key, $default) {
 				if ($key === 'passwordsalt') {
 					return '6Wow67q1wZQZpUUeI6G2LsWUu4XKx';
 				}
@@ -185,13 +185,13 @@ 
 
 		$message = 'mysecret';
 
-		$blowfish = 1 . '|' . password_hash($message, PASSWORD_BCRYPT, []);
-		$argon2 = 2 . '|' . password_hash($message, PASSWORD_ARGON2I, []);
+		$blowfish = 1.'|'.password_hash($message, PASSWORD_BCRYPT, []);
+		$argon2 = 2.'|'.password_hash($message, PASSWORD_ARGON2I, []);
 
 		$newAlg = PASSWORD_ARGON2I;
 		if (\defined('PASSWORD_ARGON2ID')) {
 			$newAlg = PASSWORD_ARGON2ID;
-			$argon2 = 2 . '|' . password_hash($message, PASSWORD_ARGON2ID, []);
+			$argon2 = 2.'|'.password_hash($message, PASSWORD_ARGON2ID, []);
 		}
 
 
@@ -214,7 +214,7 @@ 
 
 		$message = 'mysecret';
 
-		$argon2i = 2 . '|' . password_hash($message, PASSWORD_ARGON2I, []);
+		$argon2i = 2.'|'.password_hash($message, PASSWORD_ARGON2I, []);
 
 		$newHash = null;
 		$this->assertTrue($this->hasher->verify($message, $argon2i, $newHash));
@@ -238,7 +238,7 @@ 
 
 		$message = 'mysecret';
 
-		$argon2id = 3 . '|' . password_hash($message, PASSWORD_ARGON2ID, []);
+		$argon2id = 3.'|'.password_hash($message, PASSWORD_ARGON2ID, []);
 
 		$newHash = null;
 		$this->assertTrue($this->hasher->verify($message, $argon2id, $newHash));

tests/lib/Template/JSResourceLocatorTest.php

Spacing +11 added lines, -11 removed lines

@@ -57,12 +57,12 @@ 
 	}
 
 	private function rrmdir($directory) {
-		$files = array_diff(scandir($directory), ['.','..']);
+		$files = array_diff(scandir($directory), ['.', '..']);
 		foreach ($files as $file) {
-			if (is_dir($directory . '/' . $file)) {
-				$this->rrmdir($directory . '/' . $file);
+			if (is_dir($directory.'/'.$file)) {
+				$this->rrmdir($directory.'/'.$file);
 			} else {
-				unlink($directory . '/' . $file);
+				unlink($directory.'/'.$file);
 			}
 		}
 		return rmdir($directory);
@@ -77,15 +77,15 @@ 
 
 		// First create new apps path, and a symlink to it
 		$apps_dirname = $this->randomString();
-		$new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
-		$new_apps_path_symlink = $new_apps_path . '_link';
+		$new_apps_path = sys_get_temp_dir().'/'.$apps_dirname;
+		$new_apps_path_symlink = $new_apps_path.'_link';
 		$this->assertTrue((
 			mkdir($new_apps_path) && symlink($apps_dirname, $new_apps_path_symlink)
 		), 'Setup of apps path failed');
 
 		// Create an app within that path
 		$this->assertTrue((
-			mkdir($new_apps_path . '/' . $appName) && touch($new_apps_path . '/' . $appName . '/' . 'test-file.js')
+			mkdir($new_apps_path.'/'.$appName) && touch($new_apps_path.'/'.$appName.'/'.'test-file.js')
 		), 'Setup of app within the new apps path failed');
 
 		// Use the symlink as the app path
@@ -111,8 +111,8 @@ 
 		$file = $resource[2];
 
 		$expectedRoot = $new_apps_path;
-		$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test';
-		$expectedFile = $appName . '/test-file.js';
+		$expectedWebRoot = \OC::$WEBROOT.'/js-apps-test';
+		$expectedFile = $appName.'/test-file.js';
 
 		$this->assertEquals($expectedRoot, $root,
 			'Ensure the app path symlink is resolved into the real path');
@@ -147,7 +147,7 @@ 
 	public function testFindModuleJSWithFallback(): void {
 		// First create new apps path, and a symlink to it
 		$apps_dirname = $this->randomString();
-		$new_apps_path = sys_get_temp_dir() . '/' . $apps_dirname;
+		$new_apps_path = sys_get_temp_dir().'/'.$apps_dirname;
 		mkdir($new_apps_path);
 
 		// Create an app within that path
@@ -169,7 +169,7 @@ 
 		$resources = $locator->getResources();
 		$this->assertCount(3, $resources);
 
-		$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app';
+		$expectedWebRoot = \OC::$WEBROOT.'/js-apps-test/test-js-app';
 		$expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];
 
 		for ($idx = 0; $idx++; $idx < 3) {

tests/lib/TemplateLayoutTest.php

Spacing +3 added lines, -3 removed lines

@@ -98,9 +98,9 @@
 			'only version hash if not installed' => ['apps/shipped', 'style.css', false, false, '?v=version_hash'],
 			'version hash with cache buster if app not found' => ['unknown/path', '', true, false, '?v=version_hash-42'],
 			'version hash with cache buster if neither path nor file provided' => [false, false, true, false, '?v=version_hash-42'],
-			'app version hash if external app' => ['', 'other/app.css', true, false, '?v=' . substr(md5('other_2'), 0, 8) . '-42'],
-			'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
-			'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v=' . substr(md5('shipped_1-version_hash'), 0, 8) . '-42'],
+			'app version hash if external app' => ['', 'other/app.css', true, false, '?v='.substr(md5('other_2'), 0, 8).'-42'],
+			'app version and version hash if shipped app' => ['apps/shipped', 'style.css', true, false, '?v='.substr(md5('shipped_1-version_hash'), 0, 8).'-42'],
+			'prefer path over file' => ['apps/shipped', 'other/app.css', true, false, '?v='.substr(md5('shipped_1-version_hash'), 0, 8).'-42'],
 		];
 	}