Inspection of "Merge pull request #20275 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( a688f4...483e92 )

by Roeland

created 2020-04-03 06:47 UTC

Status

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

@@ -40,22 +40,22 @@  discard block
 block discarded – undo
 
 // Backends
 $authBackend = new OCA\DAV\Connector\PublicAuth(
-	\OC::$server->getRequest(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getSession()
+    \OC::$server->getRequest(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getSession()
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
 $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager(),
-	\OC::$server->getEventDispatcher()
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager(),
+    \OC::$server->getEventDispatcher()
 );
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
@@ -64,43 +64,43 @@  discard block
 block discarded – undo
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
-	$federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
-	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
-	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
-		// this is what is thrown when trying to access a non-existing share
-		throw new \Sabre\DAV\Exception\NotAuthenticated();
-	}
-
-	$share = $authBackend->getShare();
-	$owner = $share->getShareOwner();
-	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
-	$fileId = $share->getNodeId();
-
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
-	});
-
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-	OC_Util::tearDownFS();
-	OC_Util::setupFS($owner);
-	$ownerView = new \OC\Files\View('/'. $owner . '/files');
-	$path = $ownerView->getPath($fileId);
-	$fileInfo = $ownerView->getFileInfo($path);
-	$linkCheckPlugin->setFileInfo($fileInfo);
-
-	// If not readble (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
-
-	$view = new \OC\Files\View($ownerView->getAbsolutePath($path));
-	$filesDropPlugin->setView($view);
-
-	return $view;
+    $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
+    $federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
+    $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+    if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+        // this is what is thrown when trying to access a non-existing share
+        throw new \Sabre\DAV\Exception\NotAuthenticated();
+    }
+
+    $share = $authBackend->getShare();
+    $owner = $share->getShareOwner();
+    $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
+    $fileId = $share->getNodeId();
+
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
+    });
+
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+    OC_Util::tearDownFS();
+    OC_Util::setupFS($owner);
+    $ownerView = new \OC\Files\View('/'. $owner . '/files');
+    $path = $ownerView->getPath($fileId);
+    $fileInfo = $ownerView->getFileInfo($path);
+    $linkCheckPlugin->setFileInfo($fileInfo);
+
+    // If not readble (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
+
+    $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
+    $filesDropPlugin->setView($view);
+
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin();
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
+$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function(\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
 	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
 	$federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
 	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
 	});
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 
 	OC_Util::tearDownFS();
 	OC_Util::setupFS($owner);
-	$ownerView = new \OC\Files\View('/'. $owner . '/files');
+	$ownerView = new \OC\Files\View('/'.$owner.'/files');
 	$path = $ownerView->getPath($fileId);
 	$fileInfo = $ownerView->getFileInfo($path);
 	$linkCheckPlugin->setFileInfo($fileInfo);

Please login to merge, or discard this patch.

		@@ -40,22 +40,22 @@ discard block
		block discarded – undo
40	40
41	41	// Backends
42	42	$authBackend = new OCA\DAV\Connector\PublicAuth(
43		- \OC::$server->getRequest(),
44		- \OC::$server->getShareManager(),
45		- \OC::$server->getSession()
	43	+ \OC::$server->getRequest(),
	44	+ \OC::$server->getShareManager(),
	45	+ \OC::$server->getSession()
46	46	);
47	47	$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
48	48
49	49	$serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
50		- \OC::$server->getConfig(),
51		- \OC::$server->getLogger(),
52		- \OC::$server->getDatabaseConnection(),
53		- \OC::$server->getUserSession(),
54		- \OC::$server->getMountManager(),
55		- \OC::$server->getTagManager(),
56		- \OC::$server->getRequest(),
57		- \OC::$server->getPreviewManager(),
58		- \OC::$server->getEventDispatcher()
	50	+ \OC::$server->getConfig(),
	51	+ \OC::$server->getLogger(),
	52	+ \OC::$server->getDatabaseConnection(),
	53	+ \OC::$server->getUserSession(),
	54	+ \OC::$server->getMountManager(),
	55	+ \OC::$server->getTagManager(),
	56	+ \OC::$server->getRequest(),
	57	+ \OC::$server->getPreviewManager(),
	58	+ \OC::$server->getEventDispatcher()
59	59	);
60	60
61	61	$requestUri = \OC::$server->getRequest()->getRequestUri();
		@@ -64,43 +64,43 @@ discard block
		block discarded – undo
64	64	$filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
65	65
66	66	$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
67		- $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
68		- $federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
69		- $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
70		- if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
71		- // this is what is thrown when trying to access a non-existing share
72		- throw new \Sabre\DAV\Exception\NotAuthenticated();
73		- }
74		-
75		- $share = $authBackend->getShare();
76		- $owner = $share->getShareOwner();
77		- $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
78		- $fileId = $share->getNodeId();
79		-
80		- // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
81		- $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
82		- \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
83		- return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() \| \OCP\Constants::PERMISSION_SHARE]);
84		- });
85		-
86		- \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
87		-
88		- OC_Util::tearDownFS();
89		- OC_Util::setupFS($owner);
90		- $ownerView = new \OC\Files\View('/'. $owner . '/files');
91		- $path = $ownerView->getPath($fileId);
92		- $fileInfo = $ownerView->getFileInfo($path);
93		- $linkCheckPlugin->setFileInfo($fileInfo);
94		-
95		- // If not readble (files_drop) enable the filesdrop plugin
96		- if (!$isReadable) {
97		- $filesDropPlugin->enable();
98		- }
99		-
100		- $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
101		- $filesDropPlugin->setView($view);
102		-
103		- return $view;
	67	+ $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
	68	+ $federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
	69	+ $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
	70	+ if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
	71	+ // this is what is thrown when trying to access a non-existing share
	72	+ throw new \Sabre\DAV\Exception\NotAuthenticated();
	73	+ }
	74	+
	75	+ $share = $authBackend->getShare();
	76	+ $owner = $share->getShareOwner();
	77	+ $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
	78	+ $fileId = $share->getNodeId();
	79	+
	80	+ // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
	81	+ $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
	82	+ \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
	83	+ return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() \| \OCP\Constants::PERMISSION_SHARE]);
	84	+ });
	85	+
	86	+ \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
	87	+
	88	+ OC_Util::tearDownFS();
	89	+ OC_Util::setupFS($owner);
	90	+ $ownerView = new \OC\Files\View('/'. $owner . '/files');
	91	+ $path = $ownerView->getPath($fileId);
	92	+ $fileInfo = $ownerView->getFileInfo($path);
	93	+ $linkCheckPlugin->setFileInfo($fileInfo);
	94	+
	95	+ // If not readble (files_drop) enable the filesdrop plugin
	96	+ if (!$isReadable) {
	97	+ $filesDropPlugin->enable();
	98	+ }
	99	+
	100	+ $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
	101	+ $filesDropPlugin->setView($view);
	102	+
	103	+ return $view;
104	104	});
105	105
106	106	$server->addPlugin($linkCheckPlugin);

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	$linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin();
64	64	$filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
65	65
66		-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
	66	+$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function(\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
67	67	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
68	68	$federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
69	69	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79
80	80	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
81	81	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
82		- \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
	82	+ \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
83	83	return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() \| \OCP\Constants::PERMISSION_SHARE]);
84	84	});
85	85
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87
88	88	OC_Util::tearDownFS();
89	89	OC_Util::setupFS($owner);
90		- $ownerView = new \OC\Files\View('/'. $owner . '/files');
	90	+ $ownerView = new \OC\Files\View('/'.$owner.'/files');
91	91	$path = $ownerView->getPath($fileId);
92	92	$fileInfo = $ownerView->getFileInfo($path);
93	93	$linkCheckPlugin->setFileInfo($fileInfo);

nextcloud / server

Push — master ( a688f4...483e92 )

Status

Category

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

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch