nextcloud / server

tests/lib/App/AppStore/Bundles/BundleFetcherTest.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
 use Test\TestCase;
 
 class BundleFetcherTest extends TestCase {
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l10n;
-	/** @var BundleFetcher */
-	private $bundleFetcher;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-
-		$this->bundleFetcher = new BundleFetcher(
-			$this->l10n
-		);
-	}
-
-	public function testGetBundles(): void {
-		$expected = [
-			new EnterpriseBundle($this->l10n),
-			new HubBundle($this->l10n),
-			new GroupwareBundle($this->l10n),
-			new SocialSharingBundle($this->l10n),
-			new EducationBundle($this->l10n),
-			new PublicSectorBundle($this->l10n),
-		];
-		$this->assertEquals($expected, $this->bundleFetcher->getBundles());
-	}
-
-	public function testGetBundleByIdentifier(): void {
-		$this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle'));
-		$this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));
-	}
-
-
-	public function testGetBundleByIdentifierWithException(): void {
-		$this->expectException(\BadMethodCallException::class);
-		$this->expectExceptionMessage('Bundle with specified identifier does not exist');
-
-		$this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
-	}
+    /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
+    private $l10n;
+    /** @var BundleFetcher */
+    private $bundleFetcher;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->l10n = $this->createMock(IL10N::class);
+
+        $this->bundleFetcher = new BundleFetcher(
+            $this->l10n
+        );
+    }
+
+    public function testGetBundles(): void {
+        $expected = [
+            new EnterpriseBundle($this->l10n),
+            new HubBundle($this->l10n),
+            new GroupwareBundle($this->l10n),
+            new SocialSharingBundle($this->l10n),
+            new EducationBundle($this->l10n),
+            new PublicSectorBundle($this->l10n),
+        ];
+        $this->assertEquals($expected, $this->bundleFetcher->getBundles());
+    }
+
+    public function testGetBundleByIdentifier(): void {
+        $this->assertEquals(new EnterpriseBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('EnterpriseBundle'));
+        $this->assertEquals(new GroupwareBundle($this->l10n), $this->bundleFetcher->getBundleByIdentifier('GroupwareBundle'));
+    }
+
+
+    public function testGetBundleByIdentifierWithException(): void {
+        $this->expectException(\BadMethodCallException::class);
+        $this->expectExceptionMessage('Bundle with specified identifier does not exist');
+
+        $this->bundleFetcher->getBundleByIdentifier('NotExistingBundle');
+    }
 }

tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php

Indentation +12 added lines, -12 removed lines

@@ -9,16 +9,16 @@
 use OC\App\AppStore\Bundles\SocialSharingBundle;
 
 class SocialSharingBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new SocialSharingBundle($this->l10n);
-		$this->bundleIdentifier = 'SocialSharingBundle';
-		$this->bundleName = 'Social sharing bundle';
-		$this->bundleAppIds = [
-			'socialsharing_twitter',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new SocialSharingBundle($this->l10n);
+        $this->bundleIdentifier = 'SocialSharingBundle';
+        $this->bundleName = 'Social sharing bundle';
+        $this->bundleAppIds = [
+            'socialsharing_twitter',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 }

tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 use OC\App\AppStore\Bundles\EnterpriseBundle;
 
 class EnterpriseBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new EnterpriseBundle($this->l10n);
-		$this->bundleIdentifier = 'EnterpriseBundle';
-		$this->bundleName = 'Enterprise bundle';
-		$this->bundleAppIds = [
-			'admin_audit',
-			'user_ldap',
-			'files_retention',
-			'files_automatedtagging',
-			'user_saml',
-			'files_accesscontrol',
-			'terms_of_service',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new EnterpriseBundle($this->l10n);
+        $this->bundleIdentifier = 'EnterpriseBundle';
+        $this->bundleName = 'Enterprise bundle';
+        $this->bundleAppIds = [
+            'admin_audit',
+            'user_ldap',
+            'files_retention',
+            'files_automatedtagging',
+            'user_saml',
+            'files_accesscontrol',
+            'terms_of_service',
+        ];
+    }
 }

tests/lib/App/AppStore/Fetcher/FetcherBase.php

Indentation +648 added lines, -648 removed lines

@@ -23,652 +23,652 @@
 use Test\TestCase;
 
 abstract class FetcherBase extends TestCase {
-	/** @var Factory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appDataFactory;
-	/** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
-	protected $appData;
-	/** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
-	protected $clientService;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $timeFactory;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	protected $logger;
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	protected $registry;
-	/** @var Fetcher */
-	protected $fetcher;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpoint;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appDataFactory = $this->createMock(Factory::class);
-		$this->appData = $this->createMock(AppData::class);
-		$this->appDataFactory->expects($this->once())
-			->method('get')
-			->with('appstore')
-			->willReturn($this->appData);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->registry = $this->createMock(IRegistry::class);
-	}
-
-	public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				if ($var === 'version') {
-					return '11.0.0.2';
-				}
-				return $default;
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn('{"timestamp":1200,"data":[{"id":"MyApp"}],"ncversion":"11.0.0.2"}');
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1499);
-
-		$expected = [
-			[
-				'id' => 'MyApp',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				if ($var === 'appstoreurl') {
-					return 'https://apps.nextcloud.com/api/v1';
-				} elseif ($var === 'version') {
-					return '11.0.0.2';
-				}
-				return $default;
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willThrowException(new NotFoundException());
-		$folder
-			->expects($this->once())
-			->method('newFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn($fileData);
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1502);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'version') {
-					return '11.0.0.2';
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}',
-				$fileData
-			);
-		$this->timeFactory
-			->expects($this->exactly(2))
-			->method('getTime')
-			->willReturnOnConsecutiveCalls(
-				4801,
-				1502
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndNoVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				if ($var === 'appstoreurl') {
-					return 'https://apps.nextcloud.com/api/v1';
-				} elseif ($var === 'version') {
-					return '11.0.0.2';
-				}
-				return $default;
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}',
-				$fileData
-			);
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1201);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithAlreadyExistingFileAndOutdatedVersion(): void {
-		$this->config
-			->method('getSystemValueString')
-			->willReturnCallback(function ($var, $default) {
-				if ($var === 'appstoreurl') {
-					return 'https://apps.nextcloud.com/api/v1';
-				} elseif ($var === 'version') {
-					return '11.0.0.2';
-				}
-				return $default;
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"',
-				$fileData
-			);
-		$this->timeFactory
-			->method('getTime')
-			->willReturn(1201);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willReturn($response);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"myETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetWithExceptionInClient(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnArgument(1);
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$file
-			->expects($this->once())
-			->method('getContent')
-			->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with($this->endpoint)
-			->willThrowException(new \Exception());
-
-		$this->assertSame([], $this->fetcher->get());
-	}
-
-	public function testGetMatchingETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'version') {
-					return '11.0.0.2';
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$origData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-
-		$newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($newData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				$origData,
-				$newData,
-			);
-		$this->timeFactory
-			->expects($this->exactly(2))
-			->method('getTime')
-			->willReturnOnConsecutiveCalls(
-				4801,
-				4802
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-					'headers' => [
-						'If-None-Match' => '"myETag"'
-					]
-				])
-			)->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(304);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-	public function testGetNoMatchingETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'version') {
-					return '11.0.0.2';
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"newETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
-				$fileData,
-			);
-		$this->timeFactory
-			->expects($this->exactly(2))
-			->method('getTime')
-			->willReturnOnConsecutiveCalls(
-				4801,
-				4802,
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-					'headers' => [
-						'If-None-Match' => '"myETag"',
-					]
-				])
-			)
-			->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(200);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"newETag"');
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
-
-
-	public function testFetchAfterUpgradeNoETag(): void {
-		$this->config->method('getSystemValueString')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'version') {
-					return '11.0.0.3';
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getSystemValueBool')
-			->willReturnArgument(1);
-
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$this->appData
-			->expects($this->once())
-			->method('getFolder')
-			->with('/')
-			->willReturn($folder);
-		$folder
-			->expects($this->once())
-			->method('getFile')
-			->with($this->fileName)
-			->willReturn($file);
-		$fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1501,"ncversion":"11.0.0.3","ETag":"\"newETag\""}';
-		$file
-			->expects($this->once())
-			->method('putContent')
-			->with($fileData);
-		$file
-			->expects($this->exactly(2))
-			->method('getContent')
-			->willReturnOnConsecutiveCalls(
-				'{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
-				$fileData
-			);
-		$client = $this->createMock(IClient::class);
-		$this->clientService
-			->expects($this->once())
-			->method('newClient')
-			->willReturn($client);
-		$response = $this->createMock(IResponse::class);
-		$client
-			->expects($this->once())
-			->method('get')
-			->with(
-				$this->equalTo($this->endpoint),
-				$this->equalTo([
-					'timeout' => 60,
-				])
-			)
-			->willReturn($response);
-		$response->method('getStatusCode')
-			->willReturn(200);
-		$response
-			->expects($this->once())
-			->method('getBody')
-			->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
-		$response->method('getHeader')
-			->with($this->equalTo('ETag'))
-			->willReturn('"newETag"');
-		$this->timeFactory
-			->expects($this->once())
-			->method('getTime')
-			->willReturn(1501);
-
-		$expected = [
-			[
-				'id' => 'MyNewApp',
-				'foo' => 'foo',
-			],
-			[
-				'id' => 'bar',
-			],
-		];
-		$this->assertSame($expected, $this->fetcher->get());
-	}
+    /** @var Factory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $appDataFactory;
+    /** @var IAppData|\PHPUnit\Framework\MockObject\MockObject */
+    protected $appData;
+    /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
+    protected $clientService;
+    /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $timeFactory;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    protected $logger;
+    /** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
+    protected $registry;
+    /** @var Fetcher */
+    protected $fetcher;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpoint;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appDataFactory = $this->createMock(Factory::class);
+        $this->appData = $this->createMock(AppData::class);
+        $this->appDataFactory->expects($this->once())
+            ->method('get')
+            ->with('appstore')
+            ->willReturn($this->appData);
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->registry = $this->createMock(IRegistry::class);
+    }
+
+    public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                if ($var === 'version') {
+                    return '11.0.0.2';
+                }
+                return $default;
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn('{"timestamp":1200,"data":[{"id":"MyApp"}],"ncversion":"11.0.0.2"}');
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1499);
+
+        $expected = [
+            [
+                'id' => 'MyApp',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                if ($var === 'appstoreurl') {
+                    return 'https://apps.nextcloud.com/api/v1';
+                } elseif ($var === 'version') {
+                    return '11.0.0.2';
+                }
+                return $default;
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willThrowException(new NotFoundException());
+        $folder
+            ->expects($this->once())
+            ->method('newFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn($fileData);
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1502);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndOutdatedTimestamp(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'version') {
+                    return '11.0.0.2';
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.2"}',
+                $fileData
+            );
+        $this->timeFactory
+            ->expects($this->exactly(2))
+            ->method('getTime')
+            ->willReturnOnConsecutiveCalls(
+                4801,
+                1502
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndNoVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                if ($var === 'appstoreurl') {
+                    return 'https://apps.nextcloud.com/api/v1';
+                } elseif ($var === 'version') {
+                    return '11.0.0.2';
+                }
+                return $default;
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}',
+                $fileData
+            );
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1201);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithAlreadyExistingFileAndOutdatedVersion(): void {
+        $this->config
+            ->method('getSystemValueString')
+            ->willReturnCallback(function ($var, $default) {
+                if ($var === 'appstoreurl') {
+                    return 'https://apps.nextcloud.com/api/v1';
+                } elseif ($var === 'version') {
+                    return '11.0.0.2';
+                }
+                return $default;
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1201,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}},"ncversion":"11.0.0.1"',
+                $fileData
+            );
+        $this->timeFactory
+            ->method('getTime')
+            ->willReturn(1201);
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willReturn($response);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"myETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetWithExceptionInClient(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnArgument(1);
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $file
+            ->expects($this->once())
+            ->method('getContent')
+            ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->endpoint)
+            ->willThrowException(new \Exception());
+
+        $this->assertSame([], $this->fetcher->get());
+    }
+
+    public function testGetMatchingETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'version') {
+                    return '11.0.0.2';
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $origData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+
+        $newData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"myETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($newData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                $origData,
+                $newData,
+            );
+        $this->timeFactory
+            ->expects($this->exactly(2))
+            ->method('getTime')
+            ->willReturnOnConsecutiveCalls(
+                4801,
+                4802
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                    'headers' => [
+                        'If-None-Match' => '"myETag"'
+                    ]
+                ])
+            )->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(304);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+    public function testGetNoMatchingETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'version') {
+                    return '11.0.0.2';
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":4802,"ncversion":"11.0.0.2","ETag":"\"newETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
+                $fileData,
+            );
+        $this->timeFactory
+            ->expects($this->exactly(2))
+            ->method('getTime')
+            ->willReturnOnConsecutiveCalls(
+                4801,
+                4802,
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                    'headers' => [
+                        'If-None-Match' => '"myETag"',
+                    ]
+                ])
+            )
+            ->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(200);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"newETag"');
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
+
+
+    public function testFetchAfterUpgradeNoETag(): void {
+        $this->config->method('getSystemValueString')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'version') {
+                    return '11.0.0.3';
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getSystemValueBool')
+            ->willReturnArgument(1);
+
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $this->appData
+            ->expects($this->once())
+            ->method('getFolder')
+            ->with('/')
+            ->willReturn($folder);
+        $folder
+            ->expects($this->once())
+            ->method('getFile')
+            ->with($this->fileName)
+            ->willReturn($file);
+        $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1501,"ncversion":"11.0.0.3","ETag":"\"newETag\""}';
+        $file
+            ->expects($this->once())
+            ->method('putContent')
+            ->with($fileData);
+        $file
+            ->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                '{"data":[{"id":"MyOldApp","abc":"def"}],"timestamp":1200,"ncversion":"11.0.0.2","ETag":"\"myETag\""}',
+                $fileData
+            );
+        $client = $this->createMock(IClient::class);
+        $this->clientService
+            ->expects($this->once())
+            ->method('newClient')
+            ->willReturn($client);
+        $response = $this->createMock(IResponse::class);
+        $client
+            ->expects($this->once())
+            ->method('get')
+            ->with(
+                $this->equalTo($this->endpoint),
+                $this->equalTo([
+                    'timeout' => 60,
+                ])
+            )
+            ->willReturn($response);
+        $response->method('getStatusCode')
+            ->willReturn(200);
+        $response
+            ->expects($this->once())
+            ->method('getBody')
+            ->willReturn('[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}]');
+        $response->method('getHeader')
+            ->with($this->equalTo('ETag'))
+            ->willReturn('"newETag"');
+        $this->timeFactory
+            ->expects($this->once())
+            ->method('getTime')
+            ->willReturn(1501);
+
+        $expected = [
+            [
+                'id' => 'MyNewApp',
+                'foo' => 'foo',
+            ],
+            [
+                'id' => 'bar',
+            ],
+        ];
+        $this->assertSame($expected, $this->fetcher->get());
+    }
 }

tests/lib/App/AppStore/Version/VersionTest.php

Indentation +8 added lines, -8 removed lines

@@ -10,13 +10,13 @@
 use Test\TestCase;
 
 class VersionTest extends TestCase {
-	public function testGetMinimumVersion(): void {
-		$version = new Version('9', '10');
-		$this->assertSame('9', $version->getMinimumVersion());
-	}
+    public function testGetMinimumVersion(): void {
+        $version = new Version('9', '10');
+        $this->assertSame('9', $version->getMinimumVersion());
+    }
 
-	public function testGetMaximumVersion(): void {
-		$version = new Version('9', '10');
-		$this->assertSame('10', $version->getMaximumVersion());
-	}
+    public function testGetMaximumVersion(): void {
+        $version = new Version('9', '10');
+        $this->assertSame('10', $version->getMaximumVersion());
+    }
 }

tests/lib/Traits/ClientServiceTrait.php

Indentation +83 added lines, -83 removed lines

@@ -11,95 +11,95 @@
 use OCP\Http\Client\IResponse;
 
 trait ClientServiceTrait {
-	/** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
-	private $clientService;
-	/** @var IClient|\PHPUnit\Framework\MockObject\MockObject */
-	private $client;
-	private $expectedGetRequests = [];
-	private $expectedPostRequests = [];
+    /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */
+    private $clientService;
+    /** @var IClient|\PHPUnit\Framework\MockObject\MockObject */
+    private $client;
+    private $expectedGetRequests = [];
+    private $expectedPostRequests = [];
 
-	/**
-	 * Wrapper to be forward compatible to phpunit 5.4+
-	 *
-	 * @param string $originalClassName
-	 * @return \PHPUnit\Framework\MockObject\MockObject
-	 */
-	abstract protected function createMock(string $originalClassName);
+    /**
+     * Wrapper to be forward compatible to phpunit 5.4+
+     *
+     * @param string $originalClassName
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
+    abstract protected function createMock(string $originalClassName);
 
-	/**
-	 * Returns a matcher that matches when the method is executed
-	 * zero or more times.
-	 *
-	 * @return \PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
-	 *
-	 * @since  Method available since Release 3.0.0
-	 */
-	abstract public static function any();
+    /**
+     * Returns a matcher that matches when the method is executed
+     * zero or more times.
+     *
+     * @return \PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
+     *
+     * @since  Method available since Release 3.0.0
+     */
+    abstract public static function any();
 
-	protected function setUpClientServiceTrait() {
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->client = $this->createMock(IClient::class);
-		$this->clientService->expects($this->any())
-			->method('newClient')
-			->willReturn($this->client);
-		$this->client->expects($this->any())
-			->method('get')
-			->willReturnCallback(function ($url) {
-				if (!isset($this->expectedGetRequests[$url])) {
-					throw new \Exception('unexpected request: ' . $url);
-				}
-				$result = $this->expectedGetRequests[$url];
+    protected function setUpClientServiceTrait() {
+        $this->clientService = $this->createMock(IClientService::class);
+        $this->client = $this->createMock(IClient::class);
+        $this->clientService->expects($this->any())
+            ->method('newClient')
+            ->willReturn($this->client);
+        $this->client->expects($this->any())
+            ->method('get')
+            ->willReturnCallback(function ($url) {
+                if (!isset($this->expectedGetRequests[$url])) {
+                    throw new \Exception('unexpected request: ' . $url);
+                }
+                $result = $this->expectedGetRequests[$url];
 
-				if ($result instanceof \Exception) {
-					throw $result;
-				} else {
-					$response = $this->createMock(IResponse::class);
-					$response->expects($this->any())
-						->method('getBody')
-						->willReturn($result);
-					return $response;
-				}
-			});
-		$this->client->expects($this->any())
-			->method('post')
-			->willReturnCallback(function ($url) {
-				if (!isset($this->expectedPostRequests[$url])) {
-					throw new \Exception('unexpected request: ' . $url);
-				}
-				$result = $this->expectedPostRequests[$url];
+                if ($result instanceof \Exception) {
+                    throw $result;
+                } else {
+                    $response = $this->createMock(IResponse::class);
+                    $response->expects($this->any())
+                        ->method('getBody')
+                        ->willReturn($result);
+                    return $response;
+                }
+            });
+        $this->client->expects($this->any())
+            ->method('post')
+            ->willReturnCallback(function ($url) {
+                if (!isset($this->expectedPostRequests[$url])) {
+                    throw new \Exception('unexpected request: ' . $url);
+                }
+                $result = $this->expectedPostRequests[$url];
 
-				if ($result instanceof \Exception) {
-					throw $result;
-				} else {
-					$response = $this->createMock(IResponse::class);
-					$response->expects($this->any())
-						->method('getBody')
-						->willReturn($result);
-					return $response;
-				}
-			});
-	}
+                if ($result instanceof \Exception) {
+                    throw $result;
+                } else {
+                    $response = $this->createMock(IResponse::class);
+                    $response->expects($this->any())
+                        ->method('getBody')
+                        ->willReturn($result);
+                    return $response;
+                }
+            });
+    }
 
-	/**
-	 * @param string $url
-	 * @param string|\Exception $result
-	 */
-	protected function expectGetRequest($url, $result) {
-		$this->expectedGetRequests[$url] = $result;
-	}
+    /**
+     * @param string $url
+     * @param string|\Exception $result
+     */
+    protected function expectGetRequest($url, $result) {
+        $this->expectedGetRequests[$url] = $result;
+    }
 
-	/**
-	 * @param string $url
-	 * @param string|\Exception $result
-	 */
-	protected function expectPostRequest($url, $result) {
-		$this->expectedPostRequests[$url] = $result;
-	}
+    /**
+     * @param string $url
+     * @param string|\Exception $result
+     */
+    protected function expectPostRequest($url, $result) {
+        $this->expectedPostRequests[$url] = $result;
+    }
 
-	/**
-	 * @return IClientService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	protected function getClientService() {
-		return $this->clientService;
-	}
+    /**
+     * @return IClientService|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected function getClientService() {
+        return $this->clientService;
+    }
 }

tests/lib/Security/FeaturePolicy/AddFeaturePolicyEventTest.php

Indentation +9 added lines, -9 removed lines

@@ -14,15 +14,15 @@
 use Test\TestCase;
 
 class AddFeaturePolicyEventTest extends TestCase {
-	public function testAddEvent(): void {
-		$manager = $this->createMock(FeaturePolicyManager::class);
-		$policy = $this->createMock(FeaturePolicy::class);
-		$event = new AddFeaturePolicyEvent($manager);
+    public function testAddEvent(): void {
+        $manager = $this->createMock(FeaturePolicyManager::class);
+        $policy = $this->createMock(FeaturePolicy::class);
+        $event = new AddFeaturePolicyEvent($manager);
 
-		$manager->expects($this->once())
-			->method('addDefaultPolicy')
-			->with($policy);
+        $manager->expects($this->once())
+            ->method('addDefaultPolicy')
+            ->with($policy);
 
-		$event->addPolicy($policy);
-	}
+        $event->addPolicy($policy);
+    }
 }

tests/lib/Security/IdentityProof/SignerTest.php

Indentation +130 added lines, -130 removed lines

@@ -18,8 +18,8 @@ 
 use Test\TestCase;
 
 class SignerTest extends TestCase {
-	/** @var string */
-	private $private = '-----BEGIN PRIVATE KEY-----
+    /** @var string */
+    private $private = '-----BEGIN PRIVATE KEY-----
 MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDImc6QvHBjBIoo
 w9nnywiPNESleUuFJ2yQ3Gd/3w2BkblojlUAJAsUd/bQokjOH9d+7nqyzgSiXjRl
 iwKagY6NjcNEEq0X5KOMNwx6uEbtq3+7pA7H2JefNrnAuD+Fhp3Hyo3h1cse6hAq
@@ -48,8 +48,8 @@ 
 kC6HCb+CXsMRD7yp8KrrYnw=
 -----END PRIVATE KEY-----';
 
-	/** @var string */
-	private $public = '-----BEGIN PUBLIC KEY-----
+    /** @var string */
+    private $public = '-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJnOkLxwYwSKKMPZ58sI
 jzREpXlLhSdskNxnf98NgZG5aI5VACQLFHf20KJIzh/Xfu56ss4Eol40ZYsCmoGO
 jY3DRBKtF+SjjDcMerhG7at/u6QOx9iXnza5wLg/hYadx8qN4dXLHuoQKuma/IWg
@@ -59,130 +59,130 @@ 
 gQIDAQAB
 -----END PUBLIC KEY-----';
 
-	/** @var Key */
-	private $key;
-
-	/** @var Manager|\PHPUnit\Framework\MockObject\MockObject */
-	private $keyManager;
-
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-
-	/** @var Signer */
-	private $signer;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->key = new Key($this->public, $this->private);
-
-		$this->keyManager = $this->createMock(Manager::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->signer = new Signer(
-			$this->keyManager,
-			$this->timeFactory,
-			$this->userManager
-		);
-	}
-
-	public function testSign(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getCloudId')
-			->willReturn('foo@example.com');
-
-		$this->timeFactory->method('getTime')
-			->willReturn(42);
-
-		$this->keyManager->method('getKey')
-			->with($this->equalTo($user))
-			->willReturn($this->key);
-
-		$data = [
-			'foo' => 'bar',
-			'abc' => 'def',
-			'xyz' => 123,
-		];
-
-		$expects = [
-			'message' => [
-				'data' => $data,
-				'type' => 'myType',
-				'signer' => 'foo@example.com',
-				'timestamp' => 42,
-			],
-			'signature' => 'E1fNdoWMX1QmSyKv+S3FtOgLe9niYGQFWOKGaMLxc2h7s3V++EIqJvw/NCLBfrUowzWkTzhkjfbHaf88Hz34WAn4sAwXYAO8cnboQs6SClKRzQ/nvbtLgd2wm9RQ8UTOM7wR6C7HpIn4qqJ4BTQ1bAwYAiJ2GoK+W8wC0o0Gpub2906j3JJ4cbc9lufd5ohWKCev8Ubem/EEKaRIZA7qHh+Q1MKXTaJQJlCjTMe5PyGy0fsmtVxsPls3/Fkd9sVeHEHSYHzOiF6ttlxWou4TdRbq3WSEVpt1DOOvkKI9w2+zBJ7IPH8CnVpXcdIzWDctUygZKzNMUQnweDOOziEdUw=='
-		];
-
-		$result = $this->signer->sign('myType', $data, $user);
-
-		$this->assertEquals($expects, $result);
-	}
-
-	public function testVerifyValid(): void {
-		$data = [
-			'message' => [
-				'data' => [
-					'foo' => 'bar',
-					'abc' => 'def',
-					'xyz' => 123,
-				],
-				'type' => 'myType',
-				'signer' => 'foo@example.com',
-				'timestamp' => 42,
-			],
-			'signature' => 'E1fNdoWMX1QmSyKv+S3FtOgLe9niYGQFWOKGaMLxc2h7s3V++EIqJvw/NCLBfrUowzWkTzhkjfbHaf88Hz34WAn4sAwXYAO8cnboQs6SClKRzQ/nvbtLgd2wm9RQ8UTOM7wR6C7HpIn4qqJ4BTQ1bAwYAiJ2GoK+W8wC0o0Gpub2906j3JJ4cbc9lufd5ohWKCev8Ubem/EEKaRIZA7qHh+Q1MKXTaJQJlCjTMe5PyGy0fsmtVxsPls3/Fkd9sVeHEHSYHzOiF6ttlxWou4TdRbq3WSEVpt1DOOvkKI9w2+zBJ7IPH8CnVpXcdIzWDctUygZKzNMUQnweDOOziEdUw=='
-		];
-
-		$user = $this->createMock(IUser::class);
-
-		$this->keyManager->method('getKey')
-			->with($this->equalTo($user))
-			->willReturn($this->key);
-
-		$this->userManager->method('get')
-			->with('foo')
-			->willReturn($user);
-
-		$this->assertTrue($this->signer->verify($data));
-	}
-
-	public function testVerifyInvalid(): void {
-		$data = [
-			'message' => [
-				'data' => [
-					'foo' => 'bar',
-					'abc' => 'def',
-					'xyz' => 123,
-				],
-				'type' => 'myType',
-				'signer' => 'foo@example.com',
-				'timestamp' => 42,
-			],
-			'signature' => 'Invalid sig'
-		];
-
-		$user = $this->createMock(IUser::class);
-
-		$this->keyManager->method('getKey')
-			->with($this->equalTo($user))
-			->willReturn($this->key);
-
-		$this->userManager->method('get')
-			->with('foo')
-			->willReturn($user);
-
-		$this->assertFalse($this->signer->verify($data));
-	}
-
-	public function testVerifyInvalidData(): void {
-		$data = [
-		];
-
-		$this->assertFalse($this->signer->verify($data));
-	}
+    /** @var Key */
+    private $key;
+
+    /** @var Manager|\PHPUnit\Framework\MockObject\MockObject */
+    private $keyManager;
+
+    /** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $timeFactory;
+
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+
+    /** @var Signer */
+    private $signer;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->key = new Key($this->public, $this->private);
+
+        $this->keyManager = $this->createMock(Manager::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $this->signer = new Signer(
+            $this->keyManager,
+            $this->timeFactory,
+            $this->userManager
+        );
+    }
+
+    public function testSign(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getCloudId')
+            ->willReturn('foo@example.com');
+
+        $this->timeFactory->method('getTime')
+            ->willReturn(42);
+
+        $this->keyManager->method('getKey')
+            ->with($this->equalTo($user))
+            ->willReturn($this->key);
+
+        $data = [
+            'foo' => 'bar',
+            'abc' => 'def',
+            'xyz' => 123,
+        ];
+
+        $expects = [
+            'message' => [
+                'data' => $data,
+                'type' => 'myType',
+                'signer' => 'foo@example.com',
+                'timestamp' => 42,
+            ],
+            'signature' => 'E1fNdoWMX1QmSyKv+S3FtOgLe9niYGQFWOKGaMLxc2h7s3V++EIqJvw/NCLBfrUowzWkTzhkjfbHaf88Hz34WAn4sAwXYAO8cnboQs6SClKRzQ/nvbtLgd2wm9RQ8UTOM7wR6C7HpIn4qqJ4BTQ1bAwYAiJ2GoK+W8wC0o0Gpub2906j3JJ4cbc9lufd5ohWKCev8Ubem/EEKaRIZA7qHh+Q1MKXTaJQJlCjTMe5PyGy0fsmtVxsPls3/Fkd9sVeHEHSYHzOiF6ttlxWou4TdRbq3WSEVpt1DOOvkKI9w2+zBJ7IPH8CnVpXcdIzWDctUygZKzNMUQnweDOOziEdUw=='
+        ];
+
+        $result = $this->signer->sign('myType', $data, $user);
+
+        $this->assertEquals($expects, $result);
+    }
+
+    public function testVerifyValid(): void {
+        $data = [
+            'message' => [
+                'data' => [
+                    'foo' => 'bar',
+                    'abc' => 'def',
+                    'xyz' => 123,
+                ],
+                'type' => 'myType',
+                'signer' => 'foo@example.com',
+                'timestamp' => 42,
+            ],
+            'signature' => 'E1fNdoWMX1QmSyKv+S3FtOgLe9niYGQFWOKGaMLxc2h7s3V++EIqJvw/NCLBfrUowzWkTzhkjfbHaf88Hz34WAn4sAwXYAO8cnboQs6SClKRzQ/nvbtLgd2wm9RQ8UTOM7wR6C7HpIn4qqJ4BTQ1bAwYAiJ2GoK+W8wC0o0Gpub2906j3JJ4cbc9lufd5ohWKCev8Ubem/EEKaRIZA7qHh+Q1MKXTaJQJlCjTMe5PyGy0fsmtVxsPls3/Fkd9sVeHEHSYHzOiF6ttlxWou4TdRbq3WSEVpt1DOOvkKI9w2+zBJ7IPH8CnVpXcdIzWDctUygZKzNMUQnweDOOziEdUw=='
+        ];
+
+        $user = $this->createMock(IUser::class);
+
+        $this->keyManager->method('getKey')
+            ->with($this->equalTo($user))
+            ->willReturn($this->key);
+
+        $this->userManager->method('get')
+            ->with('foo')
+            ->willReturn($user);
+
+        $this->assertTrue($this->signer->verify($data));
+    }
+
+    public function testVerifyInvalid(): void {
+        $data = [
+            'message' => [
+                'data' => [
+                    'foo' => 'bar',
+                    'abc' => 'def',
+                    'xyz' => 123,
+                ],
+                'type' => 'myType',
+                'signer' => 'foo@example.com',
+                'timestamp' => 42,
+            ],
+            'signature' => 'Invalid sig'
+        ];
+
+        $user = $this->createMock(IUser::class);
+
+        $this->keyManager->method('getKey')
+            ->with($this->equalTo($user))
+            ->willReturn($this->key);
+
+        $this->userManager->method('get')
+            ->with('foo')
+            ->willReturn($user);
+
+        $this->assertFalse($this->signer->verify($data));
+    }
+
+    public function testVerifyInvalidData(): void {
+        $data = [
+        ];
+
+        $this->assertFalse($this->signer->verify($data));
+    }
 }

tests/lib/Security/IdentityProof/KeyTest.php

Indentation +12 added lines, -12 removed lines

@@ -13,20 +13,20 @@
 use Test\TestCase;
 
 class KeyTest extends TestCase {
-	/** @var Key */
-	private $key;
+    /** @var Key */
+    private $key;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->key = new Key('public', 'private');
-	}
+        $this->key = new Key('public', 'private');
+    }
 
-	public function testGetPrivate(): void {
-		$this->assertSame('private', $this->key->getPrivate());
-	}
+    public function testGetPrivate(): void {
+        $this->assertSame('private', $this->key->getPrivate());
+    }
 
-	public function testGetPublic(): void {
-		$this->assertSame('public', $this->key->getPublic());
-	}
+    public function testGetPublic(): void {
+        $this->assertSame('public', $this->key->getPublic());
+    }
 }