nextcloud / server

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'],
 		];
 	}
 

tests/lib/Cache/TestCache.php

Spacing +4 added lines, -4 removed lines

@@ -52,10 +52,10 @@
 
 	public function testClear(): void {
 		$value = 'ipsum lorum';
-		$this->instance->set('1_value1', $value . '1');
-		$this->instance->set('1_value2', $value . '2');
-		$this->instance->set('2_value1', $value . '3');
-		$this->instance->set('3_value1', $value . '4');
+		$this->instance->set('1_value1', $value.'1');
+		$this->instance->set('1_value2', $value.'2');
+		$this->instance->set('2_value1', $value.'3');
+		$this->instance->set('3_value1', $value.'4');
 
 		$this->assertEquals([
 			'1_value1' => 'ipsum lorum1',

tests/lib/Lock/DBLockingProviderTest.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->timeFactory->expects($this->any())
 			->method('getTime')
-			->willReturnCallback(function () {
+			->willReturnCallback(function() {
 				return $this->currentTime;
 			});
 		parent::setUp();

tests/lib/Mail/MailerTest.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 			$path = '/usr/sbin/sendmail';
 		}
 
-		$expected = new SendmailTransport($path . $binaryParam, null, $this->logger);
+		$expected = new SendmailTransport($path.$binaryParam, null, $this->logger);
 		$this->assertEquals($expected, self::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 
@@ -110,7 +110,7 @@ 
 				['mail_sendmailmode', 'smtp', $sendmailMode],
 			]);
 
-		$sendmail = new SendmailTransport('/var/qmail/bin/sendmail' . $binaryParam, null, $this->logger);
+		$sendmail = new SendmailTransport('/var/qmail/bin/sendmail'.$binaryParam, null, $this->logger);
 		$this->assertEquals($sendmail, self::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 

tests/lib/Mail/EMailTemplateTest.php

Spacing +8 added lines, -8 removed lines

@@ -80,9 +80,9 @@ 
 			'TestCloud - A safe home for your data<br>This is an automatically sent email, please do not reply.'
 		);
 
-		$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.html');
+		$expectedHTML = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email.html');
 		$this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
-		$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.txt');
+		$expectedTXT = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email.txt');
 		$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
 	}
 
@@ -123,9 +123,9 @@ 
 		);
 		$this->emailTemplate->addFooter();
 
-		$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.html');
+		$expectedHTML = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-custom.html');
 		$this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
-		$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.txt');
+		$expectedTXT = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-custom.txt');
 		$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
 	}
 
@@ -166,9 +166,9 @@ 
 		);
 		$this->emailTemplate->addFooter();
 
-		$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-single-button.html');
+		$expectedHTML = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-single-button.html');
 		$this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
-		$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-single-button.txt');
+		$expectedTXT = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-single-button.txt');
 		$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
 	}
 
@@ -212,9 +212,9 @@ 
 		);
 		$this->emailTemplate->addFooter();
 
-		$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom.html');
+		$expectedHTML = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-custom.html');
 		$this->assertSame($expectedHTML, $this->emailTemplate->renderHtml());
-		$expectedTXT = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email-custom-text-alternative.txt');
+		$expectedTXT = file_get_contents(\OC::$SERVERROOT.'/tests/data/emails/new-account-email-custom-text-alternative.txt');
 		$this->assertSame($expectedTXT, $this->emailTemplate->renderText());
 	}
 }

tests/lib/Remote/Api/OCSTest.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	}
 
 	protected function getOCSUrl($url) {
-		return 'https://example.com/ocs/v2.php/' . $url;
+		return 'https://example.com/ocs/v2.php/'.$url;
 	}
 
 	public function testGetUser(): void {

tests/lib/TempManagerTest.php

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->baseDir = $this->getManager()->getTempBaseDir() . $this->getUniqueID('/oc_tmp_test');
+		$this->baseDir = $this->getManager()->getTempBaseDir().$this->getUniqueID('/oc_tmp_test');
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
@@ -73,8 +73,8 @@ 
 		$this->assertTrue(is_dir($folder));
 		$this->assertTrue(is_writable($folder));
 
-		file_put_contents($folder . 'foo.txt', 'bar');
-		$this->assertEquals('bar', file_get_contents($folder . 'foo.txt'));
+		file_put_contents($folder.'foo.txt', 'bar');
+		$this->assertEquals('bar', file_get_contents($folder.'foo.txt'));
 	}
 
 	public function testCleanFiles(): void {
@@ -94,19 +94,19 @@ 
 		$manager = $this->getManager();
 		$folder1 = $manager->getTemporaryFolder();
 		$folder2 = $manager->getTemporaryFolder();
-		touch($folder1 . 'foo.txt');
-		touch($folder1 . 'bar.txt');
+		touch($folder1.'foo.txt');
+		touch($folder1.'bar.txt');
 		$this->assertTrue(file_exists($folder1));
 		$this->assertTrue(file_exists($folder2));
-		$this->assertTrue(file_exists($folder1 . 'foo.txt'));
-		$this->assertTrue(file_exists($folder1 . 'bar.txt'));
+		$this->assertTrue(file_exists($folder1.'foo.txt'));
+		$this->assertTrue(file_exists($folder1.'bar.txt'));
 
 		$manager->clean();
 
 		$this->assertFalse(file_exists($folder1));
 		$this->assertFalse(file_exists($folder2));
-		$this->assertFalse(file_exists($folder1 . 'foo.txt'));
-		$this->assertFalse(file_exists($folder1 . 'bar.txt'));
+		$this->assertFalse(file_exists($folder1.'foo.txt'));
+		$this->assertFalse(file_exists($folder1.'bar.txt'));
 	}
 
 	public function testCleanOld(): void {
@@ -114,7 +114,7 @@ 
 		$oldFile = $manager->getTemporaryFile('txt');
 		$newFile = $manager->getTemporaryFile('txt');
 		$folder = $manager->getTemporaryFolder();
-		$nonOcFile = $this->baseDir . '/foo.txt';
+		$nonOcFile = $this->baseDir.'/foo.txt';
 		file_put_contents($nonOcFile, 'bar');
 
 		$past = time() - 2 * 3600;

tests/lib/Files/SimpleFS/InMemoryFileTest.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function setupTestPdf() {
 		$fileContents = file_get_contents(
-			__DIR__ . '/../../../data/test.pdf'
+			__DIR__.'/../../../data/test.pdf'
 		);
 		$this->testPdf = new InMemoryFile('test.pdf', $fileContents);
 	}
@@ -85,7 +85,7 @@ 
 	 */
 	public function testGetContent(): void {
 		self::assertEquals(
-			file_get_contents(__DIR__ . '/../../../data/test.pdf'),
+			file_get_contents(__DIR__.'/../../../data/test.pdf'),
 			$this->testPdf->getContent()
 		);
 	}